Changeset 28720 for other-projects


Ignore:
Timestamp:
11/28/13 18:57:03 (7 years ago)
Author:
ak19
Message:

Also tidied up installation directory structure

Location:
other-projects/expeditee-release-kits/kits/rke/ant-scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml

    r28695 r28720  
    77            <arg value="checkout"/>
    88            <arg value="https://svn.cms.waikato.ac.nz/svn/expeditee/trunk"/>
    9             <arg value="${basedir}/compiled"/>
     9            <arg value="${basedir}/expeditee"/>
    1010        </exec>
    1111
     
    1414            <!--<delete dir="${basedir}/compiled/client-gli.app"/>-->
    1515        </if>
    16         <ant dir="${basedir}/compiled" antfile="${basedir}/compiled/build.xml" target="inst6" />
     16        <ant dir="${basedir}/expeditee" antfile="${basedir}/expeditee/build.xml" target="inst6" />
     17        <move todir="compiled">
     18            <fileset dir="expeditee/inst">
     19                <include name="**"/>
     20            </fileset>
     21        </move>
     22
     23
     24        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
     25            <exec dir="${rk.home}/shared/core/search4j" executable="./configure" failonerror="true"/>
     26            <exec dir="${rk.home}/shared/core/search4j" executable="make" failonerror="true"/>
     27            <copy file="${rk.home}/shared/core/search4j/search4j" todir="${basedir}/compiled" />
     28        </if>
     29        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     30            <exec dir="${rk.home}/shared/core/search4j" executable="nmake"><arg value="/f"/><arg value="win32.mak"/></exec>
     31            <copy file="${rk.home}/shared/core/search4j/search4j.exe" todir="${basedir}/compiled" />
     32        </if>
    1733    </target>
    1834
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/components.xml

    r28695 r28720  
    22<project name="components">
    33    <patternset id="Expeditee.core.component">
    4         <!--    <include name="releases" />-->
    5         <include name="inst" />
    6         <include name="inst/**" />
     4        <include name="**" />
    75    </patternset>
    86
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml

    r28716 r28720  
    157157                </else>
    158158            </if>
    159             <else>
    160                 <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    161                     <property name="java.installer" value="jre.exe"/>
    162                     <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
    163                 <else>
    164                     <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    165                         <echo>Mac has no java</echo>
    166                     </if>
    167                 </else>
    168                 </if>
    169             </else>
    170159        </if>
    171 
    172 
     160        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     161            <property name="java.installer" value="jre.exe"/>
     162            <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
     163        </if>
     164        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
     165            <echo>Mac has no java</echo>
     166        </if>
     167       
    173168        <!-- show important properties -->
    174169        <echo level="info">Projectname: ${projectname}</echo>
Note: See TracChangeset for help on using the changeset viewer.