Changeset 20113

Timestamp:

2009-08-03T12:43:35+12:00 (15 years ago)

Author:

oranfry

Message:

fix-ups after last commit

Location:

release-kits

Files:

• mark2/ant-scripts/create-installer.xml (modified) (1 diff)
• mark3/ant-scripts/build.xml (modified) (2 diffs)
• mark3/ant-scripts/create-components.xml (modified) (1 diff)
• shared/greenstone3/ant-scripts/rk3-targets.xml (modified) (1 diff)

release-kits/mark2/ant-scripts/create-installer.xml

@@ -8 +8 @@
     </target>
 
-    <target name="copy-installer-files" depends="copy-main-installer-files"> <!-- from init -->
+    <target name="copy-installer-files" depends="copy-main-installer-files,copy-greenstone2-installer-files"> <!-- from init -->
 
         <copy todir="${basedir}/installer/classes" overwrite="true">

release-kits/mark3/ant-scripts/build.xml

@@ -28 +28 @@
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
-    <import file="create-components.xml"/>
     <import file="create-installer.xml"/>
     <import file="wrap.xml"/>
 
     <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS -->
-    <target name="mark3-init">
+    <target name="mark3-init" depends="init">
         <if>
             <bool>
@@ -50 +49 @@
 
     <!-- THE MAIN TARGET -->
-    <target name="mark3" depends="init,mark3-init">
+    <target name="mark3" depends="init,gs3-init,mark3-init">
         <antcall target="compile"/>
         <antcall target="create-distribution"/>

release-kits/mark3/ant-scripts/create-components.xml

@@ -25 +25 @@
         <antcall target="compress-component"><param name="component" value="ghostscript"/></antcall>
     </target>
-
+</project>

release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

@@ -248 +248 @@
     </target>
 
-    <target name="create-distribution">
+    <target name="greenstone3-create-distribution">
         <!-- create distribution -->
         <antcall target="copy-compiled-to-dist"/> <!-- from init -->