Ignore:
Timestamp:
2008-08-13T11:44:24+12:00 (16 years ago)
Author:
oranfry
Message:

changes to mark3 after ant cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/mark3/ant-scripts/build.xml

    r16655 r16744  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    32<!--
    43        ..........................................................
     
    1716    <property name="bundled.version.ant" value="1.6.5"/>
    1817
    19     <!-- set current month and year-->
    20     <exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec>
    21     <exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec>
    22 
    2318    <!-- for the benefit of the shared scripts, set release-kit home -->
    2419    <property name="rk.home" value="${mark3.home}" />
    25 
     20    <property name="rk.os" value="linux" />
    2621
    2722    <!-- IMPORT OTHER ANT SCRIPTS -->
    2823    <import file="shared-ant-scripts/init.xml"/>
     24    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
    2925    <import file="compile.xml"/>
    3026    <import file="create-distribution.xml"/>
     
    3430    <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS -->
    3531    <target name="mark3-init">
    36         <echo>Determining Processor...</echo>
    3732        <if>
    3833            <bool>
    3934                <or><equals arg1="${processor}" arg2="ppc" /><equals arg1="${processor}" arg2="intel"/></or>
    4035            </bool>
    41 
    42             <echo>Processor: ${processor}</echo>
    43             <echo/>
    4436
    4537            <else>
     
    4840            </else>
    4941        </if>
     42        <echo>Processor: ${processor}</echo>
    5043    </target>
    5144
    5245    <!-- THE MAIN TARGET -->
    5346    <target name="mark3" depends="init,mark3-init">
    54         <addressedcall target="compile"/>
    55         <addressedcall target="create-distribution"/>
    56         <addressedcall target="create-installer"/>
    57         <addressedcall target="wrap"/>
     47        <antcall target="compile"/>
     48        <antcall target="create-distribution"/>
     49        <antcall target="create-installer"/>
     50        <antcall target="wrap"/>
    5851    </target>
    5952
Note: See TracChangeset for help on using the changeset viewer.