Changeset 34612 for main/trunk/release-kits/kits/rk2

Timestamp:

2020-12-16T23:11:25+13:00 (3 years ago)

Author:

anupama

Message:

Further rk2 changes to get the release kit to use wget to grab the old IsisGdl 32 bit mac and linux binaries on elcapitan, mountain lion and linux 64 bit. The 32 bit linux does not need to replace its 32 bit generated IsisGdl, so its compile.xml file never did that before nor at present.

Location:

main/trunk/release-kits/kits/rk2/ant-scripts

Files:

• elcapitan-compile.xml (modified) (1 diff)
• lin64-compile.xml (modified) (1 diff)
• mountainlion-compile.xml (modified) (1 diff)

main/trunk/release-kits/kits/rk2/ant-scripts/elcapitan-compile.xml

@@ -261 +261 @@
             <!-- for 64 bit need to copy in the statically compiled IsisGdl -->
             <!--<delete file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
-            <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
-            <!--<move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
+            <!--<get src="https://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
+            <exec executable="wget" failonerror="true">
+              <arg value="-P"/>
+              <arg value="${basedir}/compiled/bin/${os.shell}"/>
+              <arg value="--no-check-certificate"/>
+              <arg value="https://www.greenstone.org/caveat-emptor/IsisGdl.macleopard"/>
+            </exec>
+            <move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.macleopard" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
             <chmod perm="755" file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
         </if>

main/trunk/release-kits/kits/rk2/ant-scripts/lin64-compile.xml

@@ -252 +252 @@
             <!-- for 64 bit need to copy in the statically compiled IsisGdl -->
             <!--<delete file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
-            <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.bin32" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32"/>
+            <!--<get src="https://www.greenstone.org/caveat-emptor/IsisGdl.bin32" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32"/>-->
+            <exec executable="wget" failonerror="true">
+              <arg value="-P"/>
+              <arg value="${basedir}/compiled/bin/${os.shell}"/>
+              <arg value="--no-check-certificate"/>
+              <arg value="https://www.greenstone.org/caveat-emptor/IsisGdl.bin32"/>
+            </exec>
             <move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
             <chmod perm="755" file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
-
         </if>
 

main/trunk/release-kits/kits/rk2/ant-scripts/mountainlion-compile.xml

@@ -261 +261 @@
             <!-- for 64 bit need to copy in the statically compiled IsisGdl -->
             <!--<delete file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
-            <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
-            <!--<move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
+            <!--<get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
+            <exec executable="wget" failonerror="true">
+              <arg value="-P"/>
+              <arg value="${basedir}/compiled/bin/${os.shell}"/>
+              <arg value="--no-check-certificate"/>
+              <arg value="https://www.greenstone.org/caveat-emptor/IsisGdl.macleopard"/>
+            </exec>
+            <move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.macleopard" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
+
             <chmod perm="755" file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
         </if>