Changeset 19406

Show
Ignore:
Timestamp:
12.05.2009 16:26:33 (10 years ago)
Author:
oranfry
Message:

pass on the value of install.flax to the compiled greenstone3

Location:
release-kits/wirk3
Files:
4 modified

Legend:

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

    r19039 r19406  
    3333     
    3434    <!-- THE MAIN TARGET --> 
    35     <target name="wirk3" depends="init"> 
     35    <target name="wirk3" depends="init,gs3-init"> 
    3636        <antcall target="compile"/> 
    3737        <antcall target="create-distribution"/> 
     
    4949        <echo>branch.path         the branch of Greenstone3 to make a release of. Eg: tags/2.81. Default: trunk.</echo> 
    5050        <echo>branch.revision     the revision of Greenstone3 to make a release of. Eg: 18273. Default: HEAD.</echo> 
     51        <echo>install.flax        set to true to include flax in the distribution. Default: false.</echo> 
    5152        <echo/> 
    5253    </target> 
  • release-kits/wirk3/ant-scripts/compile.xml

    r19013 r19406  
    44    <target name="compile"> 
    55        <antcall target="checkout-greenstone3" /> 
     6        <antcall target="generate-build-properties"/> 
     7         
    68        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall> 
    79        <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
     
    2426            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/> 
    2527        </svn> 
     28    </target> 
     29 
     30    <target name="generate-build-properties"> 
     31        <copy file="compiled/build.properties.in" tofile="compiled/build.properties"/> 
     32        <if><bool><istrue value="${install.flax}"/></bool> 
     33            <rsr file="compiled/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/> 
     34        </if> 
    2635    </target> 
    2736 
     
    6776        </exec> 
    6877    </target> 
    69  
     78     
    7079</project> 
  • release-kits/wirk3/src/wirk3.cpp

    r19006 r19406  
    6565    string JAVA_HOME = getenv( "JAVA_HOME" ); 
    6666    string WIRK3_HOME = getenv( "WIRK3_HOME" ); 
     67    putenv( ("ANT_HOME=" + WIRK3_HOME + "\\core\\ant").c_str() ); 
    6768    //string PWD = getenv( "CD" ); 
    6869