diff options
| author | Gunnar Wagenknecht | 2016-10-17 12:23:58 +0000 |
|---|---|---|
| committer | Lakshmi Shanmugam | 2017-06-20 07:04:58 +0000 |
| commit | 17a3f01138ea6d67462ffc97d7901b0203af1942 (patch) | |
| tree | 134ca6b1f900d8e6377fd2d17f00f84c7f7e835a | |
| parent | bafdc941a8acf515f7ddd9fe37a9d31bb3aa838b (diff) | |
| download | eclipse.platform.swt-17a3f01138ea6d67462ffc97d7901b0203af1942.tar.gz eclipse.platform.swt-17a3f01138ea6d67462ffc97d7901b0203af1942.tar.xz eclipse.platform.swt-17a3f01138ea6d67462ffc97d7901b0203af1942.zip | |
Bug 506092 - Drop support for Mozilla XULRunner
Stop building the xulrunner library on mac. Remove the xulrunner related
targets & code from build files.
Change-Id: I8a12b1291d86385ff8ddc39a83b432866a64183c
Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh | 6 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak | 27 |
2 files changed, 1 insertions, 32 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 aa8e9c3569..c855aa51d2 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 @@ -23,12 +23,6 @@ if [ "x${MODEL}" = "xx86_64" ]; then if [ "x${OUTPUT_DIR}" = "x" ]; then export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.x86_64 fi - if [ "x${XULRUNNER_SDK}" = "x" ]; then - export XULRUNNER_SDK="/Users/Shared/xulrunner/64-bit/mozilla/dist" - fi - if [ "x${XULRUNNER_LIBS}" = "x" ]; then - export XULRUNNER_LIBS="${XULRUNNER_SDK}/lib/libxpcomglue.a" - fi fi export MACOSX_DEPLOYMENT_TARGET=10.7 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak index 7838ec547e..64889f7bc8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak @@ -15,12 +15,10 @@ include make_common.mak SWT_PREFIX=swt SWTPI_PREFIX=swt-pi -SWTXULRUNNER_PREFIX=swt-xulrunner WS_PREFIX=cocoa SWT_VERSION=$(maj_ver)$(min_ver) SWT_LIB=lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib SWTPI_LIB=lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib -XULRUNNER_LIB=lib$(SWTXULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib AWT_PREFIX = swt-awt AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib @@ -37,13 +35,8 @@ CFLAGS = -c -xobjective-c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_S LFLAGS = -bundle $(ARCHS) -framework JavaVM -framework Cocoa -framework WebKit -framework CoreServices -framework JavaScriptCore -framework Security -framework SecurityInterface SWT_OBJECTS = swt.o c.o c_stats.o callback.o SWTPI_OBJECTS = swt.o os.o os_structs.o os_stats.o os_custom.o -XULRUNNER_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o xpcominit.o xpcominit_structs.o xpcominit_stats.o -XULRUNNERCFLAGS = -c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DUSE_ASSEMBLER -DCOCOA $(CFLAGS_JAVA_VM) \ - -Wno-non-virtual-dtor -include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include -XULRUNNERLFLAGS = $(LFLAGS) - -all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) $(XULRUNNER_LIB) +all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) .c.o: cc $(CFLAGS) $*.c @@ -57,24 +50,6 @@ $(SWT_LIB): $(SWT_OBJECTS) $(SWTPI_LIB): $(SWTPI_OBJECTS) cc -o $(SWTPI_LIB) $(LFLAGS) $(SWTPI_OBJECTS) -$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) - g++ -o $(XULRUNNER_LIB) $(XULRUNNERLFLAGS) $(XULRUNNER_LIBS) $(XULRUNNER_OBJECTS) - -xpcom.o: xpcom.cpp - g++ $(XULRUNNERCFLAGS) xpcom.cpp -xpcom_custom.o: xpcom_custom.cpp - g++ $(XULRUNNERCFLAGS) xpcom_custom.cpp -xpcom_structs.o: xpcom_structs.cpp - g++ $(XULRUNNERCFLAGS) xpcom_structs.cpp -xpcom_stats.o: xpcom_stats.cpp - g++ $(XULRUNNERCFLAGS) xpcom_stats.cpp -xpcominit.o: xpcominit.cpp - g++ $(XULRUNNERCFLAGS) xpcominit.cpp -xpcominit_structs.o: xpcominit_structs.cpp - g++ $(XULRUNNERCFLAGS) xpcominit_structs.cpp -xpcominit_stats.o: xpcominit_stats.cpp - g++ $(XULRUNNERCFLAGS) xpcominit_stats.cpp - install: all cp *.jnilib $(OUTPUT_DIR) |