diff options
author | Alexander Kurtakov | 2018-03-23 13:34:57 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-03-23 13:34:57 +0000 |
commit | 05c3d136c9a5eecbcf1c9652a188bfe37b09cadb (patch) | |
tree | f2560af1c9ac1534305ae90844c217b64453c724 /bundles/org.eclipse.swt/Eclipse SWT PI | |
parent | e061a646a35408e4c4cbd20733baa1f7e304be3e (diff) | |
download | eclipse.platform.swt-05c3d136c9a5eecbcf1c9652a188bfe37b09cadb.tar.gz eclipse.platform.swt-05c3d136c9a5eecbcf1c9652a188bfe37b09cadb.tar.xz eclipse.platform.swt-05c3d136c9a5eecbcf1c9652a188bfe37b09cadb.zip |
Bug 532825 - Remove hpux/solaris clutter in the codebase
Change-Id: I735be5853d393097c7d11c9abb43e9e5cbf93c8d
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
6 files changed, 5 insertions, 376 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h index 93c1a99e19..a164b42b53 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h @@ -22,8 +22,6 @@ /* Libraries for dynamic loaded functions */ #ifdef AIX #define LIB_CAIRO "libcairo.a(libcairo.so.2)" -#elif HPUX -#define LIB_CAIRO "libcairo.so" #elif _WIN32 #define LIB_CAIRO "libcairo-2.dll" #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java index f3a1e2c9d5..4b56a979d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,8 +73,6 @@ static String os() { String osName = System.getProperty("os.name"); //$NON-NLS-1$ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$ - if (osName.equals ("Solaris")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ - if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ return osName; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh index 5c3de37342..9ce186fd45 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh @@ -1,6 +1,6 @@ #!/bin/sh #******************************************************************************* -# Copyright (c) 2000, 2017 IBM Corporation and others. +# Copyright (c) 2000, 2018 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -81,19 +81,6 @@ case $OS in SWT_OS=aix MAKEFILE=make_aix.mak ;; - "SunOS") - SWT_OS=solaris - PROC=`uname -i` - MAKEFILE=make_solaris.mak - if [ "${MODEL}" = "" ]; then - MODEL=`isainfo -k` - if [ "${MODEL}" = "amd64" ]; then - MODEL=x86_64 - MAKEFILE=make_solaris_x86_64.mak - MAKE_TYPE=gmake - fi - fi - ;; "FreeBSD") SWT_OS=freebsd MAKEFILE=make_freebsd.mak @@ -195,17 +182,6 @@ case $SWT_OS.$SWT_ARCH in export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" fi ;; - "solaris.x86_64") - if [ "${CC}" = "" ]; then - export CC="cc" - fi - if [ "${CXX}" = "" ]; then - export CXX="CC" - fi - if [ "${JAVA_HOME}" = "" ]; then - export JAVA_HOME="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71" - fi - ;; "linux.s390x") if [ "${CC}" = "" ]; then export CC=gcc @@ -247,11 +223,6 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} export SWT_LFLAGS fi fi - if [ ${OS} = 'SunOS' ]; then - SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" - SWT_LFLAGS=-m64 - export SWT_LFLAGS - fi export SWT_PTR_CFLAGS fi if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak deleted file mode 100644 index 6c95c0ee38..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak +++ /dev/null @@ -1,166 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -#******************************************************************************* - -# Makefile for creating SWT libraries for Solaris GTK - -include make_common.mak - -SWT_VERSION=$(maj_ver)$(min_ver) -GTK_VERSION?=2.0 - -# Define the various shared libraries to be build. -WS_PREFIX = gtk -SWT_PREFIX = swt -AWT_PREFIX = swt-awt -SWTPI_PREFIX = swt-pi -CAIRO_PREFIX = swt-cairo -ATK_PREFIX = swt-atk -GLX_PREFIX = swt-glx - -SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - -CAIROCFLAGS = `pkg-config --cflags cairo` -CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo - -# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) -GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/openwin/lib -Wl,-R -Wl,/usr/openwin/lib -lXtst - -AWT_LFLAGS = -G -s $(SWT_LFLAGS) -AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt - -ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` -ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 - -GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm - -# Uncomment for Native Stats tool -#NATIVE_STATS = -DNATIVE_STATS - -SWT_OBJECTS = swt.o c.o c_stats.o callback.o -AWT_OBJECTS = swt_awt.o -SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o -CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o -ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o -GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - -CFLAGS = -O \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DDTACTION_WARNING_DISABLED \ - -DSOLARIS -DGTK \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/solaris \ - -K PIC \ - ${SWT_PTR_CFLAGS} -LFLAGS = -G -K PIC -s $(SWT_LFLAGS) - - -all: make_swt make_atk make_awt make_glx - -# -# SWT libs -# -make_swt: $(SWT_LIB) $(SWTPI_LIB) - -$(SWT_LIB): $(SWT_OBJECTS) - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) - -callback.o: callback.c callback.h - $(CC) $(CFLAGS) -c callback.c - -$(SWTPI_LIB): $(SWTPI_OBJECTS) - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - -swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -os.o: os.c os.h swt.h os_custom.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c -os_structs.o: os_structs.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c -os_custom.o: os_custom.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_custom.c -os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_stats.c - -# -# CAIRO libs -# -make_cairo: $(CAIRO_LIB) - -$(CAIRO_LIB): $(CAIRO_OBJECTS) - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - -cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c -cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_stats.c - -# -# AWT lib -# -make_awt:$(AWT_LIB) - -$(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - -# -# Atk lib -# -make_atk: $(ATK_LIB) - -$(ATK_LIB): $(ATK_OBJECTS) - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) - -atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -atk_structs.o: atk_structs.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_structs.c -atk_custom.o: atk_custom.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_custom.c -atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c - -# -# GLX lib -# -make_glx: $(GLX_LIB) - -$(GLX_LIB): $(GLX_OBJECTS) - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) - -glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c - -glx_structs.o: glx_structs.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_structs.c - -glx_stats.o: glx_stats.c glx_stats.h - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_stats.c - -# -# Install -# -install: all - cp *.so $(OUTPUT_DIR) - -# -# Clean -# -clean: - rm -f *.o *.so diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak deleted file mode 100644 index dc1c53f91f..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak +++ /dev/null @@ -1,169 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2016 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -#******************************************************************************* - -# Makefile for creating SWT libraries for Solaris GTK (x86_64) - -include make_common.mak - -SWT_VERSION=$(maj_ver)$(min_ver) -GTK_VERSION?=2.0 - -# Define the various shared libraries to be build. -WS_PREFIX = gtk -SWT_PREFIX = swt -AWT_PREFIX = swt-awt -SWTPI_PREFIX = swt-pi -CAIRO_PREFIX = swt-cairo -ATK_PREFIX = swt-atk -GLX_PREFIX = swt-glx - -SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - -CAIROCFLAGS = `pkg-config --cflags cairo` -CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo - -# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) -GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst - -AWT_LFLAGS = -G ${SWT_PTR_CFLAGS} -AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt - -ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` -ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 - -GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm - -# Uncomment for Native Stats tool -#NATIVE_STATS = -DNATIVE_STATS - -SWT_OBJECTS = swt.o c.o c_stats.o callback.o -AWT_OBJECTS = swt_awt.o -SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o -CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o -ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o -GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - -CFLAGS = -O +w \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DLINUX -DGTK \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/solaris \ - -KPIC \ - ${SWT_PTR_CFLAGS} -LFLAGS = -G -KPIC ${SWT_LFLAGS} - -ifndef NO_STRIP - AWT_LFLAGS := $(AWT_LFLAGS) -s - LFLAGS := $(LFLAGS) -s -endif - -all: make_swt make_atk make_glx - -# -# SWT libs -# -make_swt: $(SWT_LIB) $(SWTPI_LIB) - -$(SWT_LIB): $(SWT_OBJECTS) - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) - -callback.o: callback.c callback.h - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - -$(SWTPI_LIB): $(SWTPI_OBJECTS) - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - -swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -os.o: os.c os.h swt.h os_custom.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c -os_structs.o: os_structs.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c -os_custom.o: os_custom.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_custom.c -os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_stats.c - -# -# CAIRO libs -# -make_cairo: $(CAIRO_LIB) - -$(CAIRO_LIB): $(CAIRO_OBJECTS) - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - -cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c -cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_stats.c - -# -# AWT lib -# -make_awt:$(AWT_LIB) - -$(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - -# -# Atk lib -# -make_atk: $(ATK_LIB) - -$(ATK_LIB): $(ATK_OBJECTS) - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) - -atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -atk_structs.o: atk_structs.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_structs.c -atk_custom.o: atk_custom.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_custom.c -atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c - -# -# GLX lib -# -make_glx: $(GLX_LIB) - -$(GLX_LIB): $(GLX_OBJECTS) - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) - -glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c - -glx_structs.o: glx_structs.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_structs.c - -glx_stats.o: glx_stats.c glx_stats.h - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_stats.c - -# -# Install -# -install: all - cp *.so $(OUTPUT_DIR) - -# -# Clean -# -clean: - rm -f *.o *.so diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 5857e0f4f8..7cd07e467a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -53,19 +53,16 @@ import org.eclipse.swt.internal.*; */ public class OS extends C { /** OS Constants */ - public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN; + public static final boolean IsAIX, IsLinux, IsWin32, BIG_ENDIAN; static { /* Initialize the OS flags and locale constants */ String osName = System.getProperty ("os.name"); - boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false; + boolean isAIX = false, isLinux = false, isWin32 = false; if (osName.equals ("Linux")) isLinux = true; if (osName.equals ("AIX")) isAIX = true; - if (osName.equals ("Solaris")) isSunOS = true; - if (osName.equals ("SunOS")) isSunOS = true; - if (osName.equals ("HP-UX")) isHPUX = true; if (osName.startsWith("Windows")) isWin32 = true; - IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsWin32 = isWin32; + IsAIX = isAIX; IsLinux = isLinux; IsWin32 = isWin32; byte[] buffer = new byte[4]; long /*int*/ ptr = C.malloc(4); |