# HG changeset patch
# User wenzelm
# Date 1523973581 -7200
# Node ID 11be98cefe9295a30eed5e9df86669e1daf83b9a
# Parent  271e2d84e7a3cedda6fb97997abc80f26ea17806
updated windows_app to launch4j 3.11 and 7zsd_extra_171_3901.7z (reconstructed by Chris Lake);

diff -r 271e2d84e7a3 -r 11be98cefe92 Admin/Windows/Installer/README
--- a/Admin/Windows/Installer/README	Tue Apr 17 15:34:58 2018 +0200
+++ b/Admin/Windows/Installer/README	Tue Apr 17 15:59:41 2018 +0200
@@ -3,9 +3,8 @@
 
 * 7zip: http://www.7-zip.org/
 
-* 7zip self-extracting installer: http://www.7zsfx.info
+* 7zip self-extracting installer: https://github.com/chrislake/7zsfxmm
 
 * final packaging:
 
-  cat 7zsd_All.sfx sfx.txt Isabelle.7z > Isabelle.exe
-
+  cat 7zsd_All_x64.sfx sfx.txt Isabelle.7z > Isabelle.exe
diff -r 271e2d84e7a3 -r 11be98cefe92 Admin/components/bundled-windows
--- a/Admin/components/bundled-windows	Tue Apr 17 15:34:58 2018 +0200
+++ b/Admin/components/bundled-windows	Tue Apr 17 15:59:41 2018 +0200
@@ -1,3 +1,3 @@
 #additional components to be bundled for release
 cygwin-20170930
-windows_app-20150821
+windows_app-20180417
diff -r 271e2d84e7a3 -r 11be98cefe92 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Tue Apr 17 15:34:58 2018 +0200
+++ b/Admin/components/components.sha1	Tue Apr 17 15:59:41 2018 +0200
@@ -225,6 +225,7 @@
 c368908584e2bca38b3bcb20431d0c69399fc2f0  windows_app-20131130.tar.gz
 c3f5285481a95fde3c1961595b4dd0311ee7ac1f  windows_app-20131201.tar.gz
 14807afcf69e50d49663d5b48f4b103f30ae842b  windows_app-20150821.tar.gz
+ed106181510e825bf959025d8e0a2fc3f78e7a3f  windows_app-20180417.tar.gz
 1c36a840320dfa9bac8af25fc289a4df5ea3eccb  xz-java-1.2-1.tar.gz
 2ae13aa17d0dc95ce254a52f1dba10929763a10d  xz-java-1.2.tar.gz
 c22196148fcace5443a933238216cff5112948df  xz-java-1.5.tar.gz
diff -r 271e2d84e7a3 -r 11be98cefe92 Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Tue Apr 17 15:34:58 2018 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Tue Apr 17 15:59:41 2018 +0200
@@ -404,7 +404,7 @@
 
       echo "application for $PLATFORM_FAMILY"
       (
-        cat "windows_app/7zsd_All.sfx"
+        cat "windows_app/7zsd_All_x64.sfx"
         cat "$ISABELLE_HOME/Admin/Windows/Installer/sfx.txt" | \
           perl -p -e "s,{ISABELLE_NAME},${ISABELLE_NAME},g;"
         cat "$TMP/${ISABELLE_NAME}.7z"