Browse Source

Fixed build script

Pierre-Olivier Latour 9 years ago
parent
commit
4ee9c30911
1 changed files with 22 additions and 18 deletions
  1. 22 18
      Run-Tests.sh

+ 22 - 18
Run-Tests.sh

@@ -1,16 +1,16 @@
 #!/bin/bash -ex
 #!/bin/bash -ex
 
 
 OSX_SDK="macosx"
 OSX_SDK="macosx"
-if [ -z "$TRAVIS" ]; then
-  IOS_SDK="iphoneos"
-else
-  IOS_SDK="iphonesimulator"
-fi
+IOS_SDK="iphonesimulator"
+TVOS_SDK="appletvsimulator"
+
 OSX_SDK_VERSION=`xcodebuild -version -sdk | grep -A 1 '^MacOSX' | tail -n 1 |  awk '{ print $2 }'`
 OSX_SDK_VERSION=`xcodebuild -version -sdk | grep -A 1 '^MacOSX' | tail -n 1 |  awk '{ print $2 }'`
-IOS_SDK_VERSION=`xcodebuild -version -sdk | grep -A 1 '^iPhone' | tail -n 1 |  awk '{ print $2 }'`
+IOS_SDK_VERSION=`xcodebuild -version -sdk | grep -A 1 '^iPhoneOS' | tail -n 1 |  awk '{ print $2 }'`
+TVOS_SDK_VERSION=`xcodebuild -version -sdk | grep -A 1 '^AppleTVOS' | tail -n 1 |  awk '{ print $2 }'`
 
 
 OSX_TARGET="GCDWebServer (Mac)"
 OSX_TARGET="GCDWebServer (Mac)"
 IOS_TARGET="GCDWebServer (iOS)"
 IOS_TARGET="GCDWebServer (iOS)"
+TVOS_TARGET="GCDWebServer (tvOS)"
 CONFIGURATION="Release"
 CONFIGURATION="Release"
 
 
 OSX_TEST_SCHEME="GCDWebServers (Mac)"
 OSX_TEST_SCHEME="GCDWebServers (Mac)"
@@ -38,22 +38,10 @@ function runTests {
 rm -rf "$BUILD_DIR"
 rm -rf "$BUILD_DIR"
 xcodebuild test -scheme "$OSX_TEST_SCHEME" "SYMROOT=$BUILD_DIR"
 xcodebuild test -scheme "$OSX_TEST_SCHEME" "SYMROOT=$BUILD_DIR"
 
 
-# Build for iOS for oldest supported deployment target (TODO: run tests on iOS)
-rm -rf "$BUILD_DIR"
-xcodebuild build -sdk "$IOS_SDK" -target "$IOS_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "IPHONEOS_DEPLOYMENT_TARGET=5.1.1" > /dev/null
-
-# Build for iOS for current deployment target (TODO: run tests on iOS)
-rm -rf "$BUILD_DIR"
-xcodebuild build -sdk "$IOS_SDK" -target "$IOS_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "IPHONEOS_DEPLOYMENT_TARGET=$IOS_SDK_VERSION" > /dev/null
-
 # Build for OS X for oldest supported deployment target
 # Build for OS X for oldest supported deployment target
 rm -rf "$BUILD_DIR"
 rm -rf "$BUILD_DIR"
 xcodebuild build -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "MACOSX_DEPLOYMENT_TARGET=10.7" > /dev/null
 xcodebuild build -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "MACOSX_DEPLOYMENT_TARGET=10.7" > /dev/null
 
 
-# Build for OS X for current deployment target
-rm -rf "$BUILD_DIR"
-xcodebuild build -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "MACOSX_DEPLOYMENT_TARGET=$OSX_SDK_VERSION" > /dev/null
-
 # Run tests
 # Run tests
 runTests $PRODUCT "htmlForm" "Tests/HTMLForm"
 runTests $PRODUCT "htmlForm" "Tests/HTMLForm"
 runTests $PRODUCT "htmlFileUpload" "Tests/HTMLFileUpload"
 runTests $PRODUCT "htmlFileUpload" "Tests/HTMLFileUpload"
@@ -64,5 +52,21 @@ runTests $PRODUCT "webDAV" "Tests/WebDAV-Finder"
 runTests $PRODUCT "webUploader" "Tests/WebUploader"
 runTests $PRODUCT "webUploader" "Tests/WebUploader"
 runTests $PRODUCT "webServer" "Tests/WebServer-Sample-Movie" "Tests/Sample-Movie.mp4"
 runTests $PRODUCT "webServer" "Tests/WebServer-Sample-Movie" "Tests/Sample-Movie.mp4"
 
 
+# Build for OS X for current deployment target
+rm -rf "$BUILD_DIR"
+xcodebuild build -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "MACOSX_DEPLOYMENT_TARGET=$OSX_SDK_VERSION" > /dev/null
+
+# Build for iOS for oldest supported deployment target
+rm -rf "$BUILD_DIR"
+xcodebuild build -sdk "$IOS_SDK" -target "$IOS_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "IPHONEOS_DEPLOYMENT_TARGET=6.0" > /dev/null
+
+# Build for iOS for current deployment target
+rm -rf "$BUILD_DIR"
+xcodebuild build -sdk "$IOS_SDK" -target "$IOS_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "IPHONEOS_DEPLOYMENT_TARGET=$IOS_SDK_VERSION" > /dev/null
+
+# Build for tvOS for current deployment target
+rm -rf "$BUILD_DIR"
+xcodebuild build -sdk "$TVOS_SDK" -target "$TVOS_TARGET" -configuration "$CONFIGURATION" "SYMROOT=$BUILD_DIR" "TVOS_DEPLOYMENT_TARGET=$TVOS_SDK_VERSION" > /dev/null
+
 # Done
 # Done
 echo "\nAll tests completed successfully!"
 echo "\nAll tests completed successfully!"