Merge pull request #1144 from wallabag/v2-build

Simplify build system

4 files changed, 21 insertions, 18 deletions

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/build.xml
index bdc4b4d8..cd2dfa3c 100644
--- a/app/build.xml
+++ b/build.xml
@@ -11,31 +11,30 @@
             <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="${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="${basedir}/app/console"/>
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
+            <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="${basedir}/app/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/../app/console"/>
+            <arg value="${basedir}/app/console"/>
             <arg value="doctrine:fixtures:load"/>
             <arg value="--no-interaction"/>
             <arg value="--env=test"/>
diff --git a/app/phpunit.xml.dist b/phpunit.xml.dist
index b8f38ff8..6f6269a4 100644
--- a/app/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,23 +9,27 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="bootstrap.php.cache"
+         bootstrap="app/bootstrap.php.cache"
         >
 
     <testsuites>
         <testsuite name="wallabag Test Suite">
-            <directory>../src/Wallabag/CoreBundle/Tests</directory>
+            <directory>./src/Wallabag/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 
+    <php>
+        <server name="KERNEL_DIR" value="./app/" />
+    </php>
+
     <filter>
         <whitelist>
-            <directory>../src</directory>
+            <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>
+                <directory>./vendor</directory>
+                <directory>./src/Wallabag/*Bundle/Resources</directory>
+                <directory>./src/Wallabag/*Bundle/Tests</directory>
+                <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
             </exclude>
         </whitelist>
     </filter>