Merge with 3.7

This commit is contained in:
Romain Neutron
2012-10-05 14:10:26 +02:00

View File

@@ -9,7 +9,6 @@ before_script:
- cp -f hudson/_GV.php config/
- curl -s http://getcomposer.org/installer | php
- php composer.phar install --dev
- sudo apt-get update
- sudo apt-get install -y xpdf ffmpeg libavcodec-extra-53 openoffice.org-writer unoconv ghostscript gsfonts dcraw ufraw graphicsmagick libgraphicsmagick1-dev libfreetype6-dev libjpeg-dev libgif-dev libtiff-dev libdjvulibre-dev libwmf-dev libmagickcore-dev libmagickwand-dev libpng-dev gettext zlib1g-dev build-essential libfaac-dev libmp3lame0 libx264-dev libvpx-dev libtheora-dev libvorbis-dev gpac
- sudo apt-get autoremove
- sudo apt-get clean
@@ -18,6 +17,7 @@ before_script:
- sudo mysql -e "GRANT ALL PRIVILEGES ON db_unitTests.* TO 'phraseaUnitTests'@'localhost' IDENTIFIED BY 'iWvGxPE8' WITH GRANT OPTION"
- mysql -e "source `pwd`/hudson/fixtures.sql"
- mysql -e 'SET @@global.sql_mode= "";'
- mysql -e 'SET @@global.wait_timeout= 999999;'
- git clone git://github.com/alchemy-fr/Phraseanet-Extension.git
- sh -c "cd Phraseanet-Extension && ./configure && make && sudo make install"
- echo "extension=phrasea2.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`