X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=235336b7356f56a34da003b83ff2c3e58c3315db;hb=67f6ffe4742ada4c7243b528891289304fc4016d;hp=7d4cbbccf5a83b2512379cec6dc095b33b1b4be2;hpb=c6cb049fa23065c0c7442f3c021c92dba43c5658;p=myslice.git

diff --git a/Makefile b/Makefile
index 7d4cbbcc..235336b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,67 +1,136 @@
-### 
-all: 
-	@echo no default target
+SHELL = /bin/bash
+
+MAKE-SILENT = $(MAKE) --no-print-directory
+
+### first purpose, build and install from the specfile
+all: build
 
 force:
 
-#################### compute emacs tags
-# list files under git but exclude third-party stuff like bootstrap and jquery
-myfiles: force
-	@git ls-files | egrep -v 'insert(_|-)above|/third-party/|/play/'
+DESTDIR := /
+datadir := /usr/share
+bindir := /usr/bin
 
-# in general it's right to rely on the contents as reported by git
-tags: force
-	$(MAKE) myfiles | xargs etags
+PWD := $(shell pwd)
+
+build: static templates
+	python setup.py build
+
+install: 
+	python setup.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/unfold \
+	    --install-scripts=$(DESTDIR)/$(datadir)/unfold \
+	    --install-data=$(DESTDIR)/$(datadir)/unfold
+
+####################
+# general stuff
+DATE=$(shell date -u +"%a, %d %b %Y %T")
+
+# This is called from the build with the following variables set 
+# (see build/Makefile and target_debian)
+# (.) RPMTARBALL
+# (.) RPMVERSION
+# (.) RPMRELEASE
+# (.) RPMNAME
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
+
+debian: static templates debian/changelog debian.source debian.package
+
+debian/changelog: debian/changelog.in
+	sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+
+debian.source: force 
+	rsync -a $(RPMTARBALL) $(DEBTARBALL)
+
+debian.package:
+	debuild -uc -us -b 
+
+debian.clean:
+	$(MAKE) -f debian/rules clean
+	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
+	find . -name '*.pyc' -delete
 
-# however sometimes we have stuff not yet added, so in this case
-ftags: force
-	find . -type f | fgrep -v '/.git/' | xargs etags
 
 #################### third-party layout is kind of special 
