adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few problems with the build.xml

Browse source 
- Fix condition checking. Phing was barfing on the old 'code'
- Packages would always be made for the previous release.  Fix that.
- Check return codes so we don't blunder ahead when things go wrong.
- Put in invalid data so accidents don't happen.
This commit is contained in:
mark_story 2012-01-05 22:01:40 -05:00
parent 2aa6822b32
commit 1644b1c249
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -2,7 +2,7 @@
project.name = CakePHP project.name = CakePHP
# Git stuff # Git stuff
git.remote = git.remote = changeme!
# Directories # Directories
build.dir = build build.dir = build

38
build.xml
View file

@ -47,13 +47,16 @@
<delete dir="${dist.dir}" includeemptydirs="true" /> <delete dir="${dist.dir}" includeemptydirs="true" />
</target> </target>
<!-- makes directories and sets properties --> <!-- Read the current version, so we can replace it -->
<target name="prepare"> <target name="current-version">
<exec executable="php" outputProperty="version"> <exec executable="php" outputProperty="version">
<arg value="-r" /> <arg value="-r" />
<arg value="$fh = file('./lib/Cake/VERSION.txt'); echo array_pop($fh);" /> <arg value="$fh = file('./lib/Cake/VERSION.txt'); echo array_pop($fh);" />
</exec> </exec>
</target>
<!-- Makes directories and sets properties -->
<target name="prepare" depends="current-version">
<!-- set PEAR stability based on version number. --> <!-- set PEAR stability based on version number. -->
<condition property="pear.stability" value="beta"> <condition property="pear.stability" value="beta">
<contains string="${version}" substring="beta" casesensitive="false"/> <contains string="${version}" substring="beta" casesensitive="false"/>
@ -149,37 +152,39 @@
<!-- <!--
Bump the version number and commit that. Bump the version number and commit that.
--> -->
<target name="next-version" depends="prepare"> <target name="next-version" depends="current-version">
<echo msg="Incrementing version." /> <echo msg="Incrementing version." />
<propertyprompt propertyName="release_version" defaultValue="${version}" promptText="Enter version to be released (without -DEV)"/> <propertyprompt propertyName="release_version" defaultValue="${version}" promptText="Enter version to be released."/>
<echo msg="$file = file_get_contents('./lib/Cake/VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./lib/Cake/VERSION.txt', $file);" /> <echo msg="$file = file_get_contents('./lib/Cake/VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./lib/Cake/VERSION.txt', $file);" />
<exec executable="php"> <exec executable="php">
<arg value="-r" /> <arg value="-r" />
<arg value="$file = file_get_contents('./lib/Cake/VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./lib/Cake/VERSION.txt', $file);" /> <arg value="$file = file_get_contents('./lib/Cake/VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./lib/Cake/VERSION.txt', $file);" />
</exec> </exec>
<echo msg="Version number updated." /> <echo msg="Version number updated." />
<property name="version" value="${release_version}" override="true" />
<echo msg="${version}" />
<echo msg="${release_version}" />
</target> </target>
<!-- <!--
Create the release commit that updates the version number and pushes the commits. Create the release commit that updates the version number and pushes the commits.
--> -->
<target name="release-commit" depends="prepare,next-version"> <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" /> <exec command="git add ./lib/Cake/VERSION.txt" checkreturn="true" />
<exec command="git commit -m 'Update version number to ${release_version}'" /> <exec command="git commit -m 'Update version number to ${release_version}'" checkreturn="true" />
<exec command="git tag -a ${release_version} -m 'CakePHP ${release_version}'" /> <exec command="git tag -a ${release_version} -m 'CakePHP ${release_version}'" 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">
<not> <equals arg1="n" arg2="${shipit}" casesensitive="false" />
<equals arg1="y" arg2="${shipit}" casesensitive="false" />
</not>"
</condition> </condition>
<fail if="noshipit" msg="You said not to ship it." /> <fail if="noshipit" msg="You said not to ship it." />
<exec command="git push ${git.remote}" /> <echo msg="Pushing commit and tag." />
<exec command="git push --tags ${git.remote}" /> <exec command="git push ${git.remote}" checkreturn="true" />
<echo msg="Pushed commit and tag." /> <exec command="git push ${git.remote} ${release_version}" checkreturn="true" />
<echo msg="Push complete." />
</target> </target>
<!-- <!--
@ -187,10 +192,10 @@
--> -->
<target name="distribute" depends="prepare"> <target name="distribute" depends="prepare">
<echo msg="Uploading tgz file to cakephp.org" /> <echo msg="Uploading tgz file to cakephp.org" />
<exec command="scp ${dist.dir}/${pear.package}.tgz cakephp@cakephp.org:${pirum.dir}" dir="." /> <exec command="scp ${dist.dir}/${pear.package}.tgz cakephp@cakephp.org:${pirum.dir}" dir="." checkreturn="true" />
<echo msg="Adding new release to pirum" /> <echo msg="Adding new release to pirum" />
<exec command="ssh cakephp@cakephp.org pirum add ${pirum.dir} ${pirum.dir}/${pear.package}.tgz" /> <exec command="ssh cakephp@cakephp.org pirum add ${pirum.dir} ${pirum.dir}/${pear.package}.tgz" checkreturn="true" />
</target> </target>
<!-- <!--
@ -199,4 +204,5 @@
<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>