From 37194e2f0168989836a8b110d9e0a08f5f92d633 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sat, 26 Jan 2013 01:05:15 +0000
Subject: [PATCH] SDK build: - move installer build tasks together

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10170 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 sdk/build.xml | 56 +++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/sdk/build.xml b/sdk/build.xml
index 3a5e9b747..51ee75b7a 100644
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -23,34 +23,6 @@
         <ant antfile="build.xml" target="update-help-sets" inheritall="false" inheritrefs="false" dir="jme3-core/"/>
     </target>
 
-    <target name="build-installers">
-        <property file="nbproject/project.properties"/>
-        <ant antfile="template.xml" dir="nbi/stub">
-            <property name="suite.location" value="${basedir}"/>
-            <property name="suite.nbi.product.uid" value="${app.name}"/>
-            <!--TODO: this is .0.2 because of the pre-release static 3.0.0, else the RCs could not be installed next to a beta-->
-            <property name="suite.nbi.product.version" value="${plugins.version}.0.2"/>
-            <property name="nbi.stub.location" value="${basedir}/nbi/stub"/>
-            <property name="nbi.stub.common.location" value="${basedir}/nbi/.common"/>
-            <property name="nbi.ant.tasks.jar" value="${basedir}/nbi/antlib/nbi-ant-tasks.jar"/>
-            <property name="nbi.registries.management.jar" value="${basedir}/nbi/antlib/nbi-registries-management.jar"/>
-            <property name="nbi.engine.jar" value="${basedir}/nbi/antlib/nbi-engine.jar"/>
-            <property name="nbi.license.file" value="${basedir}/licenses-sdk.txt"/>
-            <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/>
-            <property name="generator-jdk-location-forward-slashes" value="${java.home}"/>
-            <property name="generated-installers-location-forward-slashes" value="${basedir}/build/installer"/>
-            <property name="pack200.enabled" value="true"/>
-            <property name="nbi.icon.file" value="${basedir}/jmonkeyplatform.png"/>
-            <property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
-        </ant>
-    </target>
-    
-    <target name="build-zip-for-installer" depends="-set-bundled-jdkhome, suite.build-zip"/>
-    
-    <target name="-set-bundled-jdkhome">
-        <property name="jdkhome.string" value='jdkhome="jdk"'/>
-    </target>
-
     <target name="-create-netbeans-config">
         <!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
         <mkdir dir="build/launcher/etc"/>
@@ -301,6 +273,34 @@
         <replace file="build/jme3-tests-svn.properties" token=" " value=""/>
     </target>
 
+    <target name="build-installers">
+        <property file="nbproject/project.properties"/>
+        <ant antfile="template.xml" dir="nbi/stub">
+            <property name="suite.location" value="${basedir}"/>
+            <property name="suite.nbi.product.uid" value="${app.name}"/>
+            <!--TODO: this is .0.2 because of the pre-release static 3.0.0, else the RCs could not be installed next to a beta-->
+            <property name="suite.nbi.product.version" value="${plugins.version}.0.2"/>
+            <property name="nbi.stub.location" value="${basedir}/nbi/stub"/>
+            <property name="nbi.stub.common.location" value="${basedir}/nbi/.common"/>
+            <property name="nbi.ant.tasks.jar" value="${basedir}/nbi/antlib/nbi-ant-tasks.jar"/>
+            <property name="nbi.registries.management.jar" value="${basedir}/nbi/antlib/nbi-registries-management.jar"/>
+            <property name="nbi.engine.jar" value="${basedir}/nbi/antlib/nbi-engine.jar"/>
+            <property name="nbi.license.file" value="${basedir}/licenses-sdk.txt"/>
+            <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/>
+            <property name="generator-jdk-location-forward-slashes" value="${java.home}"/>
+            <property name="generated-installers-location-forward-slashes" value="${basedir}/build/installer"/>
+            <property name="pack200.enabled" value="true"/>
+            <property name="nbi.icon.file" value="${basedir}/jmonkeyplatform.png"/>
+            <property name="nbi.dock.icon.file" value="${basedir}/jmonkeyplatform.icns"/>
+        </ant>
+    </target>
+    
+    <target name="build-zip-for-installer" depends="-set-bundled-jdkhome, suite.build-zip"/>
+    
+    <target name="-set-bundled-jdkhome">
+        <property name="jdkhome.string" value='jdkhome="jdk"'/>
+    </target>
+
     <!--creates a debian package from the installer-->
     <target name="create-deb-package" depends="suite.build-zip">
         <unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}">