Changeset 18929 for release-kits/mark2/ant-scripts/compile.xml

Timestamp:

2009-04-09T10:08:46+12:00 (15 years ago)

Author:

oranfry

Message:

changing the way the release kits make the greenstone2 distribution: instead of starting from a fresh export of greenstone, start from a copy of the compiled working copy

File:

• release-kits/mark2/ant-scripts/compile.xml (modified) (3 diffs)

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

@@ -6 +6 @@
         <!-- checkout -->
         <antcall target="checkout-gsdl-gli" />
+        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>
         
         <!-- configure -->
         <antcall target="run-configure"/>
         <antcall target="tweak-makefiles"/>
+
+        <!-- make common-src and reconfigure -->
+        <!-- this is a workaround to a problem with the gsdl build code -->
+        <!-- expat needs to be compiled before the perl XML Parser is configured -->
+        <antcall target="make-common-src"/>
+        <antcall target="run-configure"/>
 
         <!-- make -->
@@ -18 +26 @@
         <antcall target="strip-execs"/>
 
+        <!-- gli -->
+        <antcall target="compile-gli">
+            <param name="script.format"  value="sh"/>
+            <param name="glibasedir"  value="${basedir}/compiled/gli"/>
+            <param name="gsdlbasedir" value="${basedir}/compiled"/>
+        </antcall>
+
         <!-- uninstaller -->
         <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
@@ -24 +39 @@
         <antcall target="build-demo-collection" />
 
-    </target>
-
-    <target name="checkout-gsdl-gli">
-        <svn javahl="false">
-            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
-            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
-        </svn>
     </target>