Make content in .zip launchable #1

slovensko-digital · Apr 18, 2021 · 2926673 · 2926673
1 parent 11a3f58
commit 2926673
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -29,17 +29,19 @@ You can also override various messages and defaults by editing [src/main/resourc
 
 - JDK 11+
 - Maven
-- Optional: Visual Studio Code as IDE as you can utilize the versioned settings.
+- Optional: Visual Studio Code as IDE as you can utilize the versioned settings (launch config).
 
-### Scripts
+### Goals
 
 #### `mvn package`
 
 Prepares all essential application artifacts in `./target`:
 
 - `dependency-jars/`
 - `preparedJDK/` - JLink-ed JDK (JRE) prepared for bundling with the application.
-- `whitelabel-*.jar` - Executable JAR with the application itself.
+- `whitelabel-*.jar` - JAR with the application itself.
+
+Assembles a .zip and .tar.xz with the content mention above and launch.sh/.bat which can be used to run it.
 
 ## License
 

diff --git a/pom.xml b/pom.xml
@@ -203,9 +203,11 @@
                                 <module>java.datatransfer</module>
                                 <module>java.net.http</module>
                                 <module>java.logging</module>
+                                <module>java.sql</module>
                                 <module>java.scripting</module>
                                 <!-- Needed for sun.misc.Unsafe used by JavaFX, shouldn't be used in our code -->
                                 <module>jdk.unsupported</module>
+                                <module>jdk.httpserver</module>
                             </addModules>
                             <options>
                                 <option>--compress=2</option>
@@ -227,7 +229,7 @@
                     <descriptors>
                         <descriptor>src/assembly/bin.xml</descriptor>
                     </descriptors>
-                    <finalName>${artifactId}-${version}-${platform}</finalName>
+                    <finalName>${project.artifactId}-${project.version}-${platform}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>

diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
@@ -16,20 +16,27 @@
                 <include>NOTICE*</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/dependency-jars</directory>
             <outputDirectory>/dependency-jars</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/preparedJDK</directory>
-            <outputDirectory>/preparedJDK</outputDirectory>
+            <outputDirectory>/jre</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/assembly</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>launch.*</include>
+            </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${project.build.directory}/${project.artifactId}-${project.version}.${packaging}</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>${project.artifactId}.${packaging}</destName>
+        </file>
+    </files>
 </assembly>
diff --git a/src/assembly/launch.bat b/src/assembly/launch.bat
@@ -0,0 +1 @@
+.\jre\bin\java -add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --add-opens jdk.crypto.mscapi/sun.security.mscapi=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED -jar ./whitelabel.jar
diff --git a/src/assembly/launch.sh b/src/assembly/launch.sh
@@ -0,0 +1,2 @@
+# Shell launcher for UNIX-like systems
+./jre/bin/java --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED -jar ./whitelabel.jar