devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 10:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1144 from wallabag/v2-build

Browse Source 
Simplify build system
This commit is contained in:
Nicolas Lœuillet 2015-03-04 06:25:17 +01:00
commit 73b7744383
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -26,9 +26,9 @@
/web/bundles/ /web/bundles/
/web/uploads/ /web/uploads/
# PHPUnit # Build
/app/phpunit.xml /app/build
/phpunit.xml /build
# Composer PHAR # Composer PHAR
/composer.phar /composer.phar

4
.travis.yml
View File

@ -14,5 +14,5 @@ before_script:
- echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
script: script:
- ant -f app/build.xml prepare - ant prepare
- phpunit -c app --coverage-text - phpunit --coverage-text

11
app/build.xml → build.xml
View File

@ -11,31 +11,30 @@
<arg value="install"/> <arg value="install"/>
<arg value="--no-interaction"/> <arg value="--no-interaction"/>
<arg value="--no-progress"/> <arg value="--no-progress"/>
<arg value="--working-dir=.."/>
</exec> </exec>
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/../app/console"/> <arg value="${basedir}/app/console"/>
<arg value="doctrine:database:drop"/> <arg value="doctrine:database:drop"/>
<arg value="--force"/> <arg value="--force"/>
<arg value="--env=test"/> <arg value="--env=test"/>
</exec> </exec>
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/../app/console"/> <arg value="${basedir}/app/console"/>
<arg value="doctrine:database:create"/> <arg value="doctrine:database:create"/>
<arg value="--env=test"/> <arg value="--env=test"/>
</exec> </exec>
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/../app/console"/> <arg value="${basedir}/app/console"/>
<arg value="doctrine:schema:create"/> <arg value="doctrine:schema:create"/>
<arg value="--env=test"/> <arg value="--env=test"/>
</exec> </exec>
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/../app/console"/> <arg value="${basedir}/app/console"/>
<arg value="cache:clear"/> <arg value="cache:clear"/>
<arg value="--env=test"/> <arg value="--env=test"/>
</exec> </exec>
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/../app/console"/> <arg value="${basedir}/app/console"/>
<arg value="doctrine:fixtures:load"/> <arg value="doctrine:fixtures:load"/>
<arg value="--no-interaction"/> <arg value="--no-interaction"/>
<arg value="--env=test"/> <arg value="--env=test"/>

18
app/phpunit.xml.dist → phpunit.xml.dist
View File

@ -9,23 +9,27 @@
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false"
syntaxCheck="false" syntaxCheck="false"
bootstrap="bootstrap.php.cache" bootstrap="app/bootstrap.php.cache"
> >
<testsuites> <testsuites>
<testsuite name="wallabag Test Suite"> <testsuite name="wallabag Test Suite">
<directory>../src/Wallabag/CoreBundle/Tests</directory> <directory>./src/Wallabag/*Bundle/Tests</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<php>
<server name="KERNEL_DIR" value="./app/" />
</php>
<filter> <filter>
<whitelist> <whitelist>
<directory>../src</directory> <directory>./src</directory>
<exclude> <exclude>
<directory>../vendor</directory> <directory>./vendor</directory>
<directory>../src/Wallabag/CoreBundle/Resources</directory> <directory>./src/Wallabag/*Bundle/Resources</directory>
<directory>../src/Wallabag/CoreBundle/Tests</directory> <directory>./src/Wallabag/*Bundle/Tests</directory>
<directory>../src/Wallabag/CoreBundle/DataFixtures</directory> <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
</exclude> </exclude>
</whitelist> </whitelist>
</filter> </filter>