From 0a83b39186d8fc46410c6ccf34546d6b4957e6f1 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Fri, 19 May 2017 20:52:11 +0200
Subject: [pkg] some naming changes to ui Makefile

---
 ui/Makefile | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'ui')

diff --git a/ui/Makefile b/ui/Makefile
index 594e2e3a..b95fe9ec 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -1,5 +1,5 @@
 #
-# builds for development mode
+# npm builds for development mode
 #
 
 dev-build: build-clean make-init
@@ -11,25 +11,40 @@ dev-install: dev-build
 
 # installs a prebuilt python package from
 # the magical pypi place in the sky.
-# for usage when you don't want to install nodejs
+# (see below for how this is generated).
+
 dev-install-prebuilt:
 	pip install -U leap.bitmask_js
 
 #
 # distribution builds
 #
+# This builds a python package that distributes the compiled assets, 
+# for usage when you don't want to install nodejs.
+#
+# A developer/maintainer should use only these two targets:
+#
+# - "make python-package-local": 
+#   	builds & installs the python package (from wheel).
+#
+# - "make python-package":
+#       builds & uploads the python package to pypi, 
+
+
+python-package: clean pydist-build pydist-upload
 
-dist-build: build-clean make-init
+python-package-local: clean pydist-build
+	pip install pydist/dist/*.whl
+
+
+pydist-build: make-init
 	npm install
 	npm run build:production
 	cd pydist && python setup.py bdist_wheel
 
-dist-upload:
+pydist-upload:
 	cd pydist && python setup.py sdist upload -r pypi
 
-dist-install: dist-build
-	pip install pydist/dist/*.whl
-
 #
 # clean up and set up
 #
@@ -46,5 +61,5 @@ build-clean:
 clean: build-clean
 	rm -rf node_modules
 
-uninstall:
+uninstall-python-package:
 	pip uninstall leap.bitmask_js
-- 
cgit v1.2.3