Skip to content

Commit 0a43c67

Browse files
martinlippertmartinlippert
committed
GH-1459: additional steps towards renaming everything to just Spring Tools
1 parent 7995283 commit 0a43c67

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎.github/scripts/sign-exe-in-zip-file.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ unzip -q $file -d ./${destination_folder_name}
1717
echo "Successfully extracted ${filename}"
1818
sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit`
1919
echo "Found STS distro folder: ${sts_folder}"
20-
echo "About to sign win exe file: ${sts_folder}/SpringToolSuite4.exe (id = ${id})"
21-
$sign_script ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe "${id}-${filename%.*}" 30 900
20+
echo "About to sign win exe file: ${sts_folder}/SpringToolsForEclipse.exe (id = ${id})"
21+
$sign_script ${sts_folder}/SpringToolsForEclipse.exe ${sts_folder}/SpringToolsForEclipse.exe "${id}-${filename%.*}" 30 900
2222
echo "Adding to zip contents of a folder ${destination_folder_name}"
2323
cd ${destination_folder_name}
2424
zip -r -q ../$file .

‎.github/scripts/sign-osx-distro-file.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tar -zxf $file --directory ${dir}/${destination_folder_name}
1818
echo "Successfully extracted ${filename}"
1919

2020
# sign problematic binaries
21-
for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/fsevents\.node$"`
21+
for f in `find ${dir}/${destination_folder_name}/SpringToolsForEclipse.app -type f | grep -E ".*/fsevents\.node$"`
2222
do
2323
echo "Signing binary file: ${f}"
2424
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
@@ -74,31 +74,31 @@ function signExecutableInsideNestedJar() {
7474
}
7575

7676
# sign libjansi.jnilib inside kotlin-compiler-embeddable.jar
77-
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/kotlin-compiler-embeddable.*\.jar$" "libjansi.jnilib" ".*/libjansi\.jnilib$"
77+
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/kotlin-compiler-embeddable.*\.jar$" "libjansi.jnilib" ".*/libjansi\.jnilib$"
7878

7979
# sign libsnappyjava.jnilib and libsnappyjava.dylib inside snappy-java.jar
80-
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/snappy-java.*\.jar$" "libsnappyjava.jnilib" ".*/libsnappyjava\.(jni|dy)lib$"
80+
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/snappy-java.*\.jar$" "libsnappyjava.jnilib" ".*/libsnappyjava\.(jni|dy)lib$"
8181

8282
# sign libjnidispatch.jnilib inside jna.jar
83-
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
83+
signExecutableInsideJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
8484

8585
#sign libjnidispatch.jnilib inside jna.jar which is inside org.springframework.ide.eclipse.docker.client.jar bundle
86-
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
86+
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
8787

8888
#sign libjnidispatch.jnilib inside develocity-gradle-plugin.jar which is inside rewrite-gradle.jar bundle
89-
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/rewrite-gradle-\d+.*\.jar$" ".*/develocity-gradle-plugin.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
89+
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolsForEclipse.app ".*/rewrite-gradle-\d+.*\.jar$" ".*/develocity-gradle-plugin.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
9090

9191
# Sign the app
92-
ls -la ${dir}/${destination_folder_name}/SpringToolSuite4.app/
93-
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
92+
ls -la ${dir}/${destination_folder_name}/SpringToolsForEclipse.app/
93+
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolsForEclipse.app
9494

9595
cd ${dir}/${destination_folder_name}
9696
echo "Generating dmg-config.json..."
9797
echo '{' >> dmg-config.json
9898
echo ' "title": "Spring Tools for Eclipse",' >> dmg-config.json
9999
echo ' "icon": "'$icns'",' >> dmg-config.json
100100
echo ' "contents": [' >> dmg-config.json
101-
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolSuite4.app" },' >> dmg-config.json
101+
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolsForEclipse.app" },' >> dmg-config.json
102102
echo ' { "x": 448, "y": 100, "type": "link", "path": "/Applications" },' >> dmg-config.json
103103
echo ' { "x": 1000, "y": 2000, "type": "file", "path": "'$icns'", "name": ".VolumeIcon.icns" }' >> dmg-config.json
104104
echo ' ],' >> dmg-config.json

‎eclipse-distribution/org.springframework.boot.ide.product.e434/org.springframework.boot.ide.product‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<vmArgs>-Dosgi.requiredJavaVersion=21
1313
-Dosgi.dataAreaRequiresExplicitInit=true
1414
-Dorg.slf4j.simpleLogger.defaultLogLevel=off
15-
-Dsun.java.command=SpringToolSuite4
15+
-Dsun.java.command=SpringToolsForEclipse
1616
-Dp2.trustedAuthorities=https://download.eclipse.org,https://archive.eclipse.org,https://cdn.spring.io
1717
-Xms256m
1818
-Xmx2048m
@@ -36,7 +36,7 @@
3636
startupMessageRect="7,220,441,20"
3737
startupForegroundColor="c1d72e" />
3838

