|
@@ -162,8 +162,6 @@
|
|
|
</exec>
|
|
</exec>
|
|
|
<echo msg="Version number updated." />
|
|
<echo msg="Version number updated." />
|
|
|
<property name="version" value="${release_version}" override="true" />
|
|
<property name="version" value="${release_version}" override="true" />
|
|
|
- <echo msg="${version}" />
|
|
|
|
|
- <echo msg="${release_version}" />
|
|
|
|
|
</target>
|
|
</target>
|
|
|
|
|
|
|
|
<!--
|
|
<!--
|
|
@@ -171,9 +169,9 @@
|
|
|
-->
|
|
-->
|
|
|
<target name="release-commit" depends="next-version,prepare">
|
|
<target name="release-commit" depends="next-version,prepare">
|
|
|
<echo msg="Creating new release commit" />
|
|
<echo msg="Creating new release commit" />
|
|
|
- <exec command="git add ./lib/Cake/VERSION.txt" checkreturn="true" />
|
|
|
|
|
- <exec command="git commit -m 'Update version number to ${release_version}'" checkreturn="true" />
|
|
|
|
|
- <exec command="git tag -a ${release_version} -m 'CakePHP ${release_version}'" checkreturn="true" />
|
|
|
|
|
|
|
+ <exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" />
|
|
|
|
|
+ <exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" />
|
|
|
|
|
+ <exec command="git tag -a ${release_version} -m 'CakePHP ${release_version}'" logoutput="true" checkreturn="true" />
|
|
|
|
|
|
|
|
<propertyprompt propertyName="shipit" defaultValue="n" promptText="Ship the new commit and tag?" />
|
|
<propertyprompt propertyName="shipit" defaultValue="n" promptText="Ship the new commit and tag?" />
|
|
|
<condition property="noshipit" value="1">
|
|
<condition property="noshipit" value="1">
|
|
@@ -182,8 +180,8 @@
|
|
|
<fail if="noshipit" msg="You said not to ship it." />
|
|
<fail if="noshipit" msg="You said not to ship it." />
|
|
|
|
|
|
|
|
<echo msg="Pushing commit and tag." />
|
|
<echo msg="Pushing commit and tag." />
|
|
|
- <exec command="git push ${git.remote}" checkreturn="true" />
|
|
|
|
|
- <exec command="git push ${git.remote} ${release_version}" checkreturn="true" />
|
|
|
|
|
|
|
+ <exec command="git push ${git.remote}" logoutput="true" checkreturn="true" />
|
|
|
|
|
+ <exec command="git push ${git.remote} ${release_version}" logoutput="true" checkreturn="true" />
|
|
|
<echo msg="Push complete." />
|
|
<echo msg="Push complete." />
|
|
|
</target>
|
|
</target>
|
|
|
|
|
|
|
@@ -204,5 +202,4 @@
|
|
|
<target name="build" depends="generate-package" />
|
|
<target name="build" depends="generate-package" />
|
|
|
<target name="release" depends="release-commit,build,distribute" />
|
|
<target name="release" depends="release-commit,build,distribute" />
|
|
|
|
|
|
|
|
-
|
|
|
|
|
</project>
|
|
</project>
|