diff options
| author | Alexander Kurtakov | 2015-03-24 09:49:27 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2015-03-24 09:49:27 +0000 |
| commit | 53e82df16e6956d9fa7da8fee68d4d1d759812a4 (patch) | |
| tree | 3134c6bc15b684a899b7a6cbee0bc197a61cd4e2 | |
| parent | e9c202445b7800e816318f00aed3887885c67efd (diff) | |
| download | eclipse.platform.swt-53e82df16e6956d9fa7da8fee68d4d1d759812a4.tar.gz eclipse.platform.swt-53e82df16e6956d9fa7da8fee68d4d1d759812a4.tar.xz eclipse.platform.swt-53e82df16e6956d9fa7da8fee68d4d1d759812a4.zip | |
Bug 462921 - Remove no longer built ws/os/arch binaries
Remove cocoa.macosx (32bit) build support.
Change-Id: Iea75f6218ac0f489154fdfee881ea903f89a2fb8
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh | 15 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 10 |
2 files changed, 0 insertions, 25 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh index 96e8b0dc88..912f67b064 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh @@ -27,21 +27,6 @@ if [ "x${MODEL}" = "xx86_64" ]; then if [ "x${XULRUNNER24_SDK}" = "x" ]; then export XULRUNNER24_SDK="/Users/Shared/xulrunner/24-64/xulrunner-sdk/" fi -else - export ARCHS="-arch i386 -arch ppc" - export XULRUNNER24_ARCHS="-arch i386" - if [ "x${OUTPUT_DIR}" = "x" ]; then - export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx - fi - if [ "x${XULRUNNER_SDK}" = "x" ]; then - export XULRUNNER_SDK="/Users/Shared/xulrunner/1.8.0.1/mozilla/dist/i386/dist/sdk" - fi - if [ "x${XULRUNNER_LIBS}" = "x" ]; then - export XULRUNNER_LIBS="${XULRUNNER_SDK}/lib/libxpcomglue.a ${XULRUNNER_SDK}/../../../ppc/dist/sdk/lib/libxpcomglue.a" - fi - if [ "x${XULRUNNER24_SDK}" = "x" ]; then - export XULRUNNER24_SDK="/Users/Shared/xulrunner/24/xulrunner-sdk" - fi fi if [ "x${XULRUNNER24_LIBS}" = "x" ]; then diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 51104684ff..21ad73b66a 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -53,12 +53,6 @@ </target> <target name="check_libraries" depends="get_version"> - <!-- Cocoa 32 bit and ppc not being built - <antcall target="check_fragment_libraries"> - <param name="library_count" value="5"/> - <param name="fragment" value="org.eclipse.swt.cocoa.macosx"/> - </antcall> - --> <antcall target="check_fragment_libraries"> <param name="library_count" value="5"/> <param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/> @@ -144,7 +138,6 @@ <exclude name="**/.git/**"/> <exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/> <exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/> - <exclude name="**/org.eclipse.swt.cocoa.macosx/**"/> </fileset> <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}"> <filename regex="[0-9][0-9][0-9][0-9]."/> @@ -152,7 +145,6 @@ <exclude name="**/.git/**"/> <exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/> <exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/> - <exclude name="**/org.eclipse.swt.cocoa.macosx/**"/> </fileset> <property name="not_match_text" refid="not_match"/> <resourcecount refid="match" property="match_count"/> @@ -791,7 +783,6 @@ <exclude name="**/.git/**"/> <exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/> <exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/> - <exclude name="**/org.eclipse.swt.cocoa.macosx/**"/> </fileset> <!-- Rename libraries that were not built --> @@ -810,7 +801,6 @@ <exclude name="**/tmpdir/**"/> <exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/> <exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/> - <exclude name="**/org.eclipse.swt.cocoa.macosx/**"/> </fileset> <property name="afiles" refid="addid"/> |