From c6934faa6a32f64f7f5f30c0e8476cbe8f87b2ee Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 17 Oct 2016 22:35:29 +0200 Subject: [PATCH] Improve build script --- bin/build.sh | 2 +- bin/build_vimr.sh | 12 +++++++++++- bin/clean_old_builds.sh | 3 --- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index c217f728..6429c430 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -17,7 +17,7 @@ echo "### Building VimR" ./bin/prepare_repositories.sh ./bin/clean_old_builds.sh ./bin/set_new_versions.sh ${IS_SNAPSHOT} "${MARKETING_VERSION}" -./bin/build_vimr.sh +./bin/build_vimr.sh true BUNDLE_VERSION=$(agvtool what-version | sed '2q;d' | sed -E 's/ +(.+)/\1/') MARKETING_VERSION=$(agvtool what-marketing-version | tail -n 1 | sed -E 's/.*of "(.*)" in.*/\1/') diff --git a/bin/build_vimr.sh b/bin/build_vimr.sh index 41efad65..a5e77b74 100755 --- a/bin/build_vimr.sh +++ b/bin/build_vimr.sh @@ -1,5 +1,7 @@ #!/bin/bash +CODE_SIGN=$1 + echo "### Building VimR target" # Build NeoVim @@ -27,7 +29,15 @@ make libnvim popd +echo "### Updating carthage" +carthage update --platform osx + echo "### Xcodebuilding" -xcodebuild CODE_SIGN_IDENTITY="Developer ID Application: Tae Won Ha (H96Q2NKTQH)" -configuration Release -target VimR + +if [ "${CODE_SIGN}" = true ] ; then + xcodebuild CODE_SIGN_IDENTITY="Developer ID Application: Tae Won Ha (H96Q2NKTQH)" -configuration Release -target VimR +else + xcodebuild -configuration Release -target VimR +fi echo "### Built VimR target" diff --git a/bin/clean_old_builds.sh b/bin/clean_old_builds.sh index 733e32b2..b9ddb38f 100755 --- a/bin/clean_old_builds.sh +++ b/bin/clean_old_builds.sh @@ -10,7 +10,4 @@ rm -rf build make distclean popd -echo "### Updating carthage" -carthage update --platform osx - echo "### Cleaned old builds"