diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-29 16:22:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-29 17:18:48 +0300 |
| commit | 0cd441867adedc5add8b65a42d0f156e906ab25e (patch) | |
| tree | dd133bd5396f74c5ece8b1b92b6c60747400379e /nightly | |
| parent | c36fbf56e9adc9de97e96acab753ddbb939c0b8b (diff) | |
| download | manaplus-0cd441867adedc5add8b65a42d0f156e906ab25e.tar.gz manaplus-0cd441867adedc5add8b65a42d0f156e906ab25e.tar.bz2 manaplus-0cd441867adedc5add8b65a42d0f156e906ab25e.tar.xz manaplus-0cd441867adedc5add8b65a42d0f156e906ab25e.zip | |
Add fixes for localisation dir in linux portable build and error detection.
Diffstat (limited to 'nightly')
| -rwxr-xr-x | nightly/buildlinux.sh | 12 | ||||
| -rwxr-xr-x | nightly/buildwindows.sh | 13 |
2 files changed, 23 insertions, 2 deletions
diff --git a/nightly/buildlinux.sh b/nightly/buildlinux.sh index ebc07dd87..43eb06883 100755 --- a/nightly/buildlinux.sh +++ b/nightly/buildlinux.sh @@ -2,13 +2,21 @@ cd .. -DIR=`pwd` DSTDIR=packaging/build/linux autoreconf -i #make clean -./configure --datadir=. localedir=locale +./configure --enable-portable=yes +result=$? +if [ "$result" != 0 ]; then + exit $result +fi + make +result=$? +if [ "$result" != 0 ]; then + exit $result +fi if [ -e src/manaplus ]; then diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh index ede9f0f04..286471d4c 100755 --- a/nightly/buildwindows.sh +++ b/nightly/buildwindows.sh @@ -5,11 +5,24 @@ dir=`pwd` cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly . +result=$? +if [ "$result" != 0 ]; then + exit $result +fi make -j5 2>make.log +result=$? +if [ "$result" != 0 ]; then + exit $result +fi cd ./packaging/windows ./make-translations.sh +result=$? +if [ "$result" != 0 ]; then + exit $result +fi + makensis -DDLLDIR=$dir/../packaging/windows/libs/dll/ \ -DPRODUCT_VERSION="nightly-$1" \ -DEXESUFFIX=/src \ |