From b9b154efc8d3642fdc33ad6f4d337a987b150fba Mon Sep 17 00:00:00 2001
From: derMart <hier-bei-mir@gmx.net>
Date: Mon, 23 Mar 2020 23:11:28 +0100
Subject: [PATCH 1/2] Update build files and documentation. Use Deploy dir
 inside project root. Fix #140, #139, #138, #73, #54

---
 .gitignore                   |   3 +-
 BUILD.md                     |  32 ++------
 ant/build-jar.xml            | 146 +++++++++++++++++++++++++++++++++++
 ant/deploy-beta.xml          |  68 ++++++++--------
 ant/deploy-release.xml       | 132 +++++++++++++++----------------
 ant/setup-release.xml        |  69 +++++++++--------
 jre/.gitignore               |   3 -
 jre/jce/US_export_policy.jar | Bin 3023 -> 0 bytes
 jre/jce/local_policy.jar     | Bin 3035 -> 0 bytes
 9 files changed, 287 insertions(+), 166 deletions(-)
 create mode 100644 ant/build-jar.xml
 delete mode 100644 jre/.gitignore
 delete mode 100644 jre/jce/US_export_policy.jar
 delete mode 100644 jre/jce/local_policy.jar

diff --git a/.gitignore b/.gitignore
index 2e3a0fec..9f668884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 /config.properties
 /bin
 /setup_new.nsi
-/.metadata
\ No newline at end of file
+/.metadata
+/Deploy
diff --git a/BUILD.md b/BUILD.md
index 06f3559d..2b8d1361 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,42 +2,24 @@
 
 ## Requirements
 
-Download [Java SE Runtime Environment](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) 
-for Linux x86 and Linux x64 platform in ".tar.gz" format.
-
-```
-cd ./jre
-wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-i586.tar.gz
-tar xf jre-8u101-linux-i586.tar.gz
-mv jre1.8.0_101 linjre32
-wget http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jre-8u101-linux-x64.tar.gz
-tar xf jre-8u101-linux-x64.tar.gz
-mv jre1.8.0_101 linjre64
-tar cf linjre.tar linjre32 linjre64
-cd ..
-```
-
-Install p7zip:
-
-```ShellSession
-apt-get install p7zip
-```
-
-Add bin folder:
+Java JDK installed as well as ant.
+It should work with the openjdk and ant packages from ubuntu.
 
 ```ShellSession
-mkdir ./bin
+sudo apt install openjdk-11-jdk
+sudo apt install ant
 ```
 
 ## Build
 
 ```ShellSession
+ant -buildfile ant/build-jar.xml
 ant -buildfile ant/deploy-release.xml
-ant -buildfile ant/setup-linux.xml binaries
+ant -buildfile ant/setup-release.xml
 ```
 
 Now you can run newly released FlashTool from `Deploy/FlashTool`:
 
 ```ShellSession
-./../Deploy/FlashTool/FlashTool
+./Deploy/FlashTool/FlashTool
 ```
