mv compile-remote-worker graspe-slave

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index deec319..8b6f695 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-SUBDIRS= include src examples testsuite doc
+SUBDIRS= include src tools examples testsuite doc
 DISTCLEANFILES =  *~  
 
 ACLOCAL = aclocal-1.9 -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog ChangeLog.debian\
+EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog \
        acmacro/aci.m4 \
-       tools/gras-check-arch   tools/compile-remote-worker.in \
+       tools/gras-check-arch   tools/graspe-slave.in \
        tools/MSG_visualization tools/platform_generation \
         tools/doxygen/index_create.pl
 
@@ -48,33 +48,35 @@ publish: dist
         @echo "----[ Put the tarball @VERSION@ on gcl ]----"
         scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
         scp -r doc/html/* gcl.ucsd.edu:/home/www/simgrid/
-#       scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog
+        scp ChangeLog gcl.ucsd.edu:/home/www/simgrid/dl/ChangeLog
         @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----"
         cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2
         cp -r doc/html ~/public_html/simgrid2/doc/
-#       cp ChangeLog ~/public_html/simgrid2/
+        cp ChangeLog ~/public_html/simgrid2/
         make -C ~/public_html
 
 mail:
-        @ver=`dpkg-parsechangelog -lChangeLog.debian| egrep '^Version: ' | sed 's/Version: //'`;\
+        @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
          (echo "Hello," ; \
           echo; \
-           echo "A new version of GRAS is available. Here is the changelog:";\
+           echo "A new version of SimGrid is available. Here is the changelog:";\
           echo;echo;\
-           dpkg-parsechangelog -lChangeLog.debian ;\
+           dpkg-parsechangelog -lChangeLog ;\
            echo;echo; \
           echo "It is available from the official website:";\
           echo "  http://grail.sdsc.edu/simgrid/";\
-          echo;echo "Cheers, Mt.") | \
+          echo;echo "Cheers, the SimGrid team.") | \
           mail -e \
-              -a "From: Martin.Quinson@ens-lyon.fr" \
+              -a "From: Arnaud.Legrand@imag.fr" \
               -s "New version of GRAS ($$ver)" \
-              martin.quinson@ens-lyon.fr,arnaud.legrand@ens-lyon.fr
-
+              simgrid2-users@listes.ens-lyon.fr
 
 splint:
-       splint `find src -name '*.c' | grep -v RL | grep -v SG` +matchanyintegral -warnposix +boolint -Inws_portability/Include/ -Isrc/include -Isrc/base -Isrc
-
+       splint `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
+              +matchanyintegral -warnposix +boolint \
+              +show-summary +stats\
+              -Iinclude -Isrc/include -Isrc/base -Isrc
+.PHONY: splint
 ##
 ## Cruft for remote compilation
 ##
@@ -83,10 +85,12 @@ MACHINES ?= graal.ens-lyon.fr   allo-psmn.ens-lyon.fr \
             valnure.cs.ucsb.edu sperm.cs.ucsb.edu     basalt.cs.ucsb.edu \
            nala.cs.utk.edu     AIX
 
-# ACTION: What to do there
+# ACTIONS: What to do there
 # possible values:
+#  - scp:     copy a tarball over
 #  - clean:   erase any previously existing source tree and 
 #             open the new open
+#  - untar:   open the tarball which was just copied
 #  - touch:   touch every file of the source tree to deal with 
 #             clock brokenness. May help, may harm.
 #  - config:  launch configure
@@ -95,18 +99,18 @@ MACHINES ?= graal.ens-lyon.fr   allo-psmn.ens-lyon.fr \
 #  - check:   run 'make check'
 #
 # default value:
-ACTION ?= clean untar config compile check
+ACTIONS ?= scp clean untar config compile check
 
 REMOTE_PREFIX ?='simgrid'
 
-remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
+remote: @PACKAGE@-@VERSION@.tar.gz tools/graspe-slave
        @echo;echo "----[ Recompile the package on remote hosts ]----"
        @test -e @srcdir@/buildlogs/@PACKAGE@-@VERSION@ || mkdir -p @srcdir@/buildlogs/@PACKAGE@-@VERSION@
        @failed=0;\
         for site in $(MACHINES) ; do \
           machine=`echo $$site |sed 's/^\([^%]*\)%.*$$/\1/'`;\
           machine2=`echo $$site |sed 's/^\([^%]*\)%\(.*\)$$/\2/'`;\
-          cmd="\"sh -c 'env REMOTE_PREFIX=$(REMOTE_PREFIX) $(REMOTE_PREFIX)/src/compile-remote-worker $(ACTION) 2>&1'\"";\
+          cmd="\"sh -c 'env REMOTE_PREFIX=$(REMOTE_PREFIX) $(REMOTE_PREFIX)/src/graspe-slave $(ACTIONS) 2>&1'\"";\
           if echo $$site | grep  '%' >/dev/null ; then \
             echo "----[ Compile on $$machine2 (behind $$machine) ]----";\
           else \
@@ -114,9 +118,11 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
             echo "----[ Compile on $$machine ]----";\
           fi;\
           \
-          echo "-- Copy the data over"; \
-          scp @srcdir@/@PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
+          if echo $(ACTIONS) |grep -q scp ; then \
+            echo "-- Copy the data over"; \
+            scp @srcdir@/@PACKAGE@-@VERSION@.tar.gz tools/graspe-slave \
               $$machine:$(REMOTE_PREFIX)/src;\
+          fi; \
           \
           echo "-- Compiling... (the output gets into @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \
           if echo $$site | grep  '%' >/dev/null ; then \
@@ -131,3 +137,5 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
        exit $$failed
 
 endif
+
+include $(top_srcdir)/acmacro/dist-files.mk