diff options
author | Lakshmi Shanmugam | 2017-06-19 10:49:02 +0000 |
---|---|---|
committer | Lakshmi Shanmugam | 2017-06-20 06:39:01 +0000 |
commit | bafdc941a8acf515f7ddd9fe37a9d31bb3aa838b (patch) | |
tree | 7570dbc7d174fa5e53efaa65915794509c23784a /bundles | |
parent | e20c919ea6e228c4a4a5b97c4d19cc4955d5a53d (diff) | |
download | eclipse.platform.swt-bafdc941a8acf515f7ddd9fe37a9d31bb3aa838b.tar.gz eclipse.platform.swt-bafdc941a8acf515f7ddd9fe37a9d31bb3aa838b.tar.xz eclipse.platform.swt-bafdc941a8acf515f7ddd9fe37a9d31bb3aa838b.zip |
Bug 518442: Stop building XULRunner libraries on Windows
Remove related code & targets in build files.
Change-Id: Ib71f26569622fb496a97b15ef16daafeb616f601
Diffstat (limited to 'bundles')
3 files changed, 1 insertions, 111 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat index f7dd821b0a..994050393f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat @@ -24,42 +24,21 @@ IF x.%1==x.ia64 GOTO IA64 :X86 IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-java2-sdk-50-win-i386 -IF x.%BUILD_XULRUNNER%==x.true GOTO XULRUNNER -IF x.%2%==x.make_xulrunner GOTO XULRUNNER call "%SWT_BUILDDIR%\MSVCs\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat" call %MSSDK%\setenv /XP32 /RETAIL IF x.%1==x.x86 shift GOTO MAKE -:XULRUNNER -IF x.%DEV_TOOLS%==x. set DEV_TOOLS=%SWT_BUILDDIR% -set MSSDK="%SWT_BUILDDIR%\MSSDKs\feb2003" -call %SWT_BUILDDIR%\MSVCs\msvc60\vc98\bin\vcvars32.bat -call %MSSDK%\setenv /XP32 /RETAIL -IF x.%XULRUNNER_SDK%==x. set XULRUNNER_SDK=%SWT_BUILDDIR%\gecko-sdk -IF x.%1==x.x86 shift -GOTO MAKE - :X86_64 set PROCESSOR_ARCHITECTURE=AMD64 IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk50-x86_64 set CFLAGS=-DJNI64 -IF x.%BUILD_XULRUNNER%==x.true GOTO XULRUNNER64 -IF x.%2%==x.make_xulrunner_64 GOTO XULRUNNER64 call %MSSDK%\setenv /X64 /RETAIL shift GOTO MAKE -:XULRUNNER64 -set MSSDK="%SWT_BUILDDIR%\MSSDKs\Windows 7 SDK v7.1" -call %MSSDK%\bin\setenv /x64 /Release -IF x.%XULRUNNER_SDK%==x. set XULRUNNER_SDK=%SWT_BUILDDIR%\gecko10-sdk-x86_64 -set MOZILLACFLAGS=-DJNI64 -shift -GOTO MAKE - :IA64 set PROCESSOR_ARCHITECTURE=AMD64 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak index 7cea00dddd..1dfc1a72b2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak @@ -52,25 +52,6 @@ WGL_OBJS = wgl.obj wgl_structs.obj wgl_stats.obj # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -XULRUNNER_PREFIX = swt-xulrunner -XULRUNNER_LIB = $(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll -XULRUNNER_LIBS = Advapi32.lib $(XULRUNNER_SDK)\lib\xpcomglue.lib -XULRUNNER_OBJS = xpcom.obj xpcom_custom.obj xpcom_structs.obj xpcom_stats.obj -XPCOMINIT_OBJS = xpcominit.obj xpcominit_structs.obj xpcominit_stats.obj - -MOZILLACFLAGS = -c \ - -O1 \ - $(MOZILLACFLAGS) \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -MD \ - -DMOZILLA_STRICT_API=1 \ - -W3 \ - -I. \ - -I"$(JAVA_HOME)/include" \ - -I"$(JAVA_HOME)/include/win32" \ - -I"$(XULRUNNER_SDK)\include\mozilla-config.h" -I"$(XULRUNNER_SDK)\include" - WEBKITCFLAGS = -c -O1\ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ @@ -96,21 +77,6 @@ webkit_win32_structs.obj: webkit_win32_structs.cpp cl $(WEBKITCFLAGS) webkit_win32_structs.cpp webkit_win32.obj: webkit_win32.cpp cl $(WEBKITCFLAGS) webkit_win32.cpp - -xpcom_custom.obj: xpcom_custom.cpp - cl $(MOZILLACFLAGS) xpcom_custom.cpp -xpcom_stats.obj: xpcom_stats.cpp - cl $(MOZILLACFLAGS) xpcom_stats.cpp -xpcom_structs.obj: xpcom_structs.cpp - cl $(MOZILLACFLAGS) xpcom_structs.cpp -xpcom.obj: xpcom.cpp - cl $(MOZILLACFLAGS) xpcom.cpp -xpcominit_stats.obj: xpcominit_stats.cpp - cl $(MOZILLACFLAGS) xpcominit_stats.cpp -xpcominit_structs.obj: xpcominit_structs.cpp - cl $(MOZILLACFLAGS) xpcominit_structs.cpp -xpcominit.obj: xpcominit.cpp - cl $(MOZILLACFLAGS) xpcominit.cpp .c.obj: cl $(CFLAGS) $*.c @@ -162,25 +128,7 @@ make_wgl: $(WGL_OBJS) swt_wgl.res echo -out:$(WGL_LIB) >>templrf link @templrf del templrf - -make_xulrunner: $(XULRUNNER_OBJS) $(XPCOMINIT_OBJS) swt_xpcom.res - echo $(ldebug) $(dlllflags) >templrf - echo $(XULRUNNER_LIBS) >>templrf - echo $(XULRUNNER_OBJS) $(XPCOMINIT_OBJS) >>templrf - echo swt_xpcom.res >>templrf - echo -out:$(XULRUNNER_LIB) >>templrf - link @templrf - del templrf -make_xulrunner_64: $(XULRUNNER_OBJS) swt_xpcom.res - echo /RELEASE $(dlllflags) >templrf - echo $(XULRUNNER_LIBS) >>templrf - echo $(XULRUNNER_OBJS) >>templrf - echo swt_xpcom.res >>templrf - echo -out:$(XULRUNNER_LIB) >>templrf - link @templrf - del templrf - swt.res: rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc @@ -196,12 +144,6 @@ swt_webkit.res: swt_wgl.res: rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(WGL_LIB)\" -r -fo swt_wgl.res swt_wgl.rc -swt_xpcom.res: - rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(XULRUNNER_LIB)\" -r -fo swt_xpcom.res swt_xpcom.rc - -swt_xpcominit.res: - rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(XPCOMINIT_LIB)\" -r -fo swt_xpcom.res swt_xpcom.rc - install: copy *.dll "$(OUTPUT_DIR)" diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 18692aa8ac..b8f17b3b01 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -935,22 +935,10 @@ <equals arg1="${swt.os}" arg2="wce_ppc"/> </or> </condition> - <condition property="xulrunner_target" value="make_xulrunner_64" else="make_xulrunner"> - <equals arg1="${swt.arch}" arg2="x86_64"/> - </condition> - <condition property="xul_cmd" value="cmd /c build.bat ${swt.arch} ${xulrunner_target} install;" else=""> - <and> - <equals arg1="${swt.os}" arg2="win32"/> - <or> - <equals arg1="${swt.arch}" arg2="x86"/> - <equals arg1="${swt.arch}" arg2="x86_64"/> - </or> - </and> - </condition> <condition property="build_cmd" value="unix2dos *; if cmd /c build-ce.bat ${build_targets};"> <equals arg1="${swt.os}" arg2="wce_ppc"/> </condition> - <condition property="build_cmd" value="unix2dos *; if cmd /c build.bat ${build_targets}; ${xul_cmd}" else="if sh build.sh ${build_targets};"> + <condition property="build_cmd" value="unix2dos *; if cmd /c build.bat ${build_targets};" else="if sh build.sh ${build_targets};"> <equals arg1="${swt.os}" arg2="win32"/> </condition> @@ -1007,25 +995,6 @@ <arg line="${targets}"/> <arg line="${clean}"/> </exec> - <condition property="should_build_xulrunner" value="true"> - <or> - <equals arg1="${swt.arch}" arg2="x86"/> - <equals arg1="${swt.arch}" arg2="x86_64"/> - </or> - </condition> - <antcall target="build_local_win_xulrunner"/> - </target> - - <target name="build_local_win_xulrunner" if="should_build_xulrunner"> - <condition property="xulrunner_target" value="make_xulrunner_64" else="make_xulrunner"> - <equals arg1="${swt.arch}" arg2="x86_64"/> - </condition> - <exec dir="${build_dir}" executable="cmd" failonerror="true"> - <env key="JAVA_HOME" value=""/> - <env key="BUILD_XULRUNNER" value="true"/> - <env key="OUTPUT_DIR" value="${win_output_dir}"/> - <arg line="/c '${build_dir}/${build_file}' ${swt.arch} ${xulrunner_target} install ${clean}"/> - </exec> </target> <target name="check_repo"> |