building without JDK

Author: PrinzAndreas

README.md

@@ -4,7 +4,7 @@ It allows to create ACT ONE specifications and to evaluate terms later.
 
 ## Installation
 In the current [release](/../../releases), binaries for Windows, Linux, and Mac are provided.
-Extract the distribution and run the actone script.
+Extract the distribution and run the actone script. You need to have installed a JDK unless you install the Windows version with the JDK included.
 
 ## User manual
 The language and the IDE are described in the [User Manual](documentation/UserManual.md).

buildDistribution.xml

@@ -76,6 +76,43 @@
       <zipfileset dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_.win.zip_f755" filemode="755" prefix="bin" />
       <fileset dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_.win.zip" />
     </zip>
+    <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip" />
+    <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip/bin" />
+    <copy todir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip/bin">
+      <fileset file="${basedir}/solutions/ActOne.build/source_gen/ActOne/build/actone.vmoptions" />
+      <filterchain>
+        <fixcrlf eol="crlf" />
+      </filterchain>
+      <globmapper from="*" to="actone.exe.vmoptions" />
+    </copy>
+    <copy todir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip/bin">
+      <fileset file="${basedir}/solutions/ActOne.build/source_gen/ActOne/build/actone64.vmoptions" />
+      <filterchain>
+        <fixcrlf eol="crlf" />
+      </filterchain>
+      <globmapper from="*" to="actone64.exe.vmoptions" />
+    </copy>
+    <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip_f755" />
+    <copy todir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip_f755">
+      <fileset file="${basedir}/solutions/ActOne.build/source_gen/ActOne/build/actone.bat" />
+      <filterchain>
+        <fixcrlf eol="crlf" />
+      </filterchain>
+    </copy>
+    <zip destfile="${build.layout}/ActOne-${ActOne.build.number}-with-JDK.win.zip">
+      <fileset dir="${artifacts.ActOne}" />
+      <zipfileset dir="${mps_home}/bin/win" prefix="bin">
+        <exclude name="**/*.exe" />
+        <exclude name="**/*.bat" />
+      </zipfileset>
+      <zipfileset dir="${mps_home}/bin/win" prefix="bin" filemode="755">
+        <include name="**/*.exe" />
+        <include name="**/append.bat" />
+      </zipfileset>
+      <zipfileset dir="${mps_home}/jbr" prefix="jbr" />
+      <zipfileset dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip_f755" filemode="755" prefix="bin" />
+      <fileset dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_-with-JDK.win.zip" />
+    </zip>
     <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_.macos.zip" />
     <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_.macos.zip/ActOne ${version}.app" />
     <mkdir dir="${build.tmp}/default/ActOne-_dl__lbrace_build.number_rbrace_.macos.zip/ActOne ${version}.app/Contents" />

myBuild.xml

@@ -90,10 +90,6 @@
       <fileset file="${basedir}/icons/aboutACTONE.png" />
       <fileset dir="${build.tmp}/default/branding.jar" />
     </jar>
-    <mkdir dir="${build.layout}/jbr" />
-    <copy todir="${build.layout}/jbr">
-      <fileset dir="${mps_home}/jbr" />
-    </copy>
     <mkdir dir="${build.layout}/plugins" />
     <mkdir dir="${build.layout}/plugins/svn4idea" />
     <copy todir="${build.layout}/plugins/svn4idea">