Permalink
Browse files

package task is now in deploy.xml

  • Loading branch information...
1 parent a4d2148 commit 66296d46d006ee390e9e106b284c60562d89a39b @claylo claylo committed with mtdowling Oct 15, 2012
Showing with 3 additions and 8 deletions.
  1. +3 −8 build.xml
View
@@ -1,22 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
-<project name="guzzle" default="package">
-=======
<project name="guzzle" default="test">
->>>>>>> refactored build including git subsplit management and PEAR package generation
<!-- set local values, like git location -->
<property file="phing/build.properties" override="true" />
-
+
<property name="dir.output" value="${project.basedir}/build/artifacts" />
<property name="dir.imports" value="${project.basedir}/phing/imports" />
<property name="dir.bin" value="${project.basedir}/bin" />
<property name="repo.dir" value="${project.basedir}" />
-
+
<import file="${dir.imports}/dependencies.xml"/>
<import file="${dir.imports}/test.xml"/>
<import file="${dir.imports}/deploy.xml"/>
<!-- <import file="${dir.imports}/metrics.xml"/> -->
-
<target name="test" description="Run unit tests" depends="test-init">
<exec passthru="true" command="phpunit" />
@@ -49,4 +44,4 @@
<exec passthru="true" command="open ${dir.output}/coverage/index.html" />
</target>
-</project>
+</project>

0 comments on commit 66296d4

Please sign in to comment.