From c9a4f7dbbb7c0eab4e78e4af701cd8aeb583e3ac Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 11 Mar 2024 14:23:39 +0100 Subject: [PATCH] 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 https://github.com/eclipse-platform/eclipse.platform.swt/issues/1095 Co-authored-by: Hannes Wellmann --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c27c916f4e..3a7c268d3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -150,9 +150,9 @@ 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 + rm binaries/org.eclipse.swt.gtk.*/libswt-*.so + rm binaries/org.eclipse.swt.win32.*/swt-*.dll + rm binaries/org.eclipse.swt.cocoa.*/libswt-*.jnilib echo "Incrementing version from ${swt_version} to ${new_version}; new comma_ver=${new_comma_ver}"