Changeset 16736 for release-kits/lirk3/ant-scripts/compile.xml

Timestamp:

2008-08-13T11:35:05+12:00 (16 years ago)

Author:

oranfry

Message:

changes to lirk3 after ant hack cleaned up

File:

• release-kits/lirk3/ant-scripts/compile.xml (modified) (4 diffs)

release-kits/lirk3/ant-scripts/compile.xml

@@ -9 +9 @@
         <!-- preparation -->
         <antcall target="set-version-number-property" />
-        <antcall target="dist-prepare-unix" />
+        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
+
         <antcall target="tweak-configure-scripts" />
 
         <!-- update -->
-        <antcall target="dist-update-unix" />
+        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
 
         <!-- configure -->
-        <antcall target="dist-configure-unix" />
+        <antcall target="regenerate-configure"/>
+        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
         <antcall target="tweak-makefiles" />
 
         <!-- build -->
-        <antcall target="dist-build-unix" />
+        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
         <antcall target="linux-strip-execs" />
 
@@ -38 +40 @@
     </target>
 
-    <target name="dist-prepare-unix">
-        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
-    </target>
     <target name="tweak-configure-scripts">
         <antcall target="mgpp-add-static" />
@@ -47 +46 @@
     </target>
 
-    <target name="dist-update-unix">
-        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
-    </target>
-
-    <target name="dist-configure-unix">
+    <target name="regenerate-configure">
         <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
             <arg line="configure.in"/>
         </exec>
         <chmod file="greenstone3/gs2build/configure" perm="+x"/>
-        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
     </target>
 
@@ -65 +59 @@
         <antcall target="rtftohtml-add-static" />
         <antcall target="gdbm-add-static" />
-    </target>
-
-    <target name="dist-build-unix">
-        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
     </target>