Permalink
Browse files

Stop using OpenSSL

Don't link libcrypto*.a into the library; instead link the
EmptyApp against Security.framework.

Change-Id: Iaddf6a723e38fcec1f6a9920f7df22d21a8ce8ea
Reviewed-on: http://review.couchbase.org/9589
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Jens Alfke <jens@couchbase.com>
  • Loading branch information...
1 parent deeefaf commit 4385ede3b978128c4189023ed2ea6582dff15a6c @snej snej committed Sep 14, 2011

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -17,6 +17,8 @@
273112E1140559B30072C622 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27A3ACF213C78BD9008CE9F0 /* InfoPlist.strings */; };
273112EB14055A410072C622 /* app.ini in Resources */ = {isa = PBXBuildFile; fileRef = 273112EA14055A410072C622 /* app.ini */; };
278D67FA1411494100198716 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A3AD0113C78BD9008CE9F0 /* SenTestingKit.framework */; };
+ 27962304142026430051455D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27962303142026430051455D /* Security.framework */; };
+ 2796230D142109170051455D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27962303142026430051455D /* Security.framework */; };
27A3ACEA13C78BD9008CE9F0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A3ACE913C78BD9008CE9F0 /* UIKit.framework */; };
27A3ACEC13C78BD9008CE9F0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A3ACEB13C78BD9008CE9F0 /* Foundation.framework */; };
27A3ACEE13C78BD9008CE9F0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A3ACED13C78BD9008CE9F0 /* CoreGraphics.framework */; };
@@ -50,6 +52,7 @@
273112E6140559B30072C622 /* Listener.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Listener.app; sourceTree = BUILT_PRODUCTS_DIR; };
273112EA14055A410072C622 /* app.ini */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = app.ini; sourceTree = "<group>"; };
2753C254140D54E300F334A7 /* installResources.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = installResources.sh; sourceTree = "<group>"; };
+ 27962303142026430051455D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
27A3ACE513C78BD9008CE9F0 /* Empty App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Empty App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
27A3ACE913C78BD9008CE9F0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
27A3ACEB13C78BD9008CE9F0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -75,19 +78,21 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 273112DF140559B30072C622 /* Couchbase.framework in Frameworks */,
+ 273112DE140559B30072C622 /* CoreGraphics.framework in Frameworks */,
+ 273112DD140559B30072C622 /* Foundation.framework in Frameworks */,
+ 2796230D142109170051455D /* Security.framework in Frameworks */,
278D67FA1411494100198716 /* SenTestingKit.framework in Frameworks */,
- 273112DB140559B30072C622 /* libstdc++.dylib in Frameworks */,
273112DC140559B30072C622 /* UIKit.framework in Frameworks */,
- 273112DD140559B30072C622 /* Foundation.framework in Frameworks */,
- 273112DE140559B30072C622 /* CoreGraphics.framework in Frameworks */,
- 273112DF140559B30072C622 /* Couchbase.framework in Frameworks */,
+ 273112DB140559B30072C622 /* libstdc++.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
27A3ACE213C78BD9008CE9F0 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 27962304142026430051455D /* Security.framework in Frameworks */,
27A3AD1D13C78DAC008CE9F0 /* libstdc++.dylib in Frameworks */,
27A3ACEA13C78BD9008CE9F0 /* UIKit.framework in Frameworks */,
27A3ACEC13C78BD9008CE9F0 /* Foundation.framework in Frameworks */,
@@ -114,6 +119,7 @@
27A3ACDA13C78BD9008CE9F0 = {
isa = PBXGroup;
children = (
+ 27962303142026430051455D /* Security.framework */,
27A3ACEF13C78BD9008CE9F0 /* Source */,
27A3AD0813C78BD9008CE9F0 /* Tests */,
27A3ACE813C78BD9008CE9F0 /* Frameworks */,
@@ -9,10 +9,6 @@
/* Begin PBXBuildFile section */
27167C5C13C4DB53001CC5B6 /* CouchbaseMobile.h in Headers */ = {isa = PBXBuildFile; fileRef = 79C3C6F4131F011A00C8B96D /* CouchbaseMobile.h */; settings = {ATTRIBUTES = (Public, ); }; };
27167C5E13C4DB53001CC5B6 /* CouchbaseMobile.m in Sources */ = {isa = PBXBuildFile; fileRef = 79C3C6F5131F011A00C8B96D /* CouchbaseMobile.m */; };
- 27167C6213C4DB53001CC5B6 /* libcrypto-iphonesimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E8394C1353ADF300D64D0D /* libcrypto-iphonesimulator.a */; };
- 27167C6313C4DB53001CC5B6 /* libssl-iphonesimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E8394D1353ADF300D64D0D /* libssl-iphonesimulator.a */; };
- 27167C6B13C4DFFF001CC5B6 /* libcrypto-iphoneos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E839481353ADE600D64D0D /* libcrypto-iphoneos.a */; };
- 27167C6C13C4E002001CC5B6 /* libssl-iphoneos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E839491353ADE600D64D0D /* libssl-iphoneos.a */; };
27167ECC13C4E644001CC5B6 /* libiErl14.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27167ECB13C4E644001CC5B6 /* libiErl14.a */; };
273A733613BD473D0078870D /* CouchbaseMobile.h in Copy Header(s) */ = {isa = PBXBuildFile; fileRef = 79C3C6F4131F011A00C8B96D /* CouchbaseMobile.h */; };
273A734213BD4DE90078870D /* default.ini in Copy into CouchbaseResources */ = {isa = PBXBuildFile; fileRef = 3D4791CB12A19F6A00581D10 /* default.ini */; };
@@ -87,10 +83,6 @@
buildActionMask = 2147483647;
files = (
27167ECC13C4E644001CC5B6 /* libiErl14.a in Frameworks */,
- 27167C6213C4DB53001CC5B6 /* libcrypto-iphonesimulator.a in Frameworks */,
- 27167C6313C4DB53001CC5B6 /* libssl-iphonesimulator.a in Frameworks */,
- 27167C6B13C4DFFF001CC5B6 /* libcrypto-iphoneos.a in Frameworks */,
- 27167C6C13C4E002001CC5B6 /* libssl-iphoneos.a in Frameworks */,
278FE89713E74C7A009FEE49 /* libiMonkey.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
View
@@ -68,9 +68,10 @@ The empty app, as the name implies, doesn't actually do anything. It's just an i
1. Open your Xcode project.
2. Drag the Couchbase.framework you built previously into the “Frameworks” section of the file list in your project window.
-3. If your project doesn't already contain any C++ code, you'll need to add the C++ library: Go to the target's Build Phases, open "Link Binary With Libraries", click the "+" button, and add "libstdc++.dylib".
-4. Go to the target's Build Phases and add a new Run Script phase.
-5. Paste the following into the script content of the new phase. (NOTE: If you put the Couchbase framework elsewhere, update the path in the 2nd argument to ‘rsync’ accordingly.)
+3. Link your target against the Security framework if it doesn't already. Go to the target's Build Phases and open "Link Binary With Libraries". If "Security.framework" isn't in the list, click the "+" button, and add it.
+4. Similarly, if your project doesn't already contain any C++ code, you'll need to add the C++ library ("libstdc++.dylib") using the same steps as above.
+5. Go to the target's Build Phases and add a new Run Script phase.
+6. Paste the following into the script content of the new phase. (NOTE: If you put the Couchbase framework elsewhere, update the path in the 2nd argument to ‘rsync’ accordingly.)
_Important: The `rsync` command below is a single long line. Do not put a newline in the middle!_

0 comments on commit 4385ede

Please sign in to comment.