[Dist-svn] SF.net SVN: dist: [4] trunk/dist/mcon

[<rma...@us...>]

Revision: 4
Author:   rmanfredi
Date:     2006-08-25 14:54:31 -0700 (Fri, 25 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/dist/?rev=4&view=rev

Log Message:
-----------
Let metaconfig use the MANIFEST file if there is no MANIFEST.new.
The MANIFEST.new file is necessary when using the "pat" tools, but not
when running metaconfig by itself.

Modified Paths:
--------------
    trunk/dist/mcon/man/mconfig.SH
    trunk/dist/mcon/mconfig.SH
Modified: trunk/dist/mcon/man/mconfig.SH
===================================================================
--- trunk/dist/mcon/man/mconfig.SH	2006-08-25 21:39:07 UTC (rev 3)
+++ trunk/dist/mcon/man/mconfig.SH	2006-08-25 21:54:31 UTC (rev 4)
@@ -159,7 +159,8 @@
 .IP \(bu
 Create a MANIFEST.new file in your top level directory that lists all the
 files in your package. This file will remain private and will not be
-part of the final distribution.
+part of the final distribution. (As a convenience, the MANIFEST file will
+be used by \fImetaconfig\fR if there is no MANIFEST.new file yet.)
 The filename should be the first field on each line.
 After some whitespace you can add a short comment describing your file.
 Only source files should be listed in there. The special file
@@ -972,6 +973,11 @@
 files. If you intend to write new units, you should have a good understanding
 of the whole scheme.
 .PP
+If there is no MANIFEST.new file, \fImetaconfig\fR will try to use the
+MANIFEST file instead, for convenience.  Everywhere we mention MANIFEST.new,
+it can be understood as MANIFEST provided there is no MANIFEST.new file
+found at the root of your package.
+.PP
 Assuming your MANIFEST.new file is properly set and lists all the source
 files you wish to configure, and that you have run \fIpackint\fR in your
 root source directory to create a \fI.package\fR file, you may run

Modified: trunk/dist/mcon/mconfig.SH
===================================================================
--- trunk/dist/mcon/mconfig.SH	2006-08-25 21:39:07 UTC (rev 3)
+++ trunk/dist/mcon/mconfig.SH	2006-08-25 21:54:31 UTC (rev 4)
@@ -119,6 +119,11 @@
 sub init_constants {
 	$NEWMANI = 'MANIFEST.new';		# List of files to be scanned
 	$MANI = 'MANIFEST';				# For manifake
+
+	# The distinction between MANIFEST.new and MANIFEST can make sense
+	# when the "pat" tools are used, but if only metaconfig is used, then
+	# we can very well leave without a MANIFEST.new.  --RAM, 2006-08-25
+	$NEWMANI = $MANI if -f $MANI && ! -f $NEWMANI;
 }
 
 # Record the exceptions -- almost all symbols but these are lower case


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.