From 554f78038867637a48b86471f395ab4105b750f0 Mon Sep 17 00:00:00 2001 From: jkoan Date: Wed, 24 Oct 2018 20:22:53 +0200 Subject: Remove unnecessary if else constructs and nixpaste --- scripts/build_win32.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'scripts') 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/ -- cgit v1.2.1