Changeset 18492 for gsdl/trunk/bin/script/incremental-buildcol.pl

Timestamp:

2009-02-10T14:10:31+13:00 (15 years ago)

Author:

davidb

Message:

incremental switches to -removeold if collection not built before

File:

• gsdl/trunk/bin/script/incremental-buildcol.pl (modified) (2 diffs)

gsdl/trunk/bin/script/incremental-buildcol.pl

@@ -61 +61 @@
     my $collect = pop @argv;
 
-    my $collect_dir = &util::filename_cat($ENV{'GSDLHOME'},"collect",$collect);
+
+    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",$collect);
+    }
     if (!-d $collect_dir) {
     print STDERR "Error: $collect_dir does not exist\n";
@@ -67 +90 @@
     }
 
+
+    if (!defined $build_dir) {
+    $build_dir = &util::filename_cat($collect_dir,"index");
+    push(@filtered_argv,"-builddir",$build_dir);
+    }
+
+    my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
     
-    my $index_dir = &util::filename_cat($collect_dir,"index");
+    my $build_cfg_filename = &util::filename_cat($build_dir,"build.cfg");
 
+    my $buildcol_cmd = "buildcol.pl";
 
-    my $quoted_argv = join(" ", map { "\"$_\"" } @argv);
-        
+    if (-e $build_cfg_filename) {
+    $buildcol_cmd .= " -incremental";
+    }
+    else {
+### print STDERR "$build_cfg_filename does not exist.\n";
+    print STDERR "*****\n";
+    print STDERR "* First time built. Switching to full buildcol.pl.\n";
+    print STDERR "*****\n";
+    $buildcol_cmd .= " -removeold";
+    }
+
     
-    my $buildcol_cmd = "buildcol.pl -incremental $quoted_argv -builddir \"$index_dir\" \"$collect\"";
+    $buildcol_cmd .= " $quoted_argv \"$collect\"";
     
     my $buildcol_status = system($buildcol_cmd)/256;