diff options
| author | Patrick Höhn <hoehnp@users.noreply.github.com> | 2018-10-24 21:15:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 21:15:11 +0200 |
| commit | 7901afc052c3e182993f580090a8974e894b5c1c (patch) | |
| tree | 3c95f873ecddb24e635b81a7917512b47ed30feb | |
| parent | 2962f6bdd4e1c263bed3d8dbb565fd608a1db375 (diff) | |
| parent | 554f78038867637a48b86471f395ab4105b750f0 (diff) | |
| download | navit-7901afc052c3e182993f580090a8974e894b5c1c.tar.gz | |
Merge pull request #705 from navit-gps/jkoan-clean-win32
Remove unnecessary if else constructs and nixpaste
| -rw-r--r-- | scripts/build_win32.sh | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh index 6e42d6ed4..993c0273f 100644 --- a/scripts/build_win32.sh +++ b/scripts/build_win32.sh @@ -1,34 +1,17 @@ #!/usr/bin/env bash set -e -export nixpaste="curl -F 'text=<-' http://nixpaste.lbr.uno" apt-get update && apt-get install -y mingw-w64 mingw-w64-tools \ default-jdk nsis libsaxonb-java curl mkdir win32 pushd win32 -if ! cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ - -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ -then - find . - #nixpaste < ./CMakeFiles/CMakeError.log - exit 1 -fi -if ! make -j $(nproc --all) -then - echo "make" - make -d - nixpaste < ./Makefile || cat ./Makefile - exit 1 -fi +cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \ + -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake .. +make -j $(nproc --all) +make -j $(nproc --all) package -if ! make -j $(nproc --all) package -then - echo "make package" - nixpaste < ./Makefile - exit 1 -fi popd cp win32/*.exe $CIRCLE_ARTIFACTS/ |