[Build] Unify make targets for native binaries build

Remove requirement to specify the arch as first argument for Windows in the build.bat. The first argument always has to be 'x86_64' but the value is then never used. Part of eclipse-platform#513
HannesWell · Jan 29, 2024 · f7de241 · f7de241
1 parent 31e1414
commit f7de241
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -149,8 +149,7 @@
 														<exec dir="${build_dir}" executable="${build_dir}/build.bat" failonerror="true">
 															<env key="SWT_JAVA_HOME" value="${SWT_JAVA_HOME}"/>
 															<env key="OUTPUT_DIR" value="${project.basedir}"/>
-															<arg line="${targets}"/>
-															<arg line="clean"/>
+															<arg line="install clean"/>
 														</exec>
 													</then>
 													<else>
@@ -161,8 +160,7 @@
 															<env key="OUTPUT_DIR" value="${project.basedir}"/>
 															<env key="GTK_VERSION" value="${gtk_version}"/>
 															<env key="MODEL" value="${arch}"/>
-															<arg line="${targets}"/>
-															<arg line="clean"/>
+															<arg line="install clean"/>
 														</exec>
 													</else>
 												</if>

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
@@ -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
@@ -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: