aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-03-04 06:25:17 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-03-04 06:25:17 +0100
commit73b774438395d0ed74d0fd863194d2ebfb68d9ce (patch)
tree72915c5a83a5d30889b81872b5941c9aa3962dc1
parentba7b9d48d407f87690a3fdc199b37714d2a52897 (diff)
parent8378485e332e11dcd59ed4fb8edac77b2f8f8d71 (diff)
downloadwallabag-73b774438395d0ed74d0fd863194d2ebfb68d9ce.tar.gz
wallabag-73b774438395d0ed74d0fd863194d2ebfb68d9ce.tar.zst
wallabag-73b774438395d0ed74d0fd863194d2ebfb68d9ce.zip
Merge pull request #1144 from wallabag/v2-build
Simplify build system
-rw-r--r--.gitignore6
-rw-r--r--.travis.yml4
-rw-r--r--build.xml (renamed from app/build.xml)11
-rw-r--r--phpunit.xml.dist (renamed from app/phpunit.xml.dist)18
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 @@
26/web/bundles/ 26/web/bundles/
27/web/uploads/ 27/web/uploads/
28 28
29# PHPUnit 29# Build
30/app/phpunit.xml 30/app/build
31/phpunit.xml 31/build
32 32
33# Composer PHAR 33# Composer PHAR
34/composer.phar 34/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:
14 - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini 14 - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
15 15
16script: 16script:
17 - ant -f app/build.xml prepare 17 - ant prepare
18 - phpunit -c app --coverage-text 18 - 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 @@
11 <arg value="install"/> 11 <arg value="install"/>
12 <arg value="--no-interaction"/> 12 <arg value="--no-interaction"/>
13 <arg value="--no-progress"/> 13 <arg value="--no-progress"/>
14 <arg value="--working-dir=.."/>
15 </exec> 14 </exec>
16 <exec executable="php"> 15 <exec executable="php">
17 <arg value="${basedir}/../app/console"/> 16 <arg value="${basedir}/app/console"/>
18 <arg value="doctrine:database:drop"/> 17 <arg value="doctrine:database:drop"/>
19 <arg value="--force"/> 18 <arg value="--force"/>
20 <arg value="--env=test"/> 19 <arg value="--env=test"/>
21 </exec> 20 </exec>
22 <exec executable="php"> 21 <exec executable="php">
23 <arg value="${basedir}/../app/console"/> 22 <arg value="${basedir}/app/console"/>
24 <arg value="doctrine:database:create"/> 23 <arg value="doctrine:database:create"/>
25 <arg value="--env=test"/> 24 <arg value="--env=test"/>
26 </exec> 25 </exec>
27 <exec executable="php"> 26 <exec executable="php">
28 <arg value="${basedir}/../app/console"/> 27 <arg value="${basedir}/app/console"/>
29 <arg value="doctrine:schema:create"/> 28 <arg value="doctrine:schema:create"/>
30 <arg value="--env=test"/> 29 <arg value="--env=test"/>
31 </exec> 30 </exec>
32 <exec executable="php"> 31 <exec executable="php">
33 <arg value="${basedir}/../app/console"/> 32 <arg value="${basedir}/app/console"/>
34 <arg value="cache:clear"/> 33 <arg value="cache:clear"/>
35 <arg value="--env=test"/> 34 <arg value="--env=test"/>
36 </exec> 35 </exec>
37 <exec executable="php"> 36 <exec executable="php">
38 <arg value="${basedir}/../app/console"/> 37 <arg value="${basedir}/app/console"/>
39 <arg value="doctrine:fixtures:load"/> 38 <arg value="doctrine:fixtures:load"/>
40 <arg value="--no-interaction"/> 39 <arg value="--no-interaction"/>
41 <arg value="--env=test"/> 40 <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 @@
9 processIsolation="false" 9 processIsolation="false"
10 stopOnFailure="false" 10 stopOnFailure="false"
11 syntaxCheck="false" 11 syntaxCheck="false"
12 bootstrap="bootstrap.php.cache" 12 bootstrap="app/bootstrap.php.cache"
13 > 13 >
14 14
15 <testsuites> 15 <testsuites>
16 <testsuite name="wallabag Test Suite"> 16 <testsuite name="wallabag Test Suite">
17 <directory>../src/Wallabag/CoreBundle/Tests</directory> 17 <directory>./src/Wallabag/*Bundle/Tests</directory>
18 </testsuite> 18 </testsuite>
19 </testsuites> 19 </testsuites>
20 20
21 <php>
22 <server name="KERNEL_DIR" value="./app/" />
23 </php>
24
21 <filter> 25 <filter>
22 <whitelist> 26 <whitelist>
23 <directory>../src</directory> 27 <directory>./src</directory>
24 <exclude> 28 <exclude>
25 <directory>../vendor</directory> 29 <directory>./vendor</directory>
26 <directory>../src/Wallabag/CoreBundle/Resources</directory> 30 <directory>./src/Wallabag/*Bundle/Resources</directory>
27 <directory>../src/Wallabag/CoreBundle/Tests</directory> 31 <directory>./src/Wallabag/*Bundle/Tests</directory>
28 <directory>../src/Wallabag/CoreBundle/DataFixtures</directory> 32 <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
29 </exclude> 33 </exclude>
30 </whitelist> 34 </whitelist>
31 </filter> 35 </filter>