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
3.0
nor..67 13 years ago
parent 218f6f81fe
commit 00014816f3
3 changed files with 34 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 35
      build.xml
  2. 2
      engine/build.xml
  3. 26
      sdk/build.xml

35
build.xml
Unescape 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="copy-javadoc"/>
<ant dir="engine" target="create-zip-distribution"/> <ant dir="engine" target="create-zip-distribution"/>
<ant dir="sdk" target="hudson-nightly"/> <ant dir="sdk" target="hudson-nightly"/>
</target> </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="engine" target="dist"/-->
<ant dir="sdk" target="hudson-stable"/> <ant dir="sdk" target="hudson-stable"/>
</target> </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"/> <ant dir="sdk" target="hudson-release"/>
</target> </target>
<target name="-hudson-build-engine"> <target name="-hudson-revert-changes">
<exec executable="svn" dir="engine"> <exec executable="svn" dir="engine">
<arg value="cleanup" /> <arg value="cleanup" />
</exec> </exec>
<exec executable="svn" dir="engine"> <exec executable="svn" dir="engine">
<arg value="revert" /> <arg value="revert" />
<arg value="-R" />
<arg value="." />
</exec> </exec>
<exec executable="svn" dir="engine"> <exec executable="svn" dir="engine">
<arg value="cleanup" /> <arg value="cleanup" />
@ -102,13 +104,36 @@
<exec executable="svn" dir="engine"> <exec executable="svn" dir="engine">
<arg value="update" /> <arg value="update" />
</exec> </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="."> <exec executable="svn" dir=".">
<arg value="unlock" /> <arg value="unlock" />
<arg value="engine" /> <arg value="engine" />
</exec> </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="build-bullet-natives"/>
<ant dir="engine" target="javadoc"/> <ant dir="engine" target="javadoc"/>
<ant dir="engine" target="update-sdk-nobuild"/> <ant dir="engine" target="update-sdk-nobuild"/>
</target> </target>
</project> </project>

2
engine/build.xml
Unescape View File

@ -340,7 +340,7 @@
</zip> </zip>
</target> </target>
<target name="update-sdk-nobuild"> <target depends="init" name="update-sdk-nobuild">
<antcall target="-do-update-sdk" inheritall="true"> <antcall target="-do-update-sdk" inheritall="true">
<param name="jmp_dir" value="../sdk/"/> <param name="jmp_dir" value="../sdk/"/>
</antcall> </antcall>

26
sdk/build.xml
Unescape View File

@ -117,14 +117,14 @@
--> -->
<!--creates update center version via hudson build server--> <!--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> </target>
<!--to be used after release, sets version number sans svn revision--> <!--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-->
<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>
<target name="hudson-release" depends="suite.clean, set-spec-version, build-installers, unset-spec-version"> <target name="hudson-release" depends="suite.clean, set-spec-version, build-installers, unset-spec-version">
@ -258,26 +258,6 @@
</target> </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--> <!--creates properties files containing svn info for the jme3 folders-->
<target name="-create-jme3-svn-properties"> <target name="-create-jme3-svn-properties">
<mkdir dir="build"/> <mkdir dir="build"/>

Write Preview
Loading…
Cancel
Save