From 9697c57f41b34043d15ce0016e721504845f6a54 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 24 Oct 2014 12:04:01 -0400
Subject: [PATCH] removed installer code from build-windows into a separate
 file

---
 build-windows-installer.xml | 227 ++++++++++++++++++++++++++++++++++++
 build-windows.xml           | 225 +----------------------------------
 build.xml                   |  28 +++--
 3 files changed, 244 insertions(+), 236 deletions(-)
 create mode 100644 build-windows-installer.xml

diff --git a/build-windows-installer.xml b/build-windows-installer.xml
new file mode 100644
index 0000000000..b8efca0718
--- /dev/null
+++ b/build-windows-installer.xml
@@ -0,0 +1,227 @@
+<project name="AutopsyInstallerTargets">
+
+    <!-- ADVANCED INSTALLER TARGETS -->
+    <target name="build-installer-windows" depends="getProps,init-advanced-installer"
+            description="Makes an installer from the opened ZIP file">
+        <antcall target="run-advanced-installer"  inheritAll="true" />
+    </target>
+
+    <target name="init-advanced-installer" depends="autoAIPath,inputAIPath"
+        description="Find AdvancedInstaller executable.">
+        <fail unless="ai-exe-path" message="Could not locate Advanced Installer."/>
+        <property environment="env"/>
+        
+        <property name="inst-path" value="${nbdist.dir}\${app.name}-installer"/>
+        
+        <!-- see what JREs they have installed -->
+        <condition property="jre.home.32">
+            <isset property="env.JRE_HOME_32"/>
+        </condition>
+        <if>
+            <isset property="jre.home.32" />
+            <then>
+                <echo message="32-bit JRE found, 32 bit installer will be built."/>
+            </then>
+            <else>
+                <echo message="32-bit JRE not found. No 32 bit installer will be build. Set the JRE_HOME_32 environment variable to generate a 32-bit installer."/>
+            </else>
+        </if>
+        
+        <condition property="jre.home.64">
+            <isset property="env.JRE_HOME_64"/>
+        </condition>
+        <if>
+            <isset property="jre.home.64" />
+            <then>
+                <echo message="64-bit JRE found, 64 bit installer will be built."/>
+            </then>
+            <else>
+                <echo message="64-bit JRE not found. No 64 bit installer will be build. Set the JRE_HOME_64 environment variable to generate a 64-bit installer."/>
+            </else>
+        </if>    
+    </target>
+    
+    <target name="autoAIPath" description="Attempt to find the AI path based on standard installation location">
+        <property name="AI.path" value="C:\Program Files (x86)\Caphyon\Advanced Installer 10.3\bin\x86\AdvancedInstaller.com" />
+        <available file="${AI.path}"
+                    property="ai-exe-path"
+                    value="${AI.path}"/>
+        <echo message="${ai-exe-path}" /> 
+    </target>
+   
+    <target name="inputAIPath" unless="ai-exe-path" description="Have the user input the path to the AI executable">
+        <input addProperty="ai-exe-path"
+            message="Enter the location of AdvancedInstaller.com"/>
+    </target>
+
+    <target name="run-advanced-installer" depends="setup-aip-files">
+        <antcall target="build32"  inheritAll="true" />
+        <antcall target="build64"  inheritAll="true" />
+    </target> 
+    
+    
+    <target name="setup-aip-files" description="Configure the base AIP file and then  make 32- and 64-bit versions.">
+        <!-- Copy the template file to add details to -->
+        <property name="aip-path-base" value="${nbdist.dir}\installer_${app.name}_base.aip"/>
+        <copy file="${basedir}/installer_${app.name}/installer_${app.name}.aip" tofile="${aip-path-base}" overwrite="true"/>
+        
+        <echo message="${ai-exe-path}" /> 
+        <echo>Product Version: ${app.version}</echo>
+        
+        <!-- generate new product code -->
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path-base} /SetProductCode -langid 1033"/>
+        </exec>
+        
+        <!-- Edit the API file to update versions: manual approach allows us to use non-X.Y.Z versions -->
+                        
+        <replaceregexp  file="${aip-path-base}"
+                        match="ProductVersion&quot; Value=&quot;\d+\.{1}\d+\.{1}\d+"
+                        replace="ProductVersion&quot; Value=&quot;${app.version}" />   
+                        
+        <property name="aip-path-32" value="${nbdist.dir}\installer_${app.name}_32.aip"/>
+        <copy file="${aip-path-base}" tofile="${aip-path-32}" overwrite="true"/>
+        
+        <property name="aip-path-64" value="${nbdist.dir}\installer_${app.name}_64.aip"/>
+        <copy file="${aip-path-base}" tofile="${aip-path-64}" overwrite="true"/>
+    </target>
+    
+    
+    <target name="copyJRE" description="Copy a given JRE to the installation folder">
+        <var name="new-jre-path" value="${inst-path}\jre"/>
+        <delete failonerror="false" dir="${new-jre-path}"/>
+        <mkdir dir="${new-jre-path}"/>
+        <copy todir="${new-jre-path}" overwrite="true">  
+            <fileset dir="${jre-path}">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    
+    <target name="build32" if="jre.home.32" description="Builds the 32 bit installer IF JRE_HOME_32 is set.">
+        <property environment="env"/>
+        <var name="aip-path" value="${aip-path-32}"/>
+        
+        <var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
+        <var name="aut-bin-name" value="${app.name}.exe"/>
+
+        <var name="jvm.max.mem" value="512" />
+        
+        <var name="jre-path" value="${env.JRE_HOME_32}"/>
+        <antcall target="copyJRE" inheritAll="true" />
+        
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path-base} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/>
+        </exec>
+        
+        <!-- gstreamer needs special path info to be set -->
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /NewEnvironment -name GSTREAMER_PATH -value [APPDIR]gstreamer\bin -install_operation CreateUpdate -behavior Append -system_variable"/>
+        </exec>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /NewEnvironment -name GSTREAMER_PATH -value [APPDIR]gstreamer\lib\gstreamer-0.10 -install_operation CreateUpdate -behavior Append -system_variable"/>
+        </exec>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /NewEnvironment -name PATH -value %GSTREAMER_PATH% -install_operation CreateUpdate -behavior Append -system_variable"/>
+        </exec>
+        
+        <antcall target="ai-build" inheritAll="true" />
+        
+        <delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
+        <move file="${nbdist.dir}/installer_${app.name}_32-SetupFiles/installer_${app.name}_32.msi" tofile="${nbdist.dir}/${app.name}-${app.version}-32bit.msi" />
+    </target>
+    
+    
+
+    <target name="build64" if="jre.home.64" description="Builds the 64 bit installer IF JRE_HOME_64 is set.">
+        <property environment="env"/>
+        <var name="aip-path" value="${aip-path-64}"/>
+        
+        <var name="aut-bin-name" value="${app.name}64.exe"/>
+        <var name="aut-bin-name-todelete" value="${app.name}.exe"/>
+        
+        <var name="jvm.max.mem" value="2048"/>
+        
+        <var name="jre-path" value="${env.JRE_HOME_64}"/>
+        <antcall target="copyJRE" inheritAll="true" />
+        
+        
+        <echo message="aip-path: ${aip-path}" />
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /SetAppdir -buildname DefaultBuild -path [ProgramFiles64Folder][ProductName]-${app.version}"/>
+        </exec>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /SetPackageType x64"/>
+        </exec>
+        
+        <antcall target="ai-build" inheritAll="true" />
+        
+        <delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/>
+        <move file="${nbdist.dir}/installer_${app.name}_64-SetupFiles/installer_${app.name}_64.msi" tofile="${nbdist.dir}/${app.name}-${app.version}-64bit.msi" />
+    </target>
+   
+   
+    <!-- 32/64 specific since config settings are different -->
+    <target name="update-config" description="Updates configuration file with correct JVM args.">
+        <!-- Update configuration file to include jre -->
+        <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
+        <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
+        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
+        <propertyfile file="${inst.property.file}">
+            <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
+            <entry key="default_options" value="@JVM_OPTIONS" />
+            <entry key="jdkhome" value="&quot;jre&quot;" />
+            <entry key="default_userdir" value="${HOME}/${APPNAME}" />
+        </propertyfile>
+        <!-- workaround for ant escaping : and = when setting properties -->
+        <replace file="${inst.property.file}" token="@JVM_OPTIONS" value="${jvm.args}" />
+    </target>
+        
+    
+    <target name="add-ai-files" depends="update-config" description="Add the files in the installation path to the installer file">
+        <foreach target="add-file-or-dir" param="theFile" inheritall="true" inheritrefs="true">
+            <path> 
+                <fileset dir="${inst-path}">
+                    <include name="*" /> 
+                </fileset>
+                <dirset dir="${inst-path}">
+                    <include name="*"/> 
+                </dirset>
+            </path>
+        </foreach>
+        
+        <echo message="Removing extra executable..."/>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/>
+        </exec>
+    </target>
+
+    <target name="add-file-or-dir">
+        <condition property="file-or-folder" value="File" else="Folder">
+            <available file="${theFile}" type="file" />
+        </condition>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /Add${file-or-folder} APPDIR ${theFile}" />
+        </exec>
+    </target>
+
+    <!-- 32/64 specific since exec changes -->
+    <target name="add-ai-shortcuts" description="Configure installer to have desktop short cuts">
+        <echo message="Adding desktop/menu shortcuts..."/>
+        <exec executable="${ai-exe-path}">
+            <arg line='/edit ${aip-path} /NewShortcut -name "${app.title} ${app.version}" -dir DesktopFolder -target APPDIR\bin\${aut-bin-name} -icon ${inst-path}\icon.ico'/>
+        </exec>
+        <exec executable="${ai-exe-path}">
+            <arg line='/edit ${aip-path} /NewShortcut -name "${app.title} ${app.version}" -dir SHORTCUTDIR -target APPDIR\bin\${aut-bin-name} -icon ${inst-path}\icon.ico'/>
+        </exec>
+    </target>
+    
+    <target name="ai-build" description="Build the installer based on properties set by 32/64 targets.">
+        <antcall target="add-ai-files" inheritAll="true" />
+        <antcall target="add-ai-shortcuts" inheritAll="true" />
+        <exec executable="${ai-exe-path}">
+            <arg line="/build ${aip-path}"/>
+        </exec>
+    </target>
+</project>
\ No newline at end of file
diff --git a/build-windows.xml b/build-windows.xml
index d1b34d586d..768173d662 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -9,6 +9,7 @@
     <property name="i686" location="${basedir}/Core/release/modules/lib/i686"/>
     <property name="crt" location="${basedir}/thirdparty/crt" />
         
