Changeset 35593 for main

Timestamp:

2021-10-14T16:33:44+13:00 (3 years ago)

Author:

davidb

Message:

Fixes after testing on Windows 64-bit

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -927 +927 @@
     <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-setupenv.properties">
       <arg value="/c" />
-      <arg value=".\gs3-setup.bat >nul 2>gs3-setupenv.errors ; set" />
+      <arg value=".\gs3-setup.bat >foo.txt 2>gs3-setupenv.errors &amp;&amp; set"/>
     </exec>          
+
+    <!-- Need to escape any backslashes (typically happens on Windows with file/dir paths) so can be parsed in correctly by 
+     property file read, otherwise can trigger errors such as Malformed \uXXXX -->
+    <rsr verbosity="1" file="gs3-setupenv.properties" pattern="\\" replacement="\\\\" />
     
     <property file="${basedir}/gs3-setupenv.properties" prefix="env"/>
@@ -946 +950 @@
     </condition>
 
-    <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source ./gs3-setup.sh' (Unix) before starting the Greenstone server."/>    
+    <fail if="gs3-setup-not-done" message="Failed to run 'gs3-setup' (Windows) or 'source ./gs3-setup.sh' (Unix) before starting the Greenstone server."/>    
   </target>
 
@@ -961 +965 @@
       <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
     <arg value="/c" />
-    <arg value=".\gs3-devel.sh >nul 2>gs3-develenv.errors ; set" />
+    <arg value=".\gs3-devel.bat >nul 2>gs3-develenv.errors &amp;&amp; set" />
       </exec>          
-      
+
+      <!-- Need to escape any backslashes (typically happens on Windows with file/dir paths) so can be parsed in correctly by 
+       property file read, otherwise can trigger errors such as Malformed \uXXXX -->
+      <rsr verbosity="1" file="gs3-develenv.properties" pattern="\\" replacement="\\\\" />
+
       <property file="${basedir}/gs3-develenv.properties" prefix="env"/>