windows - include JRE with the installation

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -3250,6 +3250,10 @@
 			<releaseDate>2020-11-19 00:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Windows: bundle Java JRE with the installation to avoid Java version issues</description>
+				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>macOS: added quick action toolbar that was already available for other platforms</description>

diylc/diylc-swing/install.iss

@@ -13,7 +13,6 @@ AlwaysShowDirOnReadyPage=yes
 
 [Files]
 Source: "diylc.exe"; DestDir: "{app}"
-Source: "diylc.l4j.ini"; DestDir: "{app}"
 Source: "icons\diylc_file.ico"; DestDir: "{app}"
 Source: "build\jar\diylc.jar"; DestDir: "{app}"
 Source: "build\jar\lib\*"; DestDir: "{app}\lib"
@@ -21,6 +20,7 @@ Source: "build\jar\library\*"; DestDir: "{app}\library"
 Source: "themes\*"; DestDir: "{app}\themes"
 Source: "lang\*"; DestDir: "{app}\lang"
 Source: "fonts\*"; DestDir: "{app}\fonts"
+Source: "jre\win\jre1.8.0_211\*"; DestDir: "{app}\jre"; Flags: ignoreversion recursesubdirs
 Source: "innosetup\donate.bmp"; DestDir: "{tmp}"; Flags: dontcopy nocompression
 
 [Registry]

diylc/diylc-swing/launch4j.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launch4jConfig>
+  <dontWrapJar>true</dontWrapJar>
+  <headerType>gui</headerType>
+  <jar>diylc.jar</jar>
+  <outfile>C:\Users\bancika\git\diy-layout-creator\diylc\diylc-swing\diylc.exe</outfile>
+  <errTitle></errTitle>
+  <cmdLine></cmdLine>
+  <chdir>.</chdir>
+  <priority>normal</priority>
+  <downloadUrl>http://java.com/download</downloadUrl>
+  <supportUrl></supportUrl>
+  <stayAlive>false</stayAlive>
+  <restartOnCrash>false</restartOnCrash>
+  <manifest></manifest>
+  <icon>C:\Users\bancika\git\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico</icon>
+  <classPath>
+    <mainClass>org.diylc.DIYLCStarter</mainClass>
+    <cp>lib</cp>
+  </classPath>
+  <jre>
+    <path>jre</path>
+    <bundledJre64Bit>false</bundledJre64Bit>
+    <bundledJreAsFallback>false</bundledJreAsFallback>
+    <minVersion>1.8.0</minVersion>
+    <maxVersion></maxVersion>
+    <jdkPreference>preferJre</jdkPreference>
+    <runtimeBits>32/64</runtimeBits>
+    <initialHeapSize>512</initialHeapSize>
+    <maxHeapSize>1024</maxHeapSize>
+    <opt>-Dorg.diylc.scriptRun=true</opt>
+    <opt>-Dfile.encoding=UTF-8</opt>
+  </jre>
+</launch4jConfig>

diylc/diylc-swing/src/org/diylc/DIYLCStarter.java

@@ -71,6 +71,16 @@ public class DIYLCStarter {
    * @throws InvalidActivityException
    */
   public static void main(String[] args) {
+    try {
+      runDIYLC(args);
+    } catch (Throwable t) {
+      LOG.error("Major error while starting DIYLC", t);
+      System.out.println("Major error while starting DIYLC");
+      t.printStackTrace(System.out);
+    }
+  }
+  
+  public static void runDIYLC(String[] args) {
     // Initialize splash screen
     DIYLCSplash splash = null;
     Exception splashException = null;
@@ -106,6 +116,7 @@ public class DIYLCStarter {
 
     LOG.debug("Java version: " + System.getProperty("java.runtime.version") + " by "
         + System.getProperty("java.vm.vendor"));
+    LOG.debug("Java home: " + System.getProperty("java.home"));
     LOG.debug("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
 
     LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
@@ -170,7 +181,8 @@ public class DIYLCStarter {
 
     String val = System.getProperty(SCRIPT_RUN);
     if (!"true".equals(val)) {
-      int response = JOptionPane.showConfirmDialog(null,
+      LOG.info("Detected no scriptRun setting!");
+      int response = JOptionPane.showConfirmDialog(splash,
           "It is not recommended to run DIYLC by clicking on the diylc.jar file.\n"
               + "Please use diylc.exe on Windows or run.sh on OSX/Linux to ensure the best\n"
               + "performance and reliability. Do you want to continue?",