+    <import file="build-windows-installer.xml" />
     
     <target name="makeBaseLibDirs" description="Set up folder hierarchy under release/modules/lib">
         <mkdir dir="${amd64}"/>
@@ -138,229 +139,5 @@
         </copy>
     </target>
     
-    <!-- ADVANCED INSTALLER TARGETS -->
-    <target name="build-installer-windows" depends="getProps,init-advanced-installer"
-            description="Makes an installer from the opened ZIP file">
-        <antcall target="run-advanced-installer"  inheritAll="true" />
-    </target>
-
-    <target name="init-advanced-installer" depends="autoAIPath,inputAIPath"
-        description="Find AdvancedInstaller executable.">
-        <fail unless="ai-exe-path" message="Could not locate Advanced Installer."/>
-        <property environment="env"/>
-        
-        <property name="inst-path" value="${nbdist.dir}\${app.name}-installer"/>
-        
-        <!-- see what JREs they have installed -->
-        <condition property="jre.home.32">
-            <isset property="env.JRE_HOME_32"/>
-        </condition>
-        <if>
-            <isset property="jre.home.32" />
-            <then>
-                <echo message="32-bit JRE found, 32 bit installer will be built."/>
-            </then>
-            <else>
-                <echo message="32-bit JRE not found. No 32 bit installer will be build. Set the JRE_HOME_32 environment variable to generate a 32-bit installer."/>
-            </else>
-        </if>
-        
-        <condition property="jre.home.64">
-            <isset property="env.JRE_HOME_64"/>
-        </condition>
-        <if>
-            <isset property="jre.home.64" />
-            <then>
-                <echo message="64-bit JRE found, 64 bit installer will be built."/>
-            </then>
-            <else>
-                <echo message="64-bit JRE not found. No 64 bit installer will be build. Set the JRE_HOME_64 environment variable to generate a 64-bit installer."/>
-            </else>
-        </if>    
-    </target>
-    
-    <target name="autoAIPath" description="Attempt to find the AI path based on standard installation location">
-        <property name="AI.path" value="C:\Program Files (x86)\Caphyon\Advanced Installer 10.3\bin\x86\AdvancedInstaller.com" />
-        <available file="${AI.path}"
-                    property="ai-exe-path"
-                    value="${AI.path}"/>
-        <echo message="${ai-exe-path}" /> 
-    </target>
-   
-    <target name="inputAIPath" unless="ai-exe-path" description="Have the user input the path to the AI executable">
-        <input addProperty="ai-exe-path"
-            message="Enter the location of AdvancedInstaller.com"/>
-    </target>
-
-    <target name="run-advanced-installer" depends="setup-aip-files">
-        <antcall target="build32"  inheritAll="true" />
-        <antcall target="build64"  inheritAll="true" />
-    </target> 
-    
-    
-    <target name="setup-aip-files" description="Configure the base AIP file and then  make 32- and 64-bit versions.">
-        <!-- Copy the template file to add details to -->
-        <property name="aip-path-base" value="${nbdist.dir}\installer_${app.name}_base.aip"/>
-        <copy file="${basedir}/installer_${app.name}/installer_${app.name}.aip" tofile="${aip-path-base}" overwrite="true"/>
-        
-        <echo message="${ai-exe-path}" /> 
-        <echo>Product Version: ${app.version}</echo>
-        
-        <!-- generate new product code -->
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path-base} /SetProductCode -langid 1033"/>
-        </exec>
-        
-        <!-- Edit the API file to update versions: manual approach allows us to use non-X.Y.Z versions -->
-                        
-        <replaceregexp  file="${aip-path-base}"
-                        match="ProductVersion&quot; Value=&quot;\d+\.{1}\d+\.{1}\d+"
-                        replace="ProductVersion&quot; Value=&quot;${app.version}" />   
-                        
-        <property name="aip-path-32" value="${nbdist.dir}\installer_${app.name}_32.aip"/>
-        <copy file="${aip-path-base}" tofile="${aip-path-32}" overwrite="true"/>
-        
-        <property name="aip-path-64" value="${nbdist.dir}\installer_${app.name}_64.aip"/>
-        <copy file="${aip-path-base}" tofile="${aip-path-64}" overwrite="true"/>
-    </target>
-    
-    
-    <target name="copyJRE" description="Copy a given JRE to the installation folder">
-        <var name="new-jre-path" value="${inst-path}\jre"/>
-        <delete failonerror="false" dir="${new-jre-path}"/>
-        <mkdir dir="${new-jre-path}"/>
-        <copy todir="${new-jre-path}" overwrite="true">  
-            <fileset dir="${jre-path}">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-    </target>
-    
-    
-    <target name="build32" if="jre.home.32" description="Builds the 32 bit installer IF JRE_HOME_32 is set.">
-        <property environment="env"/>
-        <var name="aip-path" value="${aip-path-32}"/>
-        
-        <var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
-        <var name="aut-bin-name" value="${app.name}.exe"/>
-
-        <var name="jvm.max.mem" value="512" />
-        
-        <var name="jre-path" value="${env.JRE_HOME_32}"/>
-        <antcall target="copyJRE" inheritAll="true" />
-        
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path-base} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/>
-        </exec>
-        
-        <!-- gstreamer needs special path info to be set -->
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /NewEnvironment -name GSTREAMER_PATH -value [APPDIR]gstreamer\bin -install_operation CreateUpdate -behavior Append -system_variable"/>
-        </exec>
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /NewEnvironment -name GSTREAMER_PATH -value [APPDIR]gstreamer\lib\gstreamer-0.10 -install_operation CreateUpdate -behavior Append -system_variable"/>
-        </exec>
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /NewEnvironment -name PATH -value %GSTREAMER_PATH% -install_operation CreateUpdate -behavior Append -system_variable"/>
-        </exec>
-        
-        <antcall target="ai-build" inheritAll="true" />
-        
-        <delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
-        <move file="${nbdist.dir}/installer_${app.name}_32-SetupFiles/installer_${app.name}_32.msi" tofile="${nbdist.dir}/${app.name}-${app.version}-32bit.msi" />
-    </target>
-    
-    
-
-    <target name="build64" if="jre.home.64" description="Builds the 64 bit installer IF JRE_HOME_64 is set.">
-        <property environment="env"/>
-        <var name="aip-path" value="${aip-path-64}"/>
-        
-        <var name="aut-bin-name" value="${app.name}64.exe"/>
-        <var name="aut-bin-name-todelete" value="${app.name}.exe"/>
-        
-        <var name="jvm.max.mem" value="2048"/>
-        
-        <var name="jre-path" value="${env.JRE_HOME_64}"/>
-        <antcall target="copyJRE" inheritAll="true" />
-        
-        
-        <echo message="aip-path: ${aip-path}" />
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /SetAppdir -buildname DefaultBuild -path [ProgramFiles64Folder][ProductName]-${app.version}"/>
-        </exec>
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /SetPackageType x64"/>
-        </exec>
-        
-        <antcall target="ai-build" inheritAll="true" />
-        
-        <delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/>
-        <move file="${nbdist.dir}/installer_${app.name}_64-SetupFiles/installer_${app.name}_64.msi" tofile="${nbdist.dir}/${app.name}-${app.version}-64bit.msi" />
-    </target>
-   
-   
-    <!-- 32/64 specific since config settings are different -->
-    <target name="update-config" description="Updates configuration file with correct JVM args.">
-        <!-- Update configuration file to include jre -->
-        <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
-        <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
-        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
-        <propertyfile file="${inst.property.file}">
-            <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
-            <entry key="default_options" value="@JVM_OPTIONS" />
-            <entry key="jdkhome" value="&quot;jre&quot;" />
-            <entry key="default_userdir" value="${HOME}/${APPNAME}" />
-        </propertyfile>
-        <!-- workaround for ant escaping : and = when setting properties -->
-        <replace file="${inst.property.file}" token="@JVM_OPTIONS" value="${jvm.args}" />
-    </target>
-        
-    
-    <target name="add-ai-files" depends="update-config" description="Add the files in the installation path to the installer file">
-        <foreach target="add-file-or-dir" param="theFile" inheritall="true" inheritrefs="true">
-            <path> 
-                <fileset dir="${inst-path}">
-                    <include name="*" /> 
-                </fileset>
-                <dirset dir="${inst-path}">
-                    <include name="*"/> 
-                </dirset>
-            </path>
-        </foreach>
-        
-        <echo message="Removing extra executable..."/>
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/>
-        </exec>
-    </target>
-
-    <target name="add-file-or-dir">
-        <condition property="file-or-folder" value="File" else="Folder">
-            <available file="${theFile}" type="file" />
-        </condition>
-        <exec executable="${ai-exe-path}">
-            <arg line="/edit ${aip-path} /Add${file-or-folder} APPDIR ${theFile}" />
-        </exec>
-    </target>
-
-    <!-- 32/64 specific since exec changes -->
-    <target name="add-ai-shortcuts" description="Configure installer to have desktop short cuts">
-        <echo message="Adding desktop/menu shortcuts..."/>
-        <exec executable="${ai-exe-path}">
-            <arg line='/edit ${aip-path} /NewShortcut -name "${app.title} ${app.version}" -dir DesktopFolder -target APPDIR\bin\${aut-bin-name} -icon ${inst-path}\icon.ico'/>
-        </exec>
-        <exec executable="${ai-exe-path}">
-            <arg line='/edit ${aip-path} /NewShortcut -name "${app.title} ${app.version}" -dir SHORTCUTDIR -target APPDIR\bin\${aut-bin-name} -icon ${inst-path}\icon.ico'/>
-        </exec>
-    </target>
-    
-    <target name="ai-build" description="Build the installer based on properties set by 32/64 targets.">
-        <antcall target="add-ai-files" inheritAll="true" />
-        <antcall target="add-ai-shortcuts" inheritAll="true" />
-        <exec executable="${ai-exe-path}">
-            <arg line="/build ${aip-path}"/>
-        </exec>
-    </target>
 
 </project>
