Changeset 34605
- Timestamp:
- 2020-12-16T18:35:28+13:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r34602 r34605 500 500 <!--constants --> 501 501 <property name="svn.root" value="https://svn.greenstone.org"/> 502 <property name="gsorg.root" value="http://community.nzdl.org"/> 502 <property name="gsorg.root" value="https://www.greenstone.org"/> 503 <!--<property name="gsorg.root" value="http://community.nzdl.org"/>--> 503 504 504 505 <!-- catalina home is set to tomcat basedir if already installed, otherwise … … 1595 1596 <echo>Bitness: ${uname.val}</echo> 1596 1597 <if><bool><contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/></bool> 1597 <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"--> 1598 <get src="${gsorg.root}/gs3files/IsisGdl.macleopard" 1599 dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/> 1598 <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard" 1599 dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>--> 1600 <exec executable="wget" failonerror="true"> 1601 <arg value="-P"/> 1602 <arg value="${basedir}/gs2build/bin/${os.bin.dir}"/> 1603 <arg value="--no-check-certificate"/> 1604 <arg value="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"/> 1605 </exec> 1606 <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.macleopard" 1607 tofile="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/> 1600 1608 </if> 1601 1609 <if><bool><contains string="${os.bin.dir}" substring="linux" casesensitive="false"/></bool> 1602 <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.bin32"--> 1603 <get src="${gsorg.root}/gs3files/IsisGdl.bin32" 1604 dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/> 1610 <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.bin32" 1611 dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>--> 1612 <exec executable="wget" failonerror="true"> 1613 <arg value="-P"/> 1614 <arg value="${basedir}/gs2build/bin/${os.bin.dir}"/> 1615 <arg value="--no-check-certificate"/> 1616 <arg value="${gsorg.root}/caveat-emptor/IsisGdl.bin32"/> 1617 </exec> 1618 <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.bin32" 1619 tofile="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/> 1605 1620 </if> 1606 1621 <chmod file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl" perm="755"/> … … 2234 2249 <!-- check that packages dir is there --> 2235 2250 <mkdir dir="${packages.home}"/> 2251 <!-- 2236 2252 <get src="${gsorg.root}/gs3files/${tomcat.version}.zip" 2237 2253 dest="${packages.home}/${tomcat.version}.zip" 2238 2254 usetimestamp="true"/> 2255 --> 2256 <exec executable="wget" failonerror="true"> 2257 <arg value="-P"/><!-- specifying output dir, also: minus-minus-directory-prefix --> 2258 <arg value="${packages.home}"/> 2259 <arg value="--no-check-certificate"/> 2260 <arg value="${gsorg.root}/gs3files/${tomcat.version}.zip"/> 2261 </exec> 2239 2262 <unzip src="${packages.home}/${tomcat.version}.zip" 2240 dest="${packages.home}"/>2263 dest="${packages.home}"/> 2241 2264 2242 2265 <!-- If we are using Java 1.4, we'd be using tomcat 5.5 in which case … … 2244 2267 <if> 2245 2268 <bool><equals arg1="1.4" arg2="${ant.java.version}"/></bool> 2269 <!-- 2246 2270 <get src="${gsorg.root}/gs3files/${tomcat.version}-compat.zip" 2247 2271 dest="${packages.home}/${tomcat.version}-compat.zip" 2248 2272 usetimestamp="true"/> 2273 --> 2274 <exec executable="wget" failonerror="true"> 2275 <arg value="-P"/> 2276 <arg value="${packages.home}"/> 2277 <arg value="--no-check-certificate"/> 2278 <arg value="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"/> 2279 </exec> 2249 2280 <unzip src="${packages.home}/${tomcat.version}-compat.zip" 2250 2281 dest="${packages.home}"/> … … 2755 2786 </bool> 2756 2787 <property name="ant.download.version" value="apache-ant-1.9.13" /> 2788 <!-- 2757 2789 <get src="${gsorg.root}/gs3files/${ant.download.version}-bin.zip" 2758 2790 dest="${packages.home}/${ant.download.version}-bin.zip" 2759 2791 usetimestamp="true"/> 2792 --> 2793 <exec executable="wget" failonerror="true"> 2794 <arg value="-P"/> 2795 <arg value="${packages.home}"/> 2796 <arg value="--no-check-certificate"/> 2797 <arg value="${gsorg.root}/gs3files/${ant.download.version}-bin.zip"/> 2798 </exec> 2760 2799 <unzip src="${packages.home}/${ant.download.version}-bin.zip" 2761 2800 dest="${packages.home}"/> … … 2871 2910 </bool> 2872 2911 2912 <!-- 2873 2913 <get src="${gsorg.root}/gs3files/${axis.zip.version}" 2874 2914 dest="${packages.home}/${axis.zip.version}" 2875 2915 usetimestamp="true"/> 2916 --> 2917 <exec executable="wget" failonerror="true"> 2918 <arg value="-P"/><!-- output dir, alt: minus-minus-directory-prefix --> 2919 <arg value="${packages.home}"/> 2920 <arg value="--no-check-certificate"/> 2921 <arg value="${gsorg.root}/gs3files/${axis.zip.version}"/> 2922 </exec> 2876 2923 <unzip src="${packages.home}/${axis.zip.version}" 2877 2924 dest="${packages.home}"/>
Note:
See TracChangeset
for help on using the changeset viewer.