Ignore:
Timestamp:
2010-03-01T15:27:36+13:00 (12 years ago)
Author:
oranfry
Message:

moved binary specific forwarding properties to rk3, and fixed sork3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/greenstone3/ant-scripts/greenstone3-shared.xml

    r21745 r21748  
    1212    <property name="version.major" value="3"/>
    1313    <target name="gs3-init">
    14 
    15         <!-- don't let greenstone3 block and wait for user input to accept
    16             the properties for the build -->
    17         <property name="forward.properties.accepted" value="true"/>
    18 
    19         <!-- make sure all c++ compilation is done statically on linux -->
    20         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
    21             <property name="forward.compile.static" value="true"/>
    22         </if>
    2314
    2415        <!-- show the property set to be forwarded to greenstone3 -->
     
    7364
    7465    </target>
     66
     67    <target name="persist-forwarded-properties">
     68        <echoproperties prefix="forward." destfile="${greenstone3basedir}/forward.properties"/>
     69        <replaceregexp file="${greenstone3basedir}/forward.properties" match="forward\.(.*)" replace="\1" byline="true"/>
     70        <copy file="${greenstone3basedir}/build.properties.in" tofile="${greenstone3basedir}/build.properties"/>
     71        <concat destfile="${greenstone3basedir}/build.properties" append="true" fixlastline="yes">
     72            <fileset file="${greenstone3basedir}/forward.properties"/>
     73        </concat>
     74    </target>
    7575   
    76     <!-- unused. this or something similar might need to go back in, to make the forward.properties permanent -->
    77     <target name="generate-build-properties">
    78         <copy file="${greenstone3.basedir}/build.properties.in" tofile="${greenstone3.basedir}/build.properties"/>
    79         <if><bool><istrue value="${install.flax}"/></bool>
    80             <rsr file="${greenstone3.basedir}/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/>
    81         </if>
    82         <if><bool><isset property="server.default.servlet"/></bool>
    83             <rsr file="${greenstone3.basedir}/build.properties" pattern="^#?server.default.servlet\s*[=:].*" replacement="server.default.servlet=${server.default.servlet}"/>
    84         </if>
    85     </target>
    86 
    8776    <!-- create the property set to be forwarded to greenstone3 -->
    8877    <propertyset id="forward.properties">
Note: See TracChangeset for help on using the changeset viewer.