Skip to content

Commit c9a4f7d

Browse files
Remove all existing native *swt* libraries before copying new
If 'make_common.mak' is changed manually (e.g. during new release-cycle preparation), the code in 'Check if SWT-binaries build is needed' stage, that is supposed to delete native libraries, doesn't delete anything as it relies on getSWTVersions() that reads the (already changed) versions. Adjust the file-pattern to delete every *swt* library file stored in git instead, regardless of its exact version. Fixes #1095 Co-authored-by: Hannes Wellmann <[email protected]>
1 parent d2a5d7a commit c9a4f7d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ pipeline {
150150
'comma_ver='+swtVersions['comma_ver'], "new_comma_ver=${swtVersions['maj_ver']},${swtVersions['min_ver']},${swtVersions['new_rev']},0" ]) {
151151
sh '''
152152
# Delete native binaries to be replaced by subsequent binaries build
153-
rm -f binaries/org.eclipse.swt.gtk.*/lib*-${swt_version}.so
154-
rm -f binaries/org.eclipse.swt.win32.*/*-${swt_version}.dll
155-
rm -f binaries/org.eclipse.swt.cocoa.*/lib*-${swt_version}.jnilib
153+
rm binaries/org.eclipse.swt.gtk.*/libswt-*.so
154+
rm binaries/org.eclipse.swt.win32.*/swt-*.dll
155+
rm binaries/org.eclipse.swt.cocoa.*/libswt-*.jnilib
156156
157157
echo "Incrementing version from ${swt_version} to ${new_version}; new comma_ver=${new_comma_ver}"
158158

0 commit comments

Comments
 (0)