[mpich2-commits] r6755 - in mpich2/trunk: maint src/binding/f90 src/mpi/romio/include src/mpid/ch3/channels/nemesis/nemesis/include src/mpid/ch3/channels/nemesis/nemesis/utils/monitor src/mpid/ch3/channels/nemesis/nemesis/utils/replacements src/mpid/ch3/channels/nemesis/src src/mpl src/mpl/include test/mpi/f77/init test/mpi/f90/init test/mpi/threads

[gropp at mcs.anl.gov]

Author: gropp
Date: 2010-05-28 09:43:05 -0500 (Fri, 28 May 2010)
New Revision: 6755

Modified:
   mpich2/trunk/maint/updatefiles
   mpich2/trunk/src/binding/f90/
   mpich2/trunk/src/mpi/romio/include/
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/utils/monitor/
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/utils/replacements/
   mpich2/trunk/src/mpid/ch3/channels/nemesis/src/
   mpich2/trunk/src/mpl/
   mpich2/trunk/src/mpl/include/
   mpich2/trunk/test/mpi/f77/init/
   mpich2/trunk/test/mpi/f90/init/
   mpich2/trunk/test/mpi/threads/
Log:
Added information on using the -distrib option to updatefiles and updated many missing svn:ignore properties

Modified: mpich2/trunk/maint/updatefiles
===================================================================
--- mpich2/trunk/maint/updatefiles	2010-05-27 20:16:49 UTC (rev 6754)
+++ mpich2/trunk/maint/updatefiles	2010-05-28 14:43:05 UTC (rev 6755)
@@ -188,7 +188,7 @@
     -help|--help|-usage|--usage)
     cat <<EOF
     updatefiles [ --with-autotools=dir ] [ -noatdircheck | -no-atdir-check ] \\
-                [ --do=stepname ] [ args for simplemake ]
+                [ --do=stepname ] [ -distrib ] [ args for simplemake ]
     Update the files in the MPICH2 build tree.  This file builds the 
     configure files, creates the Makefile.in files (using the simplemake
     program), extracts the error messages.
@@ -199,6 +199,14 @@
     -noatdircheck or -no-atdir-check disables the check that enforces all
     autotools being installed in the same directory.
 
+    -distrib creates a distribution version of the Makefile.in files (no
+    targets for updating the Makefile.in from Makefile.sm or rebuilding the
+    autotools targets).  This does not create the configure files because
+    some of those depend on rules in the Makefile.in in that directory.  
+    Thus, to build all of the files for a distribution, run maint/updatefiles
+    twice, as in 
+         maint/updatefiles && maint/updatefiles -distrib
+
     Use --do=stepname to update only a single step.  For example, 
     --do=build_configure only updates the configure scripts.  The available
     steps are:
@@ -982,7 +990,14 @@
     fi
 fi
 
+# FIXME: Because this invokes scripts in third-party tools to build
+# configure and/or makefiles, it may create a configure even if
+# do_build_configure is no, or create a Makefile.in even if do_makefiles is
+# no.  
 if [ "$do_build_configure" = "yes" -o "$do_makefiles" = "yes" ] ; then
+    # Make the requests for configure/makefile visible to the external tools
+    export do_build_configure
+    export do_makefiles
     # must come after the above autoreconf-like logic because the above
     # logic will delete the results of this actual autoreconf
 
@@ -1011,7 +1026,11 @@
     done
 fi
 
+# Same fixme as above on configure/makefiles 
 if [ -f src/mpe2/maint/updatefiles -a "$do_build_configure" = "yes" ] ; then
+    # Make the requests for configure/makefile visible to MPE
+    export do_build_configure
+    export do_makefiles
     # If we have the mpe2 updatefiles, execute it from the mpe directory
     (cd src/mpe2 && chmod a+x maint/updatefiles && maint/updatefiles )
 fi


Property changes on: mpich2/trunk/src/binding/f90
___________________________________________________________________
Modified: svn:ignore
   - mpi_base.f90.orig
mpi_base.f90.new
mpif.h
Makefile
Makefile.in
Makefile.sm
mpi.f90
mpi_t1.f90
mpimod.pcl
mpi_sizeofs.f90
mpi_base.f90
mpif90model.h
mpif90type.h
mpi_constants.f90
typef90intf.c
typef90realf.c
typef90cmplxf.c
.deps
*.mod
*.MOD
*.gcov
*.gcda
*.gcno
.libs
.state-cache
mpifnoext.h
configure
config.status
config.log
autom4te.cache


   + mpi_base.f90.orig
