From 00029c7f81b0b94d3ccbac736beef743f7ee7af2 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 16 Oct 2019 15:45:59 -0700
Subject: [PATCH] Add a script to repackage windows zip as self-extracting jars

---
 .../common/html/nightly-generic-snippet.html  |   2 +-
 .../common/repackage-windows-zips.sh          |  11 ++++++++
 .../common/self-extracting-jar-creator.jar    | Bin 0 -> 5325 bytes
 self-extracting-jar-creator/README.md         |  25 ++++++++++++++++++
 self-extracting-jar-creator/build.sh          |   3 +++
 self-extracting-jar-creator/pom.xml           |   4 +--
 .../src/main/java/SelfExtractor.java          |   9 ++++---
 7 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100755 eclipse-distribution/common/repackage-windows-zips.sh
 create mode 100644 eclipse-distribution/common/self-extracting-jar-creator.jar
 create mode 100644 self-extracting-jar-creator/README.md
 create mode 100755 self-extracting-jar-creator/build.sh

diff --git a/eclipse-distribution/common/html/nightly-generic-snippet.html b/eclipse-distribution/common/html/nightly-generic-snippet.html
index 0760785d9..8f8c976df 100644
--- a/eclipse-distribution/common/html/nightly-generic-snippet.html
+++ b/eclipse-distribution/common/html/nightly-generic-snippet.html
@@ -1,6 +1,6 @@
 <ul>
 
-	<li><a href="https://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.7z.exe">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.7z.exe</li>
+	<li><a href="https://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.self-extracting.jar</li>
 	<li><a href="https://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-tool-suite-4-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
 	<li><a href="https://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-tool-suite-4-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
 	<li><a href="https://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-tool-suite-4-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
diff --git a/eclipse-distribution/common/repackage-windows-zips.sh b/eclipse-distribution/common/repackage-windows-zips.sh
new file mode 100755
index 000000000..044225647
--- /dev/null
+++ b/eclipse-distribution/common/repackage-windows-zips.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#We are assuming this script will be called by bamboo from the root of the git repo
+set -ev
+echo "Repackaging Windows Distribution Zip files as self extracting jars..."
+cd eclipse-distribution
+echo pwd = $(pwd)
+find . -name "*.zip"
+for zipfile in $(find $(pwd) -name "*.win32.x86_64.zip"); do
+    java -jar commons/self-extracting-jar-creator.jar "$zipfile"
+done
+echo "Repackaging Windows Distribution Zip files DONE"
diff --git a/eclipse-distribution/common/self-extracting-jar-creator.jar b/eclipse-distribution/common/self-extracting-jar-creator.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bc177598ea1e54307451e1218e81674759da994c
GIT binary patch
literal 5325
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
PoIN%8cz6Uf-{1ZZ5`Qp+

literal 0
HcmV?d00001

diff --git a/self-extracting-jar-creator/README.md b/self-extracting-jar-creator/README.md
new file mode 100644
index 000000000..dc7bbf5a2
--- /dev/null
+++ b/self-extracting-jar-creator/README.md
@@ -0,0 +1,25 @@
+Self-extracting Jar Creator
+===========================
+
+Simple utility that creates self-extracting jars.
+
+Building
+--------
+
+Run `./build.sh` from the directory containing this readme.
+The creator utility is produced as `target/self-extracting-jar-creator-*.jar`.
+A copy of this file is also installed into eclipse-distributions/commons for
+use by the STS build.
+
+Creating a Self Extracting Jar
+------------------------------
+
+Run command `java -jar self-extracing-jar-creator/target/self-extracing-jar-creator-0.0.1-SNAPSHOT.jar <path-to-zip-you-want-to-repackage>`.
+The repackaged zip is created in the same directory as the original zip.
+
+Unpacking a Self Extracting Jar
+------------------------------
+
+Double-click the self extracting jar (this works only if your OS environment is setup to recognize executable jars and run them
+through a JVM, this seems to be the case in Windows if a JVM is installed). Alternatively, you can also unpack STS 
+from the commandline via `java -jar <path-to-self-extracting-jar>`.
diff --git a/self-extracting-jar-creator/build.sh b/self-extracting-jar-creator/build.sh
new file mode 100755
index 000000000..5a3003549
--- /dev/null
+++ b/self-extracting-jar-creator/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+mvn clean package
+cp target/*.jar ../eclipse-distribution/common/self-extracting-jar-creator.jar
\ No newline at end of file
diff --git a/self-extracting-jar-creator/pom.xml b/self-extracting-jar-creator/pom.xml
index 44b5240d0..68f86712d 100644
--- a/self-extracting-jar-creator/pom.xml
+++ b/self-extracting-jar-creator/pom.xml
@@ -2,8 +2,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.github.kdvolder</groupId>
-	<artifactId>self-extracing-jar-creator</artifactId>
+	<groupId>org.springframework.ide</groupId>
+	<artifactId>self-extracting-jar-creator</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/self-extracting-jar-creator/src/main/java/SelfExtractor.java b/self-extracting-jar-creator/src/main/java/SelfExtractor.java
index 1250caeaa..c99c57ad3 100644
--- a/self-extracting-jar-creator/src/main/java/SelfExtractor.java
+++ b/self-extracting-jar-creator/src/main/java/SelfExtractor.java
@@ -53,7 +53,7 @@ public class SelfExtractor {
 			try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(new File(repackagedPath)))) {
 				ZipEntry entry;
 				while ((entry = zipIn.getNextEntry())!=null) {
-					System.out.println("Adding: "+entry.getName());
+					//System.out.println("Adding: "+entry.getName());
 					if (entry.getName().equals("contents.zip")) {
 						//skip. We need to write the wrapped zip contents here.
 					} else {
@@ -67,7 +67,7 @@ public class SelfExtractor {
 				} //end while
 				entry = new ZipEntry("contents.zip");
 				zipOut.putNextEntry(entry);
-				System.out.println("Adding: "+entry.getName());
+				//System.out.println("Adding: "+entry.getName());
 				try (FileInputStream contentsZipIn = new FileInputStream(contentsZip)) {
 					copy(contentsZipIn, zipOut);
 				}
@@ -89,7 +89,8 @@ public class SelfExtractor {
         String myResourceUrl = resource.toString();
         //Example: jar:file:/home/.../self-extracing-jar-creator-0.0.1-SNAPSHOT.jar!/SelfExtractor.class 
         if (!myResourceUrl.startsWith("jar:file:")) {
-        	File devJar = new File("target/self-extracing-jar-creator-0.0.1-SNAPSHOT.jar");
+        	//For convenience in 'development mode' look for a local jar built by maven.
+        	File devJar = new File("target/self-extracting-jar-creator-0.0.1-SNAPSHOT.jar");
         	if (devJar.isFile()) {
         		return devJar;
         	}
@@ -101,7 +102,7 @@ public class SelfExtractor {
 	private ZipInputStream openContentsZip() {
 		InputStream zip = this.getClass().getResourceAsStream(CONTENTS_ZIP_RSRC);
 		if (zip==null) {
-			throw new IllegalArgumentException("Couldn't find embedded '"+CONTENTS_ZIP_RSRC+"");
+			throw new IllegalArgumentException("Malformed archive: Couldn't find embedded '"+CONTENTS_ZIP_RSRC+"");
 		}
 		return new ZipInputStream(zip);
 	}