From 092db3f6832be3e3d886a7c1bcaad298f3f54b97 Mon Sep 17 00:00:00 2001
From: Dale Schultz <dschultzca@yahoo.ca>
Date: Wed, 19 Dec 2018 21:17:57 -0500
Subject: [PATCH] Include new customize directory into builds

---
 build.xml                              | 19 +++----
 templates/install-linux.xml.template   |  2 +
 templates/install-windows.xml.template | 70 ++++++++++++--------------
 3 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/build.xml b/build.xml
index ce445204..103dcb22 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 <!-- Master build file for RomRaider
 
  RomRaider Open-Source Tuning, Logging and Reflashing
- Copyright (C) 2006-2018 RomRaider.com
+ Copyright (C) 2006-2013 RomRaider.com
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -75,11 +75,11 @@
         <!-- java compiler properties -->
         <property name="javac.source" value="1.6" />
         <property name="javac.target" value="1.6" />
-    	<property name="debug" value="off" />
+        <property name="debug" value="off" />
         <property name="deprecation" value="on" />
 
-    	<!-- version properties are set in this file, both for the product itself and
-		        for some of the external dependencies (jar files and such) -->
+        <!-- version properties are set in this file, both for the product itself and
+                for some of the external dependencies (jar files and such) -->
         <property file="version.properties" />
 
         <!-- basic project properties -->
@@ -309,16 +309,16 @@
             <javac 
                 failonerror="true"
                 srcdir="${src.java.dir}" 
-            	destdir="${classes.dir}"
+                destdir="${classes.dir}"
                 source="${javac.source}"
                 target="${javac.target}"
                 includeantruntime="false"
                 debug="${debug}"
                 deprecation="${deprecation}">
                 <classpath refid="@{os}.classpath" />
-            	<!--
-            	<compilerarg value="-Xlint" />
-            	-->
+                <!--
+                <compilerarg value="-Xlint" />
+                -->
             </javac>
         </sequential>
     </macrodef>
@@ -340,7 +340,8 @@
                 <zipfileset dir="lib/common" prefix="${name.package}/lib/common" />
                 <zipfileset dir="lib/@{os}" prefix="${name.package}/lib/@{os}" />
                 <zipfileset dir="src" prefix="${name.package}/src" excludes="**/*.template" />
+                <zipfileset dir="customize" prefix="${name.package}/customize"/>
             </zip>
         </sequential>
     </macrodef>
-</project>
+</project>
\ No newline at end of file
diff --git a/templates/install-linux.xml.template b/templates/install-linux.xml.template
index 6f02b4a4..a45e9859 100644
--- a/templates/install-linux.xml.template
+++ b/templates/install-linux.xml.template
@@ -69,6 +69,7 @@
             <file src="plugins/txs_tuner.plugin" targetdir="$INSTALL_PATH/plugins"/>
             <file src="plugins/txs_utec.plugin" targetdir="$INSTALL_PATH/plugins"/>
             <file src="plugins/zt2.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <fileset dir="customize" targetdir="$INSTALL_PATH/customize"/>
 
             <fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
             <fileset dir="lib/linux" targetdir="$INSTALL_PATH/lib/linux"/>
@@ -89,6 +90,7 @@
                 <exclude name="plugins/txs_tuner.plugin"/>
                 <exclude name="plugins/txs_utec.plugin"/>
                 <exclude name="plugins/zt2.plugin"/>
+                <exclude name="customize/**"/>
             </updatecheck>
 
 	        <executable targetfile="$INSTALL_PATH/post-install-tasks.sh" stage="postinstall"
diff --git a/templates/install-windows.xml.template b/templates/install-windows.xml.template
index 6a1fc610..d45e8fec 100644
--- a/templates/install-windows.xml.template
+++ b/templates/install-windows.xml.template
@@ -44,52 +44,44 @@
     <packs>
         <pack name="Base" required="yes">
             <description>RomRaider binary files</description>
