diff --git a/scripts/preparation.osx.sh b/scripts/preparation.osx.sh index 7dd8db2f..9de26c7f 100644 --- a/scripts/preparation.osx.sh +++ b/scripts/preparation.osx.sh @@ -28,5 +28,5 @@ brew update > /dev/null brew install zsh || brew upgrade zsh || true brew install git || brew upgrade git || true brew install cmake || brew upgrade cmake || true -brew install python || brew upgrade python || true +brew install python3 || brew upgrade python3 || true brew install ninja || brew upgrade ninja || true diff --git a/scripts/run.osx.sh b/scripts/run.osx.sh index c445d755..d7608461 100644 --- a/scripts/run.osx.sh +++ b/scripts/run.osx.sh @@ -1,19 +1,19 @@ -mkdir -p build-sol2/Debug -mkdir -p build-sol2/Release -cd build-sol2 - -echo "=== Compiler and tool variables ===" -ninja --version -cmake --version - -cd Debug - cmake ${SOL2_DIR} -G Xcode -DCMAKE_BUILD_TYPE=Debug -DLUA_VERSION="${LUA_VERSION}" -DCI=ON -DPLATFORM=${PLATFORM} -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON - cmake --build . --config Debug - ctest --build-config Debug --output-on-failure -cd .. - -cd Release - cmake ${SOL2_DIR} -G Xcode -DCMAKE_BUILD_TYPE=Release -DLUA_VERSION="${LUA_VERSION}" -DCI=ON -DPLATFORM=${PLATFORM} -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON - cmake --build . --config Release - ctest --build-config Release --output-on-failure -cd .. +mkdir -p build-sol2/Debug +mkdir -p build-sol2/Release +cd build-sol2 + +echo "=== Compiler and tool variables ===" +ninja --version +cmake --version + +cd Debug + cmake ${SOL2_DIR} -G Xcode -DCMAKE_BUILD_TYPE=Debug -DLUA_VERSION="${LUA_VERSION}" -DCI=ON -DPLATFORM=${PLATFORM} -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON + cmake --build . --config Debug + ctest --build-config Debug --output-on-failure +cd .. + +cd Release + cmake ${SOL2_DIR} -G Xcode -DCMAKE_BUILD_TYPE=Release -DLUA_VERSION="${LUA_VERSION}" -DCI=ON -DPLATFORM=${PLATFORM} -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DEXAMPLES_SINGLE=ON -DTESTS_SINGLE=ON + cmake --build . --config Release + ctest --build-config Release --output-on-failure +cd ..