From 426f73041de57fbeeefedd4817d1c7db8527b631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Llorens?= <adria_llo@hotmail.com>
Date: Thu, 3 Nov 2016 12:17:17 +0100
Subject: [PATCH] no message

---
 package/{windows => resources}/modpath.iss    |   0
 package/windows/DPF Manager.iss               |  90 +++++
 pom.xml                                       | 311 +++++++++++++++---
 .../shell/core/util/VersionUtil.java          |   3 +-
 4 files changed, 361 insertions(+), 43 deletions(-)
 rename package/{windows => resources}/modpath.iss (100%)
 create mode 100644 package/windows/DPF Manager.iss

diff --git a/package/windows/modpath.iss b/package/resources/modpath.iss
similarity index 100%
rename from package/windows/modpath.iss
rename to package/resources/modpath.iss
diff --git a/package/windows/DPF Manager.iss b/package/windows/DPF Manager.iss
new file mode 100644
index 00000000..b96d1645
--- /dev/null
+++ b/package/windows/DPF Manager.iss	
@@ -0,0 +1,90 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{0D5B5F16-9992-49DC-AD65-D66FE249CE67}
+AppName=DPF Manager
+AppVersion=3.0
+AppVerName=DPF Manager {#SetupSetting("AppVersion")}
+AppPublisher=DPF Manager
+AppComments=DPF Manager
+AppCopyright=Copyright (C) 2015-2016
+AppPublisherURL=http://dpfmanager.org/
+AppSupportURL=http://dpfmanager.org/
+AppUpdatesURL=http://dpfmanager.org/
+UsePreviousAppDir=no
+;DefaultDirName={localappdata}\DPF Manager
+DefaultDirName={pf}\DPF Manager
+DefaultGroupName=DPF Manager
+OutputBaseFilename=DPF Manager-{#SetupSetting("AppVersion")}
+Compression=lzma
+SolidCompression=yes
+PrivilegesRequired=admin
+SetupIconFile=DPF Manager\DPF Manager.ico
+UninstallDisplayIcon={app}\DPF Manager.ico
+UninstallDisplayName=DPF Manager
+ArchitecturesInstallIn64BitMode=x64
+ChangesEnvironment=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: modifypath; Description: "Add application directory to your system path"
+
+[Files]
+Source: "DPF Manager\DPF Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "DPF Manager\app\dpf-manager-console.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "DPF Manager\*"; DestDir: "{app}"; Excludes: "*.exe,resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "DPF Manager\app\resources\*"; DestDir: "{app}"; Excludes: "*.dpf,*.iss"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "DPF Manager\app\resources\*.dpf"; DestDir: "{%HOMEPATH}\DPF Manager"; Flags: ignoreversion
+
+[Icons]
+Name: "{group}\DPF Manager"; Filename: "{app}\DPF Manager.exe"
+Name: "{commondesktop}\DPF Manager"; Filename: "{app}\DPF Manager.exe"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\DPF Manager.exe"; Description: "{cm:LaunchProgram,DPFManager}"; Flags: nowait postinstall skipifsilent
+
+[UninstallDelete]
+Type: dirifempty; Name: "{pf}\DPF Manager"
+
+[Code]
+const
+	ModPathName = 'modifypath';
+	ModPathType = 'user';
+
+Procedure customUninstall();
+var
+  mRes : integer;
+begin
+  // Ask for delete DPF Manager folder
+  mRes := MsgBox('Do you want to remove also the reports and configuration files?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2)
+  // Line breaks with with ' #13#13 '
+  if mRes = IDYES then begin
+     // Delete config files
+     DeleteFile('{%HOMEPATH}\DPF Manager\*.dpf');
+     // Delete data folder
+     DelTree('{%HOMEPATH}\DPF Manager\data', True, True, True);
+     // Delete reports directory recursively
+     DelTree('{%HOMEPATH}\DPF Manager\reports', True, True, True);
+     // Delete DPF Manager user folder only if empty
+     RemoveDir('{%HOMEPATH}\DPF Manager');
+  end;
+end;
+
+function ModPathDir(): TArrayOfString;
+begin
+	setArrayLength(Result, 1)
+	Result[0] := ExpandConstant('{app}');
+end;
+// Fixed for javapackager
+#include "DPF Manager\app\resources\modpath.iss"
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fd302c02..6818c8a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,17 +464,66 @@
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
 
     <profiles>
-        <!--Windows Profile-->
+
+        <!-- Windows Profile Only Jar-->
         <profile>
             <id>windows</id>
             <activation>
                 <os>
                     <family>Windows</family>
                 </os>
+                <property>
+                    <name>!installers</name>
+                </property>
+            </activation>
+            <build>
+                <finalName>DPF Manager</finalName>
+                <plugins>
+                    <!-- Create Jar -->
+                    <plugin>
+                        <groupId>com.zenjava</groupId>
+                        <artifactId>javafx-maven-plugin</artifactId>
+                        <version>8.7.0</version>
+                        <configuration>
+                            <mainClass>${gui.class}</mainClass>
+                            <verbose>true</verbose>
+                            <jfxAppOutputDir>${project.build.directory}/jfx/app</jfxAppOutputDir>
+                            <jfxMainAppJarName>${project.name}-jfx.jar</jfxMainAppJarName>
+                            <vendor>${project.name}</vendor>
+                            <bundler>ALL</bundler>
+                            <needShortcut>true</needShortcut>
+                            <needMenu>true</needMenu>
+                            <appName>${project.name}</appName>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>create-jfxjar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build-jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Windows Profile Installers -->
+        <profile>
+            <id>windows-installers</id>
+            <activation>
+                <os>
+                    <family>Windows</family>
+                </os>
+                <property>
+                    <name>installers</name>
+                </property>
             </activation>
             <build>
                 <finalName>DPF Manager</finalName>
@@ -486,7 +535,7 @@
                         <artifactId>javafx-maven-plugin</artifactId>
                         <version>8.4.0</version>
                         <configuration>
-                            <mainClass>${main.class}</mainClass>
+                            <mainClass>${gui.class}</mainClass>
                             <verbose>true</verbose>
                             <jfxAppOutputDir>${project.build.directory}/jfx/app</jfxAppOutputDir>
                             <jfxMainAppJarName>${project.name}-jfx.jar</jfxMainAppJarName>
@@ -507,27 +556,21 @@
                         </executions>
                     </plugin>
 
-                    <!--Build EXEs-->
+                    <!-- Build Command Line Exe -->
                     <plugin>
                         <groupId>com.akathist.maven.plugins.launch4j</groupId>
                         <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>1.7.12</version>
+                        <version>1.7.7</version>
                         <executions>
-                            <!--Command line exe-->
                             <execution>
                                 <id>l4j-clui</id>
                                 <phase>package</phase>
-                                <goals>
-                                    <goal>launch4j</goal>
-                                </goals>
+                                <goals><goal>launch4j</goal></goals>
                                 <configuration>
                                     <headerType>console</headerType>
-                                    <icon>${project.basedir}/package/windows/${project.name}.ico
-                                    </icon>
-                                    <jar>${project.name}-jfx.jar</jar>
-                                    <outfile>
-                                        ${project.build.directory}/jfx/app/dpf-manager-console.exe
-                                    </outfile>
+                                    <icon>${project.basedir}/package/windows/${project.name}.ico</icon>
+                                    <jar>app/${project.name}-jfx.jar</jar>
+                                    <outfile>${project.build.directory}/jfx/app/dpf-manager-console.exe</outfile>
                                     <dontWrapJar>true</dontWrapJar>
                                     <chdir>.</chdir>
                                     <classPath>
@@ -536,48 +579,46 @@
                                         <preCp>anything</preCp>
                                     </classPath>
                                     <jre>
-                                        <minVersion>1.8.0_60</minVersion>
+                                        <minVersion>1.8.0</minVersion>
                                     </jre>
                                 </configuration>
                             </execution>
-                            <!--Gui exe-->
+                        </executions>
+                    </plugin>
+
+                    <!--Copy resources-->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>2.7</version>
+                        <executions>
                             <execution>
-                                <id>l4j-gui</id>
+                                <id>copy-resources</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>launch4j</goal>
+                                    <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
-                                    <headerType>gui</headerType>
-                                    <icon>${project.basedir}/package/windows/${project.name}.ico
-                                    </icon>
-                                    <jar>${project.name}-jfx.jar</jar>
-                                    <outfile>${project.build.directory}/jfx/app/DPF Manager.exe
-                                    </outfile>
-                                    <dontWrapJar>true</dontWrapJar>
-                                    <chdir>.</chdir>
-                                    <classPath>
-                                        <mainClass>${gui.class}</mainClass>
-                                        <addDependencies>false</addDependencies>
-                                        <preCp>anything</preCp>
-                                    </classPath>
-                                    <jre>
-                                        <minVersion>1.8.0_60</minVersion>
-                                    </jre>
+                                    <outputDirectory>${project.build.directory}/jfx/app/resources</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>package/resources</directory>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
 
+                    <!-- Build Gui Exe and Installers -->
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
                         <version>1.4.0</version>
                         <executions>
-                            <!-- Update version -->
                             <execution>
                                 <id>read-version</id>
-                                <phase>process-classes</phase>
+                                <phase>compile</phase>
                                 <goals>
                                     <goal>java</goal>
                                 </goals>
@@ -589,7 +630,7 @@
                                     </arguments>
                                 </configuration>
                             </execution>
-                            <!--Build installer-->
+                            <!--No JRE-->
                             <execution>
                                 <id>package-exe</id>
                                 <phase>package</phase>
@@ -597,10 +638,69 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>cmd</executable>
+                                    <executable>javapackager</executable>
+                                    <arguments>
+                                        <argument>-deploy</argument>
+                                        <argument>-native</argument>
+                                        <argument>exe</argument>
+                                        <argument>-embedjnlp</argument>
+                                        <argument>-v</argument>
+                                        <argument>-appclass</argument>
+                                        <argument>${gui.class}</argument>
+                                        <!--Customize params-->
+                                        <argument>-name</argument>
+                                        <argument>${project.name}</argument>
+                                        <argument>-title</argument>
+                                        <argument>${project.name}</argument>
+                                        <argument>-vendor</argument>
+                                        <argument>${project.name}</argument>
+                                        <!--Input files params-->
+                                        <argument>-srcdir</argument>
+                                        <argument>${project.build.directory}/jfx/app</argument>
+                                        <!--Output params-->
+                                        <argument>-outdir</argument>
+                                        <argument>${project.build.directory}/jfx/native</argument>
+                                        <argument>-outfile</argument>
+                                        <argument>${project.name}</argument>
+                                        <!--Runtime-->
+                                        <argument>-Bruntime=</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                            <!--OpenJRE-->
+                            <execution>
+                                <id>package-exe-java</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>javapackager</executable>
                                     <arguments>
-                                        <argument>/C</argument>
-                                        <argument>build-windows.bat</argument>
+                                        <argument>-deploy</argument>
+                                        <argument>-native</argument>
+                                        <argument>exe</argument>
+                                        <argument>-embedjnlp</argument>
+                                        <argument>-v</argument>
+                                        <argument>-appclass</argument>
+                                        <argument>${gui.class}</argument>
+                                        <!--Customize params-->
+                                        <argument>-name</argument>
+                                        <argument>${project.name}</argument>
+                                        <argument>-title</argument>
+                                        <argument>${project.name}</argument>
+                                        <argument>-vendor</argument>
+                                        <argument>${project.name}</argument>
+                                        <!--Input files params-->
+                                        <argument>-srcdir</argument>
+                                        <argument>${project.build.directory}/jfx/app</argument>
+                                        <!--Output params-->
+                                        <argument>-outdir</argument>
+                                        <argument>${project.build.directory}/jfx/java</argument>
+                                        <argument>-outfile</argument>
+                                        <argument>${project.name}</argument>
+                                        <!--Runtime-->
+                                        <argument>-Bruntime=C:\Program Files\Zulu\zulu-8\jre</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -611,13 +711,16 @@
             </build>
         </profile>
 
-        <!-- Not Windows profile -->
+        <!-- NOT Windows Profile Only Jar-->
         <profile>
             <id>not-win-deploy</id>
             <activation>
                 <os>
                     <family>!Windows</family>
                 </os>
+                <property>
+                    <name>!installers</name>
+                </property>
             </activation>
             <build>
                 <finalName>DPF Manager</finalName>
@@ -693,6 +796,132 @@
             </build>
         </profile>
 
+        <!-- NOT Windows Profile Installers -->
+        <profile>
+            <id>not-win-deploy</id>
+            <activation>
+                <os>
+                    <family>!Windows</family>
+                </os>
+                <property>
+                    <name>installers</name>
+                </property>
+            </activation>
+            <build>
+                <finalName>DPF Manager</finalName>
+                <plugins>
+
+                    <!-- Update version -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.4.0</version>
+                        <executions>
+                            <execution>
+                                <id>read-version</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>${version.util.class}</mainClass>
+                                    <arguments>
+                                        <argument>${project.version}</argument>
+                                        <argument>${project.basedir}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Create Jar (No JRE) and Installer -->
+                    <plugin>
+                        <groupId>com.zenjava</groupId>
+                        <artifactId>javafx-maven-plugin</artifactId>
+                        <version>8.7.0</version>
+                        <executions>
+                            <execution>
+                                <id>create-jfxjar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build-jar</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>${main.class}</mainClass>
+                                    <verbose>true</verbose>
+                                    <jfxAppOutputDir>${project.build.directory}/jfx/app</jfxAppOutputDir>
+                                    <jfxMainAppJarName>${project.build.finalName}-jfx.jar
+                                    </jfxMainAppJarName>
+                                    <deployDir>${project.basedir}</deployDir>
+                                    <vendor>${project.build.finalName}</vendor>
+                                    <nativeOutputDir>${project.build.directory}/jfx/native</nativeOutputDir>
+                                    <bundler>ALL</bundler>
+                                    <nativeReleaseVersion>${project.version}</nativeReleaseVersion>
+                                    <needShortcut>true</needShortcut>
+                                    <needMenu>true</needMenu>
+                                    <appName>${project.name}</appName>
+                                    <additionalAppResources>${project.basedir}/package/resources
+                                    </additionalAppResources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>create-native</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build-native</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>${main.class}</mainClass>
+                                    <verbose>true</verbose>
+                                    <jfxAppOutputDir>${project.build.directory}/jfx/app</jfxAppOutputDir>
+                                    <jfxMainAppJarName>${project.build.finalName}-jfx.jar
+                                    </jfxMainAppJarName>
+                                    <deployDir>${project.basedir}</deployDir>
+                                    <vendor>${project.build.finalName}</vendor>
+                                    <nativeOutputDir>${project.build.directory}/jfx/native</nativeOutputDir>
+                                    <bundler>ALL</bundler>
+                                    <nativeReleaseVersion>${project.version}</nativeReleaseVersion>
+                                    <needShortcut>true</needShortcut>
+                                    <needMenu>true</needMenu>
+                                    <appName>${project.name}</appName>
+                                    <additionalAppResources>${project.basedir}/package/resources
+                                    </additionalAppResources>
+                                    <bundleArguments>
+                                        <runtime />
+                                    </bundleArguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>create-native-java</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build-native</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>${main.class}</mainClass>
+                                    <verbose>true</verbose>
+                                    <jfxAppOutputDir>${project.build.directory}/jfx/app</jfxAppOutputDir>
+                                    <jfxMainAppJarName>${project.build.finalName}-jfx.jar
+                                    </jfxMainAppJarName>
+                                    <deployDir>${project.basedir}</deployDir>
+                                    <vendor>${project.build.finalName}</vendor>
+                                    <nativeOutputDir>${project.build.directory}/jfx/java</nativeOutputDir>
+                                    <bundler>ALL</bundler>
+                                    <nativeReleaseVersion>${project.version}</nativeReleaseVersion>
+                                    <needShortcut>true</needShortcut>
+                                    <needMenu>true</needMenu>
+                                    <appName>${project.name}</appName>
+                                    <additionalAppResources>${project.basedir}/package/resources
+                                    </additionalAppResources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>release-sign-artifacts</id>
             <activation>
diff --git a/src/main/java/dpfmanager/shell/core/util/VersionUtil.java b/src/main/java/dpfmanager/shell/core/util/VersionUtil.java
index 786707bb..c1a241d1 100644
--- a/src/main/java/dpfmanager/shell/core/util/VersionUtil.java
+++ b/src/main/java/dpfmanager/shell/core/util/VersionUtil.java
@@ -37,11 +37,10 @@ public static void main(String[] args) {
     String version = args[0];
     String baseDir = args[1];
 
-    String issPath = baseDir + "/build-windows.iss";
+    String issPath = baseDir + "/package/windows/DPF Manager.iss";
     String rpmPath = baseDir + "/package/linux/DPFManager.old.spec";
     String propOutput = baseDir + "/target/classes/version.properties";
 
-    // Windows iss
     try {
       // Windows iss
       File issFile = new File(issPath);