Cleaning up build.xml

build.xml

@@ -3,53 +3,12 @@
 	<!--
 	Build.xml file for CakePHP
 
-	Uses phing to create releases, and pear packages.
+	Uses phing to create releases.
 	Based off of build.xml in doctrine.
-
-	Requires the cakephp/d51PearPkg2 to be installed:
-
-	pear channel-discover pear.domain51.com
-	pear install cakephp/Phing_d51PearPkg2Task
-
 	Use the `release` task to update VERSION.txt, and create a new tag.
-	Use the `build` task to create a pear package based on the current working copy.
-	Use the `clean` task to clean up packaging artifacts.
-
 	-->
-
-	<taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
 	<property file="build.properties" />
 
-	<!--
-		The set of files we're going to package
-		Exclude the cli scripts, as they get installed separately.
-	 -->
-	<fileset id="libs" dir="./src">
-		<include name="**" />
-		<exclude name="Console/cake.bat" />
-		<exclude name="Console/cake.php" />
-		<exclude name="Console/cake" />
-	</fileset>
-
-	<!--
-		CLI scripts to package and install
-	-->
-	<fileset id="cli" dir="./src/Console">
-		<include name="cake.bat" />
-		<include name="cake.php" />
-		<include name="cake" />
-	</fileset>
-
-	<fileset id="non-tests" dir="./Test">
-		<exclude name="*" />
-	</fileset>
-
-	<!-- start fresh each time.  Remove the dist and build dirs -->
-	<target name="clean">
-		<delete dir="${build.dir}" includeemptydirs="true" />
-		<delete dir="${dist.dir}" includeemptydirs="true" />
-	</target>
-
 	<!-- Read the current version, so we can replace it -->
 	<target name="current-version">
 		<exec executable="php" outputProperty="version">
@@ -58,108 +17,6 @@
 		</exec>
 	</target>
 
