Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
make distcheck is now successful
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 22 Jul 2004 23:23:53 +0000 (23:23 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 22 Jul 2004 23:23:53 +0000 (23:23 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@321 48e7efb5-ca39-0410-a469-dd3cf9ba447f

15 files changed:
.cvsignore
Makefile.am
configure.ac
cruft/doc/Makefile.am
cruft/doc/gras-overrides.txt [new file with mode: 0644]
cruft/doc/gtk-doc.make [new file with mode: 0644]
cruft/doc/tmpl/comm_datadesc.sgml
examples/Makefile.am
examples/ping/.cvsignore
examples/ping/Makefile.am
src/.cvsignore
src/gras/Makefile.am
src/gras/Virtu/process.c
testsuite/Makefile.am
testsuite/run_tests.in

index b9cb2e6..83f80c0 100644 (file)
@@ -1,3 +1,4 @@
-Makefile Makefile.in aclocal.m4 autom4te.cache config.status grenier libtool gras-*.tar.gz
+Makefile Makefile.in aclocal.m4 autom4te.cache config.status grenier libtool 
+gras-*.tar.gz gras-*
 configure
 buildlogs
index ef5992d..2867718 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS= doc src 
+SUBDIRS= src doc
 DISTCLEANFILES =  *~  
 
 ACLOCAL = aclocal -I acmacro -I /usr/share/aclocal/gnome2-macros
@@ -17,18 +17,22 @@ tags: TAGS
 
 if MAINTAINER_MODE
 ##
-## The following is only interesting for me, I guess
+## The following is only interesting for me, I guess. 
+## Some of the targets will only work on my machine ;)
 ##
 
+release: distcheck remote debian publish
+
+debian: dist
+       make -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
+       cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras
+       make -C ~/CVSIMPORT/pkg-grid/gras deb check
+       dput local *.changes
+
 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/
         @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 @PACKAGE@-@VERSION@.tar.gz ~/public_html/gras/dl
+        make -C public_html publish
 
 mail:
         @ver=`dpkg-parsechangelog -lChangeLog| egrep '^Version: ' | sed 's/Version: //'`;\
index 5094f00..63c9fed 100644 (file)
@@ -65,6 +65,7 @@ fi
                                                                  
 # Can we rebuild the documentation?
 GTK_DOC_CHECK()
+AC_SUBST([htmldir],         ['${datadir}/doc/gras/html'])dnl
 
 dnl ####[ Search libs ]#######################################################
 ACI_PACKAGE([SimGrid],[the SimGrid simulator],[SG_init],[-lsimgrid],[simgrid.h],,:)
@@ -102,15 +103,17 @@ AC_CONFIG_FILES([
         src/base/Tests/trp_file_usage
     src/examples/Makefile 
       src/examples/ping/Makefile 
+      src/examples/ping/test_sg
   doc/Makefile
   tools/compile-remote-worker
 ],[
      test -e src/base/Tests/trp_tcp_usage && chmod +x src/base/Tests/trp_tcp_usage;
-     test -e src/base/Tests/trp_file_usage && chmod +x src/base/Tests/trp_file_usage;
+     test -e src/base/Tests/trp_file_usage&& chmod +x src/base/Tests/trp_file_usage;
      test -e src/base/Tests/run_tests     && chmod +x src/base/Tests/run_tests;
      test -e tools/compile-remote-worker  && chmod +x tools/compile-remote-worker;
-     chmod +x tools/gras-check-arch;
-     chmod +x src/examples/ping/test_rl; chmod +x src/examples/ping/test_sg])
+     test -e src/examples/ping/test_sg    && chmod +x src/examples/ping/test_sg;
+     chmod +x $srcdir/tools/gras-check-arch;
+     chmod +x $srcdir/src/examples/ping/test_rl])
 
 #      src/examples/pastry/Makefile
 #    src/modules/Makefile
