diff --git a/Jenkinsfile b/Jenkinsfile index 037c30d3b39..4f5b91ffbcd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -226,7 +226,7 @@ pipeline { withEnv(['PATH=C:\\tools\\cygwin\\bin;' + env.PATH]) { bat ''' mkdir libs - cmd /c build.bat x86_64 all install + cmd /c build.bat install ls -1R libs ''' } diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties index cfd7e77fc9f..447a154b876 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties +++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties @@ -19,4 +19,3 @@ src.includes = about.html,about_files/ pom.model.property.os=macosx pom.model.property.ws=cocoa pom.model.property.arch=aarch64 -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties index f0c66682426..cced1f1ceb9 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties +++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties @@ -19,4 +19,3 @@ src.includes = about.html,about_files/ pom.model.property.os=macosx pom.model.property.ws=cocoa pom.model.property.arch=x86_64 -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties index 65c1768feb7..f64dc6ffd7d 100644 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties @@ -18,4 +18,3 @@ src.includes = about.html,about_files/ pom.model.property.os=linux pom.model.property.ws=gtk pom.model.property.arch=aarch64 -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties index 0286d720aa6..87f3d64a14e 100644 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties @@ -18,4 +18,3 @@ src.includes = about.html,about_files/ pom.model.property.os=linux pom.model.property.ws=gtk pom.model.property.arch=loongarch64 -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties index 30cefaf6960..4507c57cad2 100644 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties @@ -18,4 +18,3 @@ src.includes = about.html,about_files/ pom.model.property.os=linux pom.model.property.ws=gtk pom.model.property.arch=ppc64le -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties index c145e4881b8..528d181ca38 100644 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties @@ -19,4 +19,3 @@ src.includes = about.html,about_files/ pom.model.property.os=linux pom.model.property.ws=gtk pom.model.property.arch=x86_64 -pom.model.property.targets=install diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties index dc7445c23e8..3a85ba122e0 100644 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties +++ b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties @@ -19,4 +19,3 @@ src.includes = about.html,about_files/ pom.model.property.os=win32 pom.model.property.ws=win32 pom.model.property.arch=x86_64 -pom.model.property.targets=x86_64 all install diff --git a/binaries/pom.xml b/binaries/pom.xml index bf3ecd9a5e7..4f665a75d76 100644 --- a/binaries/pom.xml +++ b/binaries/pom.xml @@ -149,8 +149,7 @@ - - + @@ -161,8 +160,7 @@ - - + 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 304ff7810b5..0fb28068c28 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat @@ -55,17 +55,11 @@ IF NOT EXIST "%SWT_JAVA_HOME%" ( ) @rem ----------------------- -IF NOT "x.%1"=="x.x86_64" ( - CALL :ECHO "ERROR: 32-bit builds are no longer supported." - EXIT /B 1 -) - set PROCESSOR_ARCHITECTURE=AMD64 IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64 set CFLAGS=-DJNI64 call "%MSVC_HOME%\VC\Auxiliary\Build\vcvarsall.bat" x64 -shift @rem if call to vcvarsall.bat (which sets up environment) silently fails, then provide advice to user. WHERE cl 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 8e06e2e7ef2..a9170f213b0 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 @@ -113,7 +113,7 @@ swt_awt.res: swt_wgl.res: rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(WGL_LIB)\" -r -fo swt_wgl.res swt_wgl.rc -install: +install: all copy *.dll "$(OUTPUT_DIR)" clean: