1
0
mirror of synced 2024-12-05 03:06:05 +03:00

Removing phing dependency resolving as it is done with submodules now.

This commit is contained in:
Jonathan H. Wage 2010-05-26 11:56:43 -04:00
parent 43df6eb989
commit 42e83c4de6
3 changed files with 2 additions and 75 deletions

View File

@ -1,9 +0,0 @@
dependencies=common,dbal
common.version=2.0.0-BETA1
common.srcdir=lib/Doctrine/Common
common.targetdir=lib/Doctrine/Common
dbal.version=2.0.0-BETA1
dbal.srcdir=lib/Doctrine/DBAL
dbal.targetdir=lib/Doctrine/DBAL

View File

@ -1,62 +0,0 @@
<?xml version="1.0"?>
<project name="Doctrine Dependency Management" default="resolve-dependencies" basedir=".">
<property file="build-dependencies.properties" />
<property name="download.dir" value="download"/>
<target name="resolve-dependencies" description="Resolves the project dependencies.">
<echo message="Resolving dependencies"/>
<foreach list="${dependencies}" param="dependency" target="resolve-dependency" />
</target>
<target name="resolve-dependency">
<fail unless="${dependency}.version" message="${dependency}.version not set."/>
<fail unless="${dependency}.srcdir" message="${dependency}.srcdir not set."/>
<fail unless="${dependency}.targetdir" message="${dependency}.targetdir not set."/>
<property name="dependency.version" value="${${dependency}.version}"/>
<property name="dependency.srcdir" value="${${dependency}.srcdir}"/>
<property name="dependency.targetdir" value="${${dependency}.targetdir}"/>
<echo message="${dependency.targetdir}"/>
<!--
Check out dependency. If ${dependency.targetdir} does not exist or versions dont match.
When done, place version info file into ${dependency.targetdir}.
-->
<available file="${dependency.targetdir}" type="dir" property="target.dir.exists" />
<if>
<istrue value="${target.dir.exists}"/>
<then>
<property file="${dependency.targetdir}/current-version.properties" />
</then>
</if>
<if>
<or>
<isfalse value="${target.dir.exists}" />
<not><equals arg1="${dependency.version}" arg2="${current.version}"/></not>
</or>
<then>
<echo message="Fetching dependency '${dependency}' at version '${dependency.version}'." />
<delete dir="${download.dir}/${dependency}" includeemptydirs="true" />
<mkdir dir="${download.dir}/${dependency}" />
<exec command="git clone git://github.com/doctrine/${dependency}.git ${download.dir}/${dependency}" />
<exec command="git checkout ${dependency.version}" dir="${download.dir}/${dependency}" />
<delete dir="${dependency.targetdir}" includeemptydirs="true" />
<copy todir="${dependency.targetdir}">
<fileset dir="${download.dir}/${dependency}/${dependency.srcdir}">
<include name="**" />
</fileset>
</copy>
<delete file="${dependency.targetdir}/current-version.properties" />
<touch file="${dependency.targetdir}/current-version.properties"/>
<append destFile="${dependency.targetdir}/current-version.properties" text="current.version=${dependency.version}"/>
<delete dir="${download.dir}/${dependency}" includeemptydirs="true" />
</then>
<else>
<echo message="Dependency ${dependency} is available in the correct version: ${dependency.version}." />
</else>
</if>
</target>
</project>

View File

@ -5,7 +5,6 @@
-->
<project name="Doctrine2" default="build" basedir=".">
<import file="build-dependencies.xml"/>
<taskdef classname="NativePhpunitTask" classpath="./tests/" name="nativephpunit" />
<taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
@ -30,14 +29,14 @@
<!--
Fileset for the sources of the Doctrine Common dependency.
-->
<fileset id="common-sources" dir="./lib">
<fileset id="common-sources" dir="./lib/vendor/doctrine-common/lib">
<include name="Doctrine/Common/**"/>
</fileset>
<!--
Fileset for the sources of the Doctrine DBAL dependency.
-->
<fileset id="dbal-sources" dir="./lib">
<fileset id="dbal-sources" dir="./lib/vendor/doctrine-dbal/lib">
<include name="Doctrine/DBAL/**"/>
</fileset>
@ -85,7 +84,6 @@
Prepare the new build directories after cleaning
-->
<target name="prepare" depends="clean">
<phingcall target="resolve-dependencies"/>
<echo msg="Creating build directory: ${build.dir}" />
<mkdir dir="${build.dir}" />
<echo msg="Creating distribution directory: ${dist.dir}" />