Changeset 1454 for trunk/gsdl/bin/script/build

Timestamp:

2000-08-27T23:04:47+12:00 (24 years ago)

Author:

stefan

Message:

Lots of changes to perl building code for collectoraction

File:

• trunk/gsdl/bin/script/build (modified) (17 diffs)

trunk/gsdl/bin/script/build

@@ -4 +4 @@
 # windows (build.bat is in bin\windows)
 
+package build;
+
 use FileHandle;
+use File::Copy;
 
 BEGIN {
@@ -20 +23 @@
 use parsargv;
 use util;
-
-if (!parsargv::parse(\@ARGV, 
-             'append', \$append,
-             'remove_archives', \$remove_archives,
-             'remove_import', \$remove_import,
-             'buildtype/^(build|import)$/import', \$buildtype,
-             'maxdocs/^\-?\d+/-1', \$maxdocs,
-             'download/.+', \@download,
-             'out/.*/STDERR', \$out)) {
-    
-    &print_usage();
-    die "\n";
-}
+use cfgread;
+
+&parse_args (\@ARGV);
 
 my ($collection) = @ARGV;
@@ -42 +35 @@
 }
 
+if ($optionfile =~ /\w/) {
+    open (OPTIONS, $optionfile) || die "Couldn't open $optionfile\n";
+    my $line = [];
+    my $options = [];
+    while (defined ($line = &cfgread::read_cfg_line ('build::OPTIONS'))) {
+    push (@$options, @$line);
+    }
+    close OPTIONS;
+    &parse_args ($options);
+}
+
 if ($maxdocs == -1) {
     $maxdocs = "";
@@ -48 +52 @@
 }
 
-my $collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
-my $importdir = &util::filename_cat ($collectdir, "import");
-my $archivedir = &util::filename_cat ($collectdir, "archives");
-my $buildingdir = &util::filename_cat ($collectdir, "building");
-my $indexdir = &util::filename_cat ($collectdir, "index");
+my $cdir = $collectdir;
+$cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/;
+my $importdir = &util::filename_cat ($cdir, $collection, "import");
+my $archivedir = &util::filename_cat ($cdir, $collection, "archives");
+my $buildingdir = &util::filename_cat ($cdir, $collection, "building");
+my $indexdir = &util::filename_cat ($cdir, $collection, "index");
 my $bindir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin");
 
@@ -68 +73 @@
 $out->autoflush(1);
 
+# delete any .kill file left laying around from a previously aborted build
+if (-e &util::filename_cat ($cdir, $collection, ".kill")) {
+    &util::rm (&util::filename_cat ($cdir, $collection, ".kill"));
+}
+
 &main();
 
@@ -75 +85 @@
     print STDERR "\n  usage: $0 [options] collection-name\n\n";
     print STDERR "  options:\n";
+    print STDERR "   -optionfile file        Get options from file, useful on systems where\n";
+    print STDERR "                           long command lines may cause problems\n";
     print STDERR "   -append                 Add new files to existing collection\n";
     print STDERR "   -remove_archives        Remove archives directory after successfully\n";
@@ -90 +102 @@
     print STDERR "                           deleted to make way for the downloaded data if\n";
     print STDERR "                           a -download option is supplied\n";
+    print STDERR "   -collectdir directory   Collection directory (defaults to " .
+    &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
+    print STDERR "   -dontinstall            Only applicable if -collectdir is set to something\n";
+    print STDERR "                           other than the default. -dontinstall will suppress the\n";
+    print STDERR "                           default behaviour which is to install the collection to\n";
+    print STDERR "                           the gsdl/collect directory once it has been built.\n";
+    print STDERR "   -save_archives          Create a copy of the existing archives directory called\n";
+    print STDERR "                           archives.org\n";
     print STDERR "   -out                    Filename or handle to print output status to.\n";
     print STDERR "                           The default is STDERR\n\n";
