diff options
| -rw-r--r-- | README.txt | 29 | ||||
| -rw-r--r-- | pkg/install_venv.py | 21 | ||||
| -rw-r--r-- | src/leap/eip/config.py | 1 |
3 files changed, 32 insertions, 19 deletions
@@ -48,13 +48,30 @@ You can: Running the App ----------------- -leap --debug --logfile /tmp/leap.log +leap-client --debug --logfile /tmp/leap.log + +If you're running a branded build, the script name will have a suffix that +depends on your build flavor: + +leap-client-springbok (or python app.py --debug if you run it from the src/leap folder). Development ============== +Hack +-------------- + +(recommended) +virtualenv . # ensure your .gitignore knows about it +source bin/activate +git checkout develop +pkg/postmkvenv.sh + +python setup.py branding +python setup.py develop + Running tests ------------- @@ -82,16 +99,6 @@ Test-deps have a look at setup/test-requires -Hack --------------- - -(recommended) -virtualenv . # ensure your .gitignore knows about it -source bin/activate -git checkout develop -pkg/postmkvenv.sh -python setup.py develop - Compiling resource/ui files ----------------------------- diff --git a/pkg/install_venv.py b/pkg/install_venv.py index 15385beb..17dfb984 100644 --- a/pkg/install_venv.py +++ b/pkg/install_venv.py @@ -29,8 +29,8 @@ import sys ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) VENV = os.path.join(ROOT, '.venv') -PIP_REQUIRES = os.path.join(ROOT, 'setup', 'requirements.pip') -TEST_REQUIRES = os.path.join(ROOT, 'setup', 'test-requirements.pip') +PIP_REQUIRES = os.path.join(ROOT, 'pkg', 'requirements.pip') +TEST_REQUIRES = os.path.join(ROOT, 'pkg', 'test-requirements.pip') PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) @@ -108,6 +108,10 @@ class Debian(Distro): def apply_patch(self, originalfile, patchfile): run_command(['patch', originalfile, patchfile]) + def post_process(self): + #symlink qt in virtualenv + run_command(['pkg/tools/with_venv.sh', 'pkg/postmkvenv.sh']) + def install_virtualenv(self): if self.check_cmd('virtualenv'): return @@ -163,19 +167,22 @@ def create_virtualenv(venv=VENV, no_site_packages=True): """ print 'Creating venv...', if no_site_packages: - run_command(['virtualenv', '-q', '--no-site-packages', VENV]) + #setuptools and virtualenv don't play nicely together, + #so we create the virtualenv with the distribute package instead. + #See: view-source:http://pypi.python.org/pypi/distribute + run_command(['virtualenv', '-q', '--distribute', '--no-site-packages', VENV]) else: - run_command(['virtualenv', '-q', VENV]) + run_command(['virtualenv', '-q', '--distribute', VENV]) print 'done.' print 'Installing pip in virtualenv...', - if not run_command(['setup/tools/with_venv.sh', 'easy_install', + if not run_command(['pkg/tools/with_venv.sh', 'easy_install', 'pip>1.0']).strip(): die("Failed to install pip.") print 'done.' def pip_install(*args): - run_command(['setup/tools/with_venv.sh', + run_command(['pkg/tools/with_venv.sh', 'pip', 'install', '--upgrade'] + list(args), redirect_output=False) @@ -211,7 +218,7 @@ def print_help(): Or, if you prefer, you can run commands in the virtualenv on a case by case basis by running: - $ setup/tools/with_venv.sh <your command> + $ pkg/tools/with_venv.sh <your command> Also, make test will automatically use the virtualenv. """ diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py index 7c9bf335..ef0f52b4 100644 --- a/src/leap/eip/config.py +++ b/src/leap/eip/config.py @@ -60,7 +60,6 @@ def get_eip_gateway(): file. """ placeholder = "testprovider.example.org" - eipconfig = EIPConfig() #import ipdb;ipdb.set_trace() eipconfig.load() |