Skip to content

Commit

Permalink
Update file references.
Browse files Browse the repository at this point in the history
The VERSION file has moved in preparation for the repo split. Update the
build scripts accordingly.
  • Loading branch information
markstory committed Sep 6, 2013
1 parent ff81838 commit 1ae30b0
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions lib/build.xml
Expand Up @@ -54,7 +54,7 @@
<target name="current-version">
<exec executable="php" outputProperty="version">
<arg value="-r" />
<arg value="$fh = file('./lib/Cake/VERSION.txt'); echo array_pop($fh);" />
<arg value="$fh = file('./VERSION.txt'); echo array_pop($fh);" />
</exec>
</target>

Expand Down Expand Up @@ -135,25 +135,22 @@
<stability release="${pear.stability}" api="${pear.stability}" />
<notes>https://github.com/cakephp/cakephp/blob/master/README</notes>
<dependencies>
<php minimum_version="5.2.8" />
<php minimum_version="5.4.3" />
<pear minimum_version="1.9.0" recommended_version="1.9.4" />
<package name="PHPUnit" channel="pear.phpunit.de" minimum_version="3.5.0" type="optional" />
</dependencies>
<dirroles key="bin">script</dirroles>
<dirroles key="Cake/Test">php</dirroles>
<dirroles key="Cake/Console/Templates/skel">php</dirroles>
<dirroles key="Cake/Console/Templates/default">php</dirroles>
<dirroles key="Cake/View">php</dirroles>
<release>
<install as="cake" name="bin/cake" />
<install as="cake.php" name="bin/cake.php" />
<install as="cake.bat" name="bin/cake.bat" />
</release>
<exceptions key="Cake/VERSION.txt">php</exceptions>
<exceptions key="Cake/LICENSE.txt">php</exceptions>
<exceptions key="VERSION.txt">php</exceptions>
<exceptions key="LICENSE.txt">php</exceptions>
<exceptions key="Cake/Config/cacert.pem">php</exceptions>
<exceptions key="Cake/Console/Templates/skel/.htaccess">php</exceptions>
<exceptions key="Cake/Console/Templates/skel/webroot/.htaccess">php</exceptions>
</d51pearpkg2>
</target>

Expand Down Expand Up @@ -181,10 +178,10 @@
<target name="next-version" depends="current-version">
<echo msg="Incrementing version." />
<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('./VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./VERSION.txt', $file);" />
<exec executable="php">
<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('./VERSION.txt'); $file = str_replace('${version}', '${release_version}', $file); file_put_contents('./VERSION.txt', $file);" />
</exec>
<echo msg="Version number updated." />
<property name="version" value="${release_version}" override="true" />
Expand All @@ -195,7 +192,7 @@
-->
<target name="release-commit" depends="update-branch,next-version,prepare">
<echo msg="Creating new release commit" />
<exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" />
<exec command="git add ./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 -s ${release_version} -m 'CakePHP ${release_version}'" logoutput="true" checkreturn="true" />

Expand Down

0 comments on commit 1ae30b0

Please sign in to comment.