Changeset 21630 for main/trunk/release-kits/kits/rk3

Timestamp:

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

Author:

oranfry

Message:

tidy up for greenstone3, and made wrap shared

Location:

main/trunk/release-kits/kits/rk3/ant-scripts

Files:

• build.xml (modified) (2 diffs)
• compile.xml (modified) (2 diffs)
• create-components.xml (modified) (1 diff)
• create-distribution.xml (deleted)
• create-installer.xml (deleted)
• wrap.xml (deleted)

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>

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

@@ -3 +3 @@
 
     <target name="compile">
-        <antcall target="checkout-greenstone3"/>
+
+        <!-- checkout greenstone3 -->
+        <exec executable="svn">
+            <arg value="checkout"/>
+            <arg value="${svn.root}/main/${branch.path}/greenstone3"/>
+            <arg value="compiled"/>
+            <arg value="-r"><arg value="${branch.revision}"/>
+        </exec>
+
+        <!-- run greenstone3's ant prepare -->
         <ant dir="compiled" inheritAll="false">
             <target name="prepare"/>
             <propertyset refid="forward.properties"/>
         </ant>
-        <antcall target="greenstone3-set-version-numbers">
-            <param name="greenstone3basedir" value="compiled"/>
-        </antcall>
-        <antcall target="gli-set-version-numbers">
-            <param name="glibasedir" value="compiled/gli"/>
-        </antcall>
-        <antcall target="gsdl-set-version-numbers">
-            <param name="gsdl.basedir" value="compiled/gs2build"/>
-        </antcall>
+
+        <!-- set all version numbers -->
+        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli"/></antcall>
+        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="compiled/gs2build"/></antcall>
+
+        <!-- run greenstone3's ant install and ant dist-tidy -->
         <ant dir="compiled" inheritAll="false">
             <target name="install"/>
@@ -22 +29 @@
             <propertyset refid="forward.properties"/>
         </ant>
-        <antcall target="insert-xml-parser"/>
-        <antcall target="insert-ant"/>
-        <antcall target="insert-documented-examples"/>
-        <antcall target="compile-uninstaller" />
-        <antcall target="prepare-documentation"/>
 
-        <!-- windows only -->
+        <!-- insert an xml parser -->
+        <copy todir="compiled/gs2build/perllib/cpan">
+            <fileset dir="${rk.home}/shared/greenstone3" includes="XML-Parser/**/*"/>
+        </copy>
+
+        <!-- TODO: insert-ant -->
+
+        <!-- put the uninstaller in place -->
+        <antcall target="insert-and-compile-uninstaller"/>
+
+        <!-- (windows only) -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <antcall target="insert-windows-perl">
-                <param name="todir" value="compiled/gs2build/bin/windows"/>
-            </antcall>
-            <antcall target="insert-windows-icon"/>
+            <!-- insert perl -->
+            <unzip src="${rk.home}/shared/windows/perl.zip" dest="compiled/gs2build/bin/windows"/>
         </if>
+
+        <!-- minify tomcat -->
+        <delete dir="compiled/packages/tomcat/webapps/docs"/>
+        <delete dir="compiled/packages/tomcat/webapps/examples"/>
+
+        <!-- tidy up gli to make it smaller -->
+        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
+
+        <!-- strip out .svn dirs -->
+        <antcall target="strip-svn-dirs"><param name="dir" value="compiled"/></antcall>
+
+        <!-- (linux only) -->
+        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+            <!-- grab imagemagick binaries -->
+            <delete dir="compiled/gs2build/bin/linux/imagemagick"/>
+            <exec executable="svn">
+                <arg value="export"/>
+                <arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/>
+                <arg value="compiled/gs2build/bin/linux/imagemagick"/>
+            </exec>
+
+            <!-- grab wv binaries -->
+            <delete dir="compiled/gs2build/bin/linux/wv"/>
+            <exec executable="svn">
+                <arg value="export"/>
+                <arg value="${svn.root}/main/${branch.path}/binaries/linux/wv"/>
+                <arg value="compiled/gs2build/bin/linux/wv"/>
+            </exec>
+        <!-- (mac only) -->
+        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+            <!-- grab imagemagick binaries -->
+            <delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
+            <exec executable="svn">
+                <arg value="export"/>
+                <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
+                <arg value="compiled/gs2build/bin/darwin/imagemagick"/>
+            </exec>
+
+            <!-- grab ghostscript binaries -->
+            <delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
+            <exec executable="svn">
+                <arg value="export"/>
+                <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/>
+                <arg value="compiled/gs2build/bin/darwin/ghostscript"/>
+            </exec>
+        </if></else></if>
+
     </target>
 

main/trunk/release-kits/kits/rk3/ant-scripts/create-components.xml

@@ -2 +2 @@
 <project name="rk3-create-components">
 
-    <import file="${basedir}/distributions/web/resources/xml/components.xml"/>
+    <import file="${basedir}/compiled/resources/xml/components.xml"/>
     <import file="${rk.home}/core/ant-scripts/init.xml"/>
-
-    <!-- create components from the distributions folder -->
 
     <target name="create-components">
 
-        <antcall target="prepare-component"><param name="component" value="core"/></antcall>
-        <antcall target="compress-component"><param name="component" value="core"/></antcall>
+        <!-- core -->
+        <antcall target="create-component"><param name="component" value="core"/></antcall>
 
-        <antcall target="prepare-component"><param name="component" value="tomcat"/></antcall>
-        <antcall target="compress-component"><param name="component" value="tomcat"/></antcall>
+        <!-- tomcat -->
+        <antcall target="create-component"><param name="component" value="tomcat"/></antcall>
 
-        <antcall target="prepare-component"><param name="component" value="imagemagick"/></antcall>
-        <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall>
+        <!-- imageagick -->
+        <antcall target="create-component"><param name="component" value="imagemagick"/></antcall>
 
-        <!-- windows and mac only -->
+        <!-- (windows and mac only) -->
         <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
-            <antcall target="prepare-component"><param name="component" value="ghostscript"/></antcall>
-            <antcall target="compress-component"><param name="component" value="ghostscript"/></antcall>
+            <!-- ghostscript -->
+            <antcall target="create-component"><param name="component" value="ghostscript"/></antcall>
         </if>