diff options
author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-05-11 22:21:07 -0400 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-05-11 22:21:07 -0400 |
commit | a1ee6177d65326c66d403c43ed8e9d4a4c001d59 (patch) | |
tree | 7d86cd33bac26543dc0426f4f394adb17aa9b2d8 | |
parent | d4086621261c499b80450575e48ff12879ae8f92 (diff) | |
download | eclipse.platform.swt-a1ee6177d65326c66d403c43ed8e9d4a4c001d59.tar.gz eclipse.platform.swt-a1ee6177d65326c66d403c43ed8e9d4a4c001d59.tar.xz eclipse.platform.swt-a1ee6177d65326c66d403c43ed8e9d4a4c001d59.zip |
enable remote build for windows
3 files changed, 50 insertions, 9 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 a5bc068bda..531b27defa 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 @@ -15,6 +15,7 @@ IF EXIST C:\BUILD\swt-builddir set SWT_BUILDDIR=C:\BUILD\swt-builddir IF x.%SWT_BUILDDIR%==x. set SWT_BUILDDIR=S:\swt-builddir echo SWT build dir: %SWT_BUILDDIR% IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Windows Server 2003 SP1 SDK" +IF x.%WEBKIT_HOME%==x. set WEBKIT_HOME="%SWT_BUILDDIR%\webkit" IF x.%1==x.x86 GOTO X86 IF x.%1==x.x86_64 GOTO X86_64 @@ -24,13 +25,14 @@ IF x.%1==x.ia64 GOTO IA64 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=S:\swt-builddir +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 @@ -40,10 +42,12 @@ 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_xulrunner64 GOTO XULRUNNER64 call %MSSDK%\setenv /X64 /RETAIL shift GOTO MAKE @@ -58,6 +62,7 @@ GOTO MAKE :IA64 +set PROCESSOR_ARCHITECTURE=AMD64 call %MSSDK%\setenv /SRV64 /RETAIL IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.ia64 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk142-ia64 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 989f398fcf..670e0dae50 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 @@ -37,8 +37,8 @@ AWT_LIB = $(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll AWT_LIBS = "$(JAVA_HOME)\jre\bin\jawt.lib" AWT_OBJS = swt_awt.obj -WEBKIT_DIR = S:\swt-builddir\webkit\WebKit-r72896 -WEBKIT_SUPPORT_DIR = S:\swt-builddir\webkit\WebKitSupportLibrary +WEBKIT_DIR = $(WEBKIT_HOME)\WebKit-r72896 +WEBKIT_SUPPORT_DIR = $(WEBKIT_HOME)\WebKitSupportLibrary WEBKIT_PREFIX = swt-webkit WEBKIT_LIB = $(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll WEBKIT_LIBS = $(WEBKIT_DIR)\lib\webkit.lib $(WEBKIT_SUPPORT_DIR)\win\lib\CFNetwork.lib $(WEBKIT_SUPPORT_DIR)\win\lib\CoreFoundation.lib diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index a4a32dad13..12ed499c66 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -957,10 +957,15 @@ <delete dir="${build_dir}" quiet="true"/> <antcall target="copy.library.src"/> <condition property="build_task" value="build_local_win"> - <or> - <equals arg1="${swt.ws}" arg2="win32"/> - <equals arg1="${swt.ws}" arg2="wpf"/> - </or> + <and> + <not> + <isset property="machine"/> + </not> + <or> + <equals arg1="${swt.ws}" arg2="win32"/> + <equals arg1="${swt.ws}" arg2="wpf"/> + </or> + </and> </condition> <condition property="build_task" value="build_remote" else="build_local"> <isset property="machine"/> @@ -987,7 +992,38 @@ <target name="build_remote"> <property name="libs" value="*"/> <property name="exports" value=""/> - <property name="remotebuilddir" value="~/build"/> + + <condition property="remotebuilddir" value="c:/build" else="~/build/"> + <or> + <equals arg1="${swt.os}" arg2="win32"/> + <equals arg1="${swt.os}" arg2="wce_ppc"/> + </or> + </condition> + <condition property="exit_cmd" value="exit;" else=""> + <or> + <equals arg1="${swt.os}" arg2="win32"/> + <equals arg1="${swt.os}" arg2="wce_ppc"/> + </or> + </condition> + <condition property="xulrunner_target" value="make_xulrunner64" 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};"> + <equals arg1="${swt.os}" arg2="win32"/> + </condition> + <property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/> <property name="lib_output" value="${remotetmpdir}/libs"/> <property name="zip_file" value="${fragment}.${TAG}.zip"/> @@ -1000,7 +1036,7 @@ username="swtbuild" keyfile="${keyfile}" trust="true" - command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; mkdir ${lib_output}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; ${exports} export MODEL=${swt.arch}; export OUTPUT_DIR=${lib_output}; if sh build.sh ${build_targets}; then cd; else cd; rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}; exit 1; fi"/> + command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; mkdir ${lib_output}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; ${exports} export MODEL=${swt.arch}; export OUTPUT_DIR=${lib_output}; ${build_cmd} then ${exit_cmd} cd; else ${exit_cmd} cd; rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}; exit 1; fi"/> <scp file="swtbuild@${build_machine}:${lib_output}/${libs}" todir="${output_dir}" keyfile="${keyfile}" |