reservable nodes are all right

[plewww.git] / Makefile

diff --git a/Makefile b/Makefile
index d1c2f44..af50fcb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,16 @@ 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)
@@ -30,13 +30,21 @@ 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 modules $(SSHURL)/var/www/html/
+       +$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
 endif
 
+compress:
+       $(foreach file,\
+               $(shell find . -type f -iname "*.js" | grep -v datepicker.js),\
+               $(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)