diff --git a/ant/build-jar.xml b/ant/build-jar.xml
new file mode 100644
index 00000000..bfb4bd2e
--- /dev/null
+++ b/ant/build-jar.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <project basedir="../" default="build" name="Flashtool">
+    <property environment="env"/>
+    <property name="debuglevel" value="source,lines,vars"/>
+    <property name="target" value="11"/>
+    <property name="source" value="11"/>
+    <path id="Flashtool.classpath">
+        <pathelement location="bin"/>
+        <pathelement location="libs/javax.annotation_1.2.0.jar"/>
+        <pathelement location="libs/javax.inject_1.0.0.jar"/>
+        <pathelement location="libs/ini4j-0.5.4.jar"/>
+        <pathelement location="libs/commons-io-2.6.jar"/>
+        <pathelement location="libs/disruptor-3.4.2.jar"/>
+        <pathelement location="libs/jsr305-3.0.2.jar"/>
+        <pathelement location="libs/jbbp-1.4.1.jar"/>
+        <pathelement location="libs/jopt-simple-6.0-alpha-3.jar"/>
+        <pathelement location="libs/xstream-1.4.11.1.jar"/>
+        <pathelement location="libs/jsch-0.1.55.jar"/>
+        <pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
+        <pathelement location="libs/lz4-java-1.6.0.jar"/>
+        <pathelement location="libs/bcpg-jdk15on-162.jar"/>
+        <pathelement location="libs/bcpkix-jdk15on-162.jar"/>
+        <pathelement location="libs/bcprov-jdk15on-162.jar"/>
+        <pathelement location="libs/icu4j-64.2.jar"/>
+        <pathelement location="libs/log4j-api-2.12.1.jar"/>
+        <pathelement location="libs/log4j-core-2.12.1.jar"/>
+        <pathelement location="libs/log4j-slf4j18-impl-2.12.1.jar"/>
+        <pathelement location="libs/guava-28.1-jre.jar"/>
+        <pathelement location="libs/commons-compress-1.19.jar"/>
+        <pathelement location="libs/jarchivelib-1.0.0.jar"/>
+        <pathelement location="libs/apk-parser-2.6.9.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.commands_3.9.500.v20190805-1157.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.contenttype_3.7.400.v20190624-1144.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.jobs_3.10.500.v20190620-1426.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.runtime_3.16.0.v20190823-1314.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.app_1.4.300.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.bidi_1.2.100.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.common_3.10.500.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.preferences_3.7.500.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.registry_3.8.500.v20190714-1850.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface_3.17.0.v20190820-1444.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface.text_3.15.300.v20190819-0725.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.archive_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.ssh.apache_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.osgi_3.15.0.v20190830-1434.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.swt_3.112.0.v20190904-0609.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.text_3.9.0.v20190826-1019.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.forms_3.8.100.v20190625-1825.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.workbench_3.116.0.v20190826-1428.jar"/>
+        <pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
+        <pathelement location="libs/linux/x86_64/org.eclipse.swt.gtk.linux.x86_64_3.112.0.v20190904-0609.jar"/>
+        <pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/xz-1.8.jar"/>
+        <pathelement location="libs/dec-0.1.2.jar"/>
+        <pathelement location="libs/jna-5.5.0.jar"/>
+        <pathelement location="libs/jna-platform-5.5.0.jar"/>
+        <pathelement location="libs/jdom2-2.0.6.jar"/>
+    </path>
+    <path id="run.Main.classpath">
+        <path refid="Flashtool.classpath"/>
+        <pathelement location="libs/javax.annotation_1.2.0.jar"/>
+        <pathelement location="libs/javax.inject_1.0.0.jar"/>
+        <pathelement location="libs/ini4j-0.5.4.jar"/>
+        <pathelement location="libs/commons-io-2.6.jar"/>
+        <pathelement location="libs/disruptor-3.4.2.jar"/>
+        <pathelement location="libs/jsr305-3.0.2.jar"/>
+        <pathelement location="libs/jbbp-1.4.1.jar"/>
+        <pathelement location="libs/jopt-simple-6.0-alpha-3.jar"/>
+        <pathelement location="libs/xstream-1.4.11.1.jar"/>
+        <pathelement location="libs/jsch-0.1.55.jar"/>
+        <pathelement location="libs/proxy-vole-1.0.6-SNAPSHOT.jar"/>
+        <pathelement location="libs/lz4-java-1.6.0.jar"/>
+        <pathelement location="libs/bcpg-jdk15on-162.jar"/>
+        <pathelement location="libs/bcpkix-jdk15on-162.jar"/>
+        <pathelement location="libs/bcprov-jdk15on-162.jar"/>
+        <pathelement location="libs/icu4j-64.2.jar"/>
+        <pathelement location="libs/log4j-api-2.12.1.jar"/>
+        <pathelement location="libs/log4j-core-2.12.1.jar"/>
+        <pathelement location="libs/log4j-slf4j18-impl-2.12.1.jar"/>
+        <pathelement location="libs/guava-28.1-jre.jar"/>
+        <pathelement location="libs/commons-compress-1.19.jar"/>
+        <pathelement location="libs/jarchivelib-1.0.0.jar"/>
+        <pathelement location="libs/apk-parser-2.6.9.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.osgi_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.apache.sshd.sftp_2.2.0.v20190425-2127.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.commands_3.9.500.v20190805-1157.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.contenttype_3.7.400.v20190624-1144.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.jobs_3.10.500.v20190620-1426.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.core.runtime_3.16.0.v20190823-1314.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.app_1.4.300.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.bidi_1.2.100.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.common_3.10.500.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.preferences_3.7.500.v20190815-1535.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.equinox.registry_3.8.500.v20190714-1850.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface_3.17.0.v20190820-1444.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jface.text_3.15.300.v20190819-0725.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.archive_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.jgit.ssh.apache_5.5.0.201909110433-r.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.osgi_3.15.0.v20190830-1434.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.swt_3.112.0.v20190904-0609.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.text_3.9.0.v20190826-1019.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.forms_3.8.100.v20190625-1825.jar"/>
+        <pathelement location="libs/eclipse/org.eclipse.ui.workbench_3.116.0.v20190826-1428.jar"/>
+        <pathelement location="libs/bsh-3.0.0-SNAPSHOT.jar"/>
+        <pathelement location="libs/linux/x86_64/org.eclipse.swt.gtk.linux.x86_64_3.112.0.v20190904-0609.jar"/>
+        <pathelement location="libs/slf4j-api-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/slf4j-ext-2.0.0-alpha1.jar"/>
+        <pathelement location="libs/xz-1.8.jar"/>
+        <pathelement location="libs/dec-0.1.2.jar"/>
+        <pathelement location="libs/jna-5.5.0.jar"/>
+        <pathelement location="libs/jna-platform-5.5.0.jar"/>
+        <pathelement location="libs/jdom2-2.0.6.jar"/>
+    </path>
+    <target name="init">
+        <mkdir dir="bin"/>
+        <copy includeemptydirs="false" todir="bin">
+            <fileset dir="src">
+                <exclude name="**/*.launch"/>
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="bin"/>
+    </target>
+    <target depends="clean" name="cleanall"/>
+    <target depends="build-subprojects,build-project" name="build"/>
+    <target name="build-subprojects"/>
+    <target depends="init" name="build-project">
+        <echo message="${ant.project.name}: ${ant.file}"/>
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
+            <src path="src"/>
+            <classpath refid="Flashtool.classpath"/>
+        </javac>
+    </target>
+    <target name="Main">
+        <java classname="gui.Main" failonerror="true" fork="yes">
+            <classpath refid="run.Main.classpath"/>
+        </java>
+    </target>
+</project>
diff --git a/ant/deploy-beta.xml b/ant/deploy-beta.xml
index f5d71841..6a657e95 100644
--- a/ant/deploy-beta.xml
+++ b/ant/deploy-beta.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="all" name="Deploy Flashtool Beta">
-	
+
 	<property name="version" value="0.9.18.1"/>
 	<property name="progtime" value="08-25-2014 23:00:00"/>
