2001-05-04 Conrad Canterford <conrad@mail.watersprite.com.au>

* make-gnucash-patch.in: add --manifest option (allow use of a
        manifest file. Also, change --file option to allow multiple
        files.
        Fix bug in previous change.
        * README.patches: Updated to reflect new capabilities.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4113 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,11 @@
+ 2001-05-04  Conrad Canterford <conrad@mail.watersprite.com.au>
+
+	* make-gnucash-patch.in: add --manifest option (allow use of a
+	manifest file. Also, change --file option to allow multiple files.
+	Fix bug in previous change.
+
+	* README.patches: Updated to reflect new capabilities.
+
 2001-05-03  Dave Peticolas  <dave@krondo.com>
 
 	* doc/sgml/*/xacc-hierarchical-report.sgml: remove file

README.patches

@@ -1,5 +1,5 @@
 ############################################################
-          Gnucash 1.5.x README file.
+          Gnucash 1.5.x README.patches file.
 
 NOTE: THIS IS A DEVELOPMENT RELEASE!!! THIS VERSION HAS NOT
 BEEN TESTED PROPERLY AND MAY DO ABSOLUTELY ANYTHING!  
@@ -123,7 +123,7 @@ USERS GUIDE
  The general format for using make-gnucash-patch is:
       ./make-gnucash-patch <options>
 
- where valid options are:
+ where valid options are (in arbitrary order):
  --help, --h          Display a short help message explaining available
                       options.
 
@@ -160,9 +160,18 @@ USERS GUIDE
 
  --file "filename"   Generate a patch for ONLY this file. The path within
                      the CVS tree must be specified (eg. src/MultiLedger.c) or 
-                     the file cannot be matched. You *CANNOT* use this option
-                     with wildcards or partial matches.
+                     the file cannot be matched. You can specify multiple files
+                     by seperating them by commas. You can also include this
+                     option multiple times.
+                     You *CANNOT* use this option with wildcards, regexps, or
+                     partial matches.
                      Defaults to:  none.
+                     See Also: --manifest
+
+ --manifest "file"   Use "file" as a manifest file (file that contains a list
+                     of all files to be compared in the making of the diff).
+                     Manifest files must contain one filename per line. Lines 
+                     starting with # are ignored.
 
 --ignore "igname"    Name of the file in the parent directory which contains
                      regular expressions matching files which are to be excluded

make-gnucash-patch.in

@@ -85,13 +85,15 @@ my $help;
 my $zip = 1;     # defaults to on
 my $diffname = undef;
 my $ignorename = undef;
-my $filename = undef;
+my @filename = ();
+my $manifest = undef;
 
 $result = GetOptions("old=s" => \$old, "new=s" => \$new, 
             "prefix=s" => \$gnc_home, "help" => \$help,
-            "file=s" => \$filename, "ask!" => \$::ask_description,
+            "file=s" => \@filename, "ask!" => \$::ask_description,
             "diff=s" => \$diffname, "uuencode!" => \$::should_uuencode,
-            "zip!" => \$zip, "ignore=s" => \$ignorename);
+            "zip!" => \$zip, "ignore=s" => \$ignorename,
+            "manifest=s" => \$manifest);
 
 if ($help or $result == 0) {
   printf "Help information\n\n";
@@ -101,6 +103,7 @@ if ($help or $result == 0) {
   printf "--prefex \"homedir\" Full path of parent directory\n";
   printf "--diff \"diffname\"  Output name for diff file\n";
   printf "--file \"filename\"  Make patch for filename ONLY\n";
+  printf "--manifest \"file\"  Use file as a manifest file\n";
   printf "--ignore \"igname\"  File containing file matches to ignore\n";
   printf "--(no)uuencode     Enable or disable uuencoded output\n";
   printf "                   (Defaults to enabled)\n";
@@ -111,19 +114,23 @@ if ($help or $result == 0) {
   printf "and of course:\n";
   printf "--help             Displays this text\n";
   printf "\nAll options can be abbreviated to their shortest unique\n";
-  printf "  form: --o, --ne, --p, --d, --f, --i, --u/--nou, --z/--noz, \n";
-  printf "        --a/--noa, and --h\n";
+  printf "  form: --o, --ne, --p, --d, --f, --m, --i, --u/--nou,\n";
+  printf "        --z/--noz, --a/--noa, and --h\n";
   printf "\n";
   exit 1;
 }
 
 # if explicit filename given, build required MANIFEST file
 
-if (defined($filename)) {
+@filename = split(/,/,join(',',@filename));
+
+if (@filename) {
   open (FN, ">$gnc_home/tmp.MANIFEST") or die "Couldn't create MANIFEST file";
   printf (FN "# Temporary manifest file for make-gnucash-patch -f option\n");
   printf (FN "\n");
-  printf (FN "%s\n", $filename);
+  foreach my $part (@filename) {
+    printf (FN "%s\n", $part);
+  }
   close (FN);
 }
 
@@ -155,9 +162,12 @@ if (not $::ask_description) {
 
 # If -f options given, use generated manifest file
 # otherwise, add exclusions and proceed as normal
-if (defined($filename)) {
+if (@filename) {
   push(@args, '-manifest', "$gnc_home/tmp.MANIFEST");
 }
+elsif (defined($manifest)) {
+  push(@args, '-manifest', "$manifest");
+}
 else {
   # Add in the exclude patterns from the __DATA__ section
   push_exclusions(\@args);