documenting an early attempt to point at an api-v2 instance (too early in fact)

[unfold.git] / Makefile

diff --git a/Makefile b/Makefile
index 85b5d09..69c1336 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+SHELL = /bin/bash
+
 MAKE-SILENT = $(MAKE) --no-print-directory
 
 ### first purpose, build and install from the specfile
@@ -30,26 +32,43 @@ THIRD-PARTY-RESOURCES =
 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)
+
 
 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. ./unfold/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
 local-js: force
        @find . -type f -name '*.js' | egrep -v '/all-(static|templates)/|/third-party/|/templates/'
 local-css: force
        @find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 local-img: force
-       @find . -type f -name '*.png' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
+       @find . -type f -name '*.png' -o -name '*.ico' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 
 list-js: thirdparty-js local-js
 list-css: thirdparty-css local-css
@@ -108,7 +127,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