diff options
| -rw-r--r-- | example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj | 16 | ||||
| -rwxr-xr-x | scripts/get-ios.sh | 16 | ||||
| -rwxr-xr-x | scripts/get-mac.sh | 15 |
3 files changed, 32 insertions, 15 deletions
diff --git a/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj b/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj index fcbc075b..4243a6a3 100644 --- a/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj +++ b/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj @@ -415,7 +415,7 @@ C6181D2F19FDA8EA0088FBBC /* MailCore-ios.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = "MailCore-ios.framework"; + path = MailCore.framework; remoteRef = C6181D2E19FDA8EA0088FBBC /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -522,13 +522,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../Externals/ctemplate-ios/lib", - "$(SRCROOT)/../../../Externals/libetpan-ios/lib", - "$(SRCROOT)/../../../Externals/tidy-html5-ios/lib", - "$(SRCROOT)/../../../Externals/uchardet-ios/lib", - "$(SRCROOT)/../../../Externals/libsasl-ios/lib", - ); ONLY_ACTIVE_ARCH = NO; SDKROOT = iphoneos; }; @@ -552,13 +545,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../Externals/ctemplate-ios/lib", - "$(SRCROOT)/../../../Externals/libetpan-ios/lib", - "$(SRCROOT)/../../../Externals/tidy-html5-ios/lib", - "$(SRCROOT)/../../../Externals/uchardet-ios/lib", - "$(SRCROOT)/../../../Externals/libsasl-ios/lib", - ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; diff --git a/scripts/get-ios.sh b/scripts/get-ios.sh index 32a3eb3e..4296523c 100755 --- a/scripts/get-ios.sh +++ b/scripts/get-ios.sh @@ -11,3 +11,19 @@ for dep in $deps ; do name="$dep" get_prebuilt_dep done + +deps+=" libsasl-ios" +if test "x$CONFIGURATION_BUILD_DIR" != x ; then + mkdir -p "$CONFIGURATION_BUILD_DIR" + cd "$scriptpath/../Externals" + for dep in $deps ; do + if test -d "$dep" ; then + if test -d "$dep"/lib ; then + rsync -a "$dep"/lib/ "$CONFIGURATION_BUILD_DIR" + fi + if test -d "$dep"/include ; then + rsync -a "$dep"/include/ "$CONFIGURATION_BUILD_DIR/include/" + fi + fi + done +fi diff --git a/scripts/get-mac.sh b/scripts/get-mac.sh index 573bfe4a..ce473f4a 100755 --- a/scripts/get-mac.sh +++ b/scripts/get-mac.sh @@ -11,3 +11,18 @@ for dep in $deps ; do name="$dep" get_prebuilt_dep done + +if test "x$CONFIGURATION_BUILD_DIR" != x ; then + mkdir -p "$CONFIGURATION_BUILD_DIR" + cd "$scriptpath/../Externals" + for dep in $deps ; do + if test -d "$dep" ; then + if test -d "$dep"/lib ; then + rsync -a "$dep"/lib/ "$CONFIGURATION_BUILD_DIR" + fi + if test -d "$dep"/include ; then + rsync -a "$dep"/include/ "$CONFIGURATION_BUILD_DIR/include/" + fi + fi + done +fi |