-	
+
 	<target name="all" depends="core release"/>
 
 
 	<target name="clean">
-    	<mkdir dir="../../Deploy"/>
-    	<delete dir="../../Deploy/FlashTool"/>
+    	<mkdir dir="../Deploy"/>
+    	<delete dir="../Deploy/FlashTool"/>
 	</target>
 
 	<target name="clone">
-		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../../Deploy/FlashTool/devices" />
-	</target>	
-	
+		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../Deploy/FlashTool/devices" />
+	</target>
+
 	<target name="ressources">
-        <jar destfile="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
             <manifest>
                 <attribute name="Implementation-Version" value="${version}"/>
             	<attribute name="Implementation-Date" value="${progtime}"/>
@@ -30,58 +30,58 @@
     </target>
 
 	<target name="core release" depends="clean,ressources">
-        <mkdir dir ="../../Deploy/FlashTool"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/root"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir ="../../Deploy/FlashTool/custom/features"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/sin"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/mydevices"/>
-		<mkdir dir ="../../Deploy/FlashTool/firmwares"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-        <mkdir dir="../../Deploy/FlashTool/drivers"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <mkdir dir ="../Deploy/FlashTool"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/root"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir ="../Deploy/FlashTool/custom/features"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/sin"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/mydevices"/>
+		<mkdir dir ="../Deploy/FlashTool/firmwares"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+        <mkdir dir="../Deploy/FlashTool/drivers"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
     		<fileset dir="../shells"
 				excludes="**/.svn"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
     		<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
     	</copy>
