# HG changeset patch
# User herrick
# Date 1544478594 18000
# Node ID eb6d315c4e399cf67daba9e79e91780c7a6328b9
# Parent  9c17d779808e9a01d6bc7a9e67973e7c34114fd7
8215020: create-jre-installer exe fails when --runtime-image is specified.
Reviewed-by: almatvee, kcr

diff -r 9c17d779808e -r eb6d315c4e39 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java	Mon Dec 10 16:48:25 2018 -0500
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java	Mon Dec 10 16:49:54 2018 -0500
@@ -610,6 +610,12 @@
         data.put("STOP_ON_UNINSTALL", "");
         data.put("RUN_AT_STARTUP", "");
 
+        String imagePathString =
+                WIN_APP_IMAGE.fetchFrom(p).toPath().toAbsolutePath().toString();
+        data.put("APPLICATION_IMAGE", innosetupEscape(imagePathString));
+        Log.verbose("setting APPLICATION_IMAGE to " +
+                innosetupEscape(imagePathString) + " for InnoSetup");
+
         StringBuilder secondaryLaunchersCfg = new StringBuilder();
         for (Map<String, ? super Object>
                 launcher : SECONDARY_LAUNCHERS.fetchFrom(p)) {
diff -r 9c17d779808e -r eb6d315c4e39 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.iss
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.iss	Mon Dec 10 16:48:25 2018 -0500
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.iss	Mon Dec 10 16:49:54 2018 -0500
@@ -36,7 +36,7 @@
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "INSTALLER_NAME\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "APPLICATION_IMAGE\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Code]
 function returnTrue(): Boolean;