X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a29b5b3a44980d20fe6280c4346c9b2d8e521e68;hb=9ae44949b75cd220c6d67a97d148cfa9ac9f9fb9;hp=02d4ada7e314b04e345a4893e19e7e624c8b907c;hpb=27d4b7221fafd480e9532e14c65c865f964f39ab;p=unfold.git

diff --git a/Makefile b/Makefile
index 02d4ada7..a29b5b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ 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/|/bootstrap/|/jquery/'
+	@git ls-files | egrep -v 'insert(_|-)above|static/bootstrap|/jquery/|datatables/'
 
 # in general it's right to rely on the contents as reported by git
 tags: force
@@ -17,6 +17,17 @@ tags: force
 ftags: force
 	find . -type f | fgrep -v '/.git/' | xargs etags
 
+list-html: force
+	@find . -type f -name '*.html'
+list-js: force
+	@find . -type f -name '*.js' | grep -v '/all-static/'
+list-css: force
+	@find . -type f -name '*.css' | grep -v '/all-static/'
+list-img: force
+	@find . -type f -name '*.png' | grep -v '/all-static/'
+
+list-all list-resources: list-html list-js list-css list-img
+
 #################### manage static contents (extract from all the modules into the single all-static location)
 static: force
 	./manage.py collectstatic --noinput 
@@ -31,8 +42,9 @@ SSHURL:=root@$(MYSLICEBOX):/
 SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 
 ### rsync options
-# the config file should probably not be overridden
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude settings.py --exclude devel
+# the config file should probably not be overridden ??
+# --exclude settings.py 
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude devel --exclude DataTables-1.9.4 --exclude all-static --exclude '*.sqlite3' 
 # usual excludes
 RSYNC_EXCLUDES		:= --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 
@@ -41,7 +53,8 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 # xxx until we come up with a packaging this is going to be a wild guess
-INSTALLED=/usr/share/myslice
+#INSTALLED=/usr/share/myslice
+INSTALLED=/root/myslice
 
 sync:
 ifeq (,$(MYSLICEBOX))
@@ -59,5 +72,5 @@ ifeq (,$(MYSLICEBOX))
 	@echo "  $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
 	@exit 1
 else
-	@echo "$@" target not yet implemented; exit; @$(SSHCOMMAND) /etc/init.d/apache2 restart
+	@echo "$@" target not yet implemented - for an apache based depl it would read ...; exit; @$(SSHCOMMAND) /etc/init.d/apache2 restart
 endif