Skip to content

Commit 9b95a70

Browse files
jonahgrahamHannesWell
authored andcommitted
Remove the clunky DEST_PLATFORM and simplify
1 parent b33c023 commit 9b95a70

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

Jenkinsfile

+4-8
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,10 @@ pipeline {
272272
dir("libs/${PLATFORM}") {
273273
unstash "swt.binaries.${PLATFORM}"
274274
sh '''#!/bin/bash -x
275-
DEST_PLATFORM=${PLATFORM}
276275
if [[ ${PLATFORM} == cocoa.macosx.* ]]; then
277276
binariesExtension='jnilib'
278277
signerUrl='https://cbi.eclipse.org/macos/codesign/sign'
279-
elif [[ ${PLATFORM} == gtk4.linux.x86_64 ]]; then
280-
binariesExtension='so'
281-
DEST_PLATFORM=gtk.linux.x86_64
282-
elif [[ ${PLATFORM} == gtk.linux.* ]]; then
278+
elif [[ ${PLATFORM} == gtk.linux.* || ${PLATFORM} == gtk4.linux.* ]]; then
283279
binariesExtension='so'
284280
elif [[ ${PLATFORM} == win32.win32.* ]]; then
285281
binariesExtension='dll'
@@ -295,10 +291,10 @@ pipeline {
295291
done
296292
fi
297293
fi
298-
if [[ ${PLATFORM} == gtk4.linux.x86_64 ]]; then
299-
cp libswt-pi4-gtk*.so "${WORKSPACE}/eclipse.platform.swt/binaries/org.eclipse.swt.${DEST_PLATFORM}/"
294+
if [[ ${PLATFORM} == gtk4.linux.* ]]; then
295+
cp libswt-pi4-gtk*.so "${WORKSPACE}/eclipse.platform.swt/binaries/org.eclipse.swt.${PLATFORM/gtk4/gtk}/"
300296
else
301-
cp *.$binariesExtension "${WORKSPACE}/eclipse.platform.swt/binaries/org.eclipse.swt.${DEST_PLATFORM}/"
297+
cp *.$binariesExtension "${WORKSPACE}/eclipse.platform.swt/binaries/org.eclipse.swt.${PLATFORM}/"
302298
fi
303299
'''
304300
}

0 commit comments

Comments
 (0)