Changeset 35512

Timestamp:

2021-09-28T18:44:10+13:00 (3 years ago)

Author:

anupama

Message:

Some changes to the mojave Mac release-kit rk3 main compile.xml file that had been accumulating. The latest is to turn of checkout.gnomelib.ext when release-kits are running, as this property is now turned on by default in GS3checked out from SVN after discussion some weeks ago with Dr Bainbridge and Kathy.

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/mojave-compile.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/mojave-compile.xml

@@ -11 +11 @@
             <arg value="-r"/><arg value="${branch.revision}"/>
         </exec>
+
+        <!-- comment out any active checkout.gnomelib.ext=true line in build.properties.svn
+             So that the release-kits go back to behaving how they did when the line 
+             used to be commented out by default in build properties.
+             For alternative ways to achieve this, see
+             https://jeeva-paramasamy.blogspot.com/2012/07/removeunset-property-in-property-file.html
+             Further options in the propertyfile task https://ant.apache.org/manual/Tasks/propertyfile.html
+          -->
+        <!--<if><bool><equals arg1="${checkout.gnomelib.ext}" arg2="true"/></bool>-->
+        <rsr file="${basedir}/compiled/build.properties.svn" pattern="checkout.gnomelib.ext=true" replacement="#checkout.gnomelib.ext=true"/>
+        <!--</if>-->
 
         <if><bool><equals arg1="${with.jni}" arg2="false"/></bool>
@@ -159 +170 @@
           <arg value="compiled/packages"/>
           <arg value="--no-check-certificate"/>
-          <arg value="http://www.greenstone.org/gs3files/apache-ant-${insert.ant.version}-bin.tar.gz"/>
+          <arg value="https://www.greenstone.org/gs3files/apache-ant-${insert.ant.version}-bin.tar.gz"/>
         </exec>
 
@@ -172 +183 @@
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
             <!-- insert perl -->
-            <unzip src="${rk.home}/shared/windows/perl.zip" dest="compiled/gs2build/bin/windows"/>
+            <!--<unzip src="${rk.home}/shared/windows/perl.zip" dest="compiled/gs2build/bin/windows"/>-->
+            <exec executable="svn" dir="compiled/gs2build/bin/windows">
+                <arg value="export"/>
+                <arg value="${svn.root}/main/trunk/release-kits/shared/windows/perl.zip"/>
+            </exec>
+            <unzip src="compiled/gs2build/bin/windows/perl.zip" dest="compiled/gs2build/bin/windows"/>
+            <delete failonerror="false" file="compiled/gs2build/bin/windows/perl.zip" />
         </if>