From e5a7a006415d1b8016d9dec931dfdf27f5615b3e Mon Sep 17 00:00:00 2001
From: Albin Larsson <albin.post@gmail.com>
Date: Thu, 3 Feb 2022 18:25:18 +0100
Subject: [PATCH] Package for Windows (#3)

* add dependent DLLs
* Grabs OpenJFX ZIPs from the base directory. Added clean target. Default runs all targets.
* update readme
* update .gitignore for the new build process

Co-authored-by: Sebastian Berlin <sebastian.berlin@wikimedia.se>
---
 .gitignore |   6 +--
 README.md  |   9 +++--
 build.xml  | 114 ++++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0fe5d92..12373f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 build
-store
-dist
-nbproject\private
-/nbproject/private/
 bin
+tmp
 pattypan.jar
+*.zip
diff --git a/README.md b/README.md
index f8c2f35..83cedef 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,18 @@ __[:arrow_down: Download](https://github.com/yarl/pattypan/releases)__
 ----
 
 ### Build and run
-[Apache Ant](https://ant.apache.org/) is used for building Pattypan. You need to have JDK 11 or later installed as well as [a download of OpenJFX](https://gluonhq.com/products/javafx/). In order to download and build source code, do the following:
+[Apache Ant](https://ant.apache.org/) is used for building Pattypan. You need to have JDK 11 or later installed as well as [a download of OpenJFX](https://gluonhq.com/products/javafx/) for each platform you want to support. In order to download and build source code, do the following:
 
 ```
 git clone https://github.com/yarl/pattypan.git
 cd pattypan
-export PATH_TO_FX=path-to-javafx-sdk/lib
-ant compile && ant jar
+ant
 ```
 
+This will run the default `build` target. It assumes that the current directory contains the OpenJFX SDK ZIP(s) and will unpack the required files to the correct locations. The resulting JAR will support Linux, Windows or both. The ZIPs present dictates what platforms will be supported. Note that the ZIPs should have their default name to be included.
+
+A temporary directory will be used during the build process and removed afterwards. It's default path is *tmp/* and can be set using `ant -Dtmp=...`
+
 You can also set test server or any other server:
 
 ```
diff --git a/build.xml b/build.xml
index df1056d..60acded 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
-<project default="compile" basedir=".">
+<project default="build" basedir=".">
+  <target name="build" depends="prepareJavfx, compile, jar, clean"/>
   <property name="lib.dir" location="lib" />
-  <property environment="env"/>
-  <property name="openjfxSDKPath" value="${env.PATH_TO_FX}"/>
+  <property name="tmp" location="tmp" />
 
   <path id="classpath">
     <fileset dir="lib">
@@ -9,15 +9,90 @@
     </fileset>
   </path>
 
-  <target name="clean">
-    <delete dir="bin"/>
+  <target name="prepareJavfx">
+    <mkdir dir="${tmp}"/>
+    <unzip dest="${tmp}">
+      <fileset dir=".">
+        <include name="openjfx-*_linux-*_bin-sdk.zip"/>
+      </fileset>
+      <patternset>
+        <include name="**/javafx.base.jar"/>
+        <include name="**/javafx.graphics.jar"/>
+        <include name="**/javafx.controls.jar"/>
+        <include name="**/javafx.web.jar"/>
+      </patternset>
+      <mapper type="flatten"/>
+    </unzip>
+    <unzip dest="bin">
+      <fileset dir="${tmp}">
+        <include name="javafx.base.jar"/>
+        <include name="javafx.graphics.jar"/>
+        <include name="javafx.controls.jar"/>
+      </fileset>
+      <patternset>
+        <exclude name="META-INF/MANIFEST.MF"/>
+        <exclude name="module-info.class"/>
+      </patternset>
+    </unzip>
+    <unzip dest="bin">
+      <fileset dir=".">
+        <include name="openjfx-*_linux-*_bin-sdk.zip"/>
+      </fileset>
+      <patternset>
+        <include name="**/libprism*.so"/>
+        <include name="**/libjavafx*.so"/>
+        <include name="**/libglass*.so"/>
+        <include name="**/libdecora_sse.so"/>
+      </patternset>
+      <mapper type="flatten"/>
+    </unzip>
+
+    <unzip dest="${tmp}">
+      <fileset dir=".">
+        <include name="openjfx-*_windows-*_bin-sdk.zip"/>
+      </fileset>
+      <patternset>
+        <include name="**/javafx.base.jar"/>
+        <include name="**/javafx.graphics.jar"/>
+        <include name="**/javafx.controls.jar"/>
+        <include name="**/javafx.web.jar"/>
+      </patternset>
+      <mapper type="flatten"/>
+    </unzip>
+    <unzip dest="bin">
+      <fileset dir="${tmp}">
+        <include name="javafx.base.jar"/>
+        <include name="javafx.graphics.jar"/>
+        <include name="javafx.controls.jar"/>
+      </fileset>
+      <patternset>
+        <exclude name="META-INF/MANIFEST.MF"/>
+        <exclude name="module-info.class"/>
+      </patternset>
+    </unzip>
+    <unzip dest="bin">
+      <fileset dir=".">
+        <include name="openjfx-*_windows-*_bin-sdk.zip"/>
+      </fileset>
+      <patternset>
+        <include name="**/prism*.dll"/>
+        <include name="**/javafx*.dll"/>
+        <include name="**/glass.dll"/>
+        <include name="**/decora_sse.dll"/>
+        <include name="**/api-ms-win-core-console-l1-1-0.dll"/>
+        <include name="**/api-ms-win-core-console-l1-2-0.dll"/>
+        <include name="**/msvcp140.dll"/>
+        <include name="**/vcruntime140_1.dll"/>
+      </patternset>
+      <mapper type="flatten"/>
+    </unzip>
   </target>
 
-  <target name="compile" depends="clean">
+  <target name="compile">
     <mkdir dir="bin"/>
     <javac includeantruntime="false" srcdir="src" destdir="bin">
       <classpath refid="classpath" />
-      <compilerarg line="--module-path ${openjfxSDKPath}"/>
+      <compilerarg line="--module-path ${tmp}"/>
       <compilerarg line="--add-modules javafx.web"/>
     </javac>
   </target>
@@ -30,26 +105,6 @@
         <include name="text/**"/>
       </fileset>
     </copy>
-    <unzip dest="bin">
-      <fileset dir="${openjfxSDKPath}">
-        <include name="javafx.base.jar"/>
-        <include name="javafx.graphics.jar"/>
-        <include name="javafx.controls.jar"/>
-        <include name="javafx.swing.jar"/>
-      </fileset>
-      <patternset>
-        <exclude name="META-INF/MANIFEST.MF"/>
-        <exclude name="module-info.class"/>
-      </patternset>
-    </unzip>
-    <copy todir="bin">
-      <fileset dir="${openjfxSDKPath}">
-        <include name="libprism*.so"/>
-        <include name="libjavafx*.so"/>
-        <include name="libglass*.so"/>
-        <include name="libdecora_sse.so"/>
-      </fileset>
-    </copy>
     <jar destfile="pattypan.jar" basedir="bin" includes="**/*">
       <manifest>
         <attribute name="Class-Path" value="${lib.dir}"/>
@@ -58,4 +113,9 @@
       <zipgroupfileset dir="${lib.dir}"/>
     </jar>
   </target>
+
+  <target name="clean">
+    <delete dir="${tmp}"/>
+    <delete dir="bin"/>
+  </target>
 </project>