Changeset 36284

Timestamp:

2022-07-04T12:17:38+12:00 (22 months ago)

Author:

kjdon

Message:

code blocks now for windows and linux.

File:

• main/trunk/gs-release-builder/envi/etc/tasks/snapshot/environment.pl (modified) (2 diffs)

main/trunk/gs-release-builder/envi/etc/tasks/snapshot/environment.pl

@@ -1 @@
-#Where to keep snapshots
-$ENV{'DATA_DIR'} = "/gs-release-builder/snapshots";
+$os_name = $^O;
 
-#Where to find release kits and ant
-$ENV{'PATH'} = "/gs-release-builder/release-kits/bin:$ENV{'PATH'}";
+if ($os_name =~ "linux") {
+    print "Running linux setup from $home_dir/envi/etc/tasks/snapshot/environment.pl\n";
+    #Where to keep snapshots
+    $ENV{'DATA_DIR'} = "$home_dir/snapshots";
+    
+    #Where to find release kits 
+    $ENV{'PATH'} = "$home_dir/release-kits/bin:$ENV{'PATH'}";
+    
+    #Setting JAVA_HOME
+    $ENV{'JAVA_HOME'} = "$home_dir/packages/jdk1.8.0_301";
+    
+    #Adding JAVA_HOME to PATH
+    $ENV{'PATH'} = "$ENV{'JAVA_HOME'}/bin:$ENV{'PATH'}";
 
-#Setting JAVA_HOME
-$ENV{'JAVA_HOME'} = "/gs-release-builder/packages/jdk1.8.0_301";
+    # not sure what jli stuff is for
+    # TODO - test for bitness and use i386 instead of amd64 for 32 bit  version
+     $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
+     
+     
+     #PYTHON - 2.7+ needed to compile gnome-lib's glib-2.54.x
+     $ENV{'PATH'} = "$home_dir/packages/python2.7/bin:$ENV{'PATH'}";
+
+}
+
+if ($os_name =~ "MSWin32") {
+    my $home_dir = "C:\\greenstone\\gs-release-builder";
+    print "Running windows setup from envi\\bin\\tasks\\snapshot\\environment.pl\n";
+    
+    # where to put shapshots
+    $ENV{'DATA_DIR'} = "$home_dir\\snapshots";
+
+    # where to find release kits
+    $ENV{'PATH'} = "$home_dir\\release-kits\\bin;$ENV{'PATH'}";
+
+    # this was on akapuka - what is it?
+    $ENV{'munges'} = "";
+
+}
+
+# common settings
 
 # setting javacflags - needed for release kit to target java classes
 $ENV{'JAVACFLAGS'} = "-source 1.8 -target 1.8";
     
-#Adding JAVA_HOME to PATH
-$ENV{'PATH'} = "$ENV{'JAVA_HOME'}/bin:$ENV{'PATH'}";
-$ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:/gs-release-builder/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
-
 # Need to set -fPIC (for generating position independent code) among the CFLAGS
 # in order to get Expat to compile up on bedrock
@@ -20 +50 @@
 ### do we need this??
 
-#PYTHON - 2.7+ needed to compile gnome-lib's glib-2.54.x
-$ENV{'PATH'} = "/gs-release-builder/packages/python2.7/bin:$ENV{'PATH'}";