GH-1459: additional steps towards renaming everything to just Spring Tools

This commit is contained in:
Martin Lippert
2025-03-13 13:02:45 +01:00
parent 79952833a8
commit 0a43c678c0
6 changed files with 29 additions and 29 deletions

View File

@@ -17,8 +17,8 @@ unzip -q $file -d ./${destination_folder_name}
echo "Successfully extracted ${filename}"
sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit`
echo "Found STS distro folder: ${sts_folder}"
echo "About to sign win exe file: ${sts_folder}/SpringToolSuite4.exe (id = ${id})"
$sign_script ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe "${id}-${filename%.*}" 30 900
echo "About to sign win exe file: ${sts_folder}/SpringToolsForEclipse.exe (id = ${id})"
$sign_script ${sts_folder}/SpringToolsForEclipse.exe ${sts_folder}/SpringToolsForEclipse.exe "${id}-${filename%.*}" 30 900
echo "Adding to zip contents of a folder ${destination_folder_name}"
cd ${destination_folder_name}
zip -r -q ../$file .

View File

@@ -18,7 +18,7 @@ tar -zxf $file --directory ${dir}/${destination_folder_name}
echo "Successfully extracted ${filename}"
# sign problematic binaries
for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/fsevents\.node$"`
for f in `find ${dir}/${destination_folder_name}/SpringToolsForEclipse.app -type f | grep -E ".*/fsevents\.node$"`
do
echo "Signing binary file: ${f}"
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
@@ -74,23 +74,23 @@ function signExecutableInsideNestedJar() {
}
# sign libjansi.jnilib inside kotlin-compiler-embeddable.jar
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/kotlin-compiler-embeddable.*\.jar$" "libjansi.jnilib" ".*/libjansi\.jnilib$"
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/kotlin-compiler-embeddable.*\.jar$" "libjansi.jnilib" ".*/libjansi\.jnilib$"
# sign libsnappyjava.jnilib and libsnappyjava.dylib inside snappy-java.jar
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/snappy-java.*\.jar$" "libsnappyjava.jnilib" ".*/libsnappyjava\.(jni|dy)lib$"
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/snappy-java.*\.jar$" "libsnappyjava.jnilib" ".*/libsnappyjava\.(jni|dy)lib$"
# sign libjnidispatch.jnilib inside jna.jar
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
#sign libjnidispatch.jnilib inside jna.jar which is inside org.springframework.ide.eclipse.docker.client.jar bundle
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
#sign libjnidispatch.jnilib inside develocity-gradle-plugin.jar which is inside rewrite-gradle.jar bundle
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/rewrite-gradle-\d+.*\.jar$" ".*/develocity-gradle-plugin.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/rewrite-gradle-\d+.*\.jar$" ".*/develocity-gradle-plugin.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
# Sign the app
ls -la ${dir}/${destination_folder_name}/SpringToolSuite4.app/
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
ls -la ${dir}/${destination_folder_name}/SpringToolsForEclipse.app/
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolsForEclipse.app
cd ${dir}/${destination_folder_name}
echo "Generating dmg-config.json..."
@@ -98,7 +98,7 @@ echo '{' >> dmg-config.json
echo ' "title": "Spring Tools for Eclipse",' >> dmg-config.json
echo ' "icon": "'$icns'",' >> dmg-config.json
echo ' "contents": [' >> dmg-config.json
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolSuite4.app" },' >> dmg-config.json
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolsForEclipse.app" },' >> dmg-config.json
echo ' { "x": 448, "y": 100, "type": "link", "path": "/Applications" },' >> dmg-config.json
echo ' { "x": 1000, "y": 2000, "type": "file", "path": "'$icns'", "name": ".VolumeIcon.icns" }' >> dmg-config.json
echo ' ],' >> dmg-config.json