Changeset 34605 for main/trunk/greenstone3/build.xml

Timestamp:

2020-12-16T18:35:28+13:00 (3 years ago)

Author:

anupama

Message:

Didn't see that Kathy had changed gsroot to community machine. Have put it back to greenstone.org since this commit switches ant get tasks over to ant exec tasks using GS compiled wget which has https support. So we are not dependent on http urls. Still need to update all the affected release kits files.

File:

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

main/trunk/greenstone3/build.xml

@@ -500 +500 @@
   <!--constants -->
   <property name="svn.root" value="https://svn.greenstone.org"/>
-  <property name="gsorg.root" value="http://community.nzdl.org"/>
+  <property name="gsorg.root" value="https://www.greenstone.org"/>
+  <!--<property name="gsorg.root" value="http://community.nzdl.org"/>-->
 
   <!-- catalina home is set to tomcat basedir if already installed, otherwise
@@ -1595 +1596 @@
       <echo>Bitness: ${uname.val}</echo>
       <if><bool><contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/></bool>
-    <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"-->
-    <get src="${gsorg.root}/gs3files/IsisGdl.macleopard"
-             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>   
+    <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"
+             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>-->
+    <exec executable="wget" failonerror="true">
+      <arg value="-P"/>
+      <arg value="${basedir}/gs2build/bin/${os.bin.dir}"/>
+      <arg value="--no-check-certificate"/>
+      <arg value="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"/>
+    </exec>
+    <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.macleopard"
+          tofile="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
       </if>
       <if><bool><contains string="${os.bin.dir}" substring="linux" casesensitive="false"/></bool>
-    <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.bin32"-->
-    <get src="${gsorg.root}/gs3files/IsisGdl.bin32"
-             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
+    <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.bin32"
+             dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>-->
+    <exec executable="wget" failonerror="true">
+      <arg value="-P"/>
+      <arg value="${basedir}/gs2build/bin/${os.bin.dir}"/>
+      <arg value="--no-check-certificate"/>
+      <arg value="${gsorg.root}/caveat-emptor/IsisGdl.bin32"/>
+    </exec>
+    <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.bin32"
+          tofile="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
       </if>
       <chmod file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl" perm="755"/>
@@ -2234 +2249 @@
       <!-- check that packages dir is there -->
       <mkdir dir="${packages.home}"/>
+      <!--
       <get src="${gsorg.root}/gs3files/${tomcat.version}.zip"
         dest="${packages.home}/${tomcat.version}.zip"
         usetimestamp="true"/>
+      -->
+      <exec executable="wget" failonerror="true">
+    <arg value="-P"/><!-- specifying output dir, also: minus-minus-directory-prefix -->
+    <arg value="${packages.home}"/>
+    <arg value="--no-check-certificate"/>
+    <arg value="${gsorg.root}/gs3files/${tomcat.version}.zip"/>
+      </exec>
       <unzip src="${packages.home}/${tomcat.version}.zip" 
-        dest="${packages.home}"/>
+             dest="${packages.home}"/>
       
       <!-- If we are using Java 1.4, we'd be using tomcat 5.5 in which case 
@@ -2244 +2267 @@
       <if>
     <bool><equals arg1="1.4" arg2="${ant.java.version}"/></bool>
+    <!--
     <get src="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"
       dest="${packages.home}/${tomcat.version}-compat.zip"
       usetimestamp="true"/>
+      -->
+    <exec executable="wget" failonerror="true">
+      <arg value="-P"/>
+      <arg value="${packages.home}"/>
+      <arg value="--no-check-certificate"/>
+      <arg value="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"/>
+    </exec> 
     <unzip src="${packages.home}/${tomcat.version}-compat.zip" 
       dest="${packages.home}"/>
@@ -2755 +2786 @@
       </bool>
       <property name="ant.download.version" value="apache-ant-1.9.13" />
+      <!--
       <get src="${gsorg.root}/gs3files/${ant.download.version}-bin.zip"
         dest="${packages.home}/${ant.download.version}-bin.zip"
         usetimestamp="true"/>
+      -->
+      <exec executable="wget" failonerror="true">
+    <arg value="-P"/>
+    <arg value="${packages.home}"/>
+    <arg value="--no-check-certificate"/>
+    <arg value="${gsorg.root}/gs3files/${ant.download.version}-bin.zip"/>
+      </exec>
       <unzip src="${packages.home}/${ant.download.version}-bin.zip"
         dest="${packages.home}"/>
@@ -2871 +2910 @@
       </bool>
 
+      <!--
       <get src="${gsorg.root}/gs3files/${axis.zip.version}"
         dest="${packages.home}/${axis.zip.version}"
         usetimestamp="true"/>
+      -->
+      <exec executable="wget" failonerror="true">
+    <arg value="-P"/><!-- output dir, alt: minus-minus-directory-prefix -->
+    <arg value="${packages.home}"/>
+    <arg value="--no-check-certificate"/>
+    <arg value="${gsorg.root}/gs3files/${axis.zip.version}"/>
+      </exec>
       <unzip src="${packages.home}/${axis.zip.version}"
         dest="${packages.home}"/>