Changeset 16199

Timestamp:

2008-06-26T11:56:02+12:00 (15 years ago)

Author:

oranfry

Message:

put the vundled java info in the shared init script

File:

• release-kits/shared/ant-scripts/init.xml (modified) (2 diffs)

release-kits/shared/ant-scripts/init.xml

@@ -2 +2 @@
 <project name="rk-init">
 
-    <!-- CONSTANTS -->
 
     <!-- load in static properties from build.properties -->
     <property file="build.properties" />
 
+    <!-- CONSTANTS (overridable in build.properties) -->
+
     <!-- svn root -->
-    <property name="svn.root" value="http://svn.greenstone.org"/>
+    <property name="svn.root" value="http://svn.greenstone.org" />
 
+    <!-- default revision and branch path -->
+    <property name="branch.path" value="trunk" />
+    <property name="branch.revision" value="HEAD" />
+    
     <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
     <property name="java.min.version" value="1.4.0_00"/>
 
+    <!-- create a localised basedir property -->
+    <path id="basedir.path"><pathelement location="${basedir}"/></path>
+    <property name="basedir.local" refid="basedir.path"/>
+
+    
     <!-- BUNDLED JAVA INFO -->
-    <!-- the bundled javas are kept in linux/wrapper and windows/wrapper in the repository -->
+    <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->
     <!-- change this info when the bundled version changes -->
+    <!-- linux -->
     <property name="bundled.version.linux-java" value="1.6.0_05"/>
     <property name="linux-java.installer" value="jre_6u5_tar_gz"/>
     <property name="linux-java.extracted" value="jre1.6.0_05"/> <!-- set this to the name of the top level directory in the above archive -->
     <property name="component.size.linux-java" value="97Mb"/>
-
+    <!-- windows -->
     <property name="bundled.version.windows-java" value="1.6.0_03"/>
     <property name="windows-java.installer" value="jre-6u3-windows-i586-p-s.exe"/>
@@ -54 +65 @@
     <typedef name="addressedcall" classname="TreeCallTarget" classpathref="project.classpath"/>
     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
+    <typedef name="rsplit" classname="SplitResource" classpathref="project.classpath"/>
     <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/>