Changeset 18510 for gsdl/trunk/bin/script/full-rebuild.pl

Timestamp:

2009-02-12T13:31:40+13:00 (15 years ago)

Author:

davidb

Message:

Corrected mistake where collectdir was treated as the the full pathname to the named collection, rather than (as it should be) pointing to one folder higher than that.

File:

• gsdl/trunk/bin/script/full-rebuild.pl (modified) (3 diffs)

gsdl/trunk/bin/script/full-rebuild.pl

@@ -61 +61 @@
     my $collect = pop @argv;
 
-    my $collect_dir = &util::filename_cat($ENV{'GSDLHOME'},"collect",$collect);
-    if (!-d $collect_dir) {
+
+    my @filtered_argv = ();
+
+    my $collect_dir = undef;
+    my $build_dir  = undef;
+
+    while (my $arg = shift @argv) {
+    if ($arg eq "-collectdir") {
+        $collect_dir = shift @argv;
+        push(@filtered_argv,$arg,$collect_dir);
+    }
+    elsif ($arg eq "-builddir") {
+        $build_dir = shift @argv;
+        push(@filtered_argv,$arg,$build_dir);
+    }
+    else {
+        push(@filtered_argv,$arg);
+    }
+    }
+
+
+    if (!defined $collect_dir) {
+    $collect_dir = &util::filename_cat($ENV{'GSDLHOME'},"collect");
+    }
+    my $this_collect_dir = &util::filename_cat($collect_dir,$collect);
+
+    if (!-d $this_collect_dir) {
     print STDERR "Error: $collect_dir does not exist\n";
     exit(-1);
     }
 
+
+    if (!defined $build_dir) {
+    $build_dir = &util::filename_cat($this_collect_dir,"building");
+    push(@filtered_argv,"-builddir",$build_dir);
+    }
 
     
@@ -91 +121 @@
     my $buildcol_status = system($buildcol_cmd)/256;
     if ($buildcol_status == 0) {
-        my $building_dir = &util::filename_cat($collect_dir,"building");
         my $index_dir = &util::filename_cat($collect_dir,"index");
 
@@ -106 +135 @@
         print "************************\n";
 
-        &util::mv($building_dir,$index_dir);
+        &util::mv($build_dir,$index_dir);
 
     }