From f66493426a7d0839801c81089ade6511efa1be3a Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 18 Sep 2014 13:09:07 -0500
Subject: Use wheels! yeah!

No more infinite time to re-create a virtualenv.
---
 Makefile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0008cb39..bbeebc36 100644
--- a/Makefile
+++ b/Makefile
@@ -95,5 +95,19 @@ resource_graph:
 	./pkg/scripts/monitor_resource.zsh `pgrep bitmask` $(RESOURCE_TIME)
 	display bitmask-resources.png
 
+get_wheels:
+	pip install --upgrade setuptools
+	pip install --upgrade pip
+	pip install wheel
+
+gather_wheels:
+	pip wheel --wheel-dir=../wheelhouse pyzmq --build-option "--zmq=bundled"
+	# because fuck u1db externals, that's why...
+	pip wheel --wheel-dir=../wheelhouse --allow-external dirspec --allow-unverified dirspec --allow-external u1db --allow-unverified u1db -r pkg/requirements.pip
+
+install_wheel:
+	# if it's the first time, you'll need to get_wheels first
+	pip install --pre --use-wheel --no-index --find-links=../wheelhouse -r pkg/requirements.pip
+
 clean :
 	$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
-- 
cgit v1.2.3


From c7304e54e40cd9151e6d00a8441aaf48b68c9bcc Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 3 Sep 2014 15:50:08 -0700
Subject: single pref win: move eip preferences to new combined preference
 window.

---
 Makefile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bbeebc36..e7173c80 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,19 @@ TRANSLAT_DIR = data/translations
 #Project file, used for translations
 PROJFILE = data/bitmask.pro
 
-#UI files to compile
-UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui
-#Qt resource files to compile
+# UI files to compile
+UI_FILES = \
+  loggerwindow.ui \
+  wizard.ui \
+  mainwindow.ui login.ui eip_status.ui mail_status.ui \
+  preferences.ui \
+    preferences_account_page.ui \
+    preferences_vpn_page.ui \
+    preferences_email_page.ui \
+    password_change.ui \
+    advanced_key_management.ui
+
+# Qt resource files to compile
 RESOURCES = icons.qrc flags.qrc locale.qrc loggerwindow.qrc
 
 #pyuic4 and pyrcc4 binaries
-- 
cgit v1.2.3