Changeset 29078

Timestamp:

2014-05-26T11:37:09+12:00 (10 years ago)

Author:

kjdon

Message:

make builddir absolute if it isn't already (so you can say -builddir building1 for example). Needed to use self->builddir not $builddir as the latter was empty, so I have changed the make absolute for archivesdir in the same way

File:

• main/trunk/greenstone2/perllib/buildcolutils.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -275 +275 @@
   else
   {
-    $self->{'archivedir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir);
+    $self->{'archivedir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $self->{'archivedir'});
   }
   # End Mod
@@ -294 +294 @@
       &gsprintf::gsprintf($out, "{buildcol.incremental_default_builddir}\n");
     }
-  }
+  } else {
+      # make absolute if not already
+      $self->{'builddir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $self->{'builddir'});
+  }
+  
   # - why don't we make builddir absolute similar to archivedir?
   $self->{'builddir'} = &FileUtils::sanitizePath($self->{'builddir'});