Changeset 19899

Timestamp:

2009-06-24T14:21:44+12:00 (15 years ago)

Author:

kjdon

Message:

modified to look for buildConfig.xml if gs3 mode

File:

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

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

@@ -107 +107 @@
     my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
     
-    my $build_cfg_filename = &util::filename_cat($build_dir,"build.cfg");
-
     my $buildcol_cmd = "buildcol.pl";
     if($ENV{'GSDLOS'} =~ m/windows/) {
@@ -119 +117 @@
     }
 
+    if ((&colcfg::use_collection($site, $collect, $collect_dir)) eq "") {
+    print STDERR "Unable to use collection \"$collect\" within \"$collect_dir\"\n";
+    exit -1;
+    }
+    # Read in the collection configuration file.
+    my ($collect_cfg_filename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
+    
+    my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
+
+    # look for build.cfg/buildConfig.xml
+    my $build_cfg_filename ="";
+
+    if ($gs_mode eq "gs2") {
+    $build_cfg_filename = &util::filename_cat($build_dir,"build.cfg");
+    } else {
+    $build_cfg_filename = &util::filename_cat($build_dir, "buildConfig.xml");
+    }
+    
     if (-e $build_cfg_filename) {
 
@@ -124 +140 @@
     # (e.g. collect.cfg now says lucene, but build.cfg says mgpp)
 
-    if ((&colcfg::use_collection($site, $collect, $collect_dir)) eq "") {
-        print STDERR "Unable to use collection \"$collect\" within \"$collect_dir\"\n";
-        exit -1;
+    my $buildcfg;
+    if ($gs_mode eq "gs2") {
+        $buildcfg = &colcfg::read_build_cfg ($build_cfg_filename);
+    } else {
+        $buildcfg = &colcfg::read_collection_cfg_xml($build_cfg_filename);
     }
-    # Read in the collection configuration file.
-    my ($collect_cfg_filename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
-    my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
-
-    my $buildcfg = &colcfg::read_build_cfg ($build_cfg_filename);
-
     if ($buildcfg->{'buildtype'} ne $collectcfg->{'buildtype'}) {
         print STDERR "*****\n";