From a296da477c068b57a112f0af066eaaf6c5f34388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 8 Nov 2014 18:25:36 +0100
Subject: [PATCH] separated tools paths into extra properties file -
 tools.properties

---
 .gitignore       |  3 ++-
 build.xml        |  1 -
 build_common.xml | 34 ++++++++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ddc5d1fd..a542e37a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,5 @@ hs_err_pid*.log
 /libsrc/uploader/nbproject/private/
 /libsrc/uploader/build/
 /libsrc/uploader/dist/
-jpexs_website.properties
\ No newline at end of file
+/jpexs_website.properties
+/tools.properties
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 35393e969..259fa27ab 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,6 @@
     <property name="PRODUCTURL" value="http://www.free-decompiler.com/flash/" />
     <property name="MAINCLASS" value="com.jpexs.decompiler.flash.gui.Main"/>
     <property name="NSISPATH" value="c:\program files (x86)\NSIS"/>
-    <property name="LAUNCH4JPATH" value="c:\program files (x86)\launch4j" />
     <property name="MAXHEAPSIZEPERCENT" value="100"/>
     <property name="MAXHEAPSIZERUN" value="4096"/> <!-- for run task (MB)-->    
        
diff --git a/build_common.xml b/build_common.xml
index cccd02fec..51c4f0fed 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -131,12 +131,12 @@
     
     
     
-    <target name="installer" depends="-loadversion,dist">
+    <target name="installer" depends="-loadversion,-load-tools,dist">
         <taskdef name="nsis" classname="com.danielreese.nsisant.Task">
             <classpath location="${basedir}/nsisant-1.3.jar" />
         </taskdef>
         <property name="exe.file" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}_setup.exe"/>       
-        <nsis script="installer.nsi" path="${NSISPATH}" verbosity="2">
+        <nsis script="installer.nsi" path="${nsis.path}" verbosity="2">
             <define name="APP_NAME" value="${PRODUCTNAME}"/>
             <define name="APP_VER" value="${VERSION}${VERSIONSUFFIX}"/>
             <define name="APP_VER_MAJOR" value="${version.major}"/>
@@ -213,18 +213,40 @@
             </launch4jConfig>
         </echoxml>
     </target>    
-    <target name="-exe-linux" unless="is_windows" depends="-exe-config">
-        <exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}/launch4j">
+    <target name="-exe-linux" unless="is_windows" depends="-load-tools,-exe-config">
+        <exec dir="${launch4j.path}" executable="${launch4j.path}/launch4j">
             <arg file="${EXECONFIG}" />
         </exec>
     </target>
-    <target name="-exe-windows" if="is_windows" depends="-exe-config">
-        <exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}\launch4jc.exe">
+    <target name="-exe-windows" if="is_windows" depends="-load-tools,-exe-config">
+        <exec dir="${launch4j.path}" executable="${launch4j.path}\launch4jc.exe">
             <arg file="${EXECONFIG}" />
         </exec>
     </target>   
     <target name="exe" depends="-set-gui-type,-exe-linux,-exe-windows">
         
+    </target>
+    
+    
+    <target name="-check-tools">
+        <available file="tools.properties" property="tools.config.exists"/>
+    </target>
+    
+    <target name="-load-tools-ok" if="tools.config.exists">
+        <loadproperties srcfile="tools.properties" />
+    </target>
+    
+    <target name="-load-tools-fail" unless="tools.config.exists">
+        <fail>
+            tools.properties NOT found.
+            Please create file named "tools.properties" and add two lines:
+            nsis.path = Path to Nullsoft Install System
+            launch4j.path = Path to launch4j
+        </fail>
+    </target>
+    
+    <target name="-load-tools" depends="-check-tools,-load-tools-ok,-load-tools-fail">
+        
     </target>
     <target name="exe-console" depends="-set-console-type,-exe-linux,-exe-windows">