Changeset 28720 for other-projects/expeditee-release-kits/kits/rke

Timestamp:

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

Author:

ak19

Message:

Also tidied up installation directory structure

Location:

other-projects/expeditee-release-kits/kits/rke/ant-scripts

Files:

• compile.xml (modified) (2 diffs)
• components.xml (modified) (1 diff)
• init.xml (modified) (1 diff)

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>
 

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

@@ -2 +2 @@
 <project name="components">
     <patternset id="Expeditee.core.component">
-        <!--    <include name="releases" />-->
-        <include name="inst" />
-        <include name="inst/**" />
+        <include name="**" />
     </patternset>
 

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

@@ -157 +157 @@
                 </else>
             </if>
-            <else>
-                <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-                    <property name="java.installer" value="jre.exe"/>
-                    <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
-                <else>
-                    <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-                        <echo>Mac has no java</echo>
-                    </if>
-                </else>
-                </if>
-            </else>
         </if>
-
-
+        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+            <property name="java.installer" value="jre.exe"/>
+            <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
+        </if>
+        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+            <echo>Mac has no java</echo>
+        </if>
+        
         <!-- show important properties -->
         <echo level="info">Projectname: ${projectname}</echo>