Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Gut script/cibuild and replace with previous build server logic

  • Loading branch information...
commit 4787101268ead8960411e38f372415852fd3bc90 1 parent f4a4f3b
Justin Spahr-Summers jspahrsummers authored
2  ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa.xcscheme
View
@@ -22,7 +22,7 @@
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
- buildForRunning = "NO"
+ buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
85 script/cibuild
View
@@ -1,7 +1,7 @@
#!/bin/bash
-SCRIPT_DIR=$(dirname "$0")
-cd "$SCRIPT_DIR/.."
+cd "$(dirname "$0")/../ReactiveCocoaFramework"
+SCRIPT_DIR=../script
##
## Configuration Variables
@@ -13,102 +13,27 @@ then
XCCONFIGURATION="Release"
fi
-# The workspace to build.
-#
-# If not set and no workspace is found, the -workspace flag will not be passed
-# to xcodebuild.
-if [ -z "$XCWORKSPACE" ]
-then
- XCWORKSPACE=$(ls -d *.xcworkspace 2>/dev/null | head -n 1)
-fi
-
# A bootstrap script to run before building.
#
# If this file does not exist, it is not considered an error.
BOOTSTRAP="$SCRIPT_DIR/bootstrap"
-# A whitespace-separated list of default targets or schemes to build, if none
-# are specified on the command line.
-#
-# Individual names can be quoted to avoid word splitting.
-DEFAULT_TARGETS=
-
# Extra build settings to pass to xcodebuild.
-XCODEBUILD_SETTINGS="TEST_AFTER_BUILD=YES"
+XCODEBUILD_SETTINGS=
##
## Build Process
##
-if [ -z "$*" ]
-then
- # lol recursive shell script
- if [ -n "$DEFAULT_TARGETS" ]
- then
- echo "$DEFAULT_TARGETS" | xargs "$SCRIPT_DIR/cibuild"
- else
- xcodebuild -list | awk -f "$SCRIPT_DIR/targets.awk" | xargs "$SCRIPT_DIR/cibuild"
- fi
-
- exit $?
-fi
-
if [ -f "$BOOTSTRAP" ]
then
echo "*** Bootstrapping..."
bash "$BOOTSTRAP" || exit $?
fi
-echo "*** The following targets will be built:"
-
-for target in "$@"
-do
- echo "$target"
-done
-
echo "*** Cleaning all targets..."
xcodebuild -alltargets clean OBJROOT="$PWD/build" SYMROOT="$PWD/build" $XCODEBUILD_SETTINGS
-run_xcodebuild ()
-{
- local scheme=$1
-
- if [ -n "$XCWORKSPACE" ]
- then
- xcodebuild -workspace "$XCWORKSPACE" -scheme "$scheme" -configuration "$XCCONFIGURATION" build OBJROOT="$PWD/build" SYMROOT="$PWD/build" $XCODEBUILD_SETTINGS
- else
- xcodebuild -scheme "$scheme" -configuration "$XCCONFIGURATION" build OBJROOT="$PWD/build" SYMROOT="$PWD/build" $XCODEBUILD_SETTINGS
- fi
-
- local status=$?
-
- return $status
-}
-
-build_scheme ()
-{
- local scheme=$1
-
- run_xcodebuild "$scheme" 2>&1 | awk -f "$SCRIPT_DIR/xcodebuild.awk"
-
- local awkstatus=$?
- local xcstatus=${PIPESTATUS[0]}
-
- if [ "$xcstatus" -eq "65" ]
- then
- # This probably means that there's no scheme by that name. Give up.
- echo "*** Error building scheme $scheme -- perhaps it doesn't exist"
- elif [ "$awkstatus" -eq "1" ]
- then
- return $awkstatus
- fi
-
- return $xcstatus
-}
-
echo "*** Building..."
-
-for scheme in "$@"
-do
- build_scheme "$scheme" || exit $?
-done
+xcodebuild -configuration "$XCCONFIGURATION" -scheme ReactiveCocoa test OBJROOT="$PWD/build" SYMROOT="$PWD/build" $XCODEBUILD_SETTINGS || exit $?
+xcodebuild -configuration "$XCCONFIGURATION" -scheme ReactiveCocoa-iOS build OBJROOT="$PWD/build" SYMROOT="$PWD/build" $XCODEBUILD_SETTINGS || exit $?
Please sign in to comment.
Something went wrong with that request. Please try again.