Skip to content

Commit

Permalink
Remove all existing native *swt* libraries before copying new
Browse files Browse the repository at this point in the history
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
  • Loading branch information
iloveeclipse authored and HannesWell committed Mar 12, 2024
1 parent fa7cc7f commit 744c816
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Jenkinsfile
Expand Up @@ -150,9 +150,10 @@ pipeline {
'comma_ver='+swtVersions['comma_ver'], "new_comma_ver=${swtVersions['maj_ver']},${swtVersions['min_ver']},${swtVersions['new_rev']},0" ]) {
sh '''
# Delete native binaries to be replaced by subsequent binaries build
rm -f binaries/org.eclipse.swt.gtk.*/lib*-${swt_version}.so
rm -f binaries/org.eclipse.swt.win32.*/*-${swt_version}.dll
rm -f binaries/org.eclipse.swt.cocoa.*/lib*-${swt_version}.jnilib
swtNativeLibName='swt-*-+([0-9])r+([0-9])'
rm -f binaries/org.eclipse.swt.gtk.*/lib${swtNativeLibName}.so
rm -f binaries/org.eclipse.swt.win32.*/${swtNativeLibName}.dll
rm -f binaries/org.eclipse.swt.cocoa.*/lib${swtNativeLibName}.jnilib
echo "Incrementing version from ${swt_version} to ${new_version}; new comma_ver=${new_comma_ver}"
Expand Down

0 comments on commit 744c816

Please sign in to comment.