Changeset 23493 for main/trunk/release-kits/kits/rk2
- Timestamp:
- 2010-12-16T11:49:57+13:00 (13 years ago)
- Location:
- main/trunk/release-kits/kits/rk2/ant-scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23186 r23493 158 158 159 159 <mkdir dir="products"/> 160 <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version} .exe"/>160 <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}${version-extra}.exe"/> 161 161 <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 162 162 -
main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml
r22325 r23493 136 136 </exec> 137 137 <exec executable="link" dir="cdrom/build"> 138 <arg line="/OUT:../dist/Greenstone-${version} -windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>138 <arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/> 139 139 </exec> 140 140 … … 150 150 <echo level="info">link the compiled code</echo> 151 151 <exec executable="g++" dir="cdrom/build"> 152 <arg line="-static -static-libgcc -o ../dist/Greenstone-${version} -linux wrapper.o"/>152 <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/> 153 153 </exec> 154 154 … … 158 158 <mkdir dir="wrapped-installer/cdrom"/> 159 159 <!-- create app for cdrom installer --> 160 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>161 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>162 <chmod file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>160 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 161 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 162 <chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/> 163 163 164 164 <!-- copy bundled files --> 165 <copy todir="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>165 <copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/> 166 166 167 167 <!-- substitute in real values --> 168 <rsr file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>169 <rsr file="cdrom/dist/Greenstone-${version} -MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>168 <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/> 169 <rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 170 170 171 171 </if></else></if></else></if> … … 176 176 <!-- (windows) --> 177 177 <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 178 <tar destfile="products/cdrom-components-${version} -windows.tar.gz" compression="gzip">178 <tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip"> 179 179 <tarfileset dir="cdrom/dist"> 180 180 <include name="**/*"/> … … 183 183 </tarfileset> 184 184 </tar> 185 <tar destfile="products/cdrom-components-${version} -full-windows.tar.gz" compression="gzip">185 <tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip"> 186 186 <tarfileset dir="cdrom/dist"> 187 187 <include name="**/*"/> … … 195 195 <exec dir="cdrom/dist" executable="bash"> 196 196 <arg value="-c"/> 197 <arg value="tar -czf ../../products/cdrom-components-${version} -${rk.os}.tar.gz *"/>197 <arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}.tar.gz *"/> 198 198 </exec> 199 199 </if></else></if>
Note:
See TracChangeset
for help on using the changeset viewer.