Add a state SD_READY to the tasks to optimize SD_simulate

[simgrid.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee36e12..fd58ba8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,14 @@
-SUBDIRS= include src tools examples testsuite doc
+SUBDIRS= include src tools testsuite examples 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 \
        acmacro/aci.m4 \
-       tools/gras-check-arch   tools/graspe-slave.in \
-       tools/MSG_visualization tools/platform_generation \
-        tools/doxygen/index_create.pl
+       tools/graspe-slave.in \
+       tools/MSG_visualization \
+          tools/MSG_visualization/colorize.pl
 
 SOURCE_FILES = $(shell find . -name "*.[ch]")
 TAGS: $(SOURCE_FILES)
@@ -45,10 +44,10 @@ publish-old: dist
         make -C public_html publish
 
 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 -r doc/html/* scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+        @echo "----[ Put the tarball @VERSION@ on gforge ]----"
+#       scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
+#       scp -r doc/html/* gcl.ucsd.edu:/home/www/simgrid/
+#       scp -r doc/html/* scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
         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
@@ -56,6 +55,15 @@ publish: dist
         cp ChangeLog ~/public_html/simgrid2/
         make -C ~/public_html
 
+sync-gforge: 
+       rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \
+           --recursive --links --perms --times --omit-dir-times  \
+           doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/doc/ || true
+       scp doc/index.php scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+       scp doc/simgrid_modules.png doc/simgrid_logo.png doc/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+       ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/"
+       ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
+
 mail:
         @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
          (echo "Hello," ; \
@@ -65,25 +73,25 @@ mail:
            dpkg-parsechangelog -lChangeLog ;\
            echo;echo; \
           echo "It is available from the official website:";\
-          echo "  http://grail.sdsc.edu/simgrid/";\
+          echo "  http://simgrid.gforge.inria.fr";\
           echo;echo "Cheers, the SimGrid team.") | \
           mail -e \
               -a "From: Arnaud.Legrand@imag.fr" \
-              -s "New version of GRAS ($$ver)" \
-              simgrid2-users@listes.ens-lyon.fr
+              -s "New version of SimGrid ($$ver)" \
+              simgrid-user@lists.gforge.inria.fr
 
 splint:
        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
+.PHONY: splint sync-gforge
 ##
 ## Cruft for remote compilation
 ##
 
 remote: 
-       @tools/graspe-master
+       @$(top_srcdir)/tools/graspe-master
 
 endif