From b047beb3e50a541564d2ab6ff17491608a630101 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 6 Sep 2016 09:25:46 -0400
Subject: [pkg] package bitmask_www

---
 www/Makefile                     | 12 +++++++++++-
 www/leap/bitmask_www/__init__.py |  0
 www/setup.py                     | 18 +++++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 www/leap/bitmask_www/__init__.py

(limited to 'www')

diff --git a/www/Makefile b/www/Makefile
index 1e21b9a8..e3a791d2 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,11 +2,16 @@ build:
 	npm install
 	npm run build:production
 
+build-dev:
+	npm run watch 
+
 clean:
 	rm -rf public
 	rm -rf node_modules
 
-pydist-wheel:
+pydist: pydist-clean build
+	touch leap/bitmask_www/__init__.py
+	cp -r public/ leap/bitmask_www
 	python setup.py bdist_wheel
 
 pydist-dev:
@@ -14,3 +19,8 @@ pydist-dev:
 
 pydist-clean:
 	rm -rf build dist
+	rm -rf leap/bitmask_www/*
+
+all: clean build pydist
+
+.PHONY: clean build install all
diff --git a/www/leap/bitmask_www/__init__.py b/www/leap/bitmask_www/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/www/setup.py b/www/setup.py
index 860d0aaa..b5473d17 100644
--- a/www/setup.py
+++ b/www/setup.py
@@ -15,19 +15,26 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 Setup file for leap.bitmask-www
 """
+
 from setuptools import setup
 
 import datetime
 import time
 
+
+# TODO  add all the node steps in this setup too.
+# Right now it's expected that you run the node commands by hand
+# i.e., 'make build'
+
 now = datetime.datetime.now()
 timestamp = time.strftime('%Y%m%d', now.timetuple())
 
 setup(
-    name='leap.bitmask-www',
+    name='leap.bitmask_www',
     version='0.1.%s' % timestamp,
     description='Bitmask html/js UI',
     long_description=open('notes-python.txt').read(),
@@ -35,8 +42,13 @@ setup(
     author_email='info@leap.se',
     url='http://leap.se',
     namespace_packages=['leap'],
-    packages=['leap.bitmask-www'],
+    packages=['leap.bitmask_www'],
     package_data={
-        '': ['public/*', ]
+        '': ['public/*',
+             'public/css/*',
+             'public/fonts/*',
+             'public/img/*',
+             'publlic/js/*',
+             ]
     }
 )
-- 
cgit v1.2.3