-        <copy todir="../../Deploy/FlashTool/firmwares">
+        <copy todir="../Deploy/FlashTool/firmwares">
             <fileset dir="../firmwares"
                 excludes="**/.svn"/>
         </copy>
-	    <copy todir="../../Deploy/FlashTool/custom/root">
+	    <copy todir="../Deploy/FlashTool/custom/root">
 	       <fileset dir="../romupdates" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
-        <chmod file="../../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_lib/fastboot.mac" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_lib/adb.mac" perm="755" />
+        <chmod file="../Deploy/FlashTool/x10flasher_lib/unyaffs.mac" perm="755" />
     </target>
 
 	<target name="Shells only">
-        <delete dir="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir="../../Deploy/FlashTool/custom/shells"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <delete dir="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir="../Deploy/FlashTool/custom/shells"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
 			  <fileset dir="../shells"
 			           excludes="**/.svn"/>
 		</copy>
     </target>
 
 	<target name="Langs only">
-        <delete dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-    	<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+        <delete dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+    	<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
 			<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
 		</copy>
     </target>
-	
+
 	<taskdef resource="org/eclipse/jgit/ant/ant-tasks.properties">
 	       <classpath>
 	         <pathelement location="../libs/jgit.jar"/>
diff --git a/ant/deploy-release.xml b/ant/deploy-release.xml
index 906f9bad..437a5183 100644
--- a/ant/deploy-release.xml
+++ b/ant/deploy-release.xml
@@ -4,16 +4,16 @@
 	<condition property="isMac">
 	   <os family="mac" />
 	</condition>
-	 
+
 	<condition property="isLinux">
-	   <and>   
+	   <and>
 	      <os family="unix" />
 	         <not>
-	            <os family="mac" />    
+	            <os family="mac" />
 	         </not>
 	   </and>
 	</condition>
-	 
+
 	<condition property="isWindows">
 	    <os family="windows" />
 	</condition>
@@ -22,18 +22,18 @@
 	<property name="progtime" value="18-11-2019 21:30:00"/>
 
 	<target name="all" depends="core release"/>
-	
+
 	<target name="clean">
-    	<mkdir dir="../../Deploy"/>
-    	<delete dir="../../Deploy/FlashTool"/>
+    	<mkdir dir="../Deploy"/>
+    	<delete dir="../Deploy/FlashTool"/>
 	</target>
 
 	<target name="clone">
-		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../../Deploy/FlashTool/devices" />
-	</target>	
+		<git-clone uri="https://github.com/Androxyde/devices.git" dest="../Deploy/FlashTool/devices" />
+	</target>
 
 	<target name="ressources">
-        <jar destfile="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar">
             <manifest>
                 <attribute name="Implementation-Version" value="${version}"/>
             	<attribute name="Implementation-Date" value="${progtime}"/>
@@ -46,36 +46,36 @@
     </target>
 
 	<target name="core release" depends="clean, main_lib, ressources, Windowsbinaries, Linuxbinaries, Macbinaries">
-        <mkdir dir ="../../Deploy/FlashTool"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/root"/>
-        <mkdir dir ="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir ="../../Deploy/FlashTool/custom/features"/>
-		<mkdir dir ="../../Deploy/FlashTool/custom/sin"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_lib"/>
-        <mkdir dir="../../Deploy/FlashTool/x10flasher_native"/>
-		<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <mkdir dir ="../Deploy/FlashTool"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/root"/>
+        <mkdir dir ="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir ="../Deploy/FlashTool/custom/features"/>
+		<mkdir dir ="../Deploy/FlashTool/custom/sin"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_lib"/>
+        <mkdir dir="../Deploy/FlashTool/x10flasher_native"/>
+		<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
     		<fileset dir="../shells"
 				excludes="**/.svn"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
     		<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
     	</copy>
