Changeset 21630 for main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

Timestamp:

2010-01-26T14:44:30+13:00 (14 years ago)

Author:

oranfry

Message:

tidy up for greenstone3, and made wrap shared

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/build.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

@@ -10 +10 @@
 <project name="rk3-build" default="rk3">
 
-    <!-- CONSTANTS -->
-
-    <!-- for the benefit of the shared scripts, set release-kit home -->
-    <property name="rk.name" value="rk3"/>
-    <property name="rk.home" value="${rk3.home}" />
+    <property name="version.major" value="3"/>
 
     <!-- IMPORT OTHER ANT SCRIPTS -->
-    <import file="../core/ant-scripts/init.xml"/>
-    <import file="../core/ant-scripts/operations-on-gli.xml"/>
-    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
+    <import file="${rk.home}/shared/core/ant-scripts/init.xml"/>
+    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/>
+    <import file="${rk.home}/shared/greenstone2/ant-scripts/rk3-targets.xml"/>
 
     <import file="compile.xml"/>
-    <import file="create-distribution.xml"/>
-    <import file="create-installer.xml"/>
+    <import file="${rk.home}/shared/core/ant-scripts/create-installer.xml"/>
     <import file="wrap.xml"/>
 
@@ -29 +24 @@
     <target name="rk3" depends="init,gs3-init">
         <antcall target="compile"/>
-        <antcall target="create-distribution"/>
-        <ant inheritRefs="true" dir="." antfile="${rk3.home}/ant-scripts/create-components.xml" target="create-components"/>
+        <ant inheritRefs="true" dir="." antfile="${rk.home}/kits/${rk.name}/ant-scripts/create-components.xml" target="create-components"/>
         <antcall target="create-installer"/>
         <antcall target="wrap"/>
-        <antcall target="create-minimal-distribution"/>
-
     </target>
 
-    <target name="properties">
-        <echo>Required Properties:</echo>
-        <echo>version             the version string for the release</echo>
-        <echo/>
-        <echo>Optional Properties:</echo>
-        <echo>branch.path         the branch of Greenstone3 to make a release of. Eg: tags/2.81. Default: trunk.</echo>
-        <echo>branch.revision     the revision of Greenstone3 to make a release of. Eg: 18273. Default: HEAD.</echo>
-        <echo/>
-    </target>
+    <!-- target to show properties in rk3-build.properties -->
+    <target name="properties" depends="core-properties"/>
 
+    <!-- create the property set to be forwarded to greenstone3 -->
+    <propertyset id="forward.properties">
+        <propertyref prefix="forward."/>
+        <mapper type="glob" from="forward.*" to="*"/>
+        <propertyref name="app.version"/>
+        <propertyref name="branch.path"/>
+        <propertyref name="branch.revision"/>
+    </propertyset>
 
 </project>