Changeset 29576 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

Timestamp:

2014-12-10T18:29:33+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Fixed GS2PerlConstructor to set gsdlos correctly, and set PERL_PERTURB_KEYS=0 to avoid mangling collections when rebuilding

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -3 +3 @@
 // greenstome classes
 import org.greenstone.gsdl3.util.*;
+import org.greenstone.util.Misc;
 import org.greenstone.util.GlobalProperties;
 
@@ -56 +57 @@
         this.gsdl3home = GlobalProperties.getGSDL3Home();
         this.gsdl2home = this.gsdl3home + File.separator + ".." + File.separator + "gs2build";
-        this.gsdlos = System.getProperty("os.name").startsWith("Windows") ? "Windows" : "Linux";
+        this.gsdlos = Misc.getGsdlOS();
+            
         this.path = System.getenv("PATH");
 
@@ -325 +327 @@
         args.add("GSDLOS=" + this.gsdlos);
         args.add("GSDL-RUN-SETUP=true");
+        args.add("PERL_PERTURB_KEYS=0");
 
         for (String a : System.getenv().keySet())
@@ -359 +362 @@
             BufferedWriter bw = new BufferedWriter(new FileWriter(GSFile.collectDir(this.site_home) + File.separator + this.collection_name + File.separator + "log" + File.separator + "build_log." + (System.currentTimeMillis()) + ".txt"));
             bw.write("Document Editor Build \n");
+
+            bw.write("Command = " + command_str + "\n");
 
             String eline = null;