Changeset 21593
- Timestamp:
- 2010-01-25T11:02:45+13:00 (14 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/build.xml
r21523 r21593 10 10 </ant> 11 11 </target> 12 <target name="clean"> 13 <ant dir="shared/core/ant-tasks/greenstone" inheritAll="false" target="clean"> 14 <property name="crypt.jar" value="${basedir}/shared/core/lib/crypt.jar"/> 15 </ant> 16 <ant dir="shared/core/ant-installer" inheritAll="false" target="clean"> 17 <property name="antlib" value="${ant.home}/lib"/> 18 </ant> 19 </target> 12 20 13 21 </project> -
main/trunk/release-kits/kits/rk2/ant-scripts/build.xml
r21510 r21593 118 118 <target name="make-common-src"> 119 119 <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/> 120 < exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec>120 <!--<exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec>--> 121 121 </target> 122 122 -
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r21521 r21593 136 136 <target name="strip-execs"> 137 137 <exec dir="${basedir}/compiled/bin/${os.shell}" executable="find" failonerror="true"> 138 <arg line=" ! -name . -type f -maxdepth 1 -exec strip {} ;"/>138 <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} ;"/> 139 139 </exec> 140 140 </target> … … 143 143 144 144 <!-- linux, mac --> 145 <if><bool>< equals arg1="${rk.os}" arg2="linux"/></bool>145 <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 146 146 <exec dir="${basedir}/compiled" executable="${rk.home}/kits/rk2/resources/build-demo.sh" failonerror="true"/> 147 147 -
main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml
r21521 r21593 145 145 <!-- linux --> 146 146 <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 147 <copy file="${rk.home}/ linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/>147 <copy file="${rk.home}/shared/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/> 148 148 149 149 <echo level="info">compile the cdrom wrapper</echo> -
main/trunk/release-kits/kits/rk2/ant-scripts/wrap.xml
r21394 r21593 98 98 </exec> 99 99 100 <!-- figure out jar size (web jar) --> 101 <exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 102 <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 103 104 <!-- figure out java size --> 105 <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 106 <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 107 100 108 <!-- creating wrapper header file --> 101 109 <delete file="wrapper.h"/> -
main/trunk/release-kits/shared/core/ant-scripts/init.xml
r21521 r21593 24 24 <property name="basedir.local" refid="basedir.path"/> 25 25 26 <!-- size of resource chunks (w rapper) -->26 <!-- size of resource chunks (windows wrapper) --> 27 27 <property name="resources.chunksize" value="8388608"/> 28 28 29 <!-- the extra space for the dmg image in KB (mac wrapper) --> 30 <property name="dmg.overhead" value="2048"/> 31 29 32 <!-- current date and time --> 30 33 <tstamp> … … 169 172 </else></if></else></if></else></if></else></if> 170 173 171 <!-- set os.suffix -->174 <!-- set os.suffix and os.shell --> 172 175 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 173 176 <property name="os.suffix" value="MacOS-intel"/> 177 <property name="os.shell" value="darwin"/> 174 178 </if> 175 179 <property name="os.suffix" value="${rk.os}"/> 180 <property name="os.shell" value="${rk.os}"/> 176 181 177 182 <!-- show important properties -->
Note:
See TracChangeset
for help on using the changeset viewer.