From fc46e9f0e7bbab74ca92db1fe98a0ba4ff65a616 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Sun, 26 Oct 2014 15:18:42 -0700 Subject: Fixed build --- build-mac/mailcore2.xcodeproj/project.pbxproj | 8 +++- .../iOS UI Test.xcodeproj/project.pbxproj | 54 ++++++++++++++++++---- scripts/include.sh/build-dep.sh | 18 ++++++-- 3 files changed, 67 insertions(+), 13 deletions(-) diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index b9e97e69..a7838c27 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -4556,6 +4556,7 @@ INFOPLIST_FILE = "framework-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", "-lxml2", @@ -4582,6 +4583,7 @@ INFOPLIST_FILE = "framework-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", "-lxml2", @@ -4633,7 +4635,7 @@ "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)"; "HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)"; IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" \"$(SRCROOT)/../Externals/uchardet-ios/include\" /usr/include/libxml2"; - IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/include\""; + IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/lib\""; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../Externals/libetpan/lib\"", "\"$(SRCROOT)/../Externals/icu4c/lib\"", @@ -4681,7 +4683,7 @@ "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)"; "HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)"; IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" \"$(SRCROOT)/../Externals/uchardet-ios/include\" /usr/include/libxml2"; - IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/include\""; + IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\" \"$(SRCROOT)/../Externals/uchardet-ios/lib\""; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../Externals/libetpan/lib\"", "\"$(SRCROOT)/../Externals/icu4c/lib\"", @@ -4746,6 +4748,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", "-lxml2", @@ -4777,6 +4780,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", "-lxml2", 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 bb9f0ea1..fcbc075b 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 @@ -81,6 +81,20 @@ remoteGlobalIDString = C6BA2B091705F4E6003F0E9E; remoteInfo = "static mailcore2 ios"; }; + C6181D2E19FDA8EA0088FBBC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AB7BA4321713898B00104953 /* mailcore2.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 27780C3A19CF9CD100C77E44; + remoteInfo = "mailcore ios"; + }; + C6181D3019FDA8EA0088FBBC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AB7BA4321713898B00104953 /* mailcore2.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C6B5AE0219F630B3001352A6; + remoteInfo = unittest; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -170,6 +184,8 @@ AB7BA43F1713898B00104953 /* tests */, AB7BA4411713898B00104953 /* test-ios.app */, AB7BA4431713898B00104953 /* MailCore.framework */, + C6181D2F19FDA8EA0088FBBC /* MailCore-ios.framework */, + C6181D3119FDA8EA0088FBBC /* unittest.xctest */, ); name = Products; sourceTree = ""; @@ -396,6 +412,20 @@ remoteRef = AB7BA4421713898B00104953 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + C6181D2F19FDA8EA0088FBBC /* MailCore-ios.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = "MailCore-ios.framework"; + remoteRef = C6181D2E19FDA8EA0088FBBC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C6181D3119FDA8EA0088FBBC /* unittest.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = unittest.xctest; + remoteRef = C6181D3019FDA8EA0088FBBC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -492,6 +522,13 @@ 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; }; @@ -515,6 +552,13 @@ 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; @@ -530,11 +574,9 @@ GCC_PREFIX_HEADER = "iOS UI Test/iOS UI Test-Prefix.pch"; INFOPLIST_FILE = "iOS UI Test/iOS UI Test-Info.plist"; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", - "-licudata", - "-licui18n", - "-licuuc", "-lxml2", "-lsasl2", "-liconv", @@ -542,7 +584,6 @@ "-ltidy", "-lc++", "-lz", - "-licucore", ); PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -557,11 +598,9 @@ GCC_PREFIX_HEADER = "iOS UI Test/iOS UI Test-Prefix.pch"; INFOPLIST_FILE = "iOS UI Test/iOS UI Test-Info.plist"; OTHER_LDFLAGS = ( + "-luchardet-ios", "-lctemplate-ios", "-letpan-ios", - "-licudata", - "-licui18n", - "-licuuc", "-lxml2", "-lsasl2", "-liconv", @@ -569,7 +608,6 @@ "-ltidy", "-lc++", "-lz", - "-licucore", ); PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh index 1af2a5c4..9e38fc9c 100755 --- a/scripts/include.sh/build-dep.sh +++ b/scripts/include.sh/build-dep.sh @@ -93,7 +93,13 @@ build_git_ios() "Release-iphonesimulator/$library" \ -output "$name-$version/$name/lib/$library" for dep in $embedded_deps ; do - mv "$srcdir/$name/build-mac/$dep" "$name-$version" + if test -d "$srcdir/$name/build-mac/$dep" ; then + mv "$srcdir/$name/build-mac/$dep" "$name-$version" + elif test -d "$srcdir/$name/Externals/$dep" ; then + mv "$srcdir/$name/Externals/$dep" "$name-$version" + else + echo Dependency $dep not found + fi done echo "$rev"> "$name-$version/git-rev" mkdir -p "$resultdir/$name" @@ -174,7 +180,13 @@ build_git_osx() mv Release/include "$name-$version/$name" mv "Release/$library" "$name-$version/$name/lib" for dep in $embedded_deps ; do - mv "$srcdir/$name/build-mac/$dep" "$name-$version" + if test -d "$srcdir/$name/build-mac/$dep" ; then + mv "$srcdir/$name/build-mac/$dep" "$name-$version" + elif test -d "$srcdir/$name/Externals/$dep" ; then + mv "$srcdir/$name/Externals/$dep" "$name-$version" + else + echo Dependency $dep not found + fi done echo "$rev"> "$name-$version/git-rev" mkdir -p "$resultdir/$name" @@ -211,6 +223,6 @@ get_prebuilt_dep() curl -O "$url/$name/$name-$version.zip" unzip -q "$name-$version.zip" rm -rf "$scriptpath/../Externals/$name" - mv "$name-$version/$name" "$scriptpath/../Externals" + mv "$name-$version"/* "$scriptpath/../Externals" rm -rf "$tempbuilddir" } -- cgit v1.2.3