From f361f4ba74a6a34b7b524ca2a828bd888c7d135c Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 9 Aug 2013 11:46:41 -0300 Subject: Update documentation. --- Makefile | 4 +-- data/bitmask.pro | 56 +++++++++++++++++++++++++++++++++++++++ data/leap_client.pro | 56 --------------------------------------- docs/dev/internationalization.rst | 2 +- docs/dev/tests.rst | 4 +-- 5 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 data/bitmask.pro delete mode 100644 data/leap_client.pro diff --git a/Makefile b/Makefile index 7d8f2c23..0c9b7951 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ COMPILED_DIR = src/leap/gui TRANSLAT_DIR = data/translations #Project file, used for translations -PROJFILE = data/leap_client.pro +PROJFILE = data/bitmask.pro #UI files to compile UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui @@ -58,7 +58,7 @@ $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ manpages: - rst2man docs/man/leap.1.rst docs/man/leap.1 + rst2man docs/man/bitmask.1.rst docs/man/bitmask.1 apidocs: @sphinx-apidoc -o docs/api src/leap diff --git a/data/bitmask.pro b/data/bitmask.pro new file mode 100644 index 00000000..ff26ad1a --- /dev/null +++ b/data/bitmask.pro @@ -0,0 +1,56 @@ +# qmake file + +# is not there a f*** way of expanding this? other to template with python I mean... + +# to get a list of python files we can use: +# find . -iname "*.py" | grep -Ev "__init__.py|/build/|/docs/|/gui/ui_[a-z]*.py|/gui/[a-z]*_rc.py|./.venv/|/tests/" +# and remove by hand the few files that we do not want. + +SOURCES += ../src/leap/app.py \ + ../src/leap/config/leapsettings.py \ + ../src/leap/config/providerconfig.py \ + ../src/leap/crypto/srpauth.py \ + ../src/leap/crypto/srpregister.py \ + ../src/leap/gui/loggerwindow.py \ + ../src/leap/gui/login.py \ + ../src/leap/gui/mainwindow.py \ + ../src/leap/gui/statuspanel.py \ + ../src/leap/gui/twisted_main.py \ + ../src/leap/gui/wizardpage.py \ + ../src/leap/gui/wizard.py \ + ../src/leap/platform_init/initializers.py \ + ../src/leap/platform_init/locks.py \ + ../src/leap/provider/supportedapis.py \ + ../src/leap/services/abstractbootstrapper.py \ + ../src/leap/services/eip/eipbootstrapper.py \ + ../src/leap/services/eip/eipconfig.py \ + ../src/leap/services/eip/providerbootstrapper.py \ + ../src/leap/services/eip/udstelnet.py \ + ../src/leap/services/eip/vpnlaunchers.py \ + ../src/leap/services/eip/vpnprocess.py \ + ../src/leap/services/mail/smtpbootstrapper.py \ + ../src/leap/services/mail/smtpconfig.py \ + ../src/leap/services/soledad/soledadbootstrapper.py \ + ../src/leap/services/soledad/soledadconfig.py \ + ../src/leap/services/tx.py \ + ../src/leap/util/constants.py \ + ../src/leap/util/keyring_helpers.py \ + ../src/leap/util/leap_argparse.py \ + ../src/leap/util/leap_log_handler.py \ + ../src/leap/util/privilege_policies.py \ + ../src/leap/util/pyside_tests_helper.py \ + ../src/leap/util/request_helpers.py \ + ../src/leap/util/requirement_checker.py + +FORMS += ../src/leap/gui/ui/loggerwindow.ui \ + ../src/leap/gui/ui/login.ui \ + ../src/leap/gui/ui/mainwindow.ui \ + ../src/leap/gui/ui/statuspanel.ui \ + ../src/leap/gui/ui/wizard.ui \ + +# where to generate ts files -- tx will pick from here + +# original file, english + +TRANSLATIONS += ts/en_US.ts + diff --git a/data/leap_client.pro b/data/leap_client.pro deleted file mode 100644 index ff26ad1a..00000000 --- a/data/leap_client.pro +++ /dev/null @@ -1,56 +0,0 @@ -# qmake file - -# is not there a f*** way of expanding this? other to template with python I mean... - -# to get a list of python files we can use: -# find . -iname "*.py" | grep -Ev "__init__.py|/build/|/docs/|/gui/ui_[a-z]*.py|/gui/[a-z]*_rc.py|./.venv/|/tests/" -# and remove by hand the few files that we do not want. - -SOURCES += ../src/leap/app.py \ - ../src/leap/config/leapsettings.py \ - ../src/leap/config/providerconfig.py \ - ../src/leap/crypto/srpauth.py \ - ../src/leap/crypto/srpregister.py \ - ../src/leap/gui/loggerwindow.py \ - ../src/leap/gui/login.py \ - ../src/leap/gui/mainwindow.py \ - ../src/leap/gui/statuspanel.py \ - ../src/leap/gui/twisted_main.py \ - ../src/leap/gui/wizardpage.py \ - ../src/leap/gui/wizard.py \ - ../src/leap/platform_init/initializers.py \ - ../src/leap/platform_init/locks.py \ - ../src/leap/provider/supportedapis.py \ - ../src/leap/services/abstractbootstrapper.py \ - ../src/leap/services/eip/eipbootstrapper.py \ - ../src/leap/services/eip/eipconfig.py \ - ../src/leap/services/eip/providerbootstrapper.py \ - ../src/leap/services/eip/udstelnet.py \ - ../src/leap/services/eip/vpnlaunchers.py \ - ../src/leap/services/eip/vpnprocess.py \ - ../src/leap/services/mail/smtpbootstrapper.py \ - ../src/leap/services/mail/smtpconfig.py \ - ../src/leap/services/soledad/soledadbootstrapper.py \ - ../src/leap/services/soledad/soledadconfig.py \ - ../src/leap/services/tx.py \ - ../src/leap/util/constants.py \ - ../src/leap/util/keyring_helpers.py \ - ../src/leap/util/leap_argparse.py \ - ../src/leap/util/leap_log_handler.py \ - ../src/leap/util/privilege_policies.py \ - ../src/leap/util/pyside_tests_helper.py \ - ../src/leap/util/request_helpers.py \ - ../src/leap/util/requirement_checker.py - -FORMS += ../src/leap/gui/ui/loggerwindow.ui \ - ../src/leap/gui/ui/login.ui \ - ../src/leap/gui/ui/mainwindow.ui \ - ../src/leap/gui/ui/statuspanel.ui \ - ../src/leap/gui/ui/wizard.ui \ - -# where to generate ts files -- tx will pick from here - -# original file, english - -TRANSLATIONS += ts/en_US.ts - diff --git a/docs/dev/internationalization.rst b/docs/dev/internationalization.rst index 21d58924..f9f522b9 100644 --- a/docs/dev/internationalization.rst +++ b/docs/dev/internationalization.rst @@ -65,7 +65,7 @@ If you do not already have it, install the ``transifex-client`` from the cheese You can learn more about the transifex-client `here `_. -**1.** Add any new source files to the project file, ``data/leap_client.pro``. *We should automate this with some templating, it's tedious.* +**1.** Add any new source files to the project file, ``data/bitmask.pro``. *We should automate this with some templating, it's tedious.* **2.** Update the source .ts file ``data/ts/en_US.ts``.:: diff --git a/docs/dev/tests.rst b/docs/dev/tests.rst index 7f5fbaaf..d55c206a 100644 --- a/docs/dev/tests.rst +++ b/docs/dev/tests.rst @@ -39,8 +39,8 @@ Hint: colorized output Install ``rednose`` locally, export the ``NOSE_REDNOSE`` variable, and give your eyes a rest :):: - (leap_client)% pip install rednose - (leap_client)% export NOSE_REDNOSE=1 + (bitmask)% pip install rednose + (bitmask)% export NOSE_REDNOSE=1 Testing all the supported python versions ----------------------------------------- -- cgit v1.2.3 From 0635f067d5c5b4c186abe7de4d8e692ad09a1416 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 9 Aug 2013 11:47:15 -0300 Subject: Change prefix name, refactor imports. --- src/leap/_version.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/leap/_version.py b/src/leap/_version.py index 6f7e3d05..05542975 100644 --- a/src/leap/_version.py +++ b/src/leap/_version.py @@ -16,6 +16,8 @@ git_full = "$Format:%H$" import subprocess import sys +import re +import os.path def run_command(args, cwd=None, verbose=False): @@ -38,11 +40,6 @@ def run_command(args, cwd=None, verbose=False): return stdout -import sys -import re -import os.path - - def get_expanded_variables(versionfile_source): # the code embedded in _version.py can just fetch the value of these # variables. When used from setup.py, we don't want to import @@ -187,7 +184,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source, return {"version": dirname[len(parentdir_prefix):], "full": ""} tag_prefix = "" -parentdir_prefix = "leap_client-" +parentdir_prefix = "bitmask-" versionfile_source = "src/leap/_version.py" -- cgit v1.2.3