-	    <copy todir="../../Deploy/FlashTool/custom/root">
+	    <copy todir="../Deploy/FlashTool/custom/root">
 	       <fileset dir="../romupdates" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/">
 	    	<fileset dir="../libs/eclipse/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
     </target>
 
 	<target name="main_lib">
-        <jar destfile="../../Deploy/FlashTool/x10flasher.jar">
+        <jar destfile="../Deploy/FlashTool/x10flasher.jar">
             <manifest>
                 <attribute name="Main-Class" value="gui.Main"/>
                 <attribute name="Implementation-Version" value="${version}"/>
@@ -89,24 +89,24 @@
 	</target>
 
 	<target name="Macbinaries" if="isMac">
-	    <copy file="../launchers/FlashTool" todir="../../Deploy/FlashTool"/>
-	    <copy file="../launchers/FlashToolConsole" todir="../../Deploy/FlashTool"/>
-		<copy file="../launchers/xperifirm" todir="../../Deploy/FlashTool/x10flasher_lib"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_native">
+	    <copy file="../launchers/FlashTool" todir="../Deploy/FlashTool"/>
+	    <copy file="../launchers/FlashToolConsole" todir="../Deploy/FlashTool"/>
+		<copy file="../launchers/xperifirm" todir="../Deploy/FlashTool/x10flasher_lib"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_native">
             <fileset dir="../native/mac"
                 excludes="**/.svn"/>
         </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs/macos/x86_64/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/FlashTool" perm="755" />
-    	<chmod file="../../Deploy/FlashTool/FlashToolConsole" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.0.dylib" perm="755" />
-		<exec executable="ln" dir="../../Deploy/FlashTool/x10flasher_native/udev">
+		<chmod file="../Deploy/FlashTool/FlashTool" perm="755" />
+    	<chmod file="../Deploy/FlashTool/FlashToolConsole" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.0.dylib" perm="755" />
+		<exec executable="ln" dir="../Deploy/FlashTool/x10flasher_native/udev">
 		    <arg value="-sf"/>
 			<arg value="libusbx-1.0.0.dylib"/>
 			<arg value="libusbx-1.0.dylib"/>
@@ -114,32 +114,26 @@
 	</target>
 
 	<target name="Linuxbinaries" if="isLinux">
-	    <copy file="../launchers/FlashTool" todir="../../Deploy/FlashTool"/>
-	    <copy file="../launchers/FlashToolConsole" todir="../../Deploy/FlashTool"/>
-		<copy file="../launchers/xperifirm" todir="../../Deploy/FlashTool/x10flasher_native"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_native">
+	    <copy file="../launchers/FlashTool" todir="../Deploy/FlashTool"/>
+	    <copy file="../launchers/FlashToolConsole" todir="../Deploy/FlashTool"/>
+		<copy file="../launchers/xperifirm" todir="../Deploy/FlashTool/x10flasher_native"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_native">
             <fileset dir="../native/linux"
                 excludes="**/.svn"/>
         </copy>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy todir="../Deploy/FlashTool/x10flasher_lib">
 	    	<fileset dir="../libs/linux/x86_64/" includes="*.jar" excludes="**/.svn"/>
 	    </copy>
-		<chmod file="../../Deploy/FlashTool/FlashTool" perm="755" />
-    	<chmod file="../../Deploy/FlashTool/FlashToolConsole" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/bin2elf" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/bin2sin" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.so.0.1.0" perm="755" />
-		<chmod file="../../Deploy/FlashTool/x10flasher_native/udev1/libusbx-1.0.so.0.1.0" perm="755" />
-		<exec executable="ln" dir="../../Deploy/FlashTool/x10flasher_native/udev">
-		    <arg value="-sf"/>
-			<arg value="libusbx-1.0.so.0.1.0"/>
-			<arg value="libusbx-1.0.so"/>
-		</exec>
-		<exec executable="ln" dir="../../Deploy/FlashTool/x10flasher_native/udev1">
+		<chmod file="../Deploy/FlashTool/FlashTool" perm="755" />
+    	<chmod file="../Deploy/FlashTool/FlashToolConsole" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/xperifirm" perm="755"/>
+		<chmod file="../Deploy/FlashTool/x10flasher_native/adb" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/fastboot" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/unyaffs" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/bin2elf" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/bin2sin" perm="755" />
+		<chmod file="../Deploy/FlashTool/x10flasher_native/udev/libusbx-1.0.so.0.1.0" perm="755" />
+		<exec executable="ln" dir="../Deploy/FlashTool/x10flasher_native/udev">
 		    <arg value="-sf"/>
 			<arg value="libusbx-1.0.so.0.1.0"/>
 			<arg value="libusbx-1.0.so"/>