-	<!-- Makes directories and sets properties -->
-	<target name="prepare" depends="current-version">
-		<!-- set PEAR stability based on version number. -->
-		<condition property="pear.stability" value="beta">
-			<contains string="${version}" substring="beta" casesensitive="false"/>
-		</condition>
-		<condition property="pear.stability" value="alpha">
-			<contains string="${version}" substring="alpha" casesensitive="false"/>
-		</condition>
-		<condition property="pear.stability" value="devel">
-			<contains string="${version}" substring="dev" casesensitive="false"/>
-		</condition>
-		<condition property="pear.stability" value="beta">
-			<contains string="${version}" substring="rc" casesensitive="false" />
-		</condition>
-		<condition property="pear.stability" value="stable">
-			<not><isset property="pear.stability"/></not>
-		</condition>
-
-		<!-- pear versions need to not have '-' -->
-		<exec executable="php" outputProperty="pear.version">
-			<arg value="-r" />
-			<arg value="echo str_replace(array('-'), array(''), '${version}');" />
-		</exec>
-
-		<!-- Used for other targets -->
-		<property name="pear.package" value="${project.name}-${pear.version}" />
-
-		<echo msg="Preparing package of ${version} (${pear.version}+${pear.stability})" />
-
-		<!-- Get the current git branch -->
-		<exec command="git name-rev HEAD 2>/dev/null | awk '{ print $2 }'" outputProperty="git.branch" />
-	</target>
-
-	<!--
-		Copy all the files to build/ so they can be packaged up.
-	-->
-	<target name="copy-files" depends="clean,prepare">
-		<echo msg="Creating build + dist directories." />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${dist.dir}" />
-
-		<echo msg="Copying files to build directory" />
-		<copy todir="${build.dir}/${pear.package}/src">
-			<fileset refid="libs" />
-		</copy>
-		<copy todir="${build.dir}/${pear.package}/bin">
-			<fileset refid="cli" />
-		</copy>
-	</target>
-
-	<!--
-		Define the package.xml.  Using xml to make xml is fun!
-	-->
-	<target name="define-pear-package" depends="copy-files">
-		<d51pearpkg2 addhiddenfiles="true" baseinstalldir="/" dir="${build.dir}/${pear.package}">
-			<name>CakePHP</name>
-			<summary>CakePHP Rapid Development Framework</summary>
-			<channel>pear.cakephp.org</channel>
-			<description>CakePHP is an application development framework for PHP 5.2+</description>
-
-			<lead user="mark_story" name="Mark Story" email="mark@mark-story.com" />
-			<lead user="lorenzo" name="José Lorenzo Rodríguez" email="jose.zap@gmail.com" />
-			<lead user="PhpNut" name="Larry Masters" email="phpnut@cakephp.org" />
-			<developer user="ADmad" name="Adnan Sarela" email="admad.coder@gmail.com" />
-			<developer user="AD7six" name="Andy Dawson" email="andydawson76@gmail.com" />
-			<developer user="Ceeram" name="Marc Ypes" email="c33ram@gmail.com" />
-			<developer user="jrbasso" name="Juan Basso" email="" />
-			<developer user="Predominant" name="Graham Weldon" email="graham@grahamweldon.com" />
-			<developer user="renan.saddam" name="Renan Gonçalves" email="renan.saddam@gmail.com" />
-			<developer user="rchavik" name="Rachman Chavik" email="rchavik@xintesa.com" />
-
-			<license>MIT License</license>
-			<version release="${pear.version}" api="${pear.version}" />
-			<stability release="${pear.stability}" api="${pear.stability}" />
-			<notes>https://github.com/cakephp/cakephp/blob/master/README</notes>
-			<dependencies>
-				<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.7.0" type="optional" />
-			</dependencies>
-			<dirroles key="bin">script</dirroles>
-			<dirroles key="src/Console/Templates/default">php</dirroles>
-			<dirroles key="src/View">php</dirroles>
-			<release>
-				<install as="cake.bat" name="bin/cake.bat" />
-				<install as="cake.php" name="bin/cake.php" />
-				<install as="cake" name="bin/cake" />
-			</release>
-			<exceptions key="VERSION.txt">php</exceptions>
-			<exceptions key="LICENSE.txt">php</exceptions>
-			<exceptions key="src/Config/cacert.pem">php</exceptions>
-		</d51pearpkg2>
-	</target>
-
-	<!-- Generate the PEAR package from a directory and move the files to the dist folder -->
-	<target name="generate-package" depends="define-pear-package">
-		<exec command="pear package" dir="${build.dir}/${pear.package}" passthru="true"/>
-		<echo msg="Moving ${pear.package}.tgz"/>
-		<move file="${build.dir}/${pear.package}/${pear.package}.tgz" todir="${dist.dir}" />
-	</target>
-
 	<!--
 		Updates the local copy to the latest head.
 	-->
@@ -189,7 +46,7 @@
 	<!--
 		Create the release commit that updates the version number and pushes the commits.
 	-->
-	<target name="release-commit" depends="update-branch,next-version,prepare">
+	<target name="release-commit" depends="update-branch,next-version">
 		<echo msg="Creating new release commit" />
 		<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" />
@@ -202,22 +59,11 @@
 		<fail if="noshipit" msg="You said not to ship it." />
 
 		<echo msg="Pushing commit and tag." />
-		<exec command="git push ${git.remote} ${git.branch}" logoutput="true" 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." />
 	</target>
 
-	<!--
-		Upload to pirum pear channel.
-	-->
-	<target name="distribute" depends="prepare" description="Upload pear packages to pear.cakephp.org">
-		<echo msg="Uploading tgz file to cakephp.org" />
-		<exec command="scp ${dist.dir}/${pear.package}.tgz cakephp@cakephp.org:${pirum.dir}" dir="." checkreturn="true"  />
-
-		<echo msg="Adding new release to pirum" />
-		<exec command="ssh cakephp@cakephp.org pirum add ${pirum.dir} ${pirum.dir}/${pear.package}.tgz" checkreturn="true" />
-	</target>
-
 	<target name="codestyle" description="Check codestyle (human readable format)">
 		<phpcodesniffer
 			standard="CakePHP"
@@ -252,8 +98,7 @@
 	<!--
 		Top level easy to type targets
 	-->
-	<target name="build" depends="generate-package" description="Generate a pear package" />
-	<target name="release" depends="release-commit,build,distribute" description="Release a new version of CakePHP" />
+	<target name="release" depends="release-commit" description="Release a new version of CakePHP" />
 	<target name="code-reports" depends="reports-ci"
 		description="Run the code reports, generating XML output for CI server use." />