Changeset 23641


Ignore:
Timestamp:
01/27/11 13:51:23 (10 years ago)
Author:
sjm84
Message:

Adding support for ppc into the release-kits

Location:
main/trunk/release-kits
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r23615 r23641  
    5757                <exec executable="svn">
    5858                    <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"/>
    6060                    <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/>
    6161                </exec>
     
    8686            <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/>
    8787            <property name="path.arg" value="PATH=&quot;${gnome.lib.dir}/bin:${env.PATH}&quot;"/>
    88             <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
     88            <if><bool><equals arg1="${arch}" arg2="-ppc"/></bool>
     89                <property name="cflags.arg" value="CFLAGS=&quot;-DSQLITE_ENABLE_LOCKING_STYLE=0 -I${gnome.lib.dir}/include&quot;"/>
     90            <else>
     91                <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
     92            </else>
     93            </if>
    8994            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
    9095            <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r23587 r23641  
    171171        <!-- set os.suffix and os.shell -->
    172172        <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
    174186            <property name="os.shell" value="darwin"/>
    175187        </if>
     188        <property name="arch" value=""/>
     189
    176190        <property name="os.suffix" value="${rk.os}"/>
    177191        <property name="os.shell" value="${rk.os}"/>
Note: See TracChangeset for help on using the changeset viewer.