Changeset 23641

Timestamp:

2011-01-27T13:51:23+13:00 (13 years ago)

Author:

sjm84

Message:

Adding support for ppc into the release-kits

Location:

main/trunk/release-kits

Files:

• kits/rk2/ant-scripts/compile.xml (modified) (2 diffs)
• shared/core/ant-scripts/shared.xml (modified) (1 diff)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -57 +57 @@
                 <exec executable="svn">
                     <arg value="export"/>
-                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${extension-x64}.tar.gz"/>
+                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${arch}${extension-x64}.tar.gz"/>
                     <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/>
                 </exec>
@@ -86 +86 @@
             <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/>
             <property name="path.arg" value="PATH=&quot;${gnome.lib.dir}/bin:${env.PATH}&quot;"/>
-            <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
+            <if><bool><equals arg1="${arch}" arg2="-ppc"/></bool>
+                <property name="cflags.arg" value="CFLAGS=&quot;-DSQLITE_ENABLE_LOCKING_STYLE=0 -I${gnome.lib.dir}/include&quot;"/>
+            <else>
+                <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
+            </else>
+            </if>
             <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
             <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -171 +171 @@
         <!-- set os.suffix and os.shell -->
         <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-            <property name="os.suffix" value="MacOS-intel"/>
+            <exec executable="uname" outputproperty="mac.arch">
+                <arg line="-p"/>
+            </exec>
+            
+            <if><bool><equals arg1="${mac.arch}" arg2="powerpc"/></bool>
+                <property name="os.suffix" value="MacOS-ppc"/>
+                <property name="arch" value="-ppc"/>
+            <else>
+                <property name="os.suffix" value="MacOS-intel"/>
+                <property name="arch" value="-intel"/>
+            </else>
+            </if>
+
             <property name="os.shell" value="darwin"/>
         </if>
+        <property name="arch" value=""/>
+
         <property name="os.suffix" value="${rk.os}"/>
         <property name="os.shell" value="${rk.os}"/>