-            <file src="build/windows/lib/@name.package@.jar" targetdir="$INSTALL_PATH" />
-            <file src="build/dist/@name.package@.exe" targetdir="$INSTALL_PATH" />
-            <file src="license.txt" targetdir="$INSTALL_PATH" />
-            <file src="release_notes.txt" targetdir="$INSTALL_PATH" />
+            <file src="build/windows/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
+            <file src="build/dist/@name.package@.exe" targetdir="$INSTALL_PATH"/>
+            <file src="license.txt" targetdir="$INSTALL_PATH"/>
+            <file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
 
-            <file src="log4j.properties" targetdir="$INSTALL_PATH" />
+            <file src="log4j.properties" targetdir="$INSTALL_PATH"/>
 
-            <file src="cars_def.dtd" targetdir="$INSTALL_PATH" />
-            <file src="ecu_defs.dtd" targetdir="$INSTALL_PATH" />
-            <file src="logger.dtd" targetdir="$INSTALL_PATH" />
-            <file src="profile.dtd" targetdir="$INSTALL_PATH" />
+            <file src="cars_def.dtd" targetdir="$INSTALL_PATH"/>
+            <file src="ecu_defs.dtd" targetdir="$INSTALL_PATH"/>
+            <file src="logger.dtd" targetdir="$INSTALL_PATH"/>
+            <file src="profile.dtd" targetdir="$INSTALL_PATH"/>
 
-            <file src="post-install-tasks.bat" targetdir="$INSTALL_PATH" />
+            <file src="post-install-tasks.bat" targetdir="$INSTALL_PATH"/>
 
-            <file src="plugins/aem2.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/aem.xwifi.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/fourteenpoint7.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/innovate.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/lm2_mts.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/mrf.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/phidget_ik.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/plx.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/te.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/txs_tuner.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/txs_utec.plugin" targetdir="$INSTALL_PATH/plugins" />
-            <file src="plugins/zt2.plugin" targetdir="$INSTALL_PATH/plugins" />
+            <fileset dir="plugins" targetdir="$INSTALL_PATH/plugins"/>
+            <fileset dir="customize" targetdir="$INSTALL_PATH/customize"/>
 
-            <fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common" />
-            <fileset dir="lib/windows" targetdir="$INSTALL_PATH/lib/windows" />
+            <fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
+            <fileset dir="lib/windows" targetdir="$INSTALL_PATH/lib/windows"/>
 
             <updatecheck>
-                <include name="plugins/**" />
-                <exclude name="plugins/aem.plugin" />
-                <exclude name="plugins/aem2.plugin" />
-                <exclude name="plugins/aem.xwifi.plugin" />
-                <exclude name="plugins/fourteenpoint7.plugin" />
-                <exclude name="plugins/innovate.plugin" />
-                <exclude name="plugins/lm2_mts.plugin" />
-                <exclude name="plugins/mrf.plugin" />
-                <exclude name="plugins/phidget_ik.plugin" />
-                <exclude name="plugins/plx.plugin" />
-                <exclude name="plugins/te.plugin" />
-                <exclude name="plugins/txs_tuner.plugin" />
-                <exclude name="plugins/txs_utec.plugin" />
-                <exclude name="plugins/zt2.plugin" />
+                <include name="plugins/**"/>
+                <exclude name="plugins/aem.plugin"/>
+                <exclude name="plugins/aem2.plugin"/>
+                <exclude name="plugins/aem.xwifi.plugin"/>
+                <exclude name="plugins/apsx.plugin"/>
+                <exclude name="plugins/ecotrons.plugin"/>
+                <exclude name="plugins/fourteenpoint7.plugin"/>
+                <exclude name="plugins/innovate.plugin"/>
+                <exclude name="plugins/lm2_mts.plugin"/>
+                <exclude name="plugins/mrf.plugin"/>
+                <exclude name="plugins/phidget_ik.plugin"/>
+                <exclude name="plugins/plx.plugin"/>
+                <exclude name="plugins/te.plugin"/>
+                <exclude name="plugins/txs_tuner.plugin"/>
+                <exclude name="plugins/txs_utec.plugin"/>
+                <exclude name="plugins/zt2.plugin"/>
+                <exclude name="customize/**"/>
             </updatecheck>
 
 	        <executable targetfile="$INSTALL_PATH/post-install-tasks.bat" stage="postinstall"