[mpich2-commits] r5411 - in mpich2/branches/release/mpich2-1.2: . confdb maint

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-06 19:03:00 -0500 (Tue, 06 Oct 2009)
New Revision: 5411

Modified:
   mpich2/branches/release/mpich2-1.2/
   mpich2/branches/release/mpich2-1.2/confdb/
   mpich2/branches/release/mpich2-1.2/maint/release.pl
Log:
Merge r5410 from the trunk -- bug fix in the release.pl script to make
sure configure is created.



Property changes on: mpich2/branches/release/mpich2-1.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
   + /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/trunk:5410


Property changes on: mpich2/branches/release/mpich2-1.2/confdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
   + /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/trunk/confdb:5410

Modified: mpich2/branches/release/mpich2-1.2/maint/release.pl
===================================================================
--- mpich2/branches/release/mpich2-1.2/maint/release.pl	2009-10-07 00:00:11 UTC (rev 5410)
+++ mpich2/branches/release/mpich2-1.2/maint/release.pl	2009-10-07 00:03:00 UTC (rev 5411)
@@ -130,7 +130,7 @@
     debug("===> Creating configure in the main package... ");
     chdir("${root}/mpich2-${version}");
     {
-        my $cmd = "./maint/updatefiles -distrib";
+        my $cmd = "./maint/updatefiles";
         $cmd .= " --with-autoconf=$with_autoconf" if $with_autoconf;
         $cmd .= " --with-automake=$with_automake" if $with_automake;
         run_cmd($cmd);
@@ -140,8 +140,8 @@
     # Remove unnecessary files
     debug("===> Removing unnecessary files in the main package... ");
     chdir("${root}/mpich2-${version}");
-    run_cmd("rm -rf README.vin maint/config.log maint/config.status unusederr.txt autom4te.cache src/mpe2/src/slog2sdk/doc/jumpshot-4/tex");
-    run_cmd("find . -name autom4te.cache -exec rm -rf {} \;");
+    run_cmd("rm -rf README.vin maint/config.log maint/config.status unusederr.txt src/mpe2/src/slog2sdk/doc/jumpshot-4/tex");
+    run_cmd("find . -name autom4te.cache | xargs rm -rf");
     debug("done\n");
 
     # Get docs