index 99048b6..b5f7017 100644 (file)
@@ -7,7 +7,7 @@
 
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=gras
-HTML_DIR=/usr/share/doc/gras/html
+TARGET_DIR = @htmldir@
 
 # The top-level SGML file. Change it if you want.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -60,126 +60,4 @@ DOC_OVERRIDES =
 #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
 
 
-
-###########################################################################
-# Everything below here is generic and you shouldn't need to change it.
-###########################################################################
-
-TARGET_DIR=$(HTML_DIR)
-
-EXTRA_DIST =                           \
-       $(content_files)                \
-       $(extra_files)                  \
-       $(HTML_IMAGES)                  \
-       $(DOC_MAIN_SGML_FILE)           \
-       $(DOC_MODULE)-sections.txt      \
-       $(DOC_OVERRIDES)
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-          $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES =                 \
-       $(DOC_MODULE).args       \
-       $(DOC_MODULE).hierarchy  \
-       $(DOC_MODULE).interfaces \
-       $(DOC_MODULE).prerequisites \
-       $(DOC_MODULE).signals
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-TOOL_ROOT=$(shell if [ -e tools/gtkdoc-scan ] ; then echo "tools/"; else echo ""; fi)
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB)
-       @echo '*** Scanning header files ***'
-       cd $(srcdir) && \
-         $(TOOL_ROOT)gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-       @true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)
-       @echo '*** Rebuilding template files ***'
-       cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-       touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-       @true
-
-#### sgml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-       @echo '*** Building SGML ***'
-       cd $(srcdir) && \
-       $(TOOL_ROOT)gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-       touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-       @true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '*** Building HTML ***'
-       test -d $(srcdir)/html || mkdir $(srcdir)/html
-       cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-       test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-       @echo '-- Fixing Crossreferences' 
-       cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       touch html-build.stamp
-else
-all-local: 
-endif
-
-##############
-
-clean-local:
-       rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
-
-maintainer-clean-local: clean
-       cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-       (installfiles=`echo $(srcdir)/html/*.html`; \
-       if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-       then echo '-- Nothing to install' ; \
-       else \
-         for i in $$installfiles; do \
-           echo '-- Installing '$$i ; \
-           $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-         done; \
-         echo '-- Installing $(srcdir)/html/index.sgml' ; \
-         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-       fi)
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-       @echo "*** gtk-doc must be installed and enabled in order to make dist"
-       @false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-       mkdir $(distdir)/tmpl
-       mkdir $(distdir)/sgml
-       mkdir $(distdir)/html
-       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-       -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-       -cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-       images=$(HTML_IMAGES) ;               \
-       for i in $$images ; do                \
-         cp $(srcdir)/$$i $(distdir)/html ;  \
-       done
-
-.PHONY : dist-hook-local
+include gtk-doc.make
diff --git a/cruft/doc/gras-overrides.txt b/cruft/doc/gras-overrides.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/cruft/doc/gtk-doc.make b/cruft/doc/gtk-doc.make
new file mode 100644 (file)
index 0000000..7cf9c4f
--- /dev/null
@@ -0,0 +1,123 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+htmldir = $(shell if test "x$(TARGET_DIR)" = x ; then echo @htmldir@/$(DOC_MODULE) ; else echo $(TARGET_DIR) ; fi)
+html_DATA = $(wildcard html/*)
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+EXTRA_DIST = $(wildcard                        \
+       $(content_files)                \
+       $(HTML_IMAGES)                  \
+       $(DOC_MAIN_SGML_FILE)           \
+       $(DOC_MODULE).types             \
+       $(DOC_MODULE)-sections.txt      \
+       $(DOC_MODULE)-overrides.txt     )
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+          $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES =                 \
+       $(DOC_MODULE).args       \
+       $(DOC_MODULE).hierarchy  \
+       $(DOC_MODULE).interfaces \
+       $(DOC_MODULE).prerequisites \
+       $(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+       @echo '*** Scanning header files ***'
+       @-chmod -R u+w $(srcdir)
+       if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+       else \
+           cd $(srcdir) ; \
+           for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+           done \
+       fi
+       cd $(srcdir) && \
+         gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+       touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+       @true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+       @echo '*** Rebuilding template files ***'
+       @-chmod -R u+w $(srcdir)
+       cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+       touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+       @true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+       @echo '*** Building XML ***'
+       @-chmod -R u+w $(srcdir)
+       cd $(srcdir) && \
+       gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+       touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+       @true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+       @echo '*** Building HTML ***'
+       @-chmod -R u+w $(srcdir)
+       rm -rf $(srcdir)/html 
+       mkdir $(srcdir)/html
+       cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+       test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+       @echo '-- Fixing Crossreferences' 
+       cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       touch html-build.stamp
+else
+all-local:
+endif
+
+##############
+
+clean-local:
+       rm -f *~ *.bak
+       rm -rf .libs
+
+maintainer-clean-local: clean
+       cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+dist-hook: dist-hook-local
+       mkdir $(distdir)/tmpl
+       mkdir $(distdir)/xml
+       mkdir $(distdir)/html
+       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+       -cp $(srcdir)/xml/*.xml $(distdir)/xml
+       -cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local
index 4ef219e..b163d8d 100644 (file)
@@ -46,6 +46,15 @@ Describing data to be exchanged
 @type: 
 
 
+<!-- ##### MACRO GRAS_DEFINE_TYPE ##### -->
+<para>
+
+</para>
+
+@name: 
+@def: 
+
+
 <!-- ##### MACRO gras_datadesc_by_symbol ##### -->
 <para>
 
index eb677f7..6b5e04b 100644 (file)
@@ -1,3 +1,3 @@
 SUBDIRS=ping
-EXTRA_DIST=gras_stub_generator
+EXTRA_DIST=gras_stub_generator WAN_3.platform.txt WAN_3.platform_2.txt
 #bandwidth saturate alnem
index 0bf428a..576c95d 100644 (file)
@@ -1 +1,2 @@
 .deps .libs Makefile Makefile.in _*.c ping_server ping_client ping_simulator
+test_sg
index c61a69c..beb9a1c 100644 (file)
@@ -1,13 +1,16 @@
 INCLUDES= -I$(top_srcdir)/src/include -g
-EXTRA_DIST=test_rl test_sg ping_deployment.txt 
+
 TESTS=test_rl test_sg
+EXTRA_DIST=ping_deployment.txt $(TESTS)
+
+# check_SCRIPTS=$(TESTS)
 
 # AUTOMAKE variable definition
 if HAVE_SG
  check_PROGRAMS=ping_simulator ping_client ping_server 
 
  ping_simulator_SOURCES=_ping_simulator.c ping.c
- ping_simulator_LDADD= $(top_srcdir)/src/base/libgrassg.la @LIBS_SimGrid@
+ ping_simulator_LDADD= $(top_builddir)/src/base/libgrassg.la @LIBS_SimGrid@
 else
  check_PROGRAMS=ping_client ping_server
 endif
@@ -15,8 +18,8 @@ endif
 ping_client_SOURCES=   _ping_client.c ping.c
 ping_server_SOURCES=   _ping_server.c ping.c
 
-ping_client_LDADD=     $(top_srcdir)/src/base/libgrasrl.la
-ping_server_LDADD=     $(top_srcdir)/src/base/libgrasrl.la
+ping_client_LDADD=     $(top_builddir)/src/base/libgrasrl.la
+ping_server_LDADD=     $(top_builddir)/src/base/libgrasrl.la
 
 # cleanup temps
 MAINTAINERCLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c 
@@ -25,3 +28,7 @@ MAINTAINERCLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c
 _ping_client.c _ping_server.c _ping_simulator.c: ping_deployment.txt $(top_srcdir)/src/examples/gras_stub_generator
        $(top_srcdir)/src/examples/gras_stub_generator ping ping_deployment.txt >/dev/null
 
+
+# support vpath build
+#test_rl test_sg: 
+#      cp $(srcdir)/$@ . && chmod +x $@ 
index cbdfe89..1f945b6 100644 (file)
@@ -1,3 +1,4 @@
 Makefile Makefile.in
 config.h config.h.in stamp-h1
 gras_config.h gras_config.h.in
+stamp-*
index b479b2b..a7a6c58 100644 (file)
@@ -10,10 +10,13 @@ EXTRA_DIST= ./gras_private.h    \
        Virtu/virtu_sg.h \
        DataDesc/ddt_parse.yy.l DataDesc/ddt_parse.yy.c
 
-VERSION_INFO= -version-info 1:0:0
-# from `info libtool "Updating version info"`
+VERSION_INFO= -release 20040722 -version-info 0:0:0
+# from `info libtool "Updating version info"` 
+# and  `info libtool "Release numbers"` 
 #
-# - Begin with C:R:A = 0:0:0
+# A) For stable library (interface wise), you should use --version-info:
+#
+# - Begin with C:R:A = 0:0:0 (ie here, VERSION_INFO= -version-info 0:0:0)
 # - Do not update it before public release (keep numbers small)
 #
 # ----------------------------------------------------------------------+
@@ -26,6 +29,11 @@ VERSION_INFO= -version-info 1:0:0
 # |      no         |        no          |    yes    |  C   : R   : A++ |
 # |      no         |        no          |    no     |  C   : R   : A   |
 # +-----------------+--------------------+-----------+------------------+
+#
+# B) For rapidely changing library, you should go for the -release flag
+#
+#  It modifies the library name, and you thus cannot say that a library
+#   using this trick is ready for a "stable" release (say, in Debian).
 
 if HAVE_SG
  lib_LTLIBRARIES= libgrasrl.la libgrassg.la
index ef02c5d..938aea9 100644 (file)
@@ -20,12 +20,10 @@ void *gras_userdata_get(void) {
   return pd->userdata;
 }
 
-void *gras_userdata_set(void *ud) {
+void gras_userdata_set(void *ud) {
   gras_procdata_t *pd=gras_procdata_get();
 
   pd->userdata = ud;
-
-  return pd->userdata;
 }
 
 gras_error_t
index dd0adc4..94f5735 100644 (file)
@@ -1,8 +1,8 @@
 INCLUDES = -I$(top_srcdir)/src/include
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o
-MAINTAINERCLEANFILES=Makefile.in *~
+CLEANFILES = *~ test a.out *.o datadesc_usage.out
+MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
   datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
   mk_datadesc_structs.pl
@@ -34,8 +34,8 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
        ./run_tests valgrind
 
 # LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_UTILS=$(top_srcdir)/src/base/libgrasrl.la 
-LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.la   
+LDADD_UTILS=$(top_builddir)/src/base/libgrasrl.la 
+LDADD_RL=   $(top_builddir)/src/base/libgrasrl.la   
 
 log_usage_LDADD=          $(LDADD_UTILS)
 
index 59b476f..6aba7fe 100755 (executable)
@@ -17,10 +17,10 @@ for test in log_usage                           \
            dict_usage dict_crash               \
            \
            datadesc_usage                       \
-           "datadesc_usage --read datadesc.little32" \
-           "datadesc_usage --read datadesc.little64" \
-           "datadesc_usage --read datadesc.big32" \
-           "datadesc_usage --read datadesc.big64" 
+           "datadesc_usage --read @srcdir@/datadesc.little32" \
+           "datadesc_usage --read @srcdir@/datadesc.little64" \
+           "datadesc_usage --read @srcdir@/datadesc.big32" \
+           "datadesc_usage --read @srcdir@/datadesc.big64" 
 do                 
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"