39-
<launcher name="SpringToolSuite4">
39+
<launcher name="SpringToolsForEclipse">
4040
<macosx icon="../org.springframework.boot.ide.branding/sts4.icns"/>
4141
<solaris/>
4242
<win useIco="true">

‎eclipse-distribution/org.springframework.boot.ide.product.e434/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<id>org.springframework.boot.ide.branding.sts4</id>
8787
<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
8888
<rootFolders>
89-
<macosx>SpringToolSuite4.app</macosx>
89+
<macosx>SpringToolsForEclipse.app</macosx>
9090
</rootFolders>
9191
<archiveFileName>spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
9292
</product>
@@ -190,7 +190,7 @@
190190
<arg>org.eclipse.equinox.p2.director</arg>
191191
<arg>-nosplash</arg>
192192
<arg>-destination</arg>
193-
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
193+
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse</arg>
194194
<arg>-repository</arg>
195195
<arg>${justj.repository}</arg>
196196
<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
211211
<arg>org.eclipse.equinox.p2.director</arg>
212212
<arg>-nosplash</arg>
213213
<arg>-destination</arg>
214-
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
214+
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse</arg>
215215
<arg>-repository</arg>
216216
<arg>${justj.repository}</arg>
217217
<arg>-installIUs</arg>
@@ -301,10 +301,10 @@
301301
<arguments>
302302
<argument>-jar</argument>
303303
<argument>${project.build.directory}/../../common/eclipse-distribution-license-file-generator.jar</argument>
304-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/plugins/</argument>
305-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt</argument>
306-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse/plugins/</argument>
307-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt</argument>
304+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse/plugins/</argument>
305+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse/open-source-licenses.txt</argument>
306+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse/plugins/</argument>
307+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse/open-source-licenses.txt</argument>
308308
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>
309309
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt</argument>
310310
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/aarch64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>

‎eclipse-distribution/org.springframework.boot.ide.product.e436/org.springframework.boot.ide.product‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<vmArgs>-Dosgi.requiredJavaVersion=21
1313
-Dosgi.dataAreaRequiresExplicitInit=true
1414
-Dorg.slf4j.simpleLogger.defaultLogLevel=off
15-
-Dsun.java.command=SpringToolSuite4
15+
-Dsun.java.command=SpringToolsForEclipse
1616
-Dp2.trustedAuthorities=https://download.eclipse.org,https://archive.eclipse.org,https://cdn.spring.io
1717
-Xms256m
1818
-Xmx2048m
@@ -36,7 +36,7 @@
3636
startupMessageRect="7,220,441,20"
3737
startupForegroundColor="c1d72e" />
3838

39-
<launcher name="SpringToolSuite4">
39+
<launcher name="SpringToolsForEclipse">
4040
<macosx icon="../org.springframework.boot.ide.branding/sts4.icns"/>
4141
<solaris/>
4242
<win useIco="true">

‎eclipse-distribution/org.springframework.boot.ide.product.e436/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<id>org.springframework.boot.ide.branding.sts4</id>
8787
<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
8888
<rootFolders>
89-
<macosx>SpringToolSuite4.app</macosx>
89+
<macosx>SpringToolsForEclipse.app</macosx>
9090
</rootFolders>
9191
<archiveFileName>spring-tools-for-eclipse-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
9292
</product>
@@ -190,7 +190,7 @@
190190
<arg>org.eclipse.equinox.p2.director</arg>
191191
<arg>-nosplash</arg>
192192
<arg>-destination</arg>
193-
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse</arg>
193+
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse</arg>
194194
<arg>-repository</arg>
195195
<arg>${justj.repository}</arg>
196196
<arg>-installIUs</arg>
@@ -211,7 +211,7 @@
211211
<arg>org.eclipse.equinox.p2.director</arg>
212212
<arg>-nosplash</arg>
213213
<arg>-destination</arg>
214-
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse</arg>
214+
<arg>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse</arg>
215215
<arg>-repository</arg>
216216
<arg>${justj.repository}</arg>
217217
<arg>-installIUs</arg>
@@ -301,10 +301,10 @@
301301
<arguments>
302302
<argument>-jar</argument>
303303
<argument>${project.build.directory}/../../common/eclipse-distribution-license-file-generator.jar</argument>
304-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/plugins/</argument>
305-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt</argument>
306-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse/plugins/</argument>
307-
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app/Contents/Eclipse/open-source-licenses.txt</argument>
304+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse/plugins/</argument>
305+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolsForEclipse.app/Contents/Eclipse/open-source-licenses.txt</argument>
306+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse/plugins/</argument>
307+
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolsForEclipse.app/Contents/Eclipse/open-source-licenses.txt</argument>
308308
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>
309309
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/open-source-licenses.txt</argument>
310310
<argument>${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/linux/gtk/aarch64/sts-${unqualifiedVersion}.${p2.qualifier}/plugins/</argument>

0 commit comments

Comments
 (0)