Changeset 36121 for main

Timestamp:

2022-03-17T14:18:30+13:00 (2 years ago)

Author:

kjdon

Message:

the ant file needs wget for downloading things (changed from ant get task to support https). wget is in winbin, but we get winbin later as part of collection building, so lets download wget at the start

File:

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

main/trunk/greenstone3/build.xml

@@ -1030 +1030 @@
   <!-- ==================== Primary and Global Targets ============================= -->
 
-  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax,prepare-binaries"
+  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-wget-for-windows,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax,prepare-binaries"
     description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this.">
 
@@ -3466 +3466 @@
   <!-- these targets refer to the greenstone source packages - these need 
   updating less often, so are in  separate targets to the core -->
+
+  <target name="prepare-wget-for-windows">
+    <exec executable="svn" osfamily="windows" dir="${basedir}/bin/windows">
+      <arg value="export"/>
+      <arg value="-r"/><arg value="${branch.revision}"/>
+      <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/wget.exe"/> 
+    </exec>
+    <exec executable="svn" osfamily="windows" dir="${basedir}/bin/windows">
+      <arg value="export"/>
+      <arg value="-r"/><arg value="${branch.revision}"/>
+      <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/wgetrc"/>
+      <arg value="wgetrc"/>
+    </exec>
+
+  </target>
   <target name="prepare-packages" depends="init"/>