mpi_base.f90.new
mpif.h
Makefile
Makefile.in
Makefile.sm
mpi.f90
mpi_t1.f90
mpimod.pcl
mpi_sizeofs.f90
mpi_base.f90
mpif90model.h
mpif90type.h
mpi_constants.f90
typef90intf.c
typef90realf.c
typef90cmplxf.c
.deps
*.mod
*.MOD
*.gcov
*.gcda
*.gcno
.libs
.state-cache
.libstamp0
.libstamp2
mpifnoext.h
configure
config.status
config.system
config.log
autom4te.cache




Property changes on: mpich2/trunk/src/mpi/romio/include
___________________________________________________________________
Modified: svn:ignore
   - mpio.h mpiof.h
.deps
.libs
.libstamp*
*.lo
.*-cache

   + mpio.h
mpiof.h
.deps
.libs
.libstamp*
*.lo
.*-cache



Property changes on: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include
___________________________________________________________________
Modified: svn:ignore
   - .deps
.state-cache

   + mpid_nem_net_module_defs.h
.deps
.state-cache



Property changes on: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/utils/monitor
___________________________________________________________________
Modified: svn:ignore
   - configure
configure.lineno
Makefile
Makefile.in
config.log
config.status
config.system
localdefs
*.o
*.lo
*.bb
*.bbg
*.da
*.gcov
*Debug*
*Release*
*.cache
.deps
.state-cache

   + configure
configure.lineno
Makefile
Makefile.in
config.log
config.status
config.system
localdefs
*.o
*.lo
*.bb
*.bbg
*.da
*.gcov
*Debug*
*Release*
*.cache
.deps
.state-cache
.libstamp0



Property changes on: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/utils/replacements
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
.state-cache
.deps

   + Makefile
Makefile.in
.state-cache
.deps
.libstamp0



Property changes on: mpich2/trunk/src/mpid/ch3/channels/nemesis/src
___________________________________________________________________
Modified: svn:ignore
   - configure
configure.lineno
Makefile
Makefile.in
config.log
config.status
config.system
localdefs
*.o
*.lo
*.bb
*.bbg
*.da
*.gcov
*Debug*
*Release*
*.cache
.deps
.state-cache

   + configure
configure.lineno
Makefile
Makefile.in
config.log
config.status
config.system
localdefs
*.o
*.lo
*.bb
*.bbg
*.da
*.gcov
*Debug*
*Release*
*.cache
.deps
.state-cache
.libstamp0



Property changes on: mpich2/trunk/src/mpl
___________________________________________________________________
Modified: svn:ignore
   - configure
Makefile.in
autom4te.cache
aclocal.m4

   + configure
config.status
config.log
localdefs
.deps
Makefile
Makefile.in
autom4te.cache
aclocal.m4



Property changes on: mpich2/trunk/src/mpl/include
___________________________________________________________________
Modified: svn:ignore
   - mplconf.h.in
config.h.in

   + mplconf.h.in
config.h.in
mplconfig.h
config.h
stamp-h1



Property changes on: mpich2/trunk/test/mpi/f77/init
___________________________________________________________________
Modified: svn:ignore
   - Makefile.in
Makefile
*.o
*ebug*
*elease*
*.vfproj
*.gcda
*.gcno

   + Makefile.in
Makefile
checksizes.c
*.o
*ebug*
*elease*
*.vfproj
*.gcda
*.gcno



Property changes on: mpich2/trunk/test/mpi/f90/init
___________________________________________________________________
Modified: svn:ignore
   - Makefile.sm
Makefile.in
Makefile
testlist
*.o
baseenvf90.f90
*.gcda
*.gcno

   + Makefile.sm
Makefile.in
Makefile
testlist
checksizes.c
*.o
baseenvf90.f90
*.gcda
*.gcno



Property changes on: mpich2/trunk/test/mpi/threads
___________________________________________________________________
Modified: svn:ignore
   - Makefile.in
Makefile
summary.xml

   + Makefile.in
Makefile
testlist
summary.xml