diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 19:10:25 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 19:10:25 +0000 |
| commit | 45551d137e733326eeee1cc3fea0f018ba58e8eb (patch) | |
| tree | 6b7599693675dacf817b13c2cff5997d7fe486b5 /BuildTools/Scripts | |
| parent | fixed build scripts to pipe xcode error code to travis (diff) | |
| download | DiligentCore-45551d137e733326eeee1cc3fea0f018ba58e8eb.tar.gz DiligentCore-45551d137e733326eeee1cc3fea0f018ba58e8eb.zip | |
Update to linux/mac build scripts to not terminate current shell
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build.sh | 2 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/build_install.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/Scripts/travis/build.sh b/BuildTools/Scripts/travis/build.sh index 36fb88ca..391100ac 100755 --- a/BuildTools/Scripts/travis/build.sh +++ b/BuildTools/Scripts/travis/build.sh @@ -12,6 +12,6 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then else cmake .. $1 -G "Xcode" fi - xcodebuild -configuration ${CONFIG} | xcpretty && exit ${PIPESTATUS[0]} + xcodebuild -configuration ${CONFIG} | xcpretty && return ${PIPESTATUS[0]} fi diff --git a/BuildTools/Scripts/travis/build_install.sh b/BuildTools/Scripts/travis/build_install.sh index 07360cea..fc5b608f 100755 --- a/BuildTools/Scripts/travis/build_install.sh +++ b/BuildTools/Scripts/travis/build_install.sh @@ -12,6 +12,6 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then else cmake .. -DCMAKE_INSTALL_PREFIX=install -G "Xcode" fi - cmake --build . --target install --config ${CONFIG} | xcpretty && exit ${PIPESTATUS[0]} + cmake --build . --target install --config ${CONFIG} | xcpretty && return ${PIPESTATUS[0]} fi |