Skip to content

Commit

Permalink
Fixing build to place package.xml at root of package.
Browse files Browse the repository at this point in the history
  • Loading branch information
jwage committed May 25, 2010
1 parent 2db8ad3 commit 642c863
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.properties.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version_name=2.0.0-ALPHA2
version_name=2.0.0BETA2
version=2.0.0
stability=alpha
build.dir=build
Expand Down
16 changes: 7 additions & 9 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
-->
<fileset id="shared-artifacts" dir=".">
<include name="LICENSE"/>
<include name="COPYRIGHT"/>
<include name="CHANGELOG"/>
</fileset>

<!--
Expand Down Expand Up @@ -146,7 +144,7 @@
-->
<target name="build-packages" depends="build-orm">

<d51pearpkg2 baseinstalldir="/" dir="${build.dir}/orm/DoctrineORM-${version}">
<d51pearpkg2 baseinstalldir="/" dir="${build.dir}/orm">
<name>DoctrineORM</name>
<summary>Doctrine Object Relationl Mapper</summary>
<channel>pear.doctrine-project.org</channel>
Expand All @@ -162,13 +160,13 @@
<php minimum_version="5.3.0" />
<pear minimum_version="1.6.0" recommended_version="1.6.1" />
</dependencies>
<dirroles key="bin">script</dirroles>
<replacement path="bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" />
<replacement path="bin/doctrine.php" type="pear-config" from="@php_bin@" to="php_bin" />
<replacement path="bin/doctrine.php" type="pear-config" from="@bin_dir@" to="bin_dir" />
<dirroles key="DoctrineORM-${version}/bin">script</dirroles>
<replacement path="DoctrineORM-${version}/bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" />
<replacement path="DoctrineORM-${version}/bin/doctrine.php" type="pear-config" from="@php_bin@" to="php_bin" />
<replacement path="DoctrineORM-${version}/bin/doctrine.php" type="pear-config" from="@bin_dir@" to="bin_dir" />
<release>
<install as="doctrine" name="bin/doctrine" />
<install as="doctrine.php" name="bin/doctrine.php" />
<install as="doctrine" name="DoctrineORM-${version}/bin/doctrine" />
<install as="doctrine.php" name="DoctrineORM-${version}/bin/doctrine.php" />
</release>
</d51pearpkg2>
<tar destfile="${dist.dir}/DoctrineORM-${version_name}.tgz" basedir="${build.dir}/orm" compression="gzip" />
Expand Down

0 comments on commit 642c863

Please sign in to comment.