Changeset 28720 for other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml

Timestamp:

2013-11-28T18:57:03+13:00 (10 years ago)

Author:

ak19

Message:

Also tidied up installation directory structure

File:

• other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml (modified) (2 diffs)

other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml

@@ -7 +7 @@
             <arg value="checkout"/>
             <arg value="https://svn.cms.waikato.ac.nz/svn/expeditee/trunk"/>
-            <arg value="${basedir}/compiled"/>
+            <arg value="${basedir}/expeditee"/>
         </exec>
 
@@ -14 +14 @@
             <!--<delete dir="${basedir}/compiled/client-gli.app"/>-->
         </if>
-        <ant dir="${basedir}/compiled" antfile="${basedir}/compiled/build.xml" target="inst6" />
+        <ant dir="${basedir}/expeditee" antfile="${basedir}/expeditee/build.xml" target="inst6" />
+        <move todir="compiled">
+            <fileset dir="expeditee/inst">
+                <include name="**"/>
+            </fileset>
+        </move>
+
+
+        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+            <exec dir="${rk.home}/shared/core/search4j" executable="./configure" failonerror="true"/>
+            <exec dir="${rk.home}/shared/core/search4j" executable="make" failonerror="true"/>
+            <copy file="${rk.home}/shared/core/search4j/search4j" todir="${basedir}/compiled" />
+        </if>
+        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+            <exec dir="${rk.home}/shared/core/search4j" executable="nmake"><arg value="/f"/><arg value="win32.mak"/></exec>
+            <copy file="${rk.home}/shared/core/search4j/search4j.exe" todir="${basedir}/compiled" />
+        </if>
     </target>