Skip to content

Commit 33fa691

Browse files
committed
[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 #513
1 parent ce3bbd0 commit 33fa691

File tree

11 files changed

+7
-22
lines changed

11 files changed

+7
-22
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pipeline {
153153
rm -f binaries/org.eclipse.swt.gtk.*/lib*-${swt_version}.so
154154
rm -f binaries/org.eclipse.swt.win32.*/*-${swt_version}.dll
155155
rm -f binaries/org.eclipse.swt.cocoa.*/lib*-${swt_version}.jnilib
156-
156+
157157
echo "Incrementing version from ${swt_version} to ${new_version}; new comma_ver=${new_comma_ver}"
158158
159159
libraryFile='bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java'
@@ -226,11 +226,11 @@ pipeline {
226226
withEnv(['PATH=C:\\tools\\cygwin\\bin;' + env.PATH]) {
227227
bat '''
228228
mkdir libs
229-
cmd /c build.bat x86_64 all install
229+
cmd /c build.bat install
230230
ls -1R libs
231231
'''
232232
}
233-
}
233+
}
234234
}
235235
dir('libs') {
236236
stash "swt.binaries.${PLATFORM}"
@@ -291,7 +291,7 @@ pipeline {
291291
'''
292292
}
293293
}
294-
}
294+
}
295295
}
296296
stage('Build') {
297297
steps {

binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ src.includes = about.html,about_files/
1919
pom.model.property.os=macosx
2020
pom.model.property.ws=cocoa
2121
pom.model.property.arch=aarch64
22-
pom.model.property.targets=install

binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ src.includes = about.html,about_files/
1919
pom.model.property.os=macosx
2020
pom.model.property.ws=cocoa
2121
pom.model.property.arch=x86_64
22-
pom.model.property.targets=install

binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ src.includes = about.html,about_files/
1818
pom.model.property.os=linux
1919
pom.model.property.ws=gtk
2020
pom.model.property.arch=aarch64
21-
pom.model.property.targets=install

binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ src.includes = about.html,about_files/
1818
pom.model.property.os=linux
1919
pom.model.property.ws=gtk
2020
pom.model.property.arch=loongarch64
21-
pom.model.property.targets=install

binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ src.includes = about.html,about_files/
1818
pom.model.property.os=linux
1919
pom.model.property.ws=gtk
2020
pom.model.property.arch=ppc64le
21-
pom.model.property.targets=install

binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ src.includes = about.html,about_files/
1919
pom.model.property.os=linux
2020
pom.model.property.ws=gtk
2121
pom.model.property.arch=x86_64
22-
pom.model.property.targets=install

binaries/org.eclipse.swt.win32.win32.x86_64/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ src.includes = about.html,about_files/
1919
pom.model.property.os=win32
2020
pom.model.property.ws=win32
2121
pom.model.property.arch=x86_64
22-
pom.model.property.targets=x86_64 all install

binaries/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@
149149
<exec dir="${build_dir}" executable="${build_dir}/build.bat" failonerror="true">
150150
<env key="SWT_JAVA_HOME" value="${SWT_JAVA_HOME}"/>
151151
<env key="OUTPUT_DIR" value="${project.basedir}"/>
152-
<arg line="${targets}"/>
153-
<arg line="clean"/>
152+
<arg line="install clean"/>
154153
</exec>
155154
</then>
156155
<else>
@@ -161,8 +160,7 @@
161160
<env key="OUTPUT_DIR" value="${project.basedir}"/>
162161
<env key="GTK_VERSION" value="${gtk_version}"/>
163162
<env key="MODEL" value="${arch}"/>
164-
<arg line="${targets}"/>
165-
<arg line="clean"/>
163+
<arg line="install clean"/>
166164
</exec>
167165
</else>
168166
</if>

bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,11 @@ IF NOT EXIST "%SWT_JAVA_HOME%" (
5555
)
5656

5757
@rem -----------------------
58-
IF NOT "x.%1"=="x.x86_64" (
59-
CALL :ECHO "ERROR: 32-bit builds are no longer supported."
60-
EXIT /B 1
61-
)
62-
6358
set PROCESSOR_ARCHITECTURE=AMD64
6459
IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
6560

6661
set CFLAGS=-DJNI64
6762
call "%MSVC_HOME%\VC\Auxiliary\Build\vcvarsall.bat" x64
68-
shift
6963

7064
@rem if call to vcvarsall.bat (which sets up environment) silently fails, then provide advice to user.
7165
WHERE cl

0 commit comments

Comments
 (0)