diff --git a/build.xml b/build.xml
index 6cf86dae81..174bce4bf5 100644
--- a/build.xml
+++ b/build.xml
@@ -12,6 +12,7 @@
     <property name="netbeans-plat-version" value="7.3" />
     <property name="nbplatform.active.dir" value="${basedir}/netbeans-plat/${netbeans-plat-version}" />
 
+    <!-- Determine platform and include specific file -->
     <condition property="os.family" value="unix">  
         <os family="unix"/>  
     </condition>  
@@ -19,10 +20,10 @@
         <os family="windows"/>  
     </condition>  
     <import file="build-${os.family}.xml"/> 
-    <property name="test-input" location="Test/input"/>
-    <property name="thirdparty.dir" value="${basedir}/thirdparty" />
-
+    
+    <!-- Third party tools dependencies -->
     <!-- import ant-contrib tools -->
+    <property name="thirdparty.dir" value="${basedir}/thirdparty" />
     <property name="ant-contrib.dir" value="${thirdparty.dir}/ant-contrib/1.0b3" />
     <property name="ant.contrib.jar" value="${ant-contrib.dir}/ant-contrib.jar" />
     <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -31,12 +32,11 @@
         </classpath>
     </taskdef>
     
+    <target name="getJunit">
+        <property name="junit.dir" value="${thirdparty.dir}/junit/${netbeans-plat-version}" />
+        <unzip src="${junit.dir}/junit.zip" dest="${nbplatform.active.dir}"/>
+    </target>
 
