sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- recursive svn revert

Browse Source 
- move all svn revert stuff to main build file


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8771 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-11-22 15:12:32 +00:00
parent 218f6f81fe
commit 00014816f3
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build.xml
View File

@ -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>

2
engine/build.xml
View File

@ -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>

26
sdk/build.xml
View File

@ -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"/>