fixing building framework and static library targets and header searc…

…h paths used. cleaned up schemes
samdmarshall · Feb 22, 2015 · 13135ff · 13135ff
1 parent 49cc10d
commit 13135ff
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 427 deletions.
diff --git a/Framework/MobileDevice/Connection/SDMMD_Connection_Internal.h b/Framework/MobileDevice/Connection/SDMMD_Connection_Internal.h
@@ -29,10 +29,15 @@
 #define _SDM_MD_CONNECTION_INTERNAL_H_
 
 #include <CoreFoundation/CoreFoundation.h>
+#if IS_FRAMEWORK
 #include <SDMMobileDevice/CFRuntime.h>
-#include <openssl/ssl.h>
-
 #include <SDMMobileDevice/SDMMD_AMDevice_Class.h>
+#else
+#include "CFRuntime.h"
+#include "SDMMD_AMDevice_Class.h"
+#endif
+
+#include <openssl/ssl.h>
 
 struct SocketConnection_Internal {
 	bool isSSL;

diff --git a/Framework/MobileDevice/Connection/SDMMD_Connection_Private.h b/Framework/MobileDevice/Connection/SDMMD_Connection_Private.h
@@ -29,10 +29,16 @@
 #define _SDM_MD_CONNECTION_PRIVATE_H_
 
 #include <CoreFoundation/CoreFoundation.h>
+#if IS_FRAMEWORK
 #include <SDMMobileDevice/CFRuntime.h>
-#include <openssl/ssl.h>
 #include <SDMMobileDevice/SDMMD_Connection_Class.h>
 #include <SDMMobileDevice/SDMMD_Connection_Internal.h>
+#else
+#include "CFRuntime.h"
+#include "SDMMD_Connection_Class.h"
+#include "SDMMD_Connection_Internal.h"
+#endif
+#include <openssl/ssl.h>
 
 SSL *SDMMD_AMDServiceConnectionGetSecureIOContext(SDMMD_AMConnectionRef connection);
 SDMMD_AMConnectionRef SDMMD__CreateTemporaryServConn(uint32_t socket, SSL *ssl);

diff --git a/Framework/MobileDevice/Services/AFC/SDMMD_AppleFileConduit.c b/Framework/MobileDevice/Services/AFC/SDMMD_AppleFileConduit.c
@@ -305,7 +305,7 @@ sdmmd_return_t SDMMD_AFCProcessOperation(SDMMD_AFCConnectionRef conn, SDMMD_AFCO
 	return result;
 }
 
-CFStringRef SDMMD_ConvertResponseString(CFDataRef CF_RELEASES_ARGUMENT response_data)
+CF_RETURNS_RETAINED CFStringRef SDMMD_ConvertResponseString(CFDataRef CF_RELEASES_ARGUMENT response_data)
 {
 	return CFStringCreateWithBytes(kCFAllocatorDefault, CFDataGetBytePtr(response_data), CFDataGetLength(response_data), kCFStringEncodingUTF8, false);
 }

diff --git a/Framework/MobileDevice/Services/AFC/SDMMD_AppleFileConduit.h b/Framework/MobileDevice/Services/AFC/SDMMD_AppleFileConduit.h
@@ -42,7 +42,7 @@ SDMMD_AFCConnectionRef SDMMD_AFCConnectionCreate(SDMMD_AMConnectionRef conn);
 
 sdmmd_return_t SDMMD_AFCProcessOperation(SDMMD_AFCConnectionRef conn, SDMMD_AFCOperationRef *operation);
 
-CFStringRef SDMMD_ConvertResponseString(CFDataRef CF_RELEASES_ARGUMENT response_data);
+CF_RETURNS_RETAINED CFStringRef SDMMD_ConvertResponseString(CFDataRef CF_RELEASES_ARGUMENT response_data);
 CFArrayRef SDMMD_ConvertResponseArray(CFDataRef CF_RELEASES_ARGUMENT response_data);
 CFDictionaryRef SDMMD_ConvertResponseDictionary(CFDataRef CF_RELEASES_ARGUMENT response_data);
 

diff --git a/Framework/MobileDevice/Services/Debugger/SDMMD_Debugger_Internal.h b/Framework/MobileDevice/Services/Debugger/SDMMD_Debugger_Internal.h
@@ -29,7 +29,11 @@
 #define SDMMobileDevice_Framework_SDMMD_Debugger_Internal_h
 
 #include <CoreFoundation/CoreFoundation.h>
+#if IS_FRAMEWORK
 #include <SDMMobileDevice/SDMMD_AMDevice.h>
+#else
+#include "SDMMD_AMDevice.h"
+#endif
 
 CFStringRef SDMMD_CopyDeviceSupportPathFromXCRUN();
 CFStringRef SDMMD_PathToDeviceSupport(SDMMD_AMDeviceRef device);

diff --git a/Framework/SDMMobileDevice-Framework.xcodeproj/project.pbxproj b/Framework/SDMMobileDevice-Framework.xcodeproj/project.pbxproj
@@ -149,6 +149,7 @@
 		22D5F31A179C820200C34745 /* SDMMD_Notification.h in Headers */ = {isa = PBXBuildFile; fileRef = 225AC5BE175B976500A47071 /* SDMMD_Notification.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		22D7FA3918F0B1BC0034CC66 /* SDMMD_AppleFileConduit.c in Sources */ = {isa = PBXBuildFile; fileRef = 22D7FA3818F0B1BC0034CC66 /* SDMMD_AppleFileConduit.c */; };
 		22D7FA3A18F0B2F50034CC66 /* SDMMD_AppleFileConduit.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D7FA3718F0B1AD0034CC66 /* SDMMD_AppleFileConduit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		22DB11761A9A4A15003641B6 /* SDMMD_FileRelay.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D281D519A79BDB0027A9F8 /* SDMMD_FileRelay.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		22FB07DC1955E88000B73D75 /* SDMMD_Initialize.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FB07DB1955E88000B73D75 /* SDMMD_Initialize.c */; };
 		22FB07DE1955E95300B73D75 /* SDMMD_Initialize.h in Headers */ = {isa = PBXBuildFile; fileRef = 22FB07DD1955E88A00B73D75 /* SDMMD_Initialize.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		22FB07E11955E9C700B73D75 /* SDMMD_MCP_Class.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FB07E01955E9C700B73D75 /* SDMMD_MCP_Class.c */; };
@@ -1040,6 +1041,7 @@
 				22B24A841965831D00A592DE /* SDMMD_USBMux_Protocol.h in Headers */,
 				22B24A851965831D00A592DE /* SDMMD_AFC_Types.h in Headers */,
 				22B24A861965831D00A592DE /* SDMMD_AFCConnection_Class.h in Headers */,
+				22DB11761A9A4A15003641B6 /* SDMMD_FileRelay.h in Headers */,
 				22B24A871965831D00A592DE /* SDMMD_AFCOperation_Class.h in Headers */,
 				22B24A881965836200A592DE /* SDMMD_Classes.h in Headers */,
 				22B24A911965836200A592DE /* SDMMD_MRecoveryModeDevice.h in Headers */,
@@ -1310,6 +1312,10 @@
 				INSTALL_PATH = "";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/$(PRODUCT_NAME)";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_CFLAGS = (
+					"-D",
+					"IS_FRAMEWORK=1",
+				);
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = SDMMobileDevice;
@@ -1347,6 +1353,10 @@
 				INSTALL_PATH = "";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/$(PRODUCT_NAME)";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_CFLAGS = (