@@ -148,31 +142,31 @@
 	</target>
 
 	<target name="Windowsbinaries" if="isWindows" depends="main_lib">
-		<copy file="../launchers/FlashTool64.exe" todir="../../Deploy/FlashTool"/>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_lib">
+		<copy file="../launchers/FlashTool64.exe" todir="../Deploy/FlashTool"/>
+    	<copy todir="../Deploy/FlashTool/x10flasher_lib">
     		<fileset dir="../libs/win/x86_64/"/>
     	</copy>
-    	<copy todir="../../Deploy/FlashTool/x10flasher_native">
+    	<copy todir="../Deploy/FlashTool/x10flasher_native">
     		<fileset dir="../native/win32/"/>
     	</copy>
 	</target>
 
 	<target name="Shells only">
-        <delete dir="../../Deploy/FlashTool/custom/shells"/>
-    	<mkdir dir="../../Deploy/FlashTool/custom/shells"/>
-		<copy todir="../../Deploy/FlashTool/custom/shells">
+        <delete dir="../Deploy/FlashTool/custom/shells"/>
+    	<mkdir dir="../Deploy/FlashTool/custom/shells"/>
+		<copy todir="../Deploy/FlashTool/custom/shells">
 			  <fileset dir="../shells"
 			           excludes="**/.svn"/>
 		</copy>
     </target>
 
 	<target name="Langs only">
-        <delete dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-    	<mkdir dir="../../Deploy/FlashTool/x10flasher_lib/langs"/>
-		<copy todir="../../Deploy/FlashTool/x10flasher_lib/langs">
+        <delete dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+    	<mkdir dir="../Deploy/FlashTool/x10flasher_lib/langs"/>
+		<copy todir="../Deploy/FlashTool/x10flasher_lib/langs">
 			<fileset dir="../src/org/lang/ressources"
 				excludes="**/.svn"/>
 		</copy>
     </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ant/setup-release.xml b/ant/setup-release.xml
index 265345df..72ea90ca 100644
--- a/ant/setup-release.xml
+++ b/ant/setup-release.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <project default="all" name="Create Package">
-	  
+
 	<condition property="isMac">
 	   <os family="mac" />
 	</condition>
-	 
+
 	<condition property="isLinux">
-	   <and>   
+	   <and>
 	      <os family="unix" />
 	         <not>
-	            <os family="mac" />    
+	            <os family="mac" />
 	         </not>
 	   </and>
 	</condition>
-	 
+
 	<condition property="isWindows">
 	    <os family="windows" />
 	</condition>
-	
+
 	<target name="all" depends="Linuxsetup, Windowssetup, Macsetup"/>
 
     <target name="GenerateJRE">
-        <delete dir="../../Deploy/FlashTool/x10flasher_native/jre"/>
-        <echo>Running jlink to generate custom runtime</echo> 
-		<exec executable="${java.home}/bin/jlink" dir="../../Deploy/FlashTool/x10flasher_native">
+        <delete dir="../Deploy/FlashTool/x10flasher_native/jre"/>
+        <echo>Running jlink to generate custom runtime</echo>
+		<exec executable="${java.home}/bin/jlink" dir="../Deploy/FlashTool/x10flasher_native">
 		    <arg value="--output"/>
 		    <arg value="jre"/>
 		    <arg value="--no-header-files"/>
@@ -33,20 +33,20 @@
 		    <arg value="--strip-debug"/>
 		    <arg value="--add-modules"/>
 			<arg value="java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.jdi,jdk.unsupported,jdk.xml.dom,jdk.security.auth,jdk.security.jgss,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.management,jdk.scripting.nashorn"/>
