Replace script references to ObjectiveGit with SwiftGit2

This commit is contained in:
Matt Rubin 2016-12-09 13:52:02 -08:00
parent 4a562fd653
commit 9552145b9e
2 changed files with 9 additions and 9 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash -ex
#
# script/cibuild
# ObjectiveGit
# SwiftGit2
#
# Executes the build and runs tests for Mac and iOS. Designed to be invoked by
# Travis as a matrix build so that the two platform builds can run in parallel.
@ -15,15 +15,15 @@
#
# Environment Variables:
# - SCHEME: specifies which Xcode scheme to build. Set to one of the following:
# - ObjectiveGit Mac
# - ObjectiveGit iOS
# - SwiftGit2-OSX
# - SwiftGit2-iOS
# - TRAVIS: indicates when the build is being run by travis, used to invoke
# the xcpretty-travis-formatter gem for output.
if [ -z "$SCHEME" ]; then
echo "The SCHEME environment variable is empty. Please set this to one of:"
echo "- ObjectiveGit Mac"
echo "- ObjectiveGit iOS"
echo "- SwiftGit2-OSX"
echo "- SwiftGit2-iOS"
exit 1
fi
@ -34,7 +34,7 @@ fi
set -o pipefail
SCRIPT_DIR=$(dirname "$0")
XCWORKSPACE="ObjectiveGitFramework.xcworkspace"
XCWORKSPACE="SwiftGit2.xcworkspace"
XCODE_OPTIONS=$(RUN_CLANG_STATIC_ANALYZER=NO ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO)
if [ -n "$TRAVIS" ]; then
@ -51,7 +51,7 @@ fi
echo "*** Bootstrapping..."
"$SCRIPT_DIR/bootstrap"
if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
if [ "$SCHEME" == "SwiftGit2-OSX" ]; then
echo "*** Building and testing $SCHEME..."
echo
@ -60,7 +60,7 @@ if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
${XCODE_OPTIONS[*]} \
build test \
2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
elif [ "$SCHEME" == "SwiftGit2-iOS" ]; then
echo "*** Prebuilding OpenSSL"
"$SCRIPT_DIR/update_libssl_ios"

View File

@ -2,7 +2,7 @@
#
# clean_externals
# ObjectiveGit
# SwiftGit2
#
# Removes the outputs from the various static library targets.
# Necessary when switching platforms/architectures as Xcode does not clean