+					"-D",
+					"IS_FRAMEWORK=1",
+				);
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = SDMMobileDevice;

diff --git a/...ework/SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SDMMobileDevice.xcscheme b/...ework/SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SDMMobileDevice.xcscheme
diff --git a/...SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SDMMobileDeviceStatic.xcscheme b/...SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SDMMobileDeviceStatic.xcscheme
diff --git a/Framework/SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SwiftTest.xcscheme b/Framework/SDMMobileDevice-Framework.xcodeproj/xcshareddata/xcschemes/SwiftTest.xcscheme
diff --git a/...eDevice-Framework.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/xcschememanagement.plist b/...eDevice-Framework.xcodeproj/xcuserdata/sam.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,20 +4,22 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>SDMMobileDevice.xcscheme_^#shared#^_</key>
+		<key>SDMMD Framework.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>SDMMobileDeviceStatic.xcscheme_^#shared#^_</key>
+		<key>SDMMD Static Library.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
-		<key>SwiftTest.xcscheme_^#shared#^_</key>
+		<key>SwiftTest.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<false/>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/SDMMobileDevice.xcworkspace/xcshareddata/SDMMobileDevice.xccheckout b/SDMMobileDevice.xcworkspace/xcshareddata/SDMMobileDevice.xccheckout
@@ -14,6 +14,8 @@
 		<string>github.com:samdmarshall/SDMMobileDevice.git</string>
 		<key>69DB9D35-4562-46FC-9ADE-37339C753AA0</key>
 		<string>ssh://github.com/samdmarshall/Core-Lib.git</string>
+		<key>BFDCAB8EF53E1C343EC98714349F0C6B2EB9D8B8</key>
+		<string>github.com:mountsi/sample1.git</string>
 		<key>E03DDEF6-B97D-41E3-B129-83B8A6249CEB</key>
 		<string>ssh://github.com/samdmarshall/SDMMobileDevice.git</string>
 		<key>E3836662-8199-4399-9034-FC52A1A354C7</key>
@@ -29,6 +31,8 @@
 		<string>..</string>
 		<key>69DB9D35-4562-46FC-9ADE-37339C753AA0</key>
 		<string>../../SDM_MD_Demo/Core</string>
+		<key>BFDCAB8EF53E1C343EC98714349F0C6B2EB9D8B8</key>
+		<string>../sample1</string>
 		<key>E03DDEF6-B97D-41E3-B129-83B8A6249CEB</key>
 		<string>../../SDM_MD_Demo</string>
 		<key>E3836662-8199-4399-9034-FC52A1A354C7</key>
@@ -60,6 +64,14 @@
 			<key>IDESourceControlWCCName</key>
 			<string>Macro Utilities</string>
 		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>BFDCAB8EF53E1C343EC98714349F0C6B2EB9D8B8</string>
+			<key>IDESourceControlWCCName</key>
+			<string>sample1</string>
+		</dict>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>