# HG changeset patch
# User wenzelm
# Date 1378729359 -7200
# Node ID 1100982a071cf77b61b27034aeb1d55523b17b73
# Parent  74a4685a96c8efacc88ee77d3404dbe4a9664b23
generate application ini based on $ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS at build time (see also lib/Tools/java and src/Tools/jEdit/lib/Tools/jedit);

diff -r 74a4685a96c8 -r 1100982a071c Admin/Windows/WinRun4J/Isabelle.ini
--- a/Admin/Windows/WinRun4J/Isabelle.ini	Mon Sep 09 13:48:06 2013 +0200
+++ b/Admin/Windows/WinRun4J/Isabelle.ini	Mon Sep 09 14:22:39 2013 +0200
@@ -7,13 +7,5 @@
 classpath.6=lib\classes\ext\scala-reflect.jar
 classpath.7=src\Tools\jEdit\dist\jedit.jar
 vm.location=contrib\jdk\x86-cygwin\jre\bin\server\jvm.dll
-vmarg.1=-Dfile.encoding=UTF-8
-vmarg.2=-server
-vmarg.3=-Xms128m
-vmarg.4=-Xmx1024m
-vmarg.5=-Xss2m
-vmarg.6=-Dactors.corePoolSize=4
-vmarg.7=-Dactors.enableForkJoin=false
-vmarg.8=-Disabelle.home=%INI_DIR%
 splash.image=lib\logo\isabelle.bmp
-
+vmarg.1=-Disabelle.home=%INI_DIR%
diff -r 74a4685a96c8 -r 1100982a071c Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Mon Sep 09 13:48:06 2013 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Mon Sep 09 14:22:39 2013 +0200
@@ -147,8 +147,19 @@
     perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \
       "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
 
+    (
+      cat "$ISABELLE_HOME/Admin/Windows/WinRun4J/Isabelle.ini"
+      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 ]
+      done
+    ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.ini"
+
     cp "$TMP/windows_app/Isabelle.exe" "$ISABELLE_TARGET/${ISABELLE_NAME}.exe"
-    cp "$ISABELLE_HOME/Admin/Windows/WinRun4J/Isabelle.ini" "$ISABELLE_TARGET/${ISABELLE_NAME}.ini"
     cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"