From d840081ca6ab6c3f46e9a771cd4d6d4dd8e2b797 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 10 Sep 2018 12:48:14 +0200 Subject: [PATCH] Update release script --- tools/release/build_delivery_mac.sh | 22 +++++++++++----------- tools/release/build_delivery_unix.sh | 22 +++++++++++----------- tools/release/publish_delivery_mac.sh | 2 +- tools/release/test_delivery_mac.sh | 12 ++++++------ tools/release/test_delivery_unix.sh | 12 ++++++------ 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/release/build_delivery_mac.sh b/tools/release/build_delivery_mac.sh index 24826d5ae3..6753c39636 100755 --- a/tools/release/build_delivery_mac.sh +++ b/tools/release/build_delivery_mac.sh @@ -1,22 +1,22 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e # Check all prerequisite # cc -which clang | xargs echo "clang: " | tee build.log -which cmake | xargs echo "cmake: " | tee -a build.log -which make | xargs echo "make: " | tee -a build.log -which swig | xargs echo "swig: " | tee -a build.log +command -v clang | xargs echo "clang: " | tee build.log +command -v cmake | xargs echo "cmake: " | tee -a build.log +command -v make | xargs echo "make: " | tee -a build.log +command -v swig | xargs echo "swig: " | tee -a build.log # python -which python2.7 | xargs echo "python2.7: " | tee -a build.log -which python3.7 | xargs echo "python3.7: " | tee -a build.log +command -v python2.7 | xargs echo "python2.7: " | tee -a build.log +command -v python3.7 | xargs echo "python3.7: " | tee -a build.log # java -which java | xargs echo "java: " | tee -a build.log -which javac | xargs echo "javac: " | tee -a build.log -which jar | xargs echo "jar: " | tee -a build.log +command -v java | xargs echo "java: " | tee -a build.log +command -v javac | xargs echo "javac: " | tee -a build.log +command -v jar | xargs echo "jar: " | tee -a build.log # C# -which dotnet | xargs echo "dotnet: " | tee -a build.log +command -v dotnet | xargs echo "dotnet: " | tee -a build.log # Build Third Party make clean_third_party diff --git a/tools/release/build_delivery_unix.sh b/tools/release/build_delivery_unix.sh index de4f2893c6..a2bbe7a7b3 100755 --- a/tools/release/build_delivery_unix.sh +++ b/tools/release/build_delivery_unix.sh @@ -1,22 +1,22 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e # Check all prerequisite # cc -which gcc | xargs echo "gcc: " | tee build.log -which cmake | xargs echo "cmake: " | tee -a build.log -which make | xargs echo "make: " | tee -a build.log -which swig | xargs echo "swig: " | tee -a build.log +command -v gcc | xargs echo "gcc: " | tee build.log +command -v cmake | xargs echo "cmake: " | tee -a build.log +command -v make | xargs echo "make: " | tee -a build.log +command -v swig | xargs echo "swig: " | tee -a build.log # python -which python2 | xargs echo "python2: " | tee -a build.log -which python3 | xargs echo "python3: " | tee -a build.log +command -v python2 | xargs echo "python2: " | tee -a build.log +command -v python3 | xargs echo "python3: " | tee -a build.log # java -which java | xargs echo "java: " | tee -a build.log -which javac | xargs echo "javac: " | tee -a build.log -which jar | xargs echo "jar: " | tee -a build.log +command -v java | xargs echo "java: " | tee -a build.log +command -v javac | xargs echo "javac: " | tee -a build.log +command -v jar | xargs echo "jar: " | tee -a build.log # dotnet -which dotnet | xargs echo "dotnet: " | tee -a build.log +command -v dotnet | xargs echo "dotnet: " | tee -a build.log # Build Third Party make clean_third_party diff --git a/tools/release/publish_delivery_mac.sh b/tools/release/publish_delivery_mac.sh index 4757cf61d9..a8b4734021 100755 --- a/tools/release/publish_delivery_mac.sh +++ b/tools/release/publish_delivery_mac.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e diff --git a/tools/release/test_delivery_mac.sh b/tools/release/test_delivery_mac.sh index 9ad1dc5461..32e0773805 100755 --- a/tools/release/test_delivery_mac.sh +++ b/tools/release/test_delivery_mac.sh @@ -1,15 +1,15 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e # Check all prerequisite # cc -which cmake | xargs echo "cmake: " | tee build.log -which make | xargs echo "make: " | tee -a build.log -which swig | xargs echo "swig: " | tee -a build.log +command -v cmake | xargs echo "cmake: " | tee build.log +command -v make | xargs echo "make: " | tee -a build.log +command -v swig | xargs echo "swig: " | tee -a build.log # python -which python2.7 | xargs echo "python2.7: " | tee -a build.log -which python3.7 | xargs echo "python3.7: " | tee -a build.log +command -v python2.7 | xargs echo "python2.7: " | tee -a build.log +command -v python3.7 | xargs echo "python3.7: " | tee -a build.log echo Creating Python 2.7 venv... TEMP_DIR=temp_python2.7 diff --git a/tools/release/test_delivery_unix.sh b/tools/release/test_delivery_unix.sh index c2bea752c5..8802277475 100755 --- a/tools/release/test_delivery_unix.sh +++ b/tools/release/test_delivery_unix.sh @@ -1,15 +1,15 @@ -#!/bin/bash +#!/usr/bin/env bash set -x set -e # Check all prerequisite # cc -which cmake | xargs echo "cmake: " | tee build.log -which make | xargs echo "make: " | tee -a build.log -which swig | xargs echo "swig: " | tee -a build.log +command -v cmake | xargs echo "cmake: " | tee build.log +command -v make | xargs echo "make: " | tee -a build.log +command -v swig | xargs echo "swig: " | tee -a build.log # python -which python2 | xargs echo "python2: " | tee -a build.log -which python3 | xargs echo "python3: " | tee -a build.log +command -v python2 | xargs echo "python2: " | tee -a build.log +command -v python3 | xargs echo "python3: " | tee -a build.log echo Creating Python 2 venv... TEMP_DIR=temp_python2