-		</exec>        
-		<copy file="../jre/jce/local_policy.jar" todir="../../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>
-		<copy file="../jre/jce/US_export_policy.jar" todir="../../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>		
+		</exec>
+		<copy file="../jre/jce/local_policy.jar" todir="../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>
+		<copy file="../jre/jce/US_export_policy.jar" todir="../Deploy/FlashTool/x10flasher_native/jre/lib/security"/>
     </target>
-	
+
 	<target name="Windowsdrivers" if="isWindows">
-            <mkdir dir ="../../Deploy/FlashTool/drivers/"/>
+            <mkdir dir ="../Deploy/FlashTool/drivers/"/>
 	   	    <property environment="env"/>
 	        <nsis script="../drivers.nsi" path="${env.ProgramFiles}\NSIS"/>
 	</target>
 
 	<target name="Windowssetup" if="isWindows" depends="loadprops, Windowsdrivers, GenerateJRE">
 		<property environment="env"/>
-		<delete file="../../Deploy/FlashTool/config.properties"/>
+		<delete file="../Deploy/FlashTool/config.properties"/>
 		<delete file="../setup_new.nsi"/>
 		<copy file="../setup.nsi" tofile="../setup_new.nsi"/>
 		<replace file="../setup_new.nsi" token="FLASHTOOLVERSION" value="${Internal-Version}"/>
@@ -55,10 +55,10 @@
 	</target>
 
 	<target name="Linuxsetup" if="isLinux" depends="loadprops, GenerateJRE">
-	    <tar destfile="../../Deploy/flashtool-${Internal-Version}-linux.tar.xz" longfile="gnu" compression="xz">
-	       <tarfileset dir="../../Deploy/FlashTool" filemode="755" prefix="FlashTool">
+	    <tar destfile="../Deploy/flashtool-${Internal-Version}-linux.tar.gz" longfile="gnu" compression="gzip">
+	       <tarfileset dir="../Deploy/FlashTool" filemode="755" prefix="FlashTool">
 				<include name="FlashTool"/>
-				<include name="FlashToolConsole"/>	
+				<include name="FlashToolConsole"/>
 				<include name="x10flasher_native/xperifirm"/>
 				<include name="x10flasher_native/adb"/>
 				<include name="x10flasher_native/bin2elf"/>
@@ -75,10 +75,10 @@
 				<include name="x10flasher_native/jre/bin/rmid"/>
 				<include name="x10flasher_native/jre/bin/jrunscript"/>
            </tarfileset>
-	       <tarfileset dir="../../Deploy/FlashTool" prefix="FlashTool">
+	       <tarfileset dir="../Deploy/FlashTool" prefix="FlashTool">
 	            <include name="**/*"/>
 				<exclude name="FlashTool"/>
-				<exclude name="FlashToolConsole"/>	
+				<exclude name="FlashToolConsole"/>
 				<exclude name="x10flasher_native/xperifirm"/>
 				<exclude name="x10flasher_native/adb"/>
 				<exclude name="x10flasher_native/bin2elf"/>
@@ -92,34 +92,34 @@
 				<exclude name="x10flasher_native/jre/bin/keytool"/>
 				<exclude name="x10flasher_native/jre/bin/java"/>
 				<exclude name="x10flasher_native/jre/bin/rmiregistry"/>
-				<exclude name="x10flasher_native/jre/bin/rmid"/>
+				<exclude name="x10flasisther_native/jre/bin/rmid"/>
 				<exclude name="x10flasher_native/jre/bin/jrunscript"/>
            </tarfileset>
 	    </tar>
 	</target>
-	
+
 	<target name="Macsetup" if="isMac" depends="loadprops, GenerateJRE">
-		<delete dir="../../Deploy/FlashTool.app"/>
-		<copy todir="../../Deploy/FlashTool.app">
+		<delete dir="../Deploy/FlashTool.app"/>
+		<copy todir="../Deploy/FlashTool.app">
             <fileset dir="../launchers/FlashTool.app"
                 excludes="**/.svn"/>
         </copy>
