Changeset 21748
- Timestamp:
- 2010-03-01T15:27:36+13:00 (14 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk3/ant-scripts/build.xml
r21745 r21748 31 31 <target name="properties" depends="core-properties,gs3-properties"/> 32 32 33 33 34 </project> -
main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml
r21725 r21748 12 12 </exec> 13 13 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 14 19 <!-- run greenstone3's ant prepare --> 15 20 <ant dir="compiled" inheritAll="false"> 16 21 <target name="prepare"/> 17 22 <propertyset refid="forward.properties"/> 23 <property name="properties.accepted" value="true"/> 18 24 </ant> 19 25 … … 28 34 <target name="dist-tidy"/> 29 35 <propertyset refid="forward.properties"/> 36 <property name="properties.accepted" value="true"/> 30 37 </ant> 31 38 -
main/trunk/release-kits/kits/sork3/ant-scripts/build.xml
r21652 r21748 22 22 <!-- export the greenstone3 base code --> 23 23 <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> 24 27 25 28 <!-- set version numbers --> … … 30 33 <property name="properties.accepted" value="true"/> 31 34 <property name="app.version" value="${version}"/> 35 <propertyset refid="forward.properties"/> 32 36 </ant> 33 37 … … 53 57 <target name="fix-execute-permissions"/> 54 58 <target name="fix-execute-permissions-source"/> 59 <propertyset refid="forward.properties"/> 60 <property name="properties.accepted" value="true"/> 55 61 </ant> 56 62 … … 64 70 65 71 <!-- 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"/> 67 73 </target> 68 74 -
main/trunk/release-kits/kits/sork3/ant-scripts/create-sourcecode-component.xml
r21650 r21748 3 3 <project name="create-sourcecode-component"> 4 4 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"/> 7 7 8 8 <target name="create-sourcecode-component"> -
main/trunk/release-kits/shared/greenstone3/ant-scripts/greenstone3-shared.xml
r21745 r21748 12 12 <property name="version.major" value="3"/> 13 13 <target name="gs3-init"> 14 15 <!-- don't let greenstone3 block and wait for user input to accept16 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>23 14 24 15 <!-- show the property set to be forwarded to greenstone3 --> … … 73 64 74 65 </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> 75 75 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 87 76 <!-- create the property set to be forwarded to greenstone3 --> 88 77 <propertyset id="forward.properties">
Note:
See TracChangeset
for help on using the changeset viewer.