Merge branch 'release/0.3.1'

punkstar · Feb 12, 2015 · e01d797 · e01d797
2 parents 98ce46d + 24c6a76
commit e01d797
Show file tree

Hide file tree

Showing 5 changed files with 829 additions and 80 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /vendor
+/build
diff --git a/build.xml b/build.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MageConfigSync" default="test">
 
+    <property name="bin.phar-composer" value="vendor/bin/phar-composer" />
     <property name="bin.mage-ci" value="vendor/bin/mage-ci" />
     <property name="bin.phpunit" value="vendor/bin/phpunit -c ${project.basedir}/phpunit.xml" />
+    <property name="dir.build" value="${project.basedir}/build/" />
 
     <property name="magento.version" value="1.7.0.2" />
     <property name="magento.base_dir" value="${project.basedir}/magento" />
@@ -14,15 +16,15 @@
 
     <target name="test" depends="test-unit,test-integration" />
 
-    <target name="test-unit">
+    <target name="test-unit" depends="install-deps">
         <exec command="${bin.phpunit} --exclude-group integration" passthru="true" />    	
     </target>
 
-    <target name="test-integration" depends="install-magento">
+    <target name="test-integration" depends="install-magento,install-deps">
         <exec command="${bin.phpunit} --group integration" passthru="true" />       
     </target>
 
-    <target name="install-magento">
+    <target name="install-magento" depends="install-deps">
         <if>
             <not><available type="dir" file="${magento.base_dir}" /></not>
             <then>
@@ -33,4 +35,13 @@
             </else>
         </if>
     </target>
+
+    <target name="build" depends="install-deps">
+        <mkdir dir="${dir.build}" />
+        <exec command="${bin.phar-composer} build ${project.basedir} ${dir.build}" passthru="true" />
+    </target>
+
+    <target name="install-deps">
+        <exec command="composer install" />
+    </target>
 </project>
diff --git a/composer.json b/composer.json
@@ -13,13 +13,14 @@
 
     "require": {
         "php": ">=5.3.0",
-        "symfony/console": "v2.3.4",
-        "symfony/yaml": "v2.3.4"
+        "symfony/console": "*",
+        "symfony/yaml": "*"
     },
 
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "ecomdev/mage-ci": "master@dev"
+        "ecomdev/mage-ci": "master@dev",
+        "clue/phar-composer": "dev-master"
     },
 
     "autoload": {