Changeset 34601

Timestamp:

2020-12-15T14:02:34+13:00 (3 years ago)

Author:

kjdon

Message:

created new gsorg.root variable so we can easily change the value in one place

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="https://www.greenstone.org"/>
   <!-- catalina home is set to tomcat basedir if already installed, otherwise
        use greenstone's tomcat -->
@@ -1594 +1594 @@
       <echo>Bitness: ${uname.val}</echo>
       <if><bool><contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/></bool>
-    <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard"
+    <get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"
              dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>   
       </if>
       <if><bool><contains string="${os.bin.dir}" substring="linux" casesensitive="false"/></bool>
-    <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.bin32"
+    <get src="${gsorg.root}/caveat-emptor/IsisGdl.bin32"
              dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
       </if>
@@ -2231 +2231 @@
       <!-- check that packages dir is there -->
       <mkdir dir="${packages.home}"/>
-      <get src="http://www.greenstone.org/gs3files/${tomcat.version}.zip"
+      <get src="${gsorg.root}/gs3files/${tomcat.version}.zip"
         dest="${packages.home}/${tomcat.version}.zip"
         usetimestamp="true"/>
@@ -2241 +2241 @@
       <if>
     <bool><equals arg1="1.4" arg2="${ant.java.version}"/></bool>
-    <get src="http://www.greenstone.org/gs3files/${tomcat.version}-compat.zip"
+    <get src="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"
       dest="${packages.home}/${tomcat.version}-compat.zip"
       usetimestamp="true"/>
@@ -2752 +2752 @@
       </bool>
       <property name="ant.download.version" value="apache-ant-1.9.13" />
-      <get src="http://www.greenstone.org/gs3files/${ant.download.version}-bin.zip"
+      <get src="${gsorg.root}/gs3files/${ant.download.version}-bin.zip"
         dest="${packages.home}/${ant.download.version}-bin.zip"
         usetimestamp="true"/>
@@ -2868 +2868 @@
       </bool>
 
-      <get src="http://www.greenstone.org/gs3files/${axis.zip.version}"
+      <get src="${gsorg.root}/gs3files/${axis.zip.version}"
         dest="${packages.home}/${axis.zip.version}"
         usetimestamp="true"/>