summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-06-13 13:51:06 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-13 13:51:06 +0200
commit724191972ba44ce1ae5f7904bf21ec37f38aa384 (patch)
tree8763a735844f5c4d768a6fb72a2d68f411ed7ca4 /Makefile
parentd752f081b8999be691d76444f18f39db6b2b54c8 (diff)
[pkg] factor out pixelated packages
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0e44505..9b92e41 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,8 @@ clean:
dev-mail:
pip install -e '.[mail]'
-dev-gui:
+dev-gui: install_pixelated
pip install -e '.[gui]'
- pip install requests==2.11.1 whoosh chardet
- pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
dev-backend:
pip install -e '.[backend]'
@@ -24,11 +22,8 @@ dev-latest-backend: dev-backend
pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common'
pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client'
-dev-all:
+dev-all: install_pixelated
pip install -e '.[all]'
- # install pixelated from our repo until assets get packaged.
- pip install requests==2.11.1 whoosh chardet
- pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
dev-latest-all: dev-all
pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common'
@@ -49,6 +44,11 @@ install_helpers:
cp src/leap/bitmask/vpn/helpers/linux/bitmask-root /usr/local/sbin/
cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy /usr/share/polkit-1/actions/
+install_pixelated:
+ # install pixelated from our repo until assets get packaged.
+ pip install requests==2.11.1 whoosh chardet
+ pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
+
qt-resources:
pyrcc5 pkg/branding/icons.qrc -o src/leap/bitmask/gui/app_rc.py