From 131dd92872301815d3aa811e9827b76dd549ab7f Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 25 Nov 2018 21:58:03 +0700
Subject: [PATCH] Include JRE in ZIP package

---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 7a8e117f..724ce538 100644
--- a/build.xml
+++ b/build.xml
@@ -382,16 +382,17 @@
 
 		<get-windows-jre dest="${dir.staging}/jre" />
 
+		<copy todir="${dir.staging}">
+			<fileset dir="${dir.installer}/zip" includes="*.exe" />
+		</copy>
 		<copy-replace todir="${dir.staging}">
 			<fileset dir="${dir.installer}/zip" includes="*.ini" />
 		</copy-replace>
 
 		<zip destfile="${dir.dist}/${release}-portable.zip" encoding="utf-8">
-			<zipfileset dir="${dir.installer}/zip" includes="*.exe" />
-			<zipfileset dir="${dir.staging}" includes="*.ini" />
+			<zipfileset dir="${dir.staging}" />
 			<zipfileset prefix="jar" dir="${dir.dist}/lib" />
 			<zipfileset prefix="lib" dir="${dir.lib}/native/win32-x64" />
-			<zipfileset prefix="jre" dir="${dir.staging}/jre" />
 		</zip>
 	</target>