Changeset 36654

Timestamp:

2022-09-23T13:38:55+12:00 (19 months ago)

Author:

davidb

Message:

Working through a set of changes where config values need to be expressed in unix (URL, really) format to work with the Java programs that read in the config files

File:

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

main/trunk/greenstone3/build.xml

@@ -414 +414 @@
   <property name="web.home" value="${basedir}/web"/>
   <property name="web.writablehome" value="${gsdl3.writablehome}"/>
+
+  <!-- The following are useful in Java-based config files (.properties,.json,.xml)
+       where the 'Unix style' (really URL style of slash, even in a file://...) is used -->
+  <pathconvert targetos="unix" property="web.home.unix">
+    <path path="${web.home}"/>
+  </pathconvert>
+  <pathconvert targetos="unix" property="web.writablehome.unix">
+    <path path="${web.writablehome}"/>
+  </pathconvert>
+  
   <!-- If using a dispersed GS3 web folder, then the user web would not contain everything in the
        default GS3 web (it won't contain a CGI or lib folder inside WEB-INF, for instance) -->
@@ -2644 +2654 @@
   <target name="configure-webswing-ext" depends="init" >
     <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true">
-      <arg value="-Dweb.home=${web.home}"/>
-      <arg value="-Dweb.writablehome=${web.writablehome}"/>
+      <arg value="-Dweb.home=${web.home.unix}"/>
+      <arg value="-Dweb.writablehome=${web.writablehome.unix}"/>
       <arg value="configure-extension"/>
     </exec>