X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=148a8aa43bbe71e42347706512d1f6dc1f7ad795;hb=9b8b74f6feeb99e0222717f0e1ed2f6e51f7b55b;hp=6f15a957a2f246cad3f965de996b1ee4c0307a7a;hpb=878ce4154f4619a5d07c780bf1f76dfd46771df4;p=plewww.git

diff --git a/Makefile b/Makefile
index 6f15a95..148a8aa 100644
--- a/Makefile
+++ b/Makefile
@@ -7,36 +7,44 @@ tags:
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
-# make sync PLC=private.one-lab.org
+# make sync PLC=boot.planet-lab.eu
 # (*) otherwise, entering through the root context
-# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr
+
+PLCHOST ?= testplc.onelab.eu
 
 ifdef GUEST
-ifdef PLCHOST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
 SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
 endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
 	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
-	@echo "  e.g. make sync PLC=private.one-lab.org"
-	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+	@echo "  e.g. make sync PLC=boot.planet-lab.eu"
+	@echo "  or   make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
 	@exit 1
 else
 	+$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
 endif
 
+compress:
+	$(foreach file,\
+		$(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\
+		$(shell python jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
+	@echo "Compressed .js files with jsmin.py"
+
+.PHONY: compress
+
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
 # make ++foo : idem but verbose, i.e. foo=$(foo)