-		<mkdir dir="../../Deploy/FlashTool.app/Contents/MacOS"/>
+		<mkdir dir="../Deploy/FlashTool.app/Contents/MacOS"/>
         <echo message="Generating tar file flashtool-${Internal-Version}.tar"/>
-		<exec executable="tar" dir="../../Deploy/FlashTool">
+		<exec executable="tar" dir="../Deploy/FlashTool">
 		    <arg value="cf"/>
 			<arg value="../FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
 			<arg value="."/>
 		</exec>
         <echo message="Extracting tar file flashtool-${Internal-Version}.tar to prepare for dmg creation"/>
-		<exec executable="tar" dir="../../Deploy/FlashTool.app/Contents/MacOS">
+		<exec executable="tar" dir="../Deploy/FlashTool.app/Contents/MacOS">
 		    <arg value="xf"/>
 			<arg value="flashtool-${Internal-Version}.tar"/>
 		</exec>
-		<delete file="../../Deploy/FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
-		<delete file="../../Deploy/flashtool-${Internal-Version}-mac.dmg"/>
+		<delete file="../Deploy/FlashTool.app/Contents/MacOS/flashtool-${Internal-Version}.tar"/>
+		<delete file="../Deploy/flashtool-${Internal-Version}-mac.dmg"/>
         <echo message="Generating dmg file flashtool-${Internal-Version}-mac.dmg"/>
-		<exec executable="hdiutil" dir="../../Deploy">
+		<exec executable="hdiutil" dir="../Deploy">
 	       <arg value="create"/>
 		   <arg value="flashtool-${Internal-Version}-mac.dmg"/>
 		   <arg value="-srcFolder"/>
@@ -128,7 +128,7 @@
 	</target>
 
 	<target name="loadprops">
-		<loadmf jar="../../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar" prefix=""/>
+		<loadmf jar="../Deploy/FlashTool/x10flasher_lib/x10flasher-res.jar" prefix=""/>
 	</target>
 
 	<!--
@@ -150,7 +150,8 @@
 	         </loadproperties>
 	     </sequential>
 	</macrodef>
-    
-	<taskdef name="nsis" classname="com.danielreese.nsisant.Task"/>
 
-</project>
\ No newline at end of file
+	<taskdef name="nsis" classname="com.danielreese.nsisant.Task">
+		<classpath location="../libs/nsis/nsisant-1.3.jar"/>
+	</taskdef>
+</project>
diff --git a/jre/.gitignore b/jre/.gitignore
deleted file mode 100644
index c446d358..00000000
--- a/jre/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/winjre.zip
-/linjre.tar
-/macjre.tar
diff --git a/jre/jce/US_export_policy.jar b/jre/jce/US_export_policy.jar
deleted file mode 100644
index 251b102c57c076504ba818330e4fceb4509753d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3023
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

diff --git a/jre/jce/local_policy.jar b/jre/jce/local_policy.jar
deleted file mode 100644
index 1c58939bf396afd6ff44a56f4578aed3d2ddf80a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3035
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
Lo19~UoUi`@yDZ_Z


From b52280328ea6f1e8f11851a1f32639c143d2913f Mon Sep 17 00:00:00 2001
From: derMart <hier-bei-mir@gmx.net>
Date: Mon, 23 Mar 2020 23:47:01 +0100
Subject: [PATCH 2/2] remove eclipse related targets from ant/build-jar.xml

---
 ant/build-jar.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ant/build-jar.xml b/ant/build-jar.xml
index b974b129..add5e5e5 100644
--- a/ant/build-jar.xml
+++ b/ant/build-jar.xml
@@ -102,20 +102,6 @@
             <classpath refid="Flashtool.classpath"/>
         </javac>
     </target>
-    <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
-    <target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
-        <copy todir="${ant.library.dir}">
-            <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
-        </copy>
-        <unzip dest="${ant.library.dir}">
-            <patternset includes="jdtCompilerAdapter.jar"/>
-            <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
-        </unzip>
-    </target>
-    <target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
-        <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-        <antcall target="build"/>
-    </target>
     <target name="Main">
         <java classname="gui.Main" failonerror="true" fork="yes">
             <classpath refid="run.Main.classpath"/>