Changeset 1198

Timestamp:

2000-05-30T11:34:59+12:00 (24 years ago)

Author:

sjboddie

Message:

altered the build and build.bat scripts as the old build.bat didn't
seem to work on windows 98 -- build.bat now uses runperl.bat - this gives
the added advantage that the perl code only exists in build, there's
no duplication in build.bat

Location:

trunk/gsdl/bin

Files:

• script/build (modified) (8 diffs)
• windows/build.bat (modified) ( previous)

trunk/gsdl/bin/script/build

@@ -1 +1 @@
 #!/usr/bin/perl
 
-# This perl script is intended mostly for use on unix systems (hence no .pl
-# extension and the use of '/'s in paths). On windows it's suggested you
-# use build.bat (it's the same perl code with a batch file wrapper).
+# This perl script may be called directly or by running build.bat on
+# windows (build.bat is in bin\windows)
 
 BEGIN {
-    die "GSDLHOME not set - did you remember to source setup.bash?\n" 
-    unless defined $ENV{'GSDLHOME'};
-    die "GSDLOS not set - did you remember to source setup.bash?\n" 
-    unless defined $ENV{'GSDLOS'};
+
+    die "GSDLHOME not set - did you remember to source setup.bash (unix) or " .
+    "run setup.bat (windows)?\n" unless defined $ENV{'GSDLHOME'};
+    die "GSDLOS not set - did you remember to source setup.bash (unix) or " .
+    "run setup.bat (windows)?\n" unless defined $ENV{'GSDLOS'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
@@ -15 +15 @@
 use parsargv;
 use util;
+
+
+if (!parsargv::parse(\@ARGV, 
+             'buildtype/^(build|import)$/import', \$buildtype,
+             'maxdocs/^\-?\d+/-1', \$maxdocs)) {
+    &print_usage();
+    die "\n";
+}
+
+my ($collection) = @ARGV;
+
+if (!defined $collection || $collection !~ /\w/) {
+    print STDERR "You must specify a collection to build\n";
+    &print_usage();
+    die "\n";
+}
+
+if ($maxdocs == -1) {
+    $maxdocs = "";
+} else {
+    $maxdocs = "-maxdocs $maxdocs";
+}
+
+
+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 $bindir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin");
 
 &main();
@@ -29 +59 @@
 sub main {
 
-    if (!parsargv::parse(\@ARGV, 
-             'buildtype/^(build|import)$/import', \$buildtype,
-             'maxdocs/^\-?\d+/-1', \$maxdocs)) {
-    &print_usage();
-    die "\n";
-    }
-
-    ($collection) = @ARGV;
-
-    if (!defined $collection || $collection !~ /\w/) {
-    print STDERR "You must specify a collection to build\n";
-    &print_usage();
-    die "\n";
-    }
-
-    if ($maxdocs == -1) {
-    $maxdocs = "";
-    } else {
-    $maxdocs = "-maxdocs $maxdocs";
-    }
-    
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/archives/archives.inf") {
-    if (&has_content ("$ENV{'GSDLHOME'}/collect/$collection/import")) {
+    if (-e &util::filename_cat ($archivedir, "archives.inf")) {
+    if (&has_content ($importdir)) {
         if ($buildtype eq "build") {
         &gsdl_build();
@@ -65 +74 @@
     }
     } else {
-    if (&has_content ("$ENV{'GSDLHOME'}/collect/$collection/import")) {
+    if (&has_content ($importdir)) {
         if ($buildtype eq "build") {
         print STDERR "build: can't build directly from archives as no\n";
@@ -87 +96 @@
 
     print STDERR "importing the $collection collection\n\n";
-    system ("perl $ENV{'GSDLHOME'}/bin/script/import.pl -removeold $maxdocs $collection");
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/archives/archives.inf") {
+
+    my $import = &util::filename_cat ($bindir, "script", "import.pl");
+    system ("perl $import -removeold $maxdocs $collection");
+    if (-e &util::filename_cat ($archivedir, "archives.inf")) {
     print STDERR "$collection collection imported successfully\n\n";
     } else {
@@ -98 +109 @@
 
     print STDERR "building the $collection collection\n\n";
-    system ("perl $ENV{'GSDLHOME'}/bin/script/buildcol.pl $maxdocs $collection");
 
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/building/text/$collection.ldb" ||
-    -e "$ENV{'GSDLHOME'}/collect/$collection/building/text/$collection.bdb") {
+    my $buildcol = &util::filename_cat ($bindir, "script", "buildcol.pl");
+    system ("perl $buildcol $maxdocs $collection");
+    if (-e &util::filename_cat ($buildingdir, "text", "$collection.ldb") ||
+    -e &util::filename_cat ($buildingdir, "text", "$collection.bdb")) {
     print STDERR "$collection collection built successfully\n\n";
     } else {
@@ -108 +120 @@
 
     # replace old indexes with new ones
-    my $indexdir = "$ENV{'GSDLHOME'}/collect/$collection/index";
     if (&has_content ($indexdir)) {
     print STDERR "removing old indexes\n";
     &util::rm_r ($indexdir);
-    rename ("$ENV{'GSDLHOME'}/collect/$collection/building", $indexdir);
+    rename ($buildingdir, $indexdir);
     }
 }
@@ -132 +143 @@
     return 0;
 }
-
-__END__
-:endofperl