Skip to content

Commit 24f5e7c

Browse files
committed
Unify SWT natives build script arguments and remove unnecessary listing
1 parent d2974ed commit 24f5e7c

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

Jenkinsfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ pipeline {
123123
'''
124124
}
125125
dir("org.eclipse.swt.${PLATFORM}/tmpdir") {
126-
stash name:"swt.binaries.sources.${PLATFORM}", includes: "org.eclipse.swt.${PLATFORM}.master.zip"
126+
stash name:"swt.binaries.sources.${PLATFORM}", includes: "org.eclipse.swt.${PLATFORM}.master.zip"
127127
}
128128
}
129129
}
@@ -157,13 +157,7 @@ pipeline {
157157
rm org.eclipse.swt.${PLATFORM}.master.zip
158158
mkdir libs
159159
160-
#TODO: unify build script arguments?!
161-
if [[ ${PLATFORM} == cocoa.macosx.* ]]; then
162-
sw_vers -productVersion
163-
sh build.sh install
164-
elif [[ ${PLATFORM} == gtk.linux.* ]]; then
165-
sh build.sh clean install
166-
fi
160+
sh build.sh install
167161
ls -1R libs
168162
'''
169163
} else {
@@ -173,7 +167,6 @@ pipeline {
173167
rm org.eclipse.swt.%PLATFORM%.master.zip
174168
mkdir libs
175169
176-
@rem rustup show
177170
cmd /c build.bat x86_64 all install
178171
ls -1R libs
179172
'''

bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# IBM Corporation - initial API and implementation
1414
#*******************************************************************************
1515

16+
sw_vers -productVersion
17+
1618
cd `dirname $0`
1719

1820
if [ "x${MODEL}" = "xx86_64" ]; then

0 commit comments

Comments
 (0)