Changeset 28726 for other-projects/expeditee-release-kits/kits/rke
- Timestamp:
- 2013-12-02T13:48:23+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml
r28725 r28726 66 66 </exec> 67 67 68 <!-- (linux ) -->69 <else><if><bool>< equals arg1="${rk.os}" arg2="linux"/></bool>68 <!-- (linux and mac) --> 69 <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 70 70 <!-- create the build directory --> 71 71 <mkdir dir="wrapped-installer"/> … … 73 73 <!-- copy the source into place --> 74 74 <copy todir="wrapped-installer" overwrite="true"> 75 <fileset file="${rk.home}/shared/ linux/wrapper.cpp"/>75 <fileset file="${rk.home}/shared/${rk.os}/wrapper.cpp"/> 76 76 <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/> 77 77 </copy> 78 78 79 79 <!-- copy bundled files into place --> 80 <copy todir="wrapped-installer" file="${rk.home}/shared/ linux/${java.installer}"/>80 <copy todir="wrapped-installer" file="${rk.home}/shared/${rk.os}/${java.installer}"/> 81 81 <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/> 82 82 … … 136 136 <!-- link the compiled code and bundled files --> 137 137 <exec executable="g++" dir="wrapped-installer"> 138 <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}- linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>138 <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/> 139 139 </exec> 140 140 141 </if></else></if> 141 142 <!-- (mac) --> 142 <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 143 144 <!-- create and setup the build directory --> 145 <delete dir="wrapped-installer"/> 146 <mkdir dir="wrapped-installer"/> 143 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 147 144 148 145 <!-- create app for main installer --> 149 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy> 146 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"> 147 <fileset dir="${rk.home}/shared/mac/Wrapper.app"/> 148 </copy> 150 149 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/> 151 150 <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 152 151 153 152 <!-- copy bundled files --> 154 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/> 153 <!-- 154 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/> 155 155 <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="${rk.home}/shared/mac/${java.installer}"/> 156 --> 157 <move todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/> 156 158 157 159 <!-- substitute in real values --> … … 178 180 <!-- unmount it--> 179 181 <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec> 180 </if></else></if></else></if> 181 182 </if> 182 183 183 184 </target>
Note:
See TracChangeset
for help on using the changeset viewer.