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

Co-authored-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
  • Loading branch information
iloveeclipse and HannesWell committed Mar 12, 2024
1 parent d2a5d7a commit 18d018e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Jenkinsfile
Expand Up @@ -148,11 +148,11 @@ pipeline {
def swtVersions = getSWTVersions()
withEnv(['swt_version='+swtVersions['swt_version'], 'new_version='+swtVersions['new_version'], 'rev='+swtVersions['rev'], 'new_rev='+swtVersions['new_rev'],
'comma_ver='+swtVersions['comma_ver'], "new_comma_ver=${swtVersions['maj_ver']},${swtVersions['min_ver']},${swtVersions['new_rev']},0" ]) {
sh '''
sh '''#!/bin/bash
# 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}"
Expand Down

0 comments on commit 18d018e

Please sign in to comment.