tweak make sync to take settings.py into account as well

[myslice.git] / Makefile

diff --git a/Makefile b/Makefile
index d18ae06..19418db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,13 @@ all:
 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/|datatables/'
+
 # in general it's right to rely on the contents as reported by git
 tags: force
-       git ls-files | xargs etags
+       $(MAKE) myfiles | xargs etags
 
 # however sometimes we have stuff not yet added, so in this case
 ftags: force
@@ -20,13 +24,16 @@ static: force
 clean-static: force
        rm -rf ./all-static/
 
+allst: clean-static static
+
 #################### sync : push current code on a (devel) box running myslice
 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
 # usual excludes
 RSYNC_EXCLUDES         := --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 
@@ -35,7 +42,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))
@@ -53,6 +61,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
-