diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | data/bitmask.pro | 83 |
2 files changed, 44 insertions, 45 deletions
@@ -8,10 +8,10 @@ #Directory with ui and resource files RESOURCE_DIR = data/resources -UI_DIR = src/leap/gui/ui +UI_DIR = src/leap/bitmask/gui/ui #Directory for compiled resources -COMPILED_DIR = src/leap/gui +COMPILED_DIR = src/leap/bitmask/gui #Directory for (finished) translations TRANSLAT_DIR = data/translations @@ -61,7 +61,7 @@ manpages: rst2man docs/man/bitmask.1.rst docs/man/bitmask.1 apidocs: - @sphinx-apidoc -o docs/api src/leap + @sphinx-apidoc -o docs/api src/leap/bitmask clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) diff --git a/data/bitmask.pro b/data/bitmask.pro index ff26ad1a..e117668b 100644 --- a/data/bitmask.pro +++ b/data/bitmask.pro @@ -6,51 +6,50 @@ # 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 \ +SOURCES += ../src/leap/bitmask/app.py \ + ../src/leap/bitmask/config/leapsettings.py \ + ../src/leap/bitmask/config/providerconfig.py \ + ../src/leap/bitmask/crypto/srpauth.py \ + ../src/leap/bitmask/crypto/srpregister.py \ + ../src/leap/bitmask/gui/loggerwindow.py \ + ../src/leap/bitmask/gui/login.py \ + ../src/leap/bitmask/gui/mainwindow.py \ + ../src/leap/bitmask/gui/statuspanel.py \ + ../src/leap/bitmask/gui/twisted_main.py \ + ../src/leap/bitmask/gui/wizardpage.py \ + ../src/leap/bitmask/gui/wizard.py \ + ../src/leap/bitmask/platform_init/initializers.py \ + ../src/leap/bitmask/platform_init/locks.py \ + ../src/leap/bitmask/provider/supportedapis.py \ + ../src/leap/bitmask/services/abstractbootstrapper.py \ + ../src/leap/bitmask/services/eip/eipbootstrapper.py \ + ../src/leap/bitmask/services/eip/eipconfig.py \ + ../src/leap/bitmask/services/eip/providerbootstrapper.py \ + ../src/leap/bitmask/services/eip/udstelnet.py \ + ../src/leap/bitmask/services/eip/vpnlaunchers.py \ + ../src/leap/bitmask/services/eip/vpnprocess.py \ + ../src/leap/bitmask/services/mail/smtpbootstrapper.py \ + ../src/leap/bitmask/services/mail/smtpconfig.py \ + ../src/leap/bitmask/services/soledad/soledadbootstrapper.py \ + ../src/leap/bitmask/services/soledad/soledadconfig.py \ + ../src/leap/bitmask/services/tx.py \ + ../src/leap/bitmask/util/constants.py \ + ../src/leap/bitmask/util/keyring_helpers.py \ + ../src/leap/bitmask/util/leap_argparse.py \ + ../src/leap/bitmask/util/leap_log_handler.py \ + ../src/leap/bitmask/util/privilege_policies.py \ + ../src/leap/bitmask/util/pyside_tests_helper.py \ + ../src/leap/bitmask/util/request_helpers.py \ + ../src/leap/bitmask/util/requirement_checker.py + +FORMS += ../src/leap/bitmask/gui/ui/loggerwindow.ui \ + ../src/leap/bitmask/gui/ui/login.ui \ + ../src/leap/bitmask/gui/ui/mainwindow.ui \ + ../src/leap/bitmask/gui/ui/statuspanel.ui \ + ../src/leap/bitmask/gui/ui/wizard.ui \ # where to generate ts files -- tx will pick from here # original file, english TRANSLATIONS += ts/en_US.ts - |