X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2FMakefile;h=af366fcc56a5abc677d1c676bf5b9dec470c5a1c;hb=e39e728991b762ae0b52b52b06655f0c7f1b7421;hp=8f334b5622c5916eda91698128b02ce673f59239;hpb=0c9f86da04f9834904a8ce8618f3a6605f5a90af;p=sfa.git

diff --git a/sfa/client/Makefile b/sfa/client/Makefile
index 8f334b56..af366fcc 100644
--- a/sfa/client/Makefile
+++ b/sfa/client/Makefile
@@ -1,5 +1,7 @@
 # recompute the SFA graphs from different locations
 
+SFASCAN = ./sfascan.py -v
+
 # AMs, at least MyPLC AMs, are boring
 #BUNDLES += http://planet-lab.eu:12346/@auto-ple-am
 BUNDLES += http://planet-lab.eu:12345/@auto-ple-reg 
@@ -38,7 +40,8 @@ BUNDLES-LR += http://www.planet-lab.jp:12347/@auto-plj-sa
 BUNDLES-LR += http://www.emanicslab.org:12345/@auto-elc-reg 
 BUNDLES-LR += http://www.emanicslab.org:12347/@auto-elc-sa
 
-EXTENSIONS := png svg
+#EXTENSIONS := png svg
+EXTENSIONS := png
 
 ####################
 ALL += $(foreach bundle,$(BUNDLES),$(word 2,$(subst @, ,$(bundle))))
@@ -46,10 +49,12 @@ ALL += $(foreach bundle,$(BUNDLES-LR),$(word 2,$(subst @, ,$(bundle)))-lr)
 
 all: $(ALL)
 
+ple: auto-ple-reg auto-ple-sa-lr.out
+
 ####################
 define bundle_scan_target
 $(word 2,$(subst @, ,$(1))):
-	./sfascan.py $(foreach extension,$(EXTENSIONS),-o $(word 2,$(subst @, ,$(1))).$(extension)) $(word 1,$(subst @, ,$(1))) >& $(word 2,$(subst @, ,$(1))).out
+	$(SFASCAN) $(foreach extension,$(EXTENSIONS),-o $(word 2,$(subst @, ,$(1))).$(extension)) $(word 1,$(subst @, ,$(1))) >& .$(word 2,$(subst @, ,$(1))).out
 .PHONY: $(word 2,$(subst @, ,$(1)))
 endef
 
@@ -59,7 +64,7 @@ $(foreach bundle,$(BUNDLES),$(eval $(call bundle_scan_target,$(bundle))))
 #################### same but left-to-right
 define bundle_scan_target_lr
 $(word 2,$(subst @, ,$(1)))-lr:
-	./sfascan.py -l $(foreach extension,$(EXTENSIONS),-o $(word 2,$(subst @, ,$(1)))-lr.$(extension)) $(word 1,$(subst @, ,$(1))) >& $(word 2,$(subst @, ,$(1)))-lr.out
+	$(SFASCAN) -l $(foreach extension,$(EXTENSIONS),-o $(word 2,$(subst @, ,$(1)))-lr.$(extension)) $(word 1,$(subst @, ,$(1))) >& .$(word 2,$(subst @, ,$(1)))-lr.out
 .PHONY: $(word 2,$(subst @, ,$(1)))-lr
 endef
 
@@ -87,9 +92,12 @@ clean:
 	rm -f auto-*.{out,version}
 	$(foreach extension,$(EXTENSIONS),rm -rf auto-*.$(extension);)
 
+DATE=$(shell date '+%Y-%m-%d')
 PUBEXTENSIONS=png
 publish:
-	$(foreach extension,$(PUBEXTENSIONS),rsync -av auto-*.$(extension) tparment@srv-planete.inria.fr:/proj/planete/www/Thierry.Parmentelat/sfascan/ ;)
+	echo $(DATE)
+	ssh tparment@srv-planete.inria.fr mkdir /proj/planete/www/Thierry.Parmentelat/sfascan/$(DATE)
+	$(foreach extension,$(PUBEXTENSIONS),rsync -av auto-*.$(extension) tparment@srv-planete.inria.fr:/proj/planete/www/Thierry.Parmentelat/sfascan/$(DATE) ;)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)