-    <!-- This seems really bad to be hard coded, but I couldn't find a better solution -->
-    <path id="jni-path">
-        <pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/>
-        <path refid="cluster.path.id" />
-    </path>
 
     <!-- Verify that the TSK_HOME env variable is set -->
     <target name="findTSK">
@@ -48,10 +48,8 @@
         <echo> TSK_HOME: ${env.TSK_HOME}</echo>
     </target>
     
-     <target name="getJunit">
-        <property name="junit.dir" value="${thirdparty.dir}/junit/${netbeans-plat-version}" />
-        <unzip src="${junit.dir}/junit.zip" dest="${nbplatform.active.dir}"/>
-    </target>
+    
+    
     
     <!-- This target will create a custom ZIP file for us.  It first uses the general
       ZIP target and then opens it up and adds in any files that we want.  This is where we customize the
@@ -185,6 +183,11 @@
         
     </target>
     
+    <!-- This seems really bad to be hard coded, but I couldn't find a better solution -->
+    <path id="jni-path">
+        <pathelement location="${basedir}/build/cluster/modules/org-sleuthkit-datamodel.jar"/>
+        <path refid="cluster.path.id" />
+    </path>
     <target name="jni" depends="build,findTSK">
         <javah verbose="yes" outputFile="${env.TSK_HOME}/bindings/java/tsk_jni/tsk_jni/dataModel_SleuthkitJNI.h">
             <class name="org.sleuthkit.datamodel.SleuthkitJNI" />
@@ -229,6 +232,7 @@
         <antcall target="build-installer-${os.family}" />
     </target>
     
+    <property name="test-input" location="Test/input"/>
     <target name="test-download-imgs" description="Get test images and store them in the path represented by the test-input variable.">
          <available file="${test-input}/nps-2008-jean.E01" property="img-present-1"/>
          <available file="${test-input}/nps-2008-jean.E02" property="img-present-2"/>