X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=build.xml;h=37b40743ae6ac6f42f4f680837d2e0f7c17f6173;hb=2a2ceceaa42e3de656a0412526fb8c9762873c06;hp=3d82770fcb2d658964fa056000cb0d6b14863cd1;hpb=eff6a406f3eb67063ee8db660bb85c80472c7d95;p=github%2Fwallabag%2Fwallabag.git

diff --git a/build.xml b/build.xml
index 3d82770f..37b40743 100644
--- a/build.xml
+++ b/build.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="wallabag" default="build">
-    <target name="build" depends="clean,composer,prepare,phpunit"/>
-    <target name="prepare-mysql" depends="clean,composer,db_mysql,prepare"/>
-    <target name="prepare-sqlite" depends="clean,composer,db_sqlite,prepare"/>
-    <target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/>
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
 
     <target name="clean" description="Cleanup build artifacts">
         <delete dir="${basedir}/var/cache"/>
     </target>
 
-    <target name="composer" description="Install deps using Composer">
-        <exec executable="composer">
-            <arg value="up"/>
-            <arg value="--no-interaction"/>
-            <arg value="--no-progress"/>
-        </exec>
-    </target>
-
     <target name="prepare" description="Prepare for build">
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
@@ -50,8 +42,8 @@
     <target name="db_mysql" description="Run test for MySQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters.yml.dist.mysql"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">
@@ -64,8 +56,8 @@
     <target name="db_sqlite" description="Run test for SQLite">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">
@@ -78,8 +70,8 @@
     <target name="db_pgsql" description="Run test for PostgreSQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">