Changeset 155

Show
Ignore:
Timestamp:
02/21/07 11:47:26 (2 years ago)
Author:
jlee
Message:

Updated SWT; added SWT for OSX; needs testing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r146 r155  
    99        <property name="jar.dir" value="jar" /> 
    1010        <property name="dist.dir" value="dist" /> 
    11         <property name="swt.linux.x86.dir" value="lib/swt-M20060921-0945-gtk-linux-x86" /> 
    12         <property name="swt.linux.x86_64.dir" value="lib/swt-M20060921-0945-gtk-linux-x86_64" /> 
    13         <property name="swt.windows.dir" value="lib/swt-M20060921-0945-win32-win32-x86" /> 
     11        <property name="swt.linux.x86.dir" value="lib/swt-M20070212-1330-gtk-linux-x86" /> 
     12        <property name="swt.linux.x86_64.dir" value="lib/swt-M20070212-1330-gtk-linux-x86_64" /> 
     13        <property name="swt.osx.dir" value="lib/swt-M20070212-1330-carbon-macosx" /> 
     14        <property name="swt.windows.dir" value="lib/swt-M20070212-1330-win32-win32-x86" /> 
    1415        <property name="icons.dir" value="${package}/icons" /> 
    1516        <property name="resources.zip.file" value="${build.dir}/${package}/resources.zip" /> 
    …… 
    2728        <condition property="swt.dir" value="${swt.linux.x86_64.dir}"> 
    2829                <os name="Linux" arch="amd64" /> 
     30        </condition> 
     31 
     32        <condition property="swt.dir" value="${swt.osx.dir}"> 
     33                <os name="Mac OS X" /> 
    2934        </condition> 
    3035 
    …… 
    8994                <jar destfile="${dist.dir}/swt-native-gtk-linux-x86.jar" basedir="${swt.linux.x86.dir}" includes="*.so" /> 
    9095                <jar destfile="${dist.dir}/swt-native-gtk-linux-x86_64.jar" basedir="${swt.linux.x86_64.dir}" includes="*.so" /> 
     96                <jar destfile="${dist.dir}/swt-native-carbon-macosx" basedir="${swt.osx.dir}" includes="*.jnilib" /> 
    9197                <jar destfile="${dist.dir}/swt-native-win32-win32-x86.jar" basedir="${swt.windows.dir}" includes="*.dll" /> 
    9298                <copy file="${swt.linux.x86.dir}/swt.jar" tofile="${dist.dir}/swt-gtk-linux-x86.jar" /> 
    9399                <copy file="${swt.linux.x86_64.dir}/swt.jar" tofile="${dist.dir}/swt-gtk-linux-x86_64.jar" /> 
     100                <copy file="${swt.osx.dir}/swt.jar" tofile="${dist.dir}/swt-carbon-macosx.jar" /> 
    94101                <copy file="${swt.windows.dir}/swt.jar" tofile="${dist.dir}/swt-win32-win32-x86.jar" /> 
    95102                 

  • trunk/web/iriverter-nocodecs.jnlp

    r149 r155  
    3131        </resources> 
    3232 
     33        <resources os="Mac OS X"> 
     34                <nativelib href="swt-native-carbon-macosx.jar" /> 
     35                <jar href="swt-carbon-macosx.jar" /> 
     36        </resources> 
     37 
    3338        <resources os="Linux" arch="i386"> 
    3439                <nativelib href="swt-native-gtk-linux-x86.jar" /> 

  • trunk/web/iriverter.jnlp

    r149 r155  
    3232        </resources> 
    3333 
     34        <resources os="Mac OS X"> 
     35                <nativelib href="swt-native-carbon-macosx.jar" /> 
     36                <jar href="swt-carbon-macosx.jar" /> 
     37        </resources> 
     38 
    3439        <resources os="Linux" arch="i386"> 
    3540                <nativelib href="swt-native-gtk-linux-x86.jar" />