Changeset 21748

Show
Ignore:
Timestamp:
01.03.2010 15:27:36 (10 years ago)
Author:
oranfry
Message:

moved binary specific forwarding properties to rk3, and fixed sork3

Location:
main/trunk/release-kits
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

    r21745 r21748  
    3131    <target name="properties" depends="core-properties,gs3-properties"/> 
    3232 
     33 
    3334</project> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r21725 r21748  
    1212        </exec> 
    1313 
     14        <!-- make sure all c++ compilation is done statically on linux --> 
     15        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
     16            <property name="forward.compile.static" value="true"/> 
     17        </if> 
     18 
    1419        <!-- run greenstone3's ant prepare --> 
    1520        <ant dir="compiled" inheritAll="false"> 
    1621            <target name="prepare"/> 
    1722            <propertyset refid="forward.properties"/> 
     23            <property name="properties.accepted" value="true"/> 
    1824        </ant> 
    1925 
     
    2834            <target name="dist-tidy"/> 
    2935            <propertyset refid="forward.properties"/> 
     36            <property name="properties.accepted" value="true"/> 
    3037        </ant> 
    3138 
  • main/trunk/release-kits/kits/sork3/ant-scripts/build.xml

    r21652 r21748  
    2222        <!-- export the greenstone3 base code --> 
    2323        <exec executable="svn"><arg value="export"/><arg value="${svn.root}/main/${branch.path}/greenstone3"/><arg value="distributions/${dist.name}"/></exec> 
     24        <antcall target="persist-forwarded-properties"> 
     25            <param name="greenstone3basedir" value="distributions/${dist.name}"/> 
     26        </antcall> 
    2427 
    2528        <!-- set version numbers --> 
     
    3033            <property name="properties.accepted" value="true"/> 
    3134            <property name="app.version" value="${version}"/> 
     35            <propertyset refid="forward.properties"/> 
    3236        </ant> 
    3337 
     
    5357            <target name="fix-execute-permissions"/> 
    5458            <target name="fix-execute-permissions-source"/> 
     59            <propertyset refid="forward.properties"/> 
     60            <property name="properties.accepted" value="true"/> 
    5561        </ant> 
    5662 
     
    6470 
    6571        <!-- create the sourcecode component --> 
    66         <ant dir="." antfile="${rk.home}/kits/${rk.name}/ant-scripts/create-sourcecode-component.xml" target="create-sourcecode-component"/> 
     72        <ant dir="${basedir}" antfile="${rk.home}/kits/${rk.name}/ant-scripts/create-sourcecode-component.xml" target="create-sourcecode-component"/> 
    6773    </target> 
    6874 
  • main/trunk/release-kits/kits/sork3/ant-scripts/create-sourcecode-component.xml

    r21650 r21748  
    33<project name="create-sourcecode-component"> 
    44 
    5     <import file="distributions/${dist.name}/resources/xml/components.xml"/> 
    6     <import file="distributions/${dist.name}/resources/xml/executables.xml"/> 
     5    <import file="${basedir}/distributions/${dist.name}/resources/xml/components.xml"/> 
     6    <import file="${basedir}/distributions/${dist.name}/resources/xml/executables.xml"/> 
    77 
    88    <target name="create-sourcecode-component"> 
  • 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">