Changeset 23641
- Timestamp:
- 2011-01-27T13:51:23+13:00 (13 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23615 r23641 57 57 <exec executable="svn"> 58 58 <arg value="export"/> 59 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${ extension-x64}.tar.gz"/>59 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${arch}${extension-x64}.tar.gz"/> 60 60 <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/> 61 61 </exec> … … 86 86 <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/> 87 87 <property name="path.arg" value="PATH="${gnome.lib.dir}/bin:${env.PATH}""/> 88 <property name="cflags.arg" value="CFLAGS="-I${gnome.lib.dir}/include""/> 88 <if><bool><equals arg1="${arch}" arg2="-ppc"/></bool> 89 <property name="cflags.arg" value="CFLAGS="-DSQLITE_ENABLE_LOCKING_STYLE=0 -I${gnome.lib.dir}/include""/> 90 <else> 91 <property name="cflags.arg" value="CFLAGS="-I${gnome.lib.dir}/include""/> 92 </else> 93 </if> 89 94 <property name="cxxflags.arg" value="CXXFLAGS="-I${gnome.lib.dir}/include""/> 90 95 <property name="cppflags.arg" value="CPPFLAGS="-I${gnome.lib.dir}/include""/> -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23587 r23641 171 171 <!-- set os.suffix and os.shell --> 172 172 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 173 <property name="os.suffix" value="MacOS-intel"/> 173 <exec executable="uname" outputproperty="mac.arch"> 174 <arg line="-p"/> 175 </exec> 176 177 <if><bool><equals arg1="${mac.arch}" arg2="powerpc"/></bool> 178 <property name="os.suffix" value="MacOS-ppc"/> 179 <property name="arch" value="-ppc"/> 180 <else> 181 <property name="os.suffix" value="MacOS-intel"/> 182 <property name="arch" value="-intel"/> 183 </else> 184 </if> 185 174 186 <property name="os.shell" value="darwin"/> 175 187 </if> 188 <property name="arch" value=""/> 189 176 190 <property name="os.suffix" value="${rk.os}"/> 177 191 <property name="os.shell" value="${rk.os}"/>
Note:
See TracChangeset
for help on using the changeset viewer.