- Timestamp:
- 2010-12-16T11:49:57+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/shared/core/ant-scripts/wrap.xml
r21725 r23493 40 40 chunkSize="${resources.chunksize}"/> 41 41 <rsplit 42 resource="installer/Greenstone-${version} -${os.suffix}.jar"42 resource="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar" 43 43 outputDir="wrapped-installer" 44 44 resourceScript="wrapped-installer/wrapper.rc" … … 63 63 <!-- link wrapper --> 64 64 <exec executable="link" dir="wrapped-installer"> 65 <arg line="/OUT:..\products\Greenstone-${version} -${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>65 <arg line="/OUT:..\products\Greenstone-${version}${version-extra}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 66 66 </exec> 67 67 … … 79 79 <!-- copy bundled files into place --> 80 80 <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/> 81 <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version} -${os.suffix}.jar"/>81 <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 82 82 83 83 <!-- substitute in real values --> … … 122 122 <!-- link the compiled code and bundled files --> 123 123 <exec executable="g++" dir="wrapped-installer"> 124 <arg line="-static -static-libgcc -o ../products/Greenstone-${version} -linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/>124 <arg line="-static -static-libgcc -o ../products/Greenstone-${version}${version-extra}-linux wrapper.o libsearch4j.o greenstone.jar.o java.o"/> 125 125 </exec> 126 126 … … 133 133 134 134 <!-- create app for main installer --> 135 <copy todir="wrapped-installer/Greenstone${version} .app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>136 <copy todir="wrapped-installer/Greenstone${version} .app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>137 <chmod file="wrapped-installer/Greenstone${version} .app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>135 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 136 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 137 <chmod file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 138 138 139 139 <!-- copy bundled files --> 140 <copy todir="wrapped-installer/Greenstone${version} .app/Contents/Resources/Java" file="installer/Greenstone-${version}-${os.suffix}.jar"/>140 <copy todir="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Resources/Java" file="installer/Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 141 141 142 142 <!-- substitute in real values --> 143 <rsr file="wrapped-installer/Greenstone${version} .app/Contents/Info.plist">144 <job pattern="@jar@" replacement="Greenstone-${version} -${os.suffix}.jar"/>145 <job pattern="@version@" replacement="${version} "/>143 <rsr file="wrapped-installer/Greenstone${version}${version-extra}.app/Contents/Info.plist"> 144 <job pattern="@jar@" replacement="Greenstone-${version}${version-extra}-${os.suffix}.jar"/> 145 <job pattern="@version@" replacement="${version}${version-extra}"/> 146 146 </rsr> 147 147 … … 149 149 150 150 <!-- get size of app --> 151 <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version} .app"/></exec>151 <exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks Greenstone${version}${version-extra}.app"/></exec> 152 152 <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 153 153 <math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/> 154 154 155 155 <!-- create disk image --> 156 <property name="dmg.name" value="Greenstone-${version} -${os.suffix}"/>156 <property name="dmg.name" value="Greenstone-${version}${version-extra}-${os.suffix}"/> 157 157 <exec dir="products" executable="hdiutil" failonerror="true"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 158 158 <!-- mount it --> 159 159 <exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec> 160 160 <!-- copy file into it --> 161 <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version} .app /Volumes/${dmg.name}"/></exec>161 <exec executable="cp"><arg line="-r wrapped-installer/Greenstone${version}${version-extra}.app /Volumes/${dmg.name}"/></exec> 162 162 <!-- unmount it--> 163 163 <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
Note:
See TracChangeset
for help on using the changeset viewer.