--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Windows/launch4j/README Fri Aug 21 15:02:42 2015 +0200
@@ -0,0 +1,4 @@
+Java application wrapper for Windows
+====================================
+
+* http://launch4j.sourceforge.net
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Windows/launch4j/isabelle.xml Fri Aug 21 15:02:42 2015 +0200
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launch4jConfig>
+ <dontWrapJar>true</dontWrapJar>
+ <headerType>gui</headerType>
+ <jar></jar>
+ <outfile>{OUTFILE}</outfile>
+ <errTitle></errTitle>
+ <cmdLine></cmdLine>
+ <chdir></chdir>
+ <priority>normal</priority>
+ <downloadUrl></downloadUrl>
+ <supportUrl></supportUrl>
+ <stayAlive>true</stayAlive>
+ <restartOnCrash>false</restartOnCrash>
+ <manifest></manifest>
+ <icon>{ICON}</icon>
+ <classPath>
+ <mainClass>isabelle.Main</mainClass>
+{CLASSPATH}
+ </classPath>
+ <jre>
+ <path>%EXEDIR%\contrib\jdk\x86-cygwin\jre</path>
+ <bundledJre64Bit>false</bundledJre64Bit>
+ <bundledJreAsFallback>false</bundledJreAsFallback>
+ <minVersion></minVersion>
+ <maxVersion></maxVersion>
+ <jdkPreference>jdkOnly</jdkPreference>
+ <runtimeBits>64/32</runtimeBits>
+ <initialHeapSize>128</initialHeapSize>
+ <initialHeapPercent>20</initialHeapPercent>
+ <maxHeapSize>1024</maxHeapSize>
+ <maxHeapPercent>50</maxHeapPercent>
+ <opt>-Disabelle.home="%EXEDIR%" -Dcygwin.root="%EXEDIR%\\contrib\\cygwin"</opt>
+ </jre>
+ <splash>
+ <file>{SPLASH}</file>
+ <waitForWindow>false</waitForWindow>
+ <timeout>10</timeout>
+ <timeoutErr>false</timeoutErr>
+ </splash>
+</launch4jConfig>
\ No newline at end of file
Binary file Admin/Windows/launch4j/isabelle_transparent.ico has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Windows/launch4j/manifest.xml Fri Aug 21 15:02:42 2015 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+ <asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
+
--- a/Admin/components/bundled-windows Thu Aug 20 21:14:58 2015 +0200
+++ b/Admin/components/bundled-windows Fri Aug 21 15:02:42 2015 +0200
@@ -1,3 +1,3 @@
#additional components to be bundled for release
cygwin-20150410
-windows_app-20131201
+windows_app-20150821
--- a/Admin/components/components.sha1 Thu Aug 20 21:14:58 2015 +0200
+++ b/Admin/components/components.sha1 Fri Aug 21 15:02:42 2015 +0200
@@ -125,6 +125,7 @@
d273abdc7387462f77a127fa43095eed78332b5c windows_app-20130909.tar.gz
c368908584e2bca38b3bcb20431d0c69399fc2f0 windows_app-20131130.tar.gz
c3f5285481a95fde3c1961595b4dd0311ee7ac1f windows_app-20131201.tar.gz
+14807afcf69e50d49663d5b48f4b103f30ae842b windows_app-20150821.tar.gz
1c36a840320dfa9bac8af25fc289a4df5ea3eccb xz-java-1.2-1.tar.gz
2ae13aa17d0dc95ce254a52f1dba10929763a10d xz-java-1.2.tar.gz
4530a1aa6f4498ee3d78d6000fa71a3f63bd077f yices-1.0.28.tar.gz
--- a/Admin/lib/Tools/makedist_bundle Thu Aug 20 21:14:58 2015 +0200
+++ b/Admin/lib/Tools/makedist_bundle Fri Aug 21 15:02:42 2015 +0200
@@ -222,34 +222,47 @@
"$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
(
- cat "$ISABELLE_HOME/Admin/Windows/WinRun4J/Isabelle.ini"
-
+ echo -e "# Java runtime options"
declare -a JAVA_ARGS=()
eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS)"
- A=2
for ARG in "${JAVA_ARGS[@]}"
do
- echo -e "vmarg.$A=$ARG\r"
- A=$[ $A + 1 ]
+ echo -e "$ARG\r"
done
+ ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.l4j.ini"
+
+ (
+ cd "$TMP"
+
+ APP_TEMPLATE="$ISABELLE_HOME/Admin/Windows/launch4j"
- A=1
- for ENTRY in "${DISTRIBITION_CLASSPATH[@]}"
- do
- ENTRY=$(echo "$ENTRY" | perl -p -e 's,/,\\\\,g;')
- echo -e "classpath.$A=$ENTRY\r"
- A=$[ $A + 1 ]
- done
- ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.ini"
+ (
+ for ENTRY in "${DISTRIBITION_CLASSPATH[@]}"
+ do
+ ENTRY=$(echo "$ENTRY" | perl -p -e 's,/,\\\\,g;')
+ echo " <cp>$ENTRY</cp>"
+ done
+ ) > exe_classpath
+ EXE_CLASSPATH="$(cat exe_classpath)"
- cp "$TMP/windows_app/Isabelle.exe" "$ISABELLE_TARGET/${ISABELLE_NAME}.exe"
- cp "$ISABELLE_HOME/Admin/Windows/WinRun4J/manifest.xml" "$ISABELLE_TARGET/${ISABELLE_NAME}.exe.manifest"
- cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
- "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
+ perl -p \
+ -e "s,{OUTFILE},$ISABELLE_TARGET/${ISABELLE_NAME}.exe,g;" \
+ -e "s,{ICON},$APP_TEMPLATE/isabelle_transparent.ico,g;" \
+ -e "s,{SPLASH},$APP_TEMPLATE/isabelle.bmp,g;" \
+ -e "s,{CLASSPATH},$EXE_CLASSPATH,g;" \
+ "$APP_TEMPLATE/isabelle.xml" > isabelle.xml
+
+ "windows_app/launch4j-${ISABELLE_PLATFORM_FAMILY}/launch4j" isabelle.xml
+
+ cp "$APP_TEMPLATE/manifest.xml" "$ISABELLE_TARGET/${ISABELLE_NAME}.exe.manifest"
+ )
(
cd "$ISABELLE_TARGET"
+ cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
+ "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
+
for NAME in postinstall rebaseall
do
cp -a "$ISABELLE_HOME/Admin/Windows/Cygwin/isabelle/$NAME" \