From 00014816f3f58888935c1dc9a1c1932803860d58 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Tue, 22 Nov 2011 15:12:32 +0000
Subject: [PATCH] - recursive svn revert - move all svn revert stuff to main
 build file

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8771 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 build.xml        | 35 ++++++++++++++++++++++++++++++-----
 engine/build.xml |  2 +-
 sdk/build.xml    | 26 +++-----------------------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/build.xml b/build.xml
index e66ff1eac..60b2dc370 100644
--- a/build.xml
+++ b/build.xml
@@ -74,27 +74,29 @@
        ****************************************************************
       -->
       
-    <target name="hudson-nightly" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
+    <target name="hudson-nightly" depends="-hudson-revert-changes, -check-platform, -update-sdk-platform-config, -hudson-build-engine">
         <ant dir="engine" target="copy-javadoc"/>
         <ant dir="engine" target="create-zip-distribution"/>
         <ant dir="sdk" target="hudson-nightly"/>
     </target>
 
-    <target name="hudson-stable" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
+    <target name="hudson-stable" depends="-hudson-revert-changes, -check-platform, -update-sdk-platform-config, -hudson-build-engine">
         <!--ant dir="engine" target="dist"/-->
         <ant dir="sdk" target="hudson-stable"/>
     </target>
 
-    <target name="hudson-release" depends="-check-platform, -update-sdk-platform-config, -hudson-build-engine">
+    <target name="hudson-release" depends="-hudson-revert-changes, -check-platform, -update-sdk-platform-config, -hudson-build-engine">
         <ant dir="sdk" target="hudson-release"/>
     </target>
     
-    <target name="-hudson-build-engine">
+    <target name="-hudson-revert-changes">
         <exec executable="svn" dir="engine">
             <arg value="cleanup" />
         </exec>
         <exec executable="svn" dir="engine">
             <arg value="revert" />
+            <arg value="-R" />
+            <arg value="." />
         </exec>
         <exec executable="svn" dir="engine">
             <arg value="cleanup" />
@@ -102,13 +104,36 @@
         <exec executable="svn" dir="engine">
             <arg value="update" />
         </exec>
+        
+        <exec executable="svn" dir="sdk">
+            <arg value="cleanup" />
+        </exec>
+        <exec executable="svn" dir="sdk">
+            <arg value="revert" />
+            <arg value="." />
+            <arg value="-R" />
+        </exec>
+        <exec executable="svn" dir="sdk">
+            <arg value="cleanup" />
+        </exec>
+        <exec executable="svn" dir="sdk">
+            <arg value="update" />
+        </exec>
+
         <exec executable="svn" dir=".">
             <arg value="unlock" />
             <arg value="engine" />
         </exec>
+        <exec executable="svn" dir=".">
+            <arg value="unlock" />
+            <arg value="sdk" />
+        </exec>
+    </target>
+
+    <target name="-hudson-build-engine">
         <ant dir="engine" target="build-bullet-natives"/>
         <ant dir="engine" target="javadoc"/>
         <ant dir="engine" target="update-sdk-nobuild"/>
     </target>
-
+    
 </project>
\ No newline at end of file
diff --git a/engine/build.xml b/engine/build.xml
index ff1801fad..db2fee1d4 100644
--- a/engine/build.xml
+++ b/engine/build.xml
@@ -340,7 +340,7 @@
         </zip>
     </target>
 
-    <target name="update-sdk-nobuild">
+    <target depends="init" name="update-sdk-nobuild">
         <antcall target="-do-update-sdk" inheritall="true">
             <param name="jmp_dir" value="../sdk/"/>
         </antcall>
diff --git a/sdk/build.xml b/sdk/build.xml
index 36aa49802..6e0f6d9a3 100644
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -117,14 +117,14 @@
       -->
       
     <!--creates update center version via hudson build server-->
-    <target name="hudson-nightly" depends="suite.clean, -revert-svn-changes, update-help-sets, set-impl-version, suite.nbms, unset-impl-version">
+    <target name="hudson-nightly" depends="suite.clean, update-help-sets, set-impl-version, suite.nbms, unset-impl-version">
     </target>
 
     <!--to be used after release, sets version number sans svn revision-->
-    <!--target name="hudson-stable" depends="suite.clean, -revert-svn-changes, set-spec-version, suite.nbms, unset-spec-version">
+    <!--target name="hudson-stable" depends="suite.clean, set-spec-version, suite.nbms, unset-spec-version">
     </target-->
     
-    <target name="hudson-stable" depends="suite.clean, -revert-svn-changes, set-impl-version, suite.nbms, unset-spec-version">
+    <target name="hudson-stable" depends="suite.clean, set-impl-version, suite.nbms, unset-spec-version">
     </target>
     
     <target name="hudson-release" depends="suite.clean, set-spec-version, build-installers, unset-spec-version">
@@ -258,26 +258,6 @@
 
     </target>
 
-    <!--reverts svn changes (in case the revision numbers haven't been reset-->
-    <target name="-revert-svn-changes">
-        <!--remove changes from jMP (old version numbers)-->
-        <exec executable="svn" dir=".">
-            <arg value="cleanup" />
-        </exec>
-        <exec executable="svn" dir=".">
-            <arg value="revert" />
-            <arg value="." />
-            <arg value="-R" />
-        </exec>
-        <exec executable="svn" dir=".">
-            <arg value="cleanup" />
-        </exec>
-        <!--update gde svn revision-->
-        <exec executable="svn" dir=".">
-            <arg value="update" />
-        </exec>
-    </target>
-
     <!--creates properties files containing svn info for the jme3 folders-->
     <target name="-create-jme3-svn-properties">
         <mkdir dir="build"/>