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

Timestamp:

2007-12-19T15:03:24+13:00 (16 years ago)

Author:

dmn

Message:

davidbs changes to update for gs3 building

File:

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

gsdl/trunk/bin/script/build

@@ -93 +93 @@
 
 my $cdir = $collectdir;
-$cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect") unless $collectdir =~ /\w/;
+if (defined $site)
+{
+    die "GSDL3HOME not set." unless $ENV{'GSDL3HOME'};
+    $cdir = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect") unless $collectdir =~ /\w/;
+}
+else
+{
+    $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");
@@ -177 +186 @@
     print STDOUT "                           a -download option is supplied\n";
     print STDOUT "   -collectdir directory   Collection directory (defaults to " .
-    &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
+    &util::filename_cat($ENV{'GSDLHOME'}). "collect for Greenstone2;\n";
+    print STDOUT"                            for Greenstone3 use -site option and then collectdir default will be\n";
+    print STDOUT "                            set to the collect folder within that site.)\n";
+    print STDOUT "   -site                   Specify the site within a Greenstone3 installation to use.\n";
     print STDOUT "   -dontinstall            Only applicable if -collectdir is set to something\n";
     print STDOUT "                           other than the default. -dontinstall will suppress\n";
@@ -297 +309 @@
             my $download_cmd = "perl -S filecopy.pl";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
+            $download_cmd .= " -site \"$site\"" if $site =~ /\w/;
             $download_cmd .= " -out \"$outfile.download\"" if $use_out;
             $download_cmd .= " \"" . $download_dir . "\" " . $collection;
-            system ($download_cmd);
+
+            my $download_status = system ($download_cmd);
+            if ($download_status > 0) 
+            {
+            die "Failed to execute: $download_cmd\n";
+            }
+
+
             # if using output directory append the file download output to it
             &append_file ($out, "$outfile.download");
@@ -308 +328 @@
     }
     }
+
+    `echo $importdir ; ls $importdir `;
 
     if (-e &util::filename_cat ($archivedir, "archives.inf")) {
@@ -355 +377 @@
 
     if ($collectdir ne "" && !$dontinstall) {
-    my $install_collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect");
+    
+    my $install_collectdir;
+    if (defined $ENV{'GSDL3HOME'})
+    {
+        
+        if ((defined $site) && ($site ne ""))
+        {
+        $install_collectdir = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect");
+        }
+        else 
+        {
+        my $msg = "build: ERROR: Need to specify the site within the Greenstone3 installation.";
+        print $out $msg;
+        &log_event ($msg);
+        &final_out (6) if $use_out;
+        die "\n";
+        }
+    }
+    else
+    {
+        $install_collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect");
+    }
+
     if (!&util::filenames_equal ($collectdir, $install_collectdir)) {
         
@@ -403 +447 @@
 
     $import_cmd .= " -manifest manifest.xml" if ($manifest);
+    $import_cmd .= " -site \"$site\"" if $site =~ /\w/;
     $import_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
     $import_cmd .= " -statsfile \"$statsfile\"" if $statsfile =~ /\w/;
@@ -447 +492 @@
 
     $build_cmd .= " -out \"$outfile.build\"" if $use_out;
+    $build_cmd .= " -site \"$site\"" if $site =~ /\w/;
     $build_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
     $build_cmd .= " $maxdocs $collection";
@@ -503 +549 @@
     }
     }
+
     return 0;
 }
@@ -605 +652 @@
              'download/.+', \@download,
              'collectdir/.*/', \$collectdir,
+             'site/.*/', \$site,
              'dontinstall', \$dontinstall,
              'save_archives', \$save_archives,