-# because we have differents versions and all
+# because we have differents versions, and also we 
+# try to preserve the file structure from upstream
+# so let's handle this manually
 THIRD-PARTY-RESOURCES =
 # ignore variants, use the main symlink	third-party/bootstrap
 THIRD-PARTY-RESOURCES += $(shell ls third-party/bootstrap/*/*)
 # just the single js as identified with a symlink
 THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.bootstrap.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/css/dataTables.bootstrap.css)
 # likewise
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.min.js)
+# for storing the visible status of plugins
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.min.js)
+# creating queries uuids on the fly
+THIRD-PARTY-RESOURCES += $(shell ls third-party/uuid/Math.uuid.js)
 # spin comes in plain or min, + the jquery plugin, and our own settings
 THIRD-PARTY-RESOURCES += $(shell ls third-party/spin/*.js)
+# used in QueryCode
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shCore.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shAutoloader.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushPython.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushRuby.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCore.css)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCoreDefault.css)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shThemeDefault.css)
+# wizard plugin
+THIRD-PARTY-RESOURCES += $(shell ls third-party/smartwizard-1636c86/js/jquery.smartWizard-2.0.js)
+#THIRD-PARTY-RESOURCES += $(shell ls third-party/smartwizard-1636c86/js/jquery.smartWizard-2.0.min.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/smartwizard-1636c86/styles/smart_wizard.css)
+# jquery.notify
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.min.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/ui.notify.css)
+# CodeMirror
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.js) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.css) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/mode/sql/sql.js)
+# Mustache.js
+THIRD-PARTY-RESOURCES += $(shell ls third-party/mustache/mustache.js)
+
 
 thirdparty-js:
 	@find $(THIRD-PARTY-RESOURCES) -name '*.js'
 thirdparty-css:
 	@find $(THIRD-PARTY-RESOURCES) -name '*.css'
 thirdparty-img:
-	@find $(THIRD-PARTY-RESOURCES) -name '*.png'
+	@find $(THIRD-PARTY-RESOURCES) -name '*.png' -o -name '*.ico'
 
-# we might have any of these as templates - e.g. ./engine/templates/plugin-setenv.js
+# we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file
-other-js: force
+local-js: force
 	@find . -type f -name '*.js' | egrep -v '/all-(static|templates)/|/third-party/|/templates/'
-other-css: force
+local-css: force
 	@find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
-other-img: force
-	@find . -type f -name '*.png' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
+local-img: force
+	@find . -type f -name '*.png' -o -name '*.ico' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 
-list-js: thirdparty-js other-js
-list-css: thirdparty-css other-css
-list-img: thirdparty-img other-img
+list-js: thirdparty-js local-js
+list-css: thirdparty-css local-css
+list-img: thirdparty-img local-img
 
 # having templates in a templates/ subdir is fine most of the time except for plugins
-list-templates: force
+plugins-templates: force
 	@find plugins -type f -name '*.html' 
+local-templates: force
+	@$(foreach tmpl,$(shell find . -name templates),ls -1 $(tmpl)/*;)
+
+list-templates: plugins-templates local-templates
 
 #################### manage static contents (extract from all the modules into the single all-static location)
 static run-static static-run: force
 	mkdir -p ./all-static/js all-static/css all-static/img
-	ln -sf $(foreach x,$(shell $(MAKE) list-js),../../$(x)) ./all-static/js
-	ln -sf $(foreach x,$(shell $(MAKE) list-css),../../$(x)) ./all-static/css
-	ln -sf $(foreach x,$(shell $(MAKE) list-img),../../$(x)) ./all-static/img
-#	rsync -av $(shell $(MAKE) list-js) ./all-static/js
-#	rsync -av $(shell $(MAKE) list-css) ./all-static/css
-#	rsync -av $(shell $(MAKE) list-img) ./all-static/img
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-js),../../$(x)) ./all-static/js
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-css),../../$(x)) ./all-static/css
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-img),../../$(x)) ./all-static/img
 
 clean-static static-clean: force
 	rm -rf ./all-static
@@ -71,8 +140,7 @@ all-static: clean-static run-static
 #################### manage templates for the plugin area
 templates run-templates templates-run: force
 	mkdir -p all-templates
-	ln -sf $(foreach x,$(shell $(MAKE) list-templates),../$(x)) ./all-templates
-#	rsync -av $(shell $(MAKE) list-templates) ./all-templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./all-templates
 
 clean-templates templates-clean: force
 	rm -rf ./all-templates
@@ -82,6 +150,19 @@ all-templates: clean-templates run-templates
 ####################
 list-all list-resources: list-templates list-js list-css list-img
 
+#################### compute emacs tags
+# list files under git but exclude third-party stuff like bootstrap and jquery
+myfiles: force
+	@git ls-files | egrep -v 'insert(_|-)above|third-party/|play/'
+
+# in general it's right to rely on the contents as reported by git
+tags: force
+	$(MAKE-SILENT) myfiles | xargs etags
+
+# however sometimes we have stuff not yet added, so in this case
+ftags: force
+	find . -type f | fgrep -v '/.git/' | xargs etags
+
 #################### sync : push current code on a (devel) box running myslice
 SSHURL:=root@$(MYSLICEBOX):/
 SSHCOMMAND:=ssh root@$(MYSLICEBOX)
@@ -89,7 +170,7 @@ SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 ### rsync options
 # the config file should probably not be overridden ??
 # --exclude settings.py 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3' 
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3'  --exclude play/ 
 # usual excludes
 RSYNC_EXCLUDES		:= --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 
@@ -97,6 +178,7 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 # putting it together
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+##### convenience for development only, push code on a specific test box
 # xxx until we come up with a packaging this is going to be a wild guess
 # on debian04 I have stuff in /usr/share/myslice and a symlink in /root/myslice
 #INSTALLED=/usr/share/myslice