@@ -95 +115 @@
 
 sub main {
-    
+
+    if ($save_archives && -d $archivedir) {
+    print $out "caching original archives to ${archivedir}.org\n";
+    &util::cp_r ($archivedir, "${archivedir}.org");
+    }
+
     # do the download thing if we have any -download options
     if (scalar (@download)) {
@@ -103 +128 @@
         &util::rm_r ($importdir);
     }
-
+    
     foreach $download_dir (@download) {
         
@@ -120 +145 @@
             # copy download_dir and all it contains to the import directory
             my $download_cmd = "perl " . &util::filename_cat ($bindir, "script", "filecopy.pl");
+            $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -out \"$outfile.download\"" if $use_out;
             $download_cmd .= " \"" . $download_dir . "\" " . $collection;
@@ -165 +191 @@
     }
     }
+
+    if ($collectdir ne "" && !$dontinstall) {
+    my $install_collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect");
+    if (!&util::filenames_equal ($collectdir, $install_collectdir)) {
+        
+        # install collection to gsdl/collect
+        print $out "installing the $collection collection\n";
+        my $newdir = &util::filename_cat ($install_collectdir, $collection);
+        my $olddir = &util::filename_cat ($collectdir, $collection);
+        if (-d $newdir) {
+        print $out "build: Could not install collection as $newdir\n";
+        print $out "       already exists. Collection will remain at\n";
+        print $out "       $olddir\n";
+        &final_out (4) if $use_out;
+        die "\n";
+        }
+        if (!&File::Copy::move ($olddir, $newdir)) {
+        print $out "build: Failed to install collection to $newdir\n";
+        print $out "       Collection will remain at $olddir\n";
+        &final_out (5) if $use_out;
+        die "\n";
+        }
+    }
+    }
+
     &final_out (0) if $use_out;
 }
@@ -175 +226 @@
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     $import_cmd .= " -removeold" unless $append;
+    $import_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
     $import_cmd .= " $maxdocs $collection";
     system ($import_cmd);
@@ -188 +240 @@
     } else {
     &final_out (2) if $use_out;
-    die "\nimport.pl failed\n";
+    print $out "\nimport.pl failed\n";
+    die "\n";
     }
 }
@@ -198 +251 @@
     my $build_cmd = "perl " . &util::filename_cat ($bindir, "script", "buildcol.pl");
     $build_cmd .= " -out \"$outfile.build\"" if $use_out;
+    $build_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
     $build_cmd .= " $maxdocs $collection";
     system ($build_cmd);
@@ -211 +265 @@
     }
     } else {
-    &final_out (2) if $use_out;
-    die "\nbuildcol.pl failed\n";
+    &final_out (3) if $use_out;
+    print $out "\nbuildcol.pl failed\n";
+    die "\n";
     }
 
@@ -221 +276 @@
     }
     rmdir ($indexdir) if -d $indexdir;
-    rename ($buildingdir, $indexdir);
+    &File::Copy::move ($buildingdir, $indexdir);
+
+    # remove the cached arhives
+    if ($save_archives) -d "${archivedir}.org") {
+    &util::rm_r ("${archivedir}.org");
+    }
 }
 
@@ -263 +323 @@
     }
 }
+
+sub parse_args {
+    my ($argref) = @_;
+
+    if (!parsargv::parse($argref, 
+             'optionfile/.*/', \$optionfile,
+             'append', \$append,
+             'remove_archives', \$remove_archives,
+             'remove_import', \$remove_import,
+             'buildtype/^(build|import)$/import', \$buildtype,
+             'maxdocs/^\-?\d+/-1', \$maxdocs,
+             'download/.+', \@download,
+             'collectdir/.*/', \$collectdir,
+             'dontinstall', \$dontinstall,
+             'save_archives', \$save_archives,
+             'out/.*/STDERR', \$out)) {
+    
+    &print_usage();
+    die "\n";
+    }
+}