Sort images in a specific subdir to clean up the place (gtut are good candidate to...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3057 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/Makefile.am b/Makefile.am
index b79e2b5..54c948f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,8 +85,8 @@ 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 doc/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
-       scp doc/simgrid_modules2.png 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/
+       scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+       scp doc/webcruft/simgrid_modules2.png doc/webcruft/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/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"
 

diff --git a/Makefile.in b/Makefile.in
index 9f915a9..1f5696c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -723,8 +723,8 @@ gramine:
 @MAINTAINER_MODE_TRUE@ rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \
 @MAINTAINER_MODE_TRUE@     --recursive --links --perms --times --omit-dir-times  \
 @MAINTAINER_MODE_TRUE@     doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/doc/ || true
-@MAINTAINER_MODE_TRUE@ scp doc/index.php doc/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
-@MAINTAINER_MODE_TRUE@ scp doc/simgrid_modules2.png 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/
+@MAINTAINER_MODE_TRUE@ scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
+@MAINTAINER_MODE_TRUE@ scp doc/webcruft/simgrid_modules2.png doc/webcruft/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
 @MAINTAINER_MODE_TRUE@ ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/"
 @MAINTAINER_MODE_TRUE@ ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6852abd..91bb740 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@/include -name "*.[chl]") \
  $(shell find @srcdir@ -name "*.doc")
 FIGS=simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
-PNGS=$(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png simgrid_logo_small.png poster_thumbnail.png
+PNGS=$(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 
 EXTRA_DIST = html Doxyfile \
  modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html \
@@ -28,7 +28,7 @@ html: Doxyfile ./logcategories.doc simgrid_modules.map $(PNGS) $(DOCSOURCES) \
        touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc
        test -e html || mkdir html
        cp $(foreach file,$(PNGS),@srcdir@/$(file)) html/
-       cp @srcdir@/Paje_MSG_screenshot_thn.jpg @srcdir@/Paje_MSG_screenshot.jpg html/
+       cp @srcdir@/webcruft/Paje_MSG_screenshot_thn.jpg @srcdir@/webcruft/Paje_MSG_screenshot.jpg html/
        cp @srcdir@/simgrid.css html/
        : # First pass
        doxygen Doxyfile >/dev/null

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 38d6670..ccfdab5 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -199,7 +199,7 @@ DOCSOURCES = $(shell find @top_srcdir@/tools/gras  @top_srcdir@/src @top_srcdir@
  $(shell find @srcdir@ -name "*.doc")
 
 FIGS = simgrid_modules.fig simgrid_modules2.fig amok_bw_test.fig amok_bw_sat.fig
-PNGS = $(patsubst %.fig,%.png,$(FIGS)) simgrid_logo.png simgrid_logo_small.png poster_thumbnail.png
+PNGS = $(patsubst %.fig,%.png,$(FIGS)) webcruft/simgrid_logo.png webcruft/simgrid_logo_small.png webcruft/poster_thumbnail.png
 EXTRA_DIST = html Doxyfile \
  modules.doc FAQ.doc contrib.doc index.doc publis.doc footer.html \
  $(foreach file,$(FIGS),fig/$(file)) $(PNGS)
@@ -259,7 +259,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/../acmacro $(distdir)/file,$(FIGS),fig
+       $(mkdir_p) $(distdir)/../acmacro $(distdir)/file,$(FIGS),fig $(distdir)/webcruft
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -389,7 +389,7 @@ uninstall-am: uninstall-info-am uninstall-local
 @MAINTAINER_MODE_TRUE@ touch index-API.doc .FAQ.doc.toc .index.doc.toc .contrib.doc.toc
 @MAINTAINER_MODE_TRUE@ test -e html || mkdir html
 @MAINTAINER_MODE_TRUE@ cp $(foreach file,$(PNGS),@srcdir@/$(file)) html/
-@MAINTAINER_MODE_TRUE@ cp @srcdir@/Paje_MSG_screenshot_thn.jpg @srcdir@/Paje_MSG_screenshot.jpg html/
+@MAINTAINER_MODE_TRUE@ cp @srcdir@/webcruft/Paje_MSG_screenshot_thn.jpg @srcdir@/webcruft/Paje_MSG_screenshot.jpg html/
 @MAINTAINER_MODE_TRUE@ cp @srcdir@/simgrid.css html/
 @MAINTAINER_MODE_TRUE@ : # First pass
 @MAINTAINER_MODE_TRUE@ doxygen Doxyfile >/dev/null

diff --git a/doc/Paje_MSG_screenshot.jpg b/doc/Paje_MSG_screenshot.jpg
deleted file mode 100644 (file)
index 96394d8..0000000
Binary files a/doc/Paje_MSG_screenshot.jpg and /dev/null differ

diff --git a/doc/Paje_MSG_screenshot_thn.jpg b/doc/Paje_MSG_screenshot_thn.jpg
deleted file mode 100644 (file)
index 323d667..0000000
Binary files a/doc/Paje_MSG_screenshot_thn.jpg and /dev/null differ

diff --git a/doc/poster_thumbnail.png b/doc/poster_thumbnail.png
deleted file mode 100644 (file)
index 7965c54..0000000
Binary files a/doc/poster_thumbnail.png and /dev/null differ

diff --git a/doc/simgrid_logo.png b/doc/simgrid_logo.png
deleted file mode 100644 (file)
index 2ff15a6..0000000
Binary files a/doc/simgrid_logo.png and /dev/null differ

diff --git a/doc/simgrid_logo_small2.png b/doc/simgrid_logo_small2.png
deleted file mode 100644 (file)
index 6c2af1d..0000000
Binary files a/doc/simgrid_logo_small2.png and /dev/null differ

diff --git a/doc/webcruft/Paje_MSG_screenshot.jpg b/doc/webcruft/Paje_MSG_screenshot.jpg
new file mode 100644 (file)
index 0000000..c2fcb8e
Binary files /dev/null and b/doc/webcruft/Paje_MSG_screenshot.jpg differ

diff --git a/doc/webcruft/Paje_MSG_screenshot_thn.jpg b/doc/webcruft/Paje_MSG_screenshot_thn.jpg
new file mode 100644 (file)
index 0000000..5cf4d3f
Binary files /dev/null and b/doc/webcruft/Paje_MSG_screenshot_thn.jpg differ

diff --git a/doc/webcruft/poster_thumbnail.png b/doc/webcruft/poster_thumbnail.png
new file mode 100644 (file)
index 0000000..aad3ac7
Binary files /dev/null and b/doc/webcruft/poster_thumbnail.png differ

diff --git a/doc/robots.txt b/doc/webcruft/robots.txt
similarity index 100%
rename from doc/robots.txt
rename to doc/webcruft/robots.txt

diff --git a/doc/webcruft/simgrid_logo.png b/doc/webcruft/simgrid_logo.png
new file mode 100644 (file)
index 0000000..c301052
Binary files /dev/null and b/doc/webcruft/simgrid_logo.png differ

diff --git a/doc/simgrid_logo_small.png b/doc/webcruft/simgrid_logo_small.png
similarity index 100%
rename from doc/simgrid_logo_small.png
rename to doc/webcruft/simgrid_logo_small.png

diff --git a/doc/webcruft/simgrid_logo_small2.png b/doc/webcruft/simgrid_logo_small2.png
new file mode 100644 (file)
index 0000000..57db294
Binary files /dev/null and b/doc/webcruft/simgrid_logo_small2.png differ