From ea7cc9c36f690d8bf84bd32f2309521e64254432 Mon Sep 17 00:00:00 2001 From: relikd Date: Sat, 14 Sep 2019 13:43:37 +0200 Subject: [PATCH] Fix iOS build target --- RSXML.xcodeproj/project.pbxproj | 23 +++++++++++++++-------- RSXML/RSHTMLMetadata.h | 1 + RSXML/RSOPMLItem.h | 2 ++ RSXML/RSOPMLItem.m | 4 ++++ RSXMLTests/RSOPMLTests.m | 4 ++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/RSXML.xcodeproj/project.pbxproj b/RSXML.xcodeproj/project.pbxproj index 418ba98..be1e182 100644 --- a/RSXML.xcodeproj/project.pbxproj +++ b/RSXML.xcodeproj/project.pbxproj @@ -422,8 +422,6 @@ TargetAttributes = { 84AD0C041E11B7D200B38510 = { CreatedOnToolsVersion = 8.2.1; - DevelopmentTeam = 9C84TZ7Q6Z; - ProvisioningStyle = Automatic; }; 84F22C0C1B52DDEA000060CE = { CreatedOnToolsVersion = 7.0; @@ -557,13 +555,14 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREPROCESSOR_DEFINITIONS = ( + TARGET_IOS, + "$(inherited)", + ); HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXMLiOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -583,13 +582,11 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREPROCESSOR_DEFINITIONS = TARGET_IOS; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXMLiOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -746,6 +743,10 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; + GCC_PREPROCESSOR_DEFINITIONS = ( + TARGET_MAC, + "$(inherited)", + ); HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -769,6 +770,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; + GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -785,6 +787,10 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + TARGET_MAC, + "$(inherited)", + ); HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXMLTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -799,6 +805,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = TARGET_MAC; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXMLTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/RSXML/RSHTMLMetadata.h b/RSXML/RSHTMLMetadata.h index 8f5754f..68a5231 100644 --- a/RSXML/RSHTMLMetadata.h +++ b/RSXML/RSHTMLMetadata.h @@ -23,6 +23,7 @@ // SOFTWARE. @import Foundation; +@import CoreGraphics; typedef enum { RSFeedTypeNone, diff --git a/RSXML/RSOPMLItem.h b/RSXML/RSOPMLItem.h index cd82e5c..aec46c6 100644 --- a/RSXML/RSOPMLItem.h +++ b/RSXML/RSOPMLItem.h @@ -48,5 +48,7 @@ extern NSString *OPMLXMLURLKey; //xmlUrl - (id)attributeForKey:(NSString *)key; - (NSString *)recursiveDescription; +#ifdef TARGET_MAC - (NSXMLDocument *)exportXML; +#endif @end diff --git a/RSXML/RSOPMLItem.m b/RSXML/RSOPMLItem.m index 3fef2f3..025659a 100644 --- a/RSXML/RSOPMLItem.m +++ b/RSXML/RSOPMLItem.m @@ -135,6 +135,8 @@ NSString *OPMLXMLURLKey = @"xmlUrl"; return mStr; } +#ifdef TARGET_MAC + /// Can be used to export directly to @c .opml file. - (NSXMLDocument *)exportXML { NSXMLElement *head = [NSXMLElement elementWithName:@"head"]; @@ -172,4 +174,6 @@ NSString *OPMLXMLURLKey = @"xmlUrl"; } } +#endif + @end diff --git a/RSXMLTests/RSOPMLTests.m b/RSXMLTests/RSOPMLTests.m index 406e661..268aa1e 100644 --- a/RSXMLTests/RSOPMLTests.m +++ b/RSXMLTests/RSOPMLTests.m @@ -42,6 +42,8 @@ return [[RSXMLData alloc] initWithData:d url:[NSURL fileURLWithPath:s]]; } +#ifdef TARGET_MAC + - (void)testOPMLExport { RSOPMLItem *doc = [RSOPMLItem itemWithAttributes:@{OPMLTitleKey : @"Greetings from CCC", @"dateCreated" : @"2018-12-27 23:12:04 +0100", @@ -76,6 +78,8 @@ NSLog(@"%@", [document recursiveDescription]); } +#endif + - (void)testNotOPML { NSError *error;