Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Backport build-common into Common 2.1.x

  • Loading branch information...
commit f78df1166ce28ceb38df4b43cb967137ae538cf4 1 parent 441d276
@beberlei beberlei authored
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/vendor/doctrine-build-common"]
+ path = lib/vendor/doctrine-build-common
+ url = git://github.com/doctrine/doctrine-build-common.git
View
14 build.properties.dev
@@ -1,14 +0,0 @@
-version=2.0.0BETA2
-stability=beta
-build.dir=build
-dist.dir=dist
-report.dir=reports
-log.archive.dir=logs
-svn.path=/usr/bin/svn
-test.phpunit_configuration_file=
-test.phpunit_generate_coverage=0
-test.pmd_reports=0
-test.pdepend_exec=
-test.phpmd_exec=
-project.pirum_dir=
-project.download_dir=
View
117 build.xml
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
-
-<!--
- Doctrine 2 build file.
--->
-
<project name="Doctrine2" default="build" basedir=".">
<taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
+ <import file="${project.basedir}/lib/vendor/doctrine-build-common/packaging.xml" />
<property file="build.properties" />
@@ -26,83 +22,22 @@
</fileset>
<!--
- Clean the directory for the next build.
- -->
- <target name="clean">
- <available file="./build.properties" property="build_properties_exist" value="true"/>
- <fail unless="build_properties_exist" message="The build.properties file is missing." />
-
- <delete dir="${build.dir}" includeemptydirs="true" />
- <delete dir="${dist.dir}" includeemptydirs="true" />
- <delete dir="${report.dir}" includeemptydirs="true" />
- </target>
-
- <!--
- Prepare the new build directories after cleaning
- -->
- <target name="prepare" depends="clean">
- <echo msg="Creating build directory: ${build.dir}" />
- <mkdir dir="${build.dir}" />
- <echo msg="Creating distribution directory: ${dist.dir}" />
- <mkdir dir="${dist.dir}" />
- <echo msg="Creating report directory: ${report.dir}" />
- <mkdir dir="${report.dir}" />
- <mkdir dir="${build.dir}/logs"/>
- <mkdir dir="${report.dir}/tests"/>
- </target>
-
- <!--
Builds Common package, preparing it for distribution.
-->
- <target name="build-common">
- <copy todir="${build.dir}/common">
+ <target name="copy-files" depends="prepare">
+ <copy todir="${build.dir}/${project.name}-${version}">
<fileset refid="shared-artifacts"/>
</copy>
- <copy todir="${build.dir}/common">
+ <copy todir="${build.dir}/${project.name}-${version}">
<fileset refid="common-sources"/>
</copy>
</target>
- <target name="build" depends="prepare,build-common"/>
-
- <!--
- Runs the full test suite.
- -->
- <target name="test" depends="prepare">
- <if><equals arg1="${test.phpunit_generate_coverage}" arg2="1" />
- <then>
- <property name="test.phpunit_coverage_file" value="${build.dir}/logs/clover.xml" />
- </then>
- <else>
- <property name="test.phpunit_coverage_file" value="false" />
- </else>
- </if>
-
- <nativephpunit
- testfile="./tests/Doctrine/Tests/AllTests.php" junitlogfile="${build.dir}/logs/testsuites.xml"
- testdirectory="./tests" coverageclover="${test.phpunit_coverage_file}" configuration="${test.phpunit_configuration_file}"
- />
- <phpunitreport infile="${build.dir}/logs/testsuites.xml" format="frames" todir="${report.dir}/tests" />
-
- <tstamp/>
- <copy file="${build.dir}/logs/testsuites.xml" tofile="${log.archive.dir}/latest/log.xml" overwrite="true"/>
-
- <if><equals arg1="${test.pmd_reports}" arg2="1" />
- <then>
- <exec command="${test.pdepend_exec} --jdepend-xml=${build.dir}/logs/jdepend.xml ./lib/Doctrine" />
- <exec command="${test.phpmd_exec} ./lib/Doctrine xml codesize --reportfile ${build.dir}/logs/phpmd.xml" />
-
- <copy file="${build.dir}/logs/jdepend.xml" tofile="${log.archive.dir}/latest/jdepend.xml" overwrite="true"/>
- <copy file="${build.dir}/logs/phpmd.xml" tofile="${log.archive.dir}/latest/phpmd.xml" overwrite="true"/>
- </then>
- </if>
- </target>
-
<!--
Builds distributable PEAR packages.
-->
- <target name="build-packages" depends="build">
- <d51pearpkg2 baseinstalldir="/" dir="${build.dir}/common">
+ <target name="define-pear-package" depends="copy-files">
+ <d51pearpkg2 baseinstalldir="/" dir="${build.dir}/${project.name}-${version}">
<name>DoctrineCommon</name>
<summary>Doctrine Common PHP Extensions</summary>
<channel>pear.doctrine-project.org</channel>
@@ -112,49 +47,13 @@
<lead user="romanb" name="Roman Borschel" email="roman@code-factory.org" />
<lead user="beberlei" name="Benjamin Eberlei" email="kontakt@beberlei.de" />
<license>LGPL</license>
- <version release="${version}" api="${version}" />
- <stability release="${stability}" api="${stability}" />
+ <version release="${pear.version}" api="${pear.version}" />
+ <stability release="${pear.stability}" api="${pear.stability}" />
<notes>-</notes>
<dependencies>
<php minimum_version="5.3.0" />
<pear minimum_version="1.6.0" recommended_version="1.6.1" />
</dependencies>
</d51pearpkg2>
- <exec command="pear package" dir="${build.dir}/common" passthru="true" />
- <exec command="mv DoctrineCommon-${version}.tgz ../../dist" dir="${build.dir}/common" passthru="true" />
- <tar destfile="dist/DoctrineCommon-${version}-full.tar.gz" compression="gzip" basedir="${build.dir}">
- <fileset dir="${build.dir}">
- <include name="**/**" />
- <exclude name="logs/" />
- </fileset>
- </tar>
- </target>
-
- <target name="git-tag">
- <exec command="grep '${version}-DEV' ${project.basedir}/lib/Doctrine/Common/Version.php" checkreturn="true"/>
- <exec command="sed 's/${version}-DEV/${version}/' ${project.basedir}/lib/Doctrine/Common/Version.php > ${project.basedir}/lib/Doctrine/Common/Version2.php" passthru="true" />
- <exec command="mv ${project.basedir}/lib/Doctrine/Common/Version2.php ${project.basedir}/lib/Doctrine/Common/Version.php" passthru="true" />
- <exec command="git commit -a -m 'Release ${version}'" />
- <exec command="git tag -m 'Tag ${version}' -a ${version}" passthru="true" />
</target>
-
- <target name="pirum-release">
- <exec command="sudo pirum add ${project.pirum_dir} ${project.basedir}/dist/DoctrineCommon-${version}.tgz" dir="." passthru="true" />
- <exec command="sudo pirum build ${project.pirum_dir}" passthru="true" />
- </target>
-
- <target name="distribute-download">
- <copy file="dist/DoctrineCommon-${version}-full.tar.gz" todir="${project.download_dir}" />
- </target>
-
- <target name="update-dev-version">
- <exec command="grep '${version}' ${project.basedir}/lib/Doctrine/Common/Version.php" checkreturn="true"/>
- <propertyprompt propertyName="next_version" defaultValue="${version}" promptText="Enter next version string (without -DEV)" />
- <exec command="sed 's/${version}/${next_version}-DEV/' ${project.basedir}/lib/Doctrine/Common/Version.php > ${project.basedir}/lib/Doctrine/Common/Version2.php" passthru="true" />
- <exec command="mv ${project.basedir}/lib/Doctrine/Common/Version2.php ${project.basedir}/lib/Doctrine/Common/Version.php" passthru="true" />
- <exec command="git add ${project.basedir}/lib/Doctrine/Common/Version.php" passthru="true" />
- <exec command="git commit -m 'Bump Dev Version to ${next_version}'" passthru="true" />
- </target>
-
- <target name="release" depends="git-tag,build-packages,distribute-download,pirum-release,update-dev-version" />
</project>
1  lib/vendor/doctrine-build-common
@@ -0,0 +1 @@
+Subproject commit 3bfd511fb20f6bc85d85d690d6a6dd5e441c9adc
Please sign in to comment.
Something went wrong with that request. Please try again.