/hg/icedtea-web: 3 new changesets

[jvanek at icedtea.classpath.org]

changeset 717e2f0b2455 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=717e2f0b2455
author: Jiri Vanek <jvanek at redhat.com>
date: Mon May 15 16:13:51 2017 +0200

	Made jnlp protocol work in msi

	* win-installer/installer.json.in: "name": "TODO_DEFAULT", replaced by "name": "". Needs wixgen 1.3 https://github.com/akashche/wixgen/releases/tag/1.3


changeset 6088323af92c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6088323af92c
author: Jiri Vanek <jvanek at redhat.com>
date: Mon May 15 16:20:41 2017 +0200

	launcher/launchers.bat.in: added pause to the end of the script to allow reading of messages if launched out of prompt.


changeset b1a36c9a5a32 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b1a36c9a5a32
author: Jiri Vanek <jvanek at redhat.com>
date: Mon May 15 16:58:43 2017 +0200

	Makefile.am: installer renamed to itw-installer.msi, relative paths in json.in sedded to absolute ones to allow build in different build dir.


diffstat:

 ChangeLog                       |  18 ++++++++++++++++++
 Makefile.am                     |  14 ++++++++------
 launcher/launchers.bat.in       |   2 ++
 win-installer/installer.json.in |   4 ++--
 4 files changed, 30 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 6328ca1367ac -r b1a36c9a5a32 ChangeLog
--- a/ChangeLog	Mon May 15 12:05:16 2017 +0200
+++ b/ChangeLog	Mon May 15 16:58:43 2017 +0200
@@ -1,3 +1,21 @@
+2017-12-10  Jiri Vanek <jvanek at redhat.com>
+
+	* Makefile.am: installer renamed to itw-installer.msi, relative paths
+	in json.in sedded to absolute ones to allow build in different build dir.
+
+2017-12-10  Alex Kashchenko <akashche at redhat.com>
+            Jiri Vanek <jvanek at redhat.com>
+
+	* launcher/launchers.bat.in: added pause to the end of the script to allow
+	reading of messages if launched out of prompt.
+
+
+2017-12-10  Alex Kashchenko <akashche at redhat.com>
+
+	Made jnlp protocol work in msi
+	* win-installer/installer.json.in: "name": "TODO_DEFAULT", replaced by "name": "".
+	Needs wixgen 1.3 https://github.com/akashche/wixgen/releases/tag/1.3
+
 2017-12-10  Alex Kashchenko <akashche at redhat.com>
             Jiri Vanek <jvanek at redhat.com>
 
diff -r 6328ca1367ac -r b1a36c9a5a32 Makefile.am
--- a/Makefile.am	Mon May 15 12:05:16 2017 +0200
+++ b/Makefile.am	Mon May 15 16:58:43 2017 +0200
@@ -396,14 +396,16 @@
 clean-win-installer:
 	rm -rf $(WIN_INSTALLER_DIR)
 
-$(WIN_INSTALLER_DIR)/installer.json: clean-win-installer
+$(WIN_INSTALLER_DIR)/itw-installer.json: clean-win-installer
 	mkdir $(WIN_INSTALLER_DIR)
-	sed -e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@
+	sed \
+	-e "s|../win-installer|$(WIN_INSTALLER_SRC_DIR)|g" \
+	-e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@
 
-win-installer: win-only-image $(WIN_INSTALLER_DIR)/installer.json
-	"$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/installer.json -o $(WIN_INSTALLER_DIR)/installer.wxs
-	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo installer.wxs
-	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension installer.wixobj
+win-installer: win-only-image $(WIN_INSTALLER_DIR)/itw-installer.json
+	"$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/itw-installer.json -o $(WIN_INSTALLER_DIR)/itw-installer.wxs
+	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo itw-installer.wxs
+	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension itw-installer.wixobj
 endif
 
 # note that this is called only from windows specific target (hidden otherwise)
diff -r 6328ca1367ac -r b1a36c9a5a32 launcher/launchers.bat.in
--- a/launcher/launchers.bat.in	Mon May 15 12:05:16 2017 +0200
+++ b/launcher/launchers.bat.in	Mon May 15 16:58:43 2017 +0200
@@ -52,3 +52,5 @@
 rem TODO use "exec -a %PROGRAM_NAME% ..." idiom
 "%JAVA%" "-splash:%SPLASH_LOCATION%" "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %JAVAWS_J_OPTIONS% "-classpath" "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ITW_WIN_SPECIALS% %*
 
+echo Please press any key to close this window/get back prompt
+pause > nul
diff -r 6328ca1367ac -r b1a36c9a5a32 win-installer/installer.json.in
--- a/win-installer/installer.json.in	Mon May 15 12:05:16 2017 +0200
+++ b/win-installer/installer.json.in	Mon May 15 16:58:43 2017 +0200
@@ -26,7 +26,7 @@
       "values": [
         {
           "type": "string",
-          "name": "TODO_DEFAULT",
+          "name": "",
           "value": "URL:jnlp Protocol"
         },
         {
@@ -42,7 +42,7 @@
       "values": [
         {
           "type": "string",
-          "name": "TODO_DEFAULT",
+          "name": "",
           "value": "\"[INSTALLDIR]bin\\javaws.bat\" \"%1\""
         }
       ]