From 8378485e332e11dcd59ed4fb8edac77b2f8f8d71 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy.benoist@gmail.com>
Date: Tue, 3 Mar 2015 19:20:08 +0100
Subject: Simplify build system

---
 .gitignore           |  6 +++---
 .travis.yml          |  4 ++--
 app/build.xml        | 44 --------------------------------------------
 app/phpunit.xml.dist | 32 --------------------------------
 build.xml            | 43 +++++++++++++++++++++++++++++++++++++++++++
 phpunit.xml.dist     | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 84 insertions(+), 81 deletions(-)
 delete mode 100644 app/build.xml
 delete mode 100644 app/phpunit.xml.dist
 create mode 100644 build.xml
 create mode 100644 phpunit.xml.dist

diff --git a/.gitignore b/.gitignore
index 72e5ffad..9bde27db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,9 @@
 /web/bundles/
 /web/uploads/
 
-# PHPUnit
-/app/phpunit.xml
-/phpunit.xml
+# Build
+/app/build
+/build
 
 # Composer PHAR
 /composer.phar
diff --git a/.travis.yml b/.travis.yml
index e99c1e6f..ff23ad45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,5 +14,5 @@ before_script:
   - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 script:
-  - ant -f app/build.xml prepare
-  - phpunit -c app  --coverage-text
+  - ant prepare
+  - phpunit --coverage-text
diff --git a/app/build.xml b/app/build.xml
deleted file mode 100644
index bdc4b4d8..00000000
--- a/app/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="wallabag" default="build">
-    <target name="build" depends="prepare"/>
-
-    <target name="clean" description="Cleanup build artifacts">
-        <delete dir="${basedir}/app/cache"/>
-    </target>
-
-    <target name="prepare" depends="clean" description="Prepare for build">
-        <exec executable="composer">
-            <arg value="install"/>
-            <arg value="--no-interaction"/>
-            <arg value="--no-progress"/>
-            <arg value="--working-dir=.."/>
-        </exec>
-        <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
-            <arg value="doctrine:database:drop"/>
-            <arg value="--force"/>
-            <arg value="--env=test"/>
-        </exec>
-        <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
-            <arg value="doctrine:database:create"/>
-            <arg value="--env=test"/>
-        </exec>
-        <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
-            <arg value="doctrine:schema:create"/>
-            <arg value="--env=test"/>
-        </exec>
-        <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
-            <arg value="cache:clear"/>
-            <arg value="--env=test"/>
-        </exec>
-        <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
-            <arg value="doctrine:fixtures:load"/>
-            <arg value="--no-interaction"/>
-            <arg value="--env=test"/>
-        </exec>
-    </target>
-</project>
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
deleted file mode 100644
index b8f38ff8..00000000
--- a/app/phpunit.xml.dist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="bootstrap.php.cache"
-        >
-
-    <testsuites>
-        <testsuite name="wallabag Test Suite">
-            <directory>../src/Wallabag/CoreBundle/Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>../src</directory>
-            <exclude>
-                <directory>../vendor</directory>
-                <directory>../src/Wallabag/CoreBundle/Resources</directory>
-                <directory>../src/Wallabag/CoreBundle/Tests</directory>
-                <directory>../src/Wallabag/CoreBundle/DataFixtures</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/build.xml b/build.xml
new file mode 100644
index 00000000..cd2dfa3c
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/app/cache"/>
+    </target>
+
+    <target name="prepare" depends="clean" description="Prepare for build">
+        <exec executable="composer">
+            <arg value="install"/>
+            <arg value="--no-interaction"/>
+            <arg value="--no-progress"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/app/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+</project>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..6f6269a4
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="app/bootstrap.php.cache"
+        >
+
+    <testsuites>
+        <testsuite name="wallabag Test Suite">
+            <directory>./src/Wallabag/*Bundle/Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <server name="KERNEL_DIR" value="./app/" />
+    </php>
+
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+            <exclude>
+                <directory>./vendor</directory>
+                <directory>./src/Wallabag/*Bundle/Resources</directory>
+                <directory>./src/Wallabag/*Bundle/Tests</directory>
+                <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
-- 
cgit v1.2.3