Browse Source

package: don't use Ninja for Emscripten as it cannot handle deps somehow.

Stuff that's depending on particular header is not recompiled after
changing the header. With make it works.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
c525d7c896
  1. 8
      package/archlinux/PKGBUILD-emscripten
  2. 7
      package/ci/jenkins-emscripten.xml

8
package/archlinux/PKGBUILD-emscripten

@ -7,7 +7,7 @@ arch=('any')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('emscripten-corrade') depends=('emscripten-corrade')
makedepends=('cmake' 'ninja' 'emscripten' 'corrade') makedepends=('cmake' 'emscripten' 'corrade')
options=('!strip' '!buildflags') options=('!strip' '!buildflags')
_rootdir=$startdir/../../ _rootdir=$startdir/../../
@ -20,7 +20,7 @@ build() {
cmake .. \ cmake .. \
-DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \
-DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \
-G Ninja -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system
fi fi
cd "$_rootdir/build-emscripten" cd "$_rootdir/build-emscripten"
@ -34,10 +34,10 @@ build() {
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON
ninja make
} }
package() { package() {
cd "$_rootdir/build-emscripten" cd "$_rootdir/build-emscripten"
DESTDIR="$pkgdir/" ninja install DESTDIR="$pkgdir/" make install
} }

7
package/ci/jenkins-emscripten.xml

@ -77,11 +77,10 @@ cmake .. \
-DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
`#-DWITH_WAVAUDIOIMPORTER=ON` \ `#-DWITH_WAVAUDIOIMPORTER=ON` \
`#-DWITH_MAGNUMINFO=ON` \ `#-DWITH_MAGNUMINFO=ON`
-G Ninja
ninja make -j
ninja install make -j install
]]> ]]>
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>

Loading…
Cancel
Save