From b5da73f9c03c889ad31a1f7b77a743bd9ade67c4 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 24 Jun 2015 10:48:10 +1000 Subject: [PATCH 01/19] Adding iOS framework target for use by Carthage --- PEGKit.xcodeproj/project.pbxproj | 240 ++++++++++++++++++ .../xcschemes/PEGKit iOS.xcscheme | 89 +++++++ .../xcshareddata/PEGKit.xcscmblueprint | 30 +++ 3 files changed, 359 insertions(+) create mode 100644 PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme create mode 100644 PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index d286c76..5b8a02c 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -8,6 +8,65 @@ /* Begin PBXBuildFile section */ 3D0466A918E1D9770022A1BC /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D37214CA18DF3B0100525058 /* OCMock.framework */; }; + 6C8AE1521B3A313A00DF2B9F /* PKParser.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382F98171C80E100CCE513 /* PKParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1531B3A313A00DF2B9F /* PKSymbolNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18D18D1F9230036BE75 /* PKSymbolNode.h */; }; + 6C8AE1541B3A313A00DF2B9F /* PKSymbolState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D50FFE8C35004514FE /* PKSymbolState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1551B3A313A00DF2B9F /* PKSymbolRootNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18E18D1F9230036BE75 /* PKSymbolRootNode.h */; }; + 6C8AE1561B3A313A00DF2B9F /* PKDelimitState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DE0FFE8C49004514FE /* PKDelimitState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1571B3A313A00DF2B9F /* PKTokenizerState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CC0FFE8C1B004514FE /* PKTokenizerState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1581B3A313A00DF2B9F /* PKRecognitionException.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382FD9171C8CB200CCE513 /* PKRecognitionException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1591B3A313A00DF2B9F /* PKCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E10FFE8C4E004514FE /* PKCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15A1B3A313A00DF2B9F /* PKURLState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8C11643662003811F3 /* PKURLState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15B1B3A313A00DF2B9F /* NSArray+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD30FF9E95500D7773A /* NSArray+PEGKitAdditions.h */; }; + 6C8AE15C1B3A313A00DF2B9F /* NSString+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD50FF9E95500D7773A /* NSString+PEGKitAdditions.h */; }; + 6C8AE15D1B3A313A00DF2B9F /* PEGKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F8A4A017581A3C00056188 /* PEGKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15E1B3A313A00DF2B9F /* PKTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C90FFE8C15004514FE /* PKTokenizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15F1B3A313A00DF2B9F /* PKAST.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A1492816F8C6BD00770DEE /* PKAST.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1601B3A313A00DF2B9F /* PKSingleLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E40FFE8C56004514FE /* PKSingleLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1611B3A313A00DF2B9F /* PKWhitespaceState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DB0FFE8C43004514FE /* PKWhitespaceState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1621B3A313A00DF2B9F /* PKParser+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A29E4018E8516F00DC591E /* PKParser+Subclass.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1631B3A313A00DF2B9F /* PKMultiLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E70FFE8C60004514FE /* PKMultiLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1641B3A313A00DF2B9F /* PKTwitterState.h in Headers */ = {isa = PBXBuildFile; fileRef = D33DC19F11656952004CE58C /* PKTwitterState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1651B3A313A00DF2B9F /* PKWordState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D80FFE8C3D004514FE /* PKWordState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1661B3A313A00DF2B9F /* PKAssembly.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221990FFE8B9D004514FE /* PKAssembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1671B3A313A00DF2B9F /* PKEmailState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8B11643662003811F3 /* PKEmailState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1681B3A313A00DF2B9F /* PKHashtagState.h in Headers */ = {isa = PBXBuildFile; fileRef = D37F232A1453842800A98014 /* PKHashtagState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1691B3A313A00DF2B9F /* PKNumberState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CF0FFE8C24004514FE /* PKNumberState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16A1B3A313A00DF2B9F /* PKToken.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C30FFE8C07004514FE /* PKToken.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16B1B3A313A00DF2B9F /* PKDelimitDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724D816FA62D400D30459 /* PKDelimitDescriptor.h */; }; + 6C8AE16C1B3A313A00DF2B9F /* PKTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221910FFE8B8C004514FE /* PKTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16D1B3A313A00DF2B9F /* PKDelimitDescriptorCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724E816FA635700D30459 /* PKDelimitDescriptorCollection.h */; }; + 6C8AE16E1B3A313A00DF2B9F /* PKQuoteState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0E2470FFE8EB900C9DF74 /* PKQuoteState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16F1B3A313A00DF2B9F /* PKReader.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221960FFE8B95004514FE /* PKReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1711B3A313A00DF2B9F /* PKReader.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAD9B0FF9C95800D7773A /* PKReader.m */; }; + 6C8AE1721B3A313A00DF2B9F /* PKAssembly.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BADA00FF9C9B000D7773A /* PKAssembly.m */; }; + 6C8AE1731B3A313A00DF2B9F /* PKToken.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE950FF9D20900D7773A /* PKToken.m */; }; + 6C8AE1741B3A313A00DF2B9F /* PKTokenizer.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE990FF9D20900D7773A /* PKTokenizer.m */; }; + 6C8AE1751B3A313A00DF2B9F /* PKTokenizerState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE9B0FF9D20900D7773A /* PKTokenizerState.m */; }; + 6C8AE1761B3A313A00DF2B9F /* PKHashtagState.m in Sources */ = {isa = PBXBuildFile; fileRef = D37F23201453841100A98014 /* PKHashtagState.m */; }; + 6C8AE1771B3A313A00DF2B9F /* PKCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC40FF9D56400D7773A /* PKCommentState.m */; }; + 6C8AE1781B3A313A00DF2B9F /* PKDelimitState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC60FF9D56400D7773A /* PKDelimitState.m */; }; + 6C8AE1791B3A313A00DF2B9F /* PKMultiLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC80FF9D56400D7773A /* PKMultiLineCommentState.m */; }; + 6C8AE17A1B3A313A00DF2B9F /* PKNumberState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECA0FF9D56400D7773A /* PKNumberState.m */; }; + 6C8AE17B1B3A313A00DF2B9F /* PKAST.m in Sources */ = {isa = PBXBuildFile; fileRef = D375DAC2173C645C00A5E050 /* PKAST.m */; }; + 6C8AE17C1B3A313A00DF2B9F /* PKQuoteState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECC0FF9D56400D7773A /* PKQuoteState.m */; }; + 6C8AE17D1B3A313A00DF2B9F /* PKSingleLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECE0FF9D56400D7773A /* PKSingleLineCommentState.m */; }; + 6C8AE17E1B3A313A00DF2B9F /* PKSymbolState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED00FF9D56400D7773A /* PKSymbolState.m */; }; + 6C8AE17F1B3A313A00DF2B9F /* PKWhitespaceState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED20FF9D56400D7773A /* PKWhitespaceState.m */; }; + 6C8AE1801B3A313A00DF2B9F /* PKWordState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED60FF9D56400D7773A /* PKWordState.m */; }; + 6C8AE1811B3A313A00DF2B9F /* PKSymbolNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF240FF9DF9900D7773A /* PKSymbolNode.m */; }; + 6C8AE1821B3A313A00DF2B9F /* PKSymbolRootNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF260FF9DF9900D7773A /* PKSymbolRootNode.m */; }; + 6C8AE1831B3A313A00DF2B9F /* NSArray+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD40FF9E95500D7773A /* NSArray+PEGKitAdditions.m */; }; + 6C8AE1841B3A313A00DF2B9F /* NSString+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD60FF9E95500D7773A /* NSString+PEGKitAdditions.m */; }; + 6C8AE1851B3A313A00DF2B9F /* PKEmailState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8511643630003811F3 /* PKEmailState.m */; }; + 6C8AE1861B3A313A00DF2B9F /* PKURLState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8611643630003811F3 /* PKURLState.m */; }; + 6C8AE1871B3A313A00DF2B9F /* PKTwitterState.m in Sources */ = {isa = PBXBuildFile; fileRef = D33DC1971165634F004CE58C /* PKTwitterState.m */; }; + 6C8AE1881B3A313A00DF2B9F /* PKDelimitDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724D916FA62D400D30459 /* PKDelimitDescriptor.m */; }; + 6C8AE1891B3A313A00DF2B9F /* PKDelimitDescriptorCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724E916FA635700D30459 /* PKDelimitDescriptorCollection.m */; }; + 6C8AE18A1B3A313A00DF2B9F /* PKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382F9A171C80EB00CCE513 /* PKParser.m */; }; + 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382FD6171C8C9100CCE513 /* PKRecognitionException.m */; }; + 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3BD3A74172DC75600FC6549 /* InfoPlist.strings */; }; + 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30DA19E17284EC100A1A3EC /* Foundation.framework */; }; D306298218E1ED5D00EF745E /* TDTestScaffold.m in Sources */ = {isa = PBXBuildFile; fileRef = D306298118E1ED5D00EF745E /* TDTestScaffold.m */; }; D3083AB61705F05C00DA6F95 /* elementsAssign.grammar in Resources */ = {isa = PBXBuildFile; fileRef = D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */; }; D3083AB91705F09B00DA6F95 /* ElementAssignParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3083AB81705F09B00DA6F95 /* ElementAssignParserTest.m */; }; @@ -478,6 +537,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D306298118E1ED5D00EF745E /* TDTestScaffold.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TDTestScaffold.m; path = test/TDTestScaffold.m; sourceTree = ""; }; D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = elementsAssign.grammar; path = res/elementsAssign.grammar; sourceTree = ""; }; @@ -854,6 +914,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 6C8AE18E1B3A313A00DF2B9F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12818D1F5EB0036BE75 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -912,6 +980,7 @@ D3F8A48D175817DF00056188 /* PEGKit.framework */, D366C55418D1F29D00AF3EFB /* libPEGKitOSX.a */, D317C12B18D1F5EB0036BE75 /* libPEGKitIOS.a */, + 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */, ); name = Products; sourceTree = ""; @@ -1508,6 +1577,43 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 6C8AE1511B3A313A00DF2B9F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE1521B3A313A00DF2B9F /* PKParser.h in Headers */, + 6C8AE1531B3A313A00DF2B9F /* PKSymbolNode.h in Headers */, + 6C8AE1541B3A313A00DF2B9F /* PKSymbolState.h in Headers */, + 6C8AE1551B3A313A00DF2B9F /* PKSymbolRootNode.h in Headers */, + 6C8AE1561B3A313A00DF2B9F /* PKDelimitState.h in Headers */, + 6C8AE1571B3A313A00DF2B9F /* PKTokenizerState.h in Headers */, + 6C8AE1581B3A313A00DF2B9F /* PKRecognitionException.h in Headers */, + 6C8AE1591B3A313A00DF2B9F /* PKCommentState.h in Headers */, + 6C8AE15A1B3A313A00DF2B9F /* PKURLState.h in Headers */, + 6C8AE15B1B3A313A00DF2B9F /* NSArray+PEGKitAdditions.h in Headers */, + 6C8AE15C1B3A313A00DF2B9F /* NSString+PEGKitAdditions.h in Headers */, + 6C8AE15D1B3A313A00DF2B9F /* PEGKit.h in Headers */, + 6C8AE15E1B3A313A00DF2B9F /* PKTokenizer.h in Headers */, + 6C8AE15F1B3A313A00DF2B9F /* PKAST.h in Headers */, + 6C8AE1601B3A313A00DF2B9F /* PKSingleLineCommentState.h in Headers */, + 6C8AE1611B3A313A00DF2B9F /* PKWhitespaceState.h in Headers */, + 6C8AE1621B3A313A00DF2B9F /* PKParser+Subclass.h in Headers */, + 6C8AE1631B3A313A00DF2B9F /* PKMultiLineCommentState.h in Headers */, + 6C8AE1641B3A313A00DF2B9F /* PKTwitterState.h in Headers */, + 6C8AE1651B3A313A00DF2B9F /* PKWordState.h in Headers */, + 6C8AE1661B3A313A00DF2B9F /* PKAssembly.h in Headers */, + 6C8AE1671B3A313A00DF2B9F /* PKEmailState.h in Headers */, + 6C8AE1681B3A313A00DF2B9F /* PKHashtagState.h in Headers */, + 6C8AE1691B3A313A00DF2B9F /* PKNumberState.h in Headers */, + 6C8AE16A1B3A313A00DF2B9F /* PKToken.h in Headers */, + 6C8AE16B1B3A313A00DF2B9F /* PKDelimitDescriptor.h in Headers */, + 6C8AE16C1B3A313A00DF2B9F /* PKTypes.h in Headers */, + 6C8AE16D1B3A313A00DF2B9F /* PKDelimitDescriptorCollection.h in Headers */, + 6C8AE16E1B3A313A00DF2B9F /* PKQuoteState.h in Headers */, + 6C8AE16F1B3A313A00DF2B9F /* PKReader.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D366C55218D1F29D00AF3EFB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1555,6 +1661,26 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 6C8AE1501B3A313A00DF2B9F /* PEGKit iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6C8AE1911B3A313A00DF2B9F /* Build configuration list for PBXNativeTarget "PEGKit iOS" */; + buildPhases = ( + 6C8AE1511B3A313A00DF2B9F /* Headers */, + 6C8AE1701B3A313A00DF2B9F /* Sources */, + 6C8AE18C1B3A313A00DF2B9F /* Resources */, + 6C8AE18E1B3A313A00DF2B9F /* Frameworks */, + 6C8AE1901B3A313A00DF2B9F /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "PEGKit iOS"; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = TODParseKit; + productReference = 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */; + productType = "com.apple.product-type.framework"; + }; D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */ = { isa = PBXNativeTarget; buildConfigurationList = D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */; @@ -1677,11 +1803,20 @@ D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */, D37D8DC51571A4F700CDB822 /* PEGKitTests */, D338302E171C923700CCE513 /* ParserGenApp */, + 6C8AE1501B3A313A00DF2B9F /* PEGKit iOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 6C8AE18C1B3A313A00DF2B9F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D338302D171C923700CCE513 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1843,6 +1978,19 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 6C8AE1901B3A313A00DF2B9F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#cp -R -f \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" ${HOME}/Library/Frameworks"; + }; D3F8A489175817DF00056188 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1859,6 +2007,40 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 6C8AE1701B3A313A00DF2B9F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE1711B3A313A00DF2B9F /* PKReader.m in Sources */, + 6C8AE1721B3A313A00DF2B9F /* PKAssembly.m in Sources */, + 6C8AE1731B3A313A00DF2B9F /* PKToken.m in Sources */, + 6C8AE1741B3A313A00DF2B9F /* PKTokenizer.m in Sources */, + 6C8AE1751B3A313A00DF2B9F /* PKTokenizerState.m in Sources */, + 6C8AE1761B3A313A00DF2B9F /* PKHashtagState.m in Sources */, + 6C8AE1771B3A313A00DF2B9F /* PKCommentState.m in Sources */, + 6C8AE1781B3A313A00DF2B9F /* PKDelimitState.m in Sources */, + 6C8AE1791B3A313A00DF2B9F /* PKMultiLineCommentState.m in Sources */, + 6C8AE17A1B3A313A00DF2B9F /* PKNumberState.m in Sources */, + 6C8AE17B1B3A313A00DF2B9F /* PKAST.m in Sources */, + 6C8AE17C1B3A313A00DF2B9F /* PKQuoteState.m in Sources */, + 6C8AE17D1B3A313A00DF2B9F /* PKSingleLineCommentState.m in Sources */, + 6C8AE17E1B3A313A00DF2B9F /* PKSymbolState.m in Sources */, + 6C8AE17F1B3A313A00DF2B9F /* PKWhitespaceState.m in Sources */, + 6C8AE1801B3A313A00DF2B9F /* PKWordState.m in Sources */, + 6C8AE1811B3A313A00DF2B9F /* PKSymbolNode.m in Sources */, + 6C8AE1821B3A313A00DF2B9F /* PKSymbolRootNode.m in Sources */, + 6C8AE1831B3A313A00DF2B9F /* NSArray+PEGKitAdditions.m in Sources */, + 6C8AE1841B3A313A00DF2B9F /* NSString+PEGKitAdditions.m in Sources */, + 6C8AE1851B3A313A00DF2B9F /* PKEmailState.m in Sources */, + 6C8AE1861B3A313A00DF2B9F /* PKURLState.m in Sources */, + 6C8AE1871B3A313A00DF2B9F /* PKTwitterState.m in Sources */, + 6C8AE1881B3A313A00DF2B9F /* PKDelimitDescriptor.m in Sources */, + 6C8AE1891B3A313A00DF2B9F /* PKDelimitDescriptorCollection.m in Sources */, + 6C8AE18A1B3A313A00DF2B9F /* PKParser.m in Sources */, + 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12718D1F5EB0036BE75 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2220,6 +2402,55 @@ }; name = Release; }; + 6C8AE1921B3A313A00DF2B9F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_TEST_COVERAGE_FILES = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "res/PEGKit-Info.plist"; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = framework; + }; + name = Debug; + }; + 6C8AE1931B3A313A00DF2B9F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + NS_BLOCK_ASSERTIONS, + NDEBUG, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "res/PEGKit-Info.plist"; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = framework; + }; + name = Release; + }; D317C14A18D1F5EB0036BE75 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2556,6 +2787,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 6C8AE1911B3A313A00DF2B9F /* Build configuration list for PBXNativeTarget "PEGKit iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6C8AE1921B3A313A00DF2B9F /* Debug */, + 6C8AE1931B3A313A00DF2B9F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme new file mode 100644 index 0000000..72b1ddb --- /dev/null +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint new file mode 100644 index 0000000..589b65e --- /dev/null +++ b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "59BCCFF68011542A051983972F0A0E4EA5C0D708", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "948C6829607794C9C905880E4DE9DD942A04092A" : 0, + "59BCCFF68011542A051983972F0A0E4EA5C0D708" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "54CD6689-B08E-44BA-93C6-BCA349D91063", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "948C6829607794C9C905880E4DE9DD942A04092A" : "pegkit\/lib\/TDTemplateEngine\/", + "59BCCFF68011542A051983972F0A0E4EA5C0D708" : "pegkit\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "PEGKit", + "DVTSourceControlWorkspaceBlueprintVersion" : 203, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "PEGKit.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/pegkit.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "59BCCFF68011542A051983972F0A0E4EA5C0D708" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/tdtemplateengine.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "948C6829607794C9C905880E4DE9DD942A04092A" + } + ] +} \ No newline at end of file From 7ae43250af3ecb97c1303c0d9990894321faf962 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 24 Jun 2015 10:48:10 +1000 Subject: [PATCH 02/19] Adding iOS framework target for use by Carthage --- PEGKit.xcodeproj/project.pbxproj | 240 ++++++++++++++++++ .../xcschemes/PEGKit iOS.xcscheme | 89 +++++++ .../xcshareddata/PEGKit.xcscmblueprint | 30 +++ 3 files changed, 359 insertions(+) create mode 100644 PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme create mode 100644 PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index d286c76..5b8a02c 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -8,6 +8,65 @@ /* Begin PBXBuildFile section */ 3D0466A918E1D9770022A1BC /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D37214CA18DF3B0100525058 /* OCMock.framework */; }; + 6C8AE1521B3A313A00DF2B9F /* PKParser.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382F98171C80E100CCE513 /* PKParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1531B3A313A00DF2B9F /* PKSymbolNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18D18D1F9230036BE75 /* PKSymbolNode.h */; }; + 6C8AE1541B3A313A00DF2B9F /* PKSymbolState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D50FFE8C35004514FE /* PKSymbolState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1551B3A313A00DF2B9F /* PKSymbolRootNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18E18D1F9230036BE75 /* PKSymbolRootNode.h */; }; + 6C8AE1561B3A313A00DF2B9F /* PKDelimitState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DE0FFE8C49004514FE /* PKDelimitState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1571B3A313A00DF2B9F /* PKTokenizerState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CC0FFE8C1B004514FE /* PKTokenizerState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1581B3A313A00DF2B9F /* PKRecognitionException.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382FD9171C8CB200CCE513 /* PKRecognitionException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1591B3A313A00DF2B9F /* PKCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E10FFE8C4E004514FE /* PKCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15A1B3A313A00DF2B9F /* PKURLState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8C11643662003811F3 /* PKURLState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15B1B3A313A00DF2B9F /* NSArray+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD30FF9E95500D7773A /* NSArray+PEGKitAdditions.h */; }; + 6C8AE15C1B3A313A00DF2B9F /* NSString+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD50FF9E95500D7773A /* NSString+PEGKitAdditions.h */; }; + 6C8AE15D1B3A313A00DF2B9F /* PEGKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F8A4A017581A3C00056188 /* PEGKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15E1B3A313A00DF2B9F /* PKTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C90FFE8C15004514FE /* PKTokenizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE15F1B3A313A00DF2B9F /* PKAST.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A1492816F8C6BD00770DEE /* PKAST.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1601B3A313A00DF2B9F /* PKSingleLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E40FFE8C56004514FE /* PKSingleLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1611B3A313A00DF2B9F /* PKWhitespaceState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DB0FFE8C43004514FE /* PKWhitespaceState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1621B3A313A00DF2B9F /* PKParser+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A29E4018E8516F00DC591E /* PKParser+Subclass.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1631B3A313A00DF2B9F /* PKMultiLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E70FFE8C60004514FE /* PKMultiLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1641B3A313A00DF2B9F /* PKTwitterState.h in Headers */ = {isa = PBXBuildFile; fileRef = D33DC19F11656952004CE58C /* PKTwitterState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1651B3A313A00DF2B9F /* PKWordState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D80FFE8C3D004514FE /* PKWordState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1661B3A313A00DF2B9F /* PKAssembly.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221990FFE8B9D004514FE /* PKAssembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1671B3A313A00DF2B9F /* PKEmailState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8B11643662003811F3 /* PKEmailState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1681B3A313A00DF2B9F /* PKHashtagState.h in Headers */ = {isa = PBXBuildFile; fileRef = D37F232A1453842800A98014 /* PKHashtagState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1691B3A313A00DF2B9F /* PKNumberState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CF0FFE8C24004514FE /* PKNumberState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16A1B3A313A00DF2B9F /* PKToken.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C30FFE8C07004514FE /* PKToken.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16B1B3A313A00DF2B9F /* PKDelimitDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724D816FA62D400D30459 /* PKDelimitDescriptor.h */; }; + 6C8AE16C1B3A313A00DF2B9F /* PKTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221910FFE8B8C004514FE /* PKTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16D1B3A313A00DF2B9F /* PKDelimitDescriptorCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724E816FA635700D30459 /* PKDelimitDescriptorCollection.h */; }; + 6C8AE16E1B3A313A00DF2B9F /* PKQuoteState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0E2470FFE8EB900C9DF74 /* PKQuoteState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE16F1B3A313A00DF2B9F /* PKReader.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221960FFE8B95004514FE /* PKReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C8AE1711B3A313A00DF2B9F /* PKReader.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAD9B0FF9C95800D7773A /* PKReader.m */; }; + 6C8AE1721B3A313A00DF2B9F /* PKAssembly.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BADA00FF9C9B000D7773A /* PKAssembly.m */; }; + 6C8AE1731B3A313A00DF2B9F /* PKToken.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE950FF9D20900D7773A /* PKToken.m */; }; + 6C8AE1741B3A313A00DF2B9F /* PKTokenizer.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE990FF9D20900D7773A /* PKTokenizer.m */; }; + 6C8AE1751B3A313A00DF2B9F /* PKTokenizerState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE9B0FF9D20900D7773A /* PKTokenizerState.m */; }; + 6C8AE1761B3A313A00DF2B9F /* PKHashtagState.m in Sources */ = {isa = PBXBuildFile; fileRef = D37F23201453841100A98014 /* PKHashtagState.m */; }; + 6C8AE1771B3A313A00DF2B9F /* PKCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC40FF9D56400D7773A /* PKCommentState.m */; }; + 6C8AE1781B3A313A00DF2B9F /* PKDelimitState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC60FF9D56400D7773A /* PKDelimitState.m */; }; + 6C8AE1791B3A313A00DF2B9F /* PKMultiLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC80FF9D56400D7773A /* PKMultiLineCommentState.m */; }; + 6C8AE17A1B3A313A00DF2B9F /* PKNumberState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECA0FF9D56400D7773A /* PKNumberState.m */; }; + 6C8AE17B1B3A313A00DF2B9F /* PKAST.m in Sources */ = {isa = PBXBuildFile; fileRef = D375DAC2173C645C00A5E050 /* PKAST.m */; }; + 6C8AE17C1B3A313A00DF2B9F /* PKQuoteState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECC0FF9D56400D7773A /* PKQuoteState.m */; }; + 6C8AE17D1B3A313A00DF2B9F /* PKSingleLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECE0FF9D56400D7773A /* PKSingleLineCommentState.m */; }; + 6C8AE17E1B3A313A00DF2B9F /* PKSymbolState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED00FF9D56400D7773A /* PKSymbolState.m */; }; + 6C8AE17F1B3A313A00DF2B9F /* PKWhitespaceState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED20FF9D56400D7773A /* PKWhitespaceState.m */; }; + 6C8AE1801B3A313A00DF2B9F /* PKWordState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED60FF9D56400D7773A /* PKWordState.m */; }; + 6C8AE1811B3A313A00DF2B9F /* PKSymbolNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF240FF9DF9900D7773A /* PKSymbolNode.m */; }; + 6C8AE1821B3A313A00DF2B9F /* PKSymbolRootNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF260FF9DF9900D7773A /* PKSymbolRootNode.m */; }; + 6C8AE1831B3A313A00DF2B9F /* NSArray+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD40FF9E95500D7773A /* NSArray+PEGKitAdditions.m */; }; + 6C8AE1841B3A313A00DF2B9F /* NSString+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD60FF9E95500D7773A /* NSString+PEGKitAdditions.m */; }; + 6C8AE1851B3A313A00DF2B9F /* PKEmailState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8511643630003811F3 /* PKEmailState.m */; }; + 6C8AE1861B3A313A00DF2B9F /* PKURLState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8611643630003811F3 /* PKURLState.m */; }; + 6C8AE1871B3A313A00DF2B9F /* PKTwitterState.m in Sources */ = {isa = PBXBuildFile; fileRef = D33DC1971165634F004CE58C /* PKTwitterState.m */; }; + 6C8AE1881B3A313A00DF2B9F /* PKDelimitDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724D916FA62D400D30459 /* PKDelimitDescriptor.m */; }; + 6C8AE1891B3A313A00DF2B9F /* PKDelimitDescriptorCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724E916FA635700D30459 /* PKDelimitDescriptorCollection.m */; }; + 6C8AE18A1B3A313A00DF2B9F /* PKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382F9A171C80EB00CCE513 /* PKParser.m */; }; + 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382FD6171C8C9100CCE513 /* PKRecognitionException.m */; }; + 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3BD3A74172DC75600FC6549 /* InfoPlist.strings */; }; + 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30DA19E17284EC100A1A3EC /* Foundation.framework */; }; D306298218E1ED5D00EF745E /* TDTestScaffold.m in Sources */ = {isa = PBXBuildFile; fileRef = D306298118E1ED5D00EF745E /* TDTestScaffold.m */; }; D3083AB61705F05C00DA6F95 /* elementsAssign.grammar in Resources */ = {isa = PBXBuildFile; fileRef = D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */; }; D3083AB91705F09B00DA6F95 /* ElementAssignParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3083AB81705F09B00DA6F95 /* ElementAssignParserTest.m */; }; @@ -478,6 +537,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D306298118E1ED5D00EF745E /* TDTestScaffold.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TDTestScaffold.m; path = test/TDTestScaffold.m; sourceTree = ""; }; D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = elementsAssign.grammar; path = res/elementsAssign.grammar; sourceTree = ""; }; @@ -854,6 +914,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 6C8AE18E1B3A313A00DF2B9F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12818D1F5EB0036BE75 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -912,6 +980,7 @@ D3F8A48D175817DF00056188 /* PEGKit.framework */, D366C55418D1F29D00AF3EFB /* libPEGKitOSX.a */, D317C12B18D1F5EB0036BE75 /* libPEGKitIOS.a */, + 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */, ); name = Products; sourceTree = ""; @@ -1508,6 +1577,43 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 6C8AE1511B3A313A00DF2B9F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE1521B3A313A00DF2B9F /* PKParser.h in Headers */, + 6C8AE1531B3A313A00DF2B9F /* PKSymbolNode.h in Headers */, + 6C8AE1541B3A313A00DF2B9F /* PKSymbolState.h in Headers */, + 6C8AE1551B3A313A00DF2B9F /* PKSymbolRootNode.h in Headers */, + 6C8AE1561B3A313A00DF2B9F /* PKDelimitState.h in Headers */, + 6C8AE1571B3A313A00DF2B9F /* PKTokenizerState.h in Headers */, + 6C8AE1581B3A313A00DF2B9F /* PKRecognitionException.h in Headers */, + 6C8AE1591B3A313A00DF2B9F /* PKCommentState.h in Headers */, + 6C8AE15A1B3A313A00DF2B9F /* PKURLState.h in Headers */, + 6C8AE15B1B3A313A00DF2B9F /* NSArray+PEGKitAdditions.h in Headers */, + 6C8AE15C1B3A313A00DF2B9F /* NSString+PEGKitAdditions.h in Headers */, + 6C8AE15D1B3A313A00DF2B9F /* PEGKit.h in Headers */, + 6C8AE15E1B3A313A00DF2B9F /* PKTokenizer.h in Headers */, + 6C8AE15F1B3A313A00DF2B9F /* PKAST.h in Headers */, + 6C8AE1601B3A313A00DF2B9F /* PKSingleLineCommentState.h in Headers */, + 6C8AE1611B3A313A00DF2B9F /* PKWhitespaceState.h in Headers */, + 6C8AE1621B3A313A00DF2B9F /* PKParser+Subclass.h in Headers */, + 6C8AE1631B3A313A00DF2B9F /* PKMultiLineCommentState.h in Headers */, + 6C8AE1641B3A313A00DF2B9F /* PKTwitterState.h in Headers */, + 6C8AE1651B3A313A00DF2B9F /* PKWordState.h in Headers */, + 6C8AE1661B3A313A00DF2B9F /* PKAssembly.h in Headers */, + 6C8AE1671B3A313A00DF2B9F /* PKEmailState.h in Headers */, + 6C8AE1681B3A313A00DF2B9F /* PKHashtagState.h in Headers */, + 6C8AE1691B3A313A00DF2B9F /* PKNumberState.h in Headers */, + 6C8AE16A1B3A313A00DF2B9F /* PKToken.h in Headers */, + 6C8AE16B1B3A313A00DF2B9F /* PKDelimitDescriptor.h in Headers */, + 6C8AE16C1B3A313A00DF2B9F /* PKTypes.h in Headers */, + 6C8AE16D1B3A313A00DF2B9F /* PKDelimitDescriptorCollection.h in Headers */, + 6C8AE16E1B3A313A00DF2B9F /* PKQuoteState.h in Headers */, + 6C8AE16F1B3A313A00DF2B9F /* PKReader.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D366C55218D1F29D00AF3EFB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1555,6 +1661,26 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 6C8AE1501B3A313A00DF2B9F /* PEGKit iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6C8AE1911B3A313A00DF2B9F /* Build configuration list for PBXNativeTarget "PEGKit iOS" */; + buildPhases = ( + 6C8AE1511B3A313A00DF2B9F /* Headers */, + 6C8AE1701B3A313A00DF2B9F /* Sources */, + 6C8AE18C1B3A313A00DF2B9F /* Resources */, + 6C8AE18E1B3A313A00DF2B9F /* Frameworks */, + 6C8AE1901B3A313A00DF2B9F /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "PEGKit iOS"; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = TODParseKit; + productReference = 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */; + productType = "com.apple.product-type.framework"; + }; D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */ = { isa = PBXNativeTarget; buildConfigurationList = D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */; @@ -1677,11 +1803,20 @@ D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */, D37D8DC51571A4F700CDB822 /* PEGKitTests */, D338302E171C923700CCE513 /* ParserGenApp */, + 6C8AE1501B3A313A00DF2B9F /* PEGKit iOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 6C8AE18C1B3A313A00DF2B9F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D338302D171C923700CCE513 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1843,6 +1978,19 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 6C8AE1901B3A313A00DF2B9F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#cp -R -f \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" ${HOME}/Library/Frameworks"; + }; D3F8A489175817DF00056188 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1859,6 +2007,40 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 6C8AE1701B3A313A00DF2B9F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C8AE1711B3A313A00DF2B9F /* PKReader.m in Sources */, + 6C8AE1721B3A313A00DF2B9F /* PKAssembly.m in Sources */, + 6C8AE1731B3A313A00DF2B9F /* PKToken.m in Sources */, + 6C8AE1741B3A313A00DF2B9F /* PKTokenizer.m in Sources */, + 6C8AE1751B3A313A00DF2B9F /* PKTokenizerState.m in Sources */, + 6C8AE1761B3A313A00DF2B9F /* PKHashtagState.m in Sources */, + 6C8AE1771B3A313A00DF2B9F /* PKCommentState.m in Sources */, + 6C8AE1781B3A313A00DF2B9F /* PKDelimitState.m in Sources */, + 6C8AE1791B3A313A00DF2B9F /* PKMultiLineCommentState.m in Sources */, + 6C8AE17A1B3A313A00DF2B9F /* PKNumberState.m in Sources */, + 6C8AE17B1B3A313A00DF2B9F /* PKAST.m in Sources */, + 6C8AE17C1B3A313A00DF2B9F /* PKQuoteState.m in Sources */, + 6C8AE17D1B3A313A00DF2B9F /* PKSingleLineCommentState.m in Sources */, + 6C8AE17E1B3A313A00DF2B9F /* PKSymbolState.m in Sources */, + 6C8AE17F1B3A313A00DF2B9F /* PKWhitespaceState.m in Sources */, + 6C8AE1801B3A313A00DF2B9F /* PKWordState.m in Sources */, + 6C8AE1811B3A313A00DF2B9F /* PKSymbolNode.m in Sources */, + 6C8AE1821B3A313A00DF2B9F /* PKSymbolRootNode.m in Sources */, + 6C8AE1831B3A313A00DF2B9F /* NSArray+PEGKitAdditions.m in Sources */, + 6C8AE1841B3A313A00DF2B9F /* NSString+PEGKitAdditions.m in Sources */, + 6C8AE1851B3A313A00DF2B9F /* PKEmailState.m in Sources */, + 6C8AE1861B3A313A00DF2B9F /* PKURLState.m in Sources */, + 6C8AE1871B3A313A00DF2B9F /* PKTwitterState.m in Sources */, + 6C8AE1881B3A313A00DF2B9F /* PKDelimitDescriptor.m in Sources */, + 6C8AE1891B3A313A00DF2B9F /* PKDelimitDescriptorCollection.m in Sources */, + 6C8AE18A1B3A313A00DF2B9F /* PKParser.m in Sources */, + 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12718D1F5EB0036BE75 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2220,6 +2402,55 @@ }; name = Release; }; + 6C8AE1921B3A313A00DF2B9F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_TEST_COVERAGE_FILES = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "res/PEGKit-Info.plist"; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = framework; + }; + name = Debug; + }; + 6C8AE1931B3A313A00DF2B9F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + NS_BLOCK_ASSERTIONS, + NDEBUG, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "res/PEGKit-Info.plist"; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = framework; + }; + name = Release; + }; D317C14A18D1F5EB0036BE75 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2556,6 +2787,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 6C8AE1911B3A313A00DF2B9F /* Build configuration list for PBXNativeTarget "PEGKit iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6C8AE1921B3A313A00DF2B9F /* Debug */, + 6C8AE1931B3A313A00DF2B9F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme new file mode 100644 index 0000000..72b1ddb --- /dev/null +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint new file mode 100644 index 0000000..589b65e --- /dev/null +++ b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "59BCCFF68011542A051983972F0A0E4EA5C0D708", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "948C6829607794C9C905880E4DE9DD942A04092A" : 0, + "59BCCFF68011542A051983972F0A0E4EA5C0D708" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "54CD6689-B08E-44BA-93C6-BCA349D91063", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "948C6829607794C9C905880E4DE9DD942A04092A" : "pegkit\/lib\/TDTemplateEngine\/", + "59BCCFF68011542A051983972F0A0E4EA5C0D708" : "pegkit\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "PEGKit", + "DVTSourceControlWorkspaceBlueprintVersion" : 203, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "PEGKit.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/pegkit.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "59BCCFF68011542A051983972F0A0E4EA5C0D708" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/tdtemplateengine.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "948C6829607794C9C905880E4DE9DD942A04092A" + } + ] +} \ No newline at end of file From 8342f74864fe6a3ae14c42cf897ac4aa7010358f Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 24 Jun 2015 11:11:57 +1000 Subject: [PATCH 03/19] Updating framework setup. --- PEGKit.xcodeproj/project.pbxproj | 10 ++++++++-- .../xcshareddata/xcschemes/PEGKit iOS.xcscheme | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 5b8a02c..c92fbe6 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -66,7 +66,6 @@ 6C8AE18A1B3A313A00DF2B9F /* PKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382F9A171C80EB00CCE513 /* PKParser.m */; }; 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382FD6171C8C9100CCE513 /* PKRecognitionException.m */; }; 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3BD3A74172DC75600FC6549 /* InfoPlist.strings */; }; - 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30DA19E17284EC100A1A3EC /* Foundation.framework */; }; D306298218E1ED5D00EF745E /* TDTestScaffold.m in Sources */ = {isa = PBXBuildFile; fileRef = D306298118E1ED5D00EF745E /* TDTestScaffold.m */; }; D3083AB61705F05C00DA6F95 /* elementsAssign.grammar in Resources */ = {isa = PBXBuildFile; fileRef = D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */; }; D3083AB91705F09B00DA6F95 /* ElementAssignParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3083AB81705F09B00DA6F95 /* ElementAssignParserTest.m */; }; @@ -918,7 +917,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2405,6 +2403,8 @@ 6C8AE1921B3A313A00DF2B9F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2418,10 +2418,12 @@ GCC_PREFIX_HEADER = PEGKit_Prefix.pch; GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "res/PEGKit-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -2429,6 +2431,8 @@ 6C8AE1931B3A313A00DF2B9F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2443,10 +2447,12 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "res/PEGKit-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme index 72b1ddb..7166c77 100644 --- a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ @@ -55,7 +55,7 @@ @@ -73,7 +73,7 @@ From e681b9ca3fbe5f87cdeb2d8e0c8f00d63485fe9d Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 24 Jun 2015 23:31:36 +1000 Subject: [PATCH 04/19] Added Carthage to ignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e13704..7887e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DerivedData #CocoaPods Pods +Carthage From f3af8fb4487628328402aec646fa5a9310baf174 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 24 Jun 2015 23:36:10 +1000 Subject: [PATCH 05/19] Adding carthage to ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7887e3e..6e13704 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,3 @@ DerivedData #CocoaPods Pods -Carthage From 4261598a01a3701d4774f5f35d7f97e8b97cc88c Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Thu, 25 Jun 2015 00:20:21 +1000 Subject: [PATCH 06/19] Updating --- Carthage/Build | 1 + PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint | 7 +++++++ 2 files changed, 8 insertions(+) create mode 120000 Carthage/Build diff --git a/Carthage/Build b/Carthage/Build new file mode 120000 index 0000000..76f9ba2 --- /dev/null +++ b/Carthage/Build @@ -0,0 +1 @@ +../../../../Carthage/Build \ No newline at end of file diff --git a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint index 589b65e..450250f 100644 --- a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint +++ b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint @@ -4,11 +4,13 @@ }, "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "0DD07F137CC8ED7E2DAF2CDB69C18BF167A4DE11" : 0, "948C6829607794C9C905880E4DE9DD942A04092A" : 0, "59BCCFF68011542A051983972F0A0E4EA5C0D708" : 0 }, "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "54CD6689-B08E-44BA-93C6-BCA349D91063", "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "0DD07F137CC8ED7E2DAF2CDB69C18BF167A4DE11" : "..\/..", "948C6829607794C9C905880E4DE9DD942A04092A" : "pegkit\/lib\/TDTemplateEngine\/", "59BCCFF68011542A051983972F0A0E4EA5C0D708" : "pegkit\/" }, @@ -16,6 +18,11 @@ "DVTSourceControlWorkspaceBlueprintVersion" : 203, "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "PEGKit.xcworkspace", "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:drekka\/StoryTeller.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0DD07F137CC8ED7E2DAF2CDB69C18BF167A4DE11" + }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/pegkit.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", From 36ec756287b85e8e269a56760cf8f23d9a3a8806 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Wed, 1 Jul 2015 17:27:33 +1000 Subject: [PATCH 07/19] Updating installation path --- PEGKit.xcodeproj/project.pbxproj | 2 ++ .../xcshareddata/xcschemes/PEGKit iOS.xcscheme | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 5b8a02c..876f6db 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -2418,6 +2418,7 @@ GCC_PREFIX_HEADER = PEGKit_Prefix.pch; GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "res/PEGKit-Info.plist"; + INSTALL_PATH = "@rpath"; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; @@ -2443,6 +2444,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "res/PEGKit-Info.plist"; + INSTALL_PATH = "@rpath"; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme index 72b1ddb..7166c77 100644 --- a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ @@ -55,7 +55,7 @@ @@ -73,7 +73,7 @@ From a89ed79655c4d81808322c3196edd8d42c22b484 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Thu, 2 Jul 2015 11:13:22 +1000 Subject: [PATCH 08/19] Tuning setup --- .gitignore | 1 + PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 6e13704..7887e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DerivedData #CocoaPods Pods +Carthage diff --git a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint index 589b65e..4b2efde 100644 --- a/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint +++ b/PEGKit.xcworkspace/xcshareddata/PEGKit.xcscmblueprint @@ -5,17 +5,24 @@ }, "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { "948C6829607794C9C905880E4DE9DD942A04092A" : 0, + "46934DBE06979A500470CF5DA0CBD0DE39A40B0A" : 0, "59BCCFF68011542A051983972F0A0E4EA5C0D708" : 0 }, "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "54CD6689-B08E-44BA-93C6-BCA349D91063", "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { "948C6829607794C9C905880E4DE9DD942A04092A" : "pegkit\/lib\/TDTemplateEngine\/", + "46934DBE06979A500470CF5DA0CBD0DE39A40B0A" : "..\/..", "59BCCFF68011542A051983972F0A0E4EA5C0D708" : "pegkit\/" }, "DVTSourceControlWorkspaceBlueprintNameKey" : "PEGKit", "DVTSourceControlWorkspaceBlueprintVersion" : 203, "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "PEGKit.xcworkspace", "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:drekka\/Alchemic.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "46934DBE06979A500470CF5DA0CBD0DE39A40B0A" + }, { "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/itod\/pegkit.git", "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", From eba1c0f923b15f4938c20cbc27aca50f01cc9c59 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Fri, 12 Aug 2016 14:33:14 +1000 Subject: [PATCH 09/19] Adding tvOS target --- PEGKit.xcodeproj/project.pbxproj | 250 ++++++++++++++++++ .../xcschemes/PEGKit tvOS.xcscheme | 80 ++++++ 2 files changed, 330 insertions(+) create mode 100644 PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 5657874..6ab861e 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -67,6 +67,65 @@ 6C8AE18B1B3A313A00DF2B9F /* PKRecognitionException.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382FD6171C8C9100CCE513 /* PKRecognitionException.m */; }; 6C8AE18D1B3A313A00DF2B9F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3BD3A74172DC75600FC6549 /* InfoPlist.strings */; }; 6C8AE18F1B3A313A00DF2B9F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30DA19E17284EC100A1A3EC /* Foundation.framework */; }; + 6CF938821D5D87BB002CBA5F /* PKParser.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382F98171C80E100CCE513 /* PKParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938831D5D87BB002CBA5F /* PKSymbolNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18D18D1F9230036BE75 /* PKSymbolNode.h */; }; + 6CF938841D5D87BB002CBA5F /* PKSymbolState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D50FFE8C35004514FE /* PKSymbolState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938851D5D87BB002CBA5F /* PKSymbolRootNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D317C18E18D1F9230036BE75 /* PKSymbolRootNode.h */; }; + 6CF938861D5D87BB002CBA5F /* PKDelimitState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DE0FFE8C49004514FE /* PKDelimitState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938871D5D87BB002CBA5F /* PKTokenizerState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CC0FFE8C1B004514FE /* PKTokenizerState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938881D5D87BB002CBA5F /* PKRecognitionException.h in Headers */ = {isa = PBXBuildFile; fileRef = D3382FD9171C8CB200CCE513 /* PKRecognitionException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938891D5D87BB002CBA5F /* PKCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E10FFE8C4E004514FE /* PKCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9388A1D5D87BB002CBA5F /* PKURLState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8C11643662003811F3 /* PKURLState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9388B1D5D87BB002CBA5F /* NSArray+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD30FF9E95500D7773A /* NSArray+PEGKitAdditions.h */; }; + 6CF9388C1D5D87BB002CBA5F /* NSString+PEGKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D34BAFD50FF9E95500D7773A /* NSString+PEGKitAdditions.h */; }; + 6CF9388D1D5D87BB002CBA5F /* PEGKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F8A4A017581A3C00056188 /* PEGKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9388E1D5D87BB002CBA5F /* PKTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C90FFE8C15004514FE /* PKTokenizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9388F1D5D87BB002CBA5F /* PKAST.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A1492816F8C6BD00770DEE /* PKAST.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938901D5D87BB002CBA5F /* PKSingleLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E40FFE8C56004514FE /* PKSingleLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938911D5D87BB002CBA5F /* PKWhitespaceState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221DB0FFE8C43004514FE /* PKWhitespaceState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938921D5D87BB002CBA5F /* PKParser+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A29E4018E8516F00DC591E /* PKParser+Subclass.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938931D5D87BB002CBA5F /* PKMultiLineCommentState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221E70FFE8C60004514FE /* PKMultiLineCommentState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938941D5D87BB002CBA5F /* PKTwitterState.h in Headers */ = {isa = PBXBuildFile; fileRef = D33DC19F11656952004CE58C /* PKTwitterState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938951D5D87BB002CBA5F /* PKWordState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221D80FFE8C3D004514FE /* PKWordState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938961D5D87BB002CBA5F /* PKAssembly.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221990FFE8B9D004514FE /* PKAssembly.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938971D5D87BB002CBA5F /* PKEmailState.h in Headers */ = {isa = PBXBuildFile; fileRef = D35F4A8B11643662003811F3 /* PKEmailState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938981D5D87BB002CBA5F /* PKHashtagState.h in Headers */ = {isa = PBXBuildFile; fileRef = D37F232A1453842800A98014 /* PKHashtagState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938991D5D87BB002CBA5F /* PKNumberState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221CF0FFE8C24004514FE /* PKNumberState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9389A1D5D87BB002CBA5F /* PKToken.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221C30FFE8C07004514FE /* PKToken.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9389B1D5D87BB002CBA5F /* PKDelimitDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724D816FA62D400D30459 /* PKDelimitDescriptor.h */; }; + 6CF9389C1D5D87BB002CBA5F /* PKTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221910FFE8B8C004514FE /* PKTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9389D1D5D87BB002CBA5F /* PKDelimitDescriptorCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = D33724E816FA635700D30459 /* PKDelimitDescriptorCollection.h */; }; + 6CF9389E1D5D87BB002CBA5F /* PKQuoteState.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F0E2470FFE8EB900C9DF74 /* PKQuoteState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF9389F1D5D87BB002CBA5F /* PKReader.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C221960FFE8B95004514FE /* PKReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6CF938A11D5D87BB002CBA5F /* PKReader.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAD9B0FF9C95800D7773A /* PKReader.m */; }; + 6CF938A21D5D87BB002CBA5F /* PKAssembly.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BADA00FF9C9B000D7773A /* PKAssembly.m */; }; + 6CF938A31D5D87BB002CBA5F /* PKToken.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE950FF9D20900D7773A /* PKToken.m */; }; + 6CF938A41D5D87BB002CBA5F /* PKTokenizer.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE990FF9D20900D7773A /* PKTokenizer.m */; }; + 6CF938A51D5D87BB002CBA5F /* PKTokenizerState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAE9B0FF9D20900D7773A /* PKTokenizerState.m */; }; + 6CF938A61D5D87BB002CBA5F /* PKHashtagState.m in Sources */ = {isa = PBXBuildFile; fileRef = D37F23201453841100A98014 /* PKHashtagState.m */; }; + 6CF938A71D5D87BB002CBA5F /* PKCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC40FF9D56400D7773A /* PKCommentState.m */; }; + 6CF938A81D5D87BB002CBA5F /* PKDelimitState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC60FF9D56400D7773A /* PKDelimitState.m */; }; + 6CF938A91D5D87BB002CBA5F /* PKMultiLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAEC80FF9D56400D7773A /* PKMultiLineCommentState.m */; }; + 6CF938AA1D5D87BB002CBA5F /* PKNumberState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECA0FF9D56400D7773A /* PKNumberState.m */; }; + 6CF938AB1D5D87BB002CBA5F /* PKAST.m in Sources */ = {isa = PBXBuildFile; fileRef = D375DAC2173C645C00A5E050 /* PKAST.m */; }; + 6CF938AC1D5D87BB002CBA5F /* PKQuoteState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECC0FF9D56400D7773A /* PKQuoteState.m */; }; + 6CF938AD1D5D87BB002CBA5F /* PKSingleLineCommentState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAECE0FF9D56400D7773A /* PKSingleLineCommentState.m */; }; + 6CF938AE1D5D87BB002CBA5F /* PKSymbolState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED00FF9D56400D7773A /* PKSymbolState.m */; }; + 6CF938AF1D5D87BB002CBA5F /* PKWhitespaceState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED20FF9D56400D7773A /* PKWhitespaceState.m */; }; + 6CF938B01D5D87BB002CBA5F /* PKWordState.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAED60FF9D56400D7773A /* PKWordState.m */; }; + 6CF938B11D5D87BB002CBA5F /* PKSymbolNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF240FF9DF9900D7773A /* PKSymbolNode.m */; }; + 6CF938B21D5D87BB002CBA5F /* PKSymbolRootNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAF260FF9DF9900D7773A /* PKSymbolRootNode.m */; }; + 6CF938B31D5D87BB002CBA5F /* NSArray+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD40FF9E95500D7773A /* NSArray+PEGKitAdditions.m */; }; + 6CF938B41D5D87BB002CBA5F /* NSString+PEGKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D34BAFD60FF9E95500D7773A /* NSString+PEGKitAdditions.m */; }; + 6CF938B51D5D87BB002CBA5F /* PKEmailState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8511643630003811F3 /* PKEmailState.m */; }; + 6CF938B61D5D87BB002CBA5F /* PKURLState.m in Sources */ = {isa = PBXBuildFile; fileRef = D35F4A8611643630003811F3 /* PKURLState.m */; }; + 6CF938B71D5D87BB002CBA5F /* PKTwitterState.m in Sources */ = {isa = PBXBuildFile; fileRef = D33DC1971165634F004CE58C /* PKTwitterState.m */; }; + 6CF938B81D5D87BB002CBA5F /* PKDelimitDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724D916FA62D400D30459 /* PKDelimitDescriptor.m */; }; + 6CF938B91D5D87BB002CBA5F /* PKDelimitDescriptorCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = D33724E916FA635700D30459 /* PKDelimitDescriptorCollection.m */; }; + 6CF938BA1D5D87BB002CBA5F /* PKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382F9A171C80EB00CCE513 /* PKParser.m */; }; + 6CF938BB1D5D87BB002CBA5F /* PKRecognitionException.m in Sources */ = {isa = PBXBuildFile; fileRef = D3382FD6171C8C9100CCE513 /* PKRecognitionException.m */; }; + 6CF938BD1D5D87BB002CBA5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3BD3A74172DC75600FC6549 /* InfoPlist.strings */; }; + 6CF938BF1D5D87BB002CBA5F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30DA19E17284EC100A1A3EC /* Foundation.framework */; }; D306298218E1ED5D00EF745E /* TDTestScaffold.m in Sources */ = {isa = PBXBuildFile; fileRef = D306298118E1ED5D00EF745E /* TDTestScaffold.m */; }; D3083AB61705F05C00DA6F95 /* elementsAssign.grammar in Resources */ = {isa = PBXBuildFile; fileRef = D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */; }; D3083AB91705F09B00DA6F95 /* ElementAssignParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3083AB81705F09B00DA6F95 /* ElementAssignParserTest.m */; }; @@ -538,6 +597,7 @@ /* Begin PBXFileReference section */ 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6CF938C41D5D87BB002CBA5F /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D306298118E1ED5D00EF745E /* TDTestScaffold.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TDTestScaffold.m; path = test/TDTestScaffold.m; sourceTree = ""; }; D3083AB51705F05C00DA6F95 /* elementsAssign.grammar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = elementsAssign.grammar; path = res/elementsAssign.grammar; sourceTree = ""; }; @@ -922,6 +982,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6CF938BE1D5D87BB002CBA5F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CF938BF1D5D87BB002CBA5F /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12818D1F5EB0036BE75 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -981,6 +1049,7 @@ D366C55418D1F29D00AF3EFB /* libPEGKitOSX.a */, D317C12B18D1F5EB0036BE75 /* libPEGKitIOS.a */, 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */, + 6CF938C41D5D87BB002CBA5F /* PEGKit.framework */, ); name = Products; sourceTree = ""; @@ -1614,6 +1683,43 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6CF938811D5D87BB002CBA5F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CF938821D5D87BB002CBA5F /* PKParser.h in Headers */, + 6CF938831D5D87BB002CBA5F /* PKSymbolNode.h in Headers */, + 6CF938841D5D87BB002CBA5F /* PKSymbolState.h in Headers */, + 6CF938851D5D87BB002CBA5F /* PKSymbolRootNode.h in Headers */, + 6CF938861D5D87BB002CBA5F /* PKDelimitState.h in Headers */, + 6CF938871D5D87BB002CBA5F /* PKTokenizerState.h in Headers */, + 6CF938881D5D87BB002CBA5F /* PKRecognitionException.h in Headers */, + 6CF938891D5D87BB002CBA5F /* PKCommentState.h in Headers */, + 6CF9388A1D5D87BB002CBA5F /* PKURLState.h in Headers */, + 6CF9388B1D5D87BB002CBA5F /* NSArray+PEGKitAdditions.h in Headers */, + 6CF9388C1D5D87BB002CBA5F /* NSString+PEGKitAdditions.h in Headers */, + 6CF9388D1D5D87BB002CBA5F /* PEGKit.h in Headers */, + 6CF9388E1D5D87BB002CBA5F /* PKTokenizer.h in Headers */, + 6CF9388F1D5D87BB002CBA5F /* PKAST.h in Headers */, + 6CF938901D5D87BB002CBA5F /* PKSingleLineCommentState.h in Headers */, + 6CF938911D5D87BB002CBA5F /* PKWhitespaceState.h in Headers */, + 6CF938921D5D87BB002CBA5F /* PKParser+Subclass.h in Headers */, + 6CF938931D5D87BB002CBA5F /* PKMultiLineCommentState.h in Headers */, + 6CF938941D5D87BB002CBA5F /* PKTwitterState.h in Headers */, + 6CF938951D5D87BB002CBA5F /* PKWordState.h in Headers */, + 6CF938961D5D87BB002CBA5F /* PKAssembly.h in Headers */, + 6CF938971D5D87BB002CBA5F /* PKEmailState.h in Headers */, + 6CF938981D5D87BB002CBA5F /* PKHashtagState.h in Headers */, + 6CF938991D5D87BB002CBA5F /* PKNumberState.h in Headers */, + 6CF9389A1D5D87BB002CBA5F /* PKToken.h in Headers */, + 6CF9389B1D5D87BB002CBA5F /* PKDelimitDescriptor.h in Headers */, + 6CF9389C1D5D87BB002CBA5F /* PKTypes.h in Headers */, + 6CF9389D1D5D87BB002CBA5F /* PKDelimitDescriptorCollection.h in Headers */, + 6CF9389E1D5D87BB002CBA5F /* PKQuoteState.h in Headers */, + 6CF9389F1D5D87BB002CBA5F /* PKReader.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D366C55218D1F29D00AF3EFB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1681,6 +1787,26 @@ productReference = 6C8AE1941B3A313A00DF2B9F /* PEGKit.framework */; productType = "com.apple.product-type.framework"; }; + 6CF938801D5D87BB002CBA5F /* PEGKit tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6CF938C11D5D87BB002CBA5F /* Build configuration list for PBXNativeTarget "PEGKit tvOS" */; + buildPhases = ( + 6CF938811D5D87BB002CBA5F /* Headers */, + 6CF938A01D5D87BB002CBA5F /* Sources */, + 6CF938BC1D5D87BB002CBA5F /* Resources */, + 6CF938BE1D5D87BB002CBA5F /* Frameworks */, + 6CF938C01D5D87BB002CBA5F /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "PEGKit tvOS"; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = TODParseKit; + productReference = 6CF938C41D5D87BB002CBA5F /* PEGKit.framework */; + productType = "com.apple.product-type.framework"; + }; D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */ = { isa = PBXNativeTarget; buildConfigurationList = D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */; @@ -1804,6 +1930,7 @@ D37D8DC51571A4F700CDB822 /* PEGKitTests */, D338302E171C923700CCE513 /* ParserGenApp */, 6C8AE1501B3A313A00DF2B9F /* PEGKit iOS */, + 6CF938801D5D87BB002CBA5F /* PEGKit tvOS */, ); }; /* End PBXProject section */ @@ -1817,6 +1944,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6CF938BC1D5D87BB002CBA5F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CF938BD1D5D87BB002CBA5F /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D338302D171C923700CCE513 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1991,6 +2126,19 @@ shellPath = /bin/sh; shellScript = "#cp -R -f \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" ${HOME}/Library/Frameworks"; }; + 6CF938C01D5D87BB002CBA5F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#cp -R -f \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" ${HOME}/Library/Frameworks"; + }; D3F8A489175817DF00056188 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2041,6 +2189,40 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6CF938A01D5D87BB002CBA5F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CF938A11D5D87BB002CBA5F /* PKReader.m in Sources */, + 6CF938A21D5D87BB002CBA5F /* PKAssembly.m in Sources */, + 6CF938A31D5D87BB002CBA5F /* PKToken.m in Sources */, + 6CF938A41D5D87BB002CBA5F /* PKTokenizer.m in Sources */, + 6CF938A51D5D87BB002CBA5F /* PKTokenizerState.m in Sources */, + 6CF938A61D5D87BB002CBA5F /* PKHashtagState.m in Sources */, + 6CF938A71D5D87BB002CBA5F /* PKCommentState.m in Sources */, + 6CF938A81D5D87BB002CBA5F /* PKDelimitState.m in Sources */, + 6CF938A91D5D87BB002CBA5F /* PKMultiLineCommentState.m in Sources */, + 6CF938AA1D5D87BB002CBA5F /* PKNumberState.m in Sources */, + 6CF938AB1D5D87BB002CBA5F /* PKAST.m in Sources */, + 6CF938AC1D5D87BB002CBA5F /* PKQuoteState.m in Sources */, + 6CF938AD1D5D87BB002CBA5F /* PKSingleLineCommentState.m in Sources */, + 6CF938AE1D5D87BB002CBA5F /* PKSymbolState.m in Sources */, + 6CF938AF1D5D87BB002CBA5F /* PKWhitespaceState.m in Sources */, + 6CF938B01D5D87BB002CBA5F /* PKWordState.m in Sources */, + 6CF938B11D5D87BB002CBA5F /* PKSymbolNode.m in Sources */, + 6CF938B21D5D87BB002CBA5F /* PKSymbolRootNode.m in Sources */, + 6CF938B31D5D87BB002CBA5F /* NSArray+PEGKitAdditions.m in Sources */, + 6CF938B41D5D87BB002CBA5F /* NSString+PEGKitAdditions.m in Sources */, + 6CF938B51D5D87BB002CBA5F /* PKEmailState.m in Sources */, + 6CF938B61D5D87BB002CBA5F /* PKURLState.m in Sources */, + 6CF938B71D5D87BB002CBA5F /* PKTwitterState.m in Sources */, + 6CF938B81D5D87BB002CBA5F /* PKDelimitDescriptor.m in Sources */, + 6CF938B91D5D87BB002CBA5F /* PKDelimitDescriptorCollection.m in Sources */, + 6CF938BA1D5D87BB002CBA5F /* PKParser.m in Sources */, + 6CF938BB1D5D87BB002CBA5F /* PKRecognitionException.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D317C12718D1F5EB0036BE75 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2461,6 +2643,65 @@ }; name = Release; }; + 6CF938C21D5D87BB002CBA5F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_TEST_COVERAGE_FILES = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "$(SRCROOT)/res/PEGKit-Info.plist"; + INSTALL_PATH = "@rpath"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 9.0; + WRAPPER_EXTENSION = framework; + }; + name = Debug; + }; + 6CF938C31D5D87BB002CBA5F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + COMBINE_HIDPI_IMAGES = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath/"; + FRAMEWORK_VERSION = A; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = PEGKit_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + NS_BLOCK_ASSERTIONS, + NDEBUG, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + INFOPLIST_FILE = "$(SRCROOT)/res/PEGKit-Info.plist"; + INSTALL_PATH = "@rpath"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LLVM_LTO = NO; + PRODUCT_NAME = PEGKit; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 9.0; + WRAPPER_EXTENSION = framework; + }; + name = Release; + }; D317C14A18D1F5EB0036BE75 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2806,6 +3047,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 6CF938C11D5D87BB002CBA5F /* Build configuration list for PBXNativeTarget "PEGKit tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6CF938C21D5D87BB002CBA5F /* Debug */, + 6CF938C31D5D87BB002CBA5F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; D317C14918D1F5EB0036BE75 /* Build configuration list for PBXNativeTarget "libPEGKitIOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme new file mode 100644 index 0000000..c26083b --- /dev/null +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9d831e19e47a81f8d0c7f91ec20c194335434478 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Fri, 12 Aug 2016 14:56:13 +1000 Subject: [PATCH 10/19] Fixing merge bugs. --- PEGKit.xcodeproj/project.pbxproj | 18 ++++++++---------- ParserGenApp/ParserGenApp-Info.plist | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 6ab861e..00546f7 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -2568,8 +2568,11 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; + PRODUCT_BUNDLE_IDENTIFIER = "com.parsekit.${PRODUCT_NAME:rfc1034identifier}"; + TVOS_DEPLOYMENT_TARGET = 9.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; }; @@ -2580,7 +2583,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.parsekit.${PRODUCT_NAME:rfc1034identifier}"; + TVOS_DEPLOYMENT_TARGET = 9.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; }; @@ -2646,7 +2652,6 @@ 6CF938C21D5D87BB002CBA5F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2661,13 +2666,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "$(SRCROOT)/res/PEGKit-Info.plist"; INSTALL_PATH = "@rpath"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = appletvos; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -2675,7 +2677,6 @@ 6CF938C31D5D87BB002CBA5F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2691,13 +2692,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "$(SRCROOT)/res/PEGKit-Info.plist"; INSTALL_PATH = "@rpath"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LLVM_LTO = NO; PRODUCT_NAME = PEGKit; SDKROOT = appletvos; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/ParserGenApp/ParserGenApp-Info.plist b/ParserGenApp/ParserGenApp-Info.plist index 6d35aad..5a666fa 100644 --- a/ParserGenApp/ParserGenApp-Info.plist +++ b/ParserGenApp/ParserGenApp-Info.plist @@ -43,6 +43,8 @@ ???? CFBundleVersion 1 + LSApplicationCategoryType + public.app-category.developer-tools LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSMainNibFile From 2ae0fd4cd25832fb36cf1f30c1b635a2a8f212d8 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Fri, 12 Aug 2016 16:00:28 +1000 Subject: [PATCH 11/19] TWeaking project file. --- PEGKit.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 00546f7..e8bae14 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 47; objects = { /* Begin PBXBuildFile section */ @@ -1909,7 +1909,7 @@ LastUpgradeCheck = 0600; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "PEGKit" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 6.3"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( From 9913a1fe42c4785b1a49baf7c41f7d5be57a8dfa Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Fri, 12 Aug 2016 16:58:27 +1000 Subject: [PATCH 12/19] Fixing schemes --- .../xcschemes/PEGKit iOS.xcscheme | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme index 7166c77..cb924f7 100644 --- a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit iOS.xcscheme @@ -14,39 +14,30 @@ buildForAnalyzing = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> - - - - @@ -64,17 +55,17 @@ From b835d58ea6cd68e6b5e4097b42a5b2df8cbfef7f Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Fri, 12 Aug 2016 16:59:18 +1000 Subject: [PATCH 13/19] Fixing schemes --- .../xcshareddata/xcschemes/PEGKit tvOS.xcscheme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme index 99087f8..9790946 100644 --- a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ From fbbd8e250dba9a5b0b2d4091f178a77d81ba0c75 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 10:41:39 +1100 Subject: [PATCH 14/19] Merging and adding tvOS target again --- .DS_Store | Bin 6148 -> 6148 bytes PEGKit.xcodeproj/project.pbxproj | 285 +++++++++++++++++- .../xcschemes/PEGKit tvOS.xcscheme | 33 +- 3 files changed, 289 insertions(+), 29 deletions(-) diff --git a/.DS_Store b/.DS_Store index c06c68773ebe020513cb41c4c7a9479f33529182..7f0dc718563a2613c0af306b1d261abb206b8e41 100644 GIT binary patch delta 289 zcmZoMXfc=|#>B)qu~2NHo}wrR0|Nsi1A_nqLncEBgC0W#Lo!4D=8ufa8S6n(0t^8R zt_4w3{`MCu^wG0d*sh-5>$<23hNhvK!W?;Bt^y>jg zBQ|@2fW{+Pl$)PIgeFuy1sTYWyTGuShf$k#Gdl-A2QUDDp8U={nP0?`1L%JsVqn-D IAhLxS0LQRA_y7O^ delta 83 zcmZoMXfc=|#>B`mu~2NHo}wrV0|Nsi1A_nqLncEBgC0W#Lo!48#KPr_ESv8zX|ry= kz @@ -29,6 +29,15 @@ shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -42,15 +51,6 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - - - - @@ -60,15 +60,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> - - - - From be263de619b1a0c7a30bfce39f4ec5ada3964d4f Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 10:45:06 +1100 Subject: [PATCH 15/19] Correcting info plist --- .DS_Store | Bin 6148 -> 0 bytes PEGKit.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7f0dc718563a2613c0af306b1d261abb206b8e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5dOCIQ1Md4gU5XU5$Y3!k}BdwD0o(y;%`W(Eqcsr`4$R3fDhrxli%#D zwV@ST5D}Sy*)N&hFPr(cWI6y`can90Hh>mgu(8fzfyuo1oHb%ZCS7>OCC1prJq9S| zR$JgNDximdj2;efgxT}UFhq$FPx9*Kywe{Pc^MMe8Xgkc_=b}gX_`&O1K@e@?Ikdm z;AAUv%8S`|dz6hf7rfgY^BCb8x6J8`zt3SUC+xf~%lpjh>0$pQ@1?2nS>4HhbN-=yoID{5}*km{uucem|j*pl` ztQ0vzb4n#D)x{RWDV=d2*Ci1vMWw^V=EKFEUF=X?*qzV!VL4o)Xrn1$3e*)?)7!Sx z|K8XAf1PA^rhqB%uM}|2w4ZjFQmn0W$w{sC^i#T+tg95K6kdc<%(YUAx9Pzc_i{l@ UB36ow(Cm*ukiiC1;8zuR2fPPnga7~l diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index c377eba..b488a0a 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -2627,7 +2627,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "PEGKitiOS-Info.plist"; + INFOPLIST_FILE = "res/PEGKitiOS-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2676,7 +2676,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "PEGKitiOS-Info.plist"; + INFOPLIST_FILE = "res/PEGKitiOS-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2730,7 +2730,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "$(PROJECT_DIR)/res/PEGKitiOS-Info.plist"; + INFOPLIST_FILE = "res/PEGKitiOS-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2778,7 +2778,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "$(PROJECT_DIR)/res/PEGKitiOS-Info.plist"; + INFOPLIST_FILE = "res/PEGKitiOS-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; From 4d49712ac9aca8b925a8e2257dc42f5ebd9a58c8 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 10:58:37 +1100 Subject: [PATCH 16/19] Adding module maps and fixing tvOS Target --- PEGKit.xcodeproj/project.pbxproj | 16 +++++++++++++--- module.modulemap | 3 +++ module.private.modulemap | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 module.modulemap create mode 100644 module.private.modulemap diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index b488a0a..45d3343 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -593,6 +593,8 @@ /* Begin PBXFileReference section */ 6CB12C401DBD80980061F891 /* PEGKittvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKittvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6CB12C421DBD853B0061F891 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; + 6CB12C431DBD853B0061F891 /* module.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.private.modulemap; sourceTree = ""; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D305025D1CE5560F00AB4B68 /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D30502651CE5567700AB4B68 /* PEGKitiOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "PEGKitiOS-Info.plist"; path = "res/PEGKitiOS-Info.plist"; sourceTree = ""; }; @@ -1073,6 +1075,8 @@ 089C1665FE841158C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 6CB12C421DBD853B0061F891 /* module.modulemap */, + 6CB12C431DBD853B0061F891 /* module.private.modulemap */, D3503E1C18D0B89C002F3F5B /* PEGKit_Prefix.pch */, D3F8A4921758187300056188 /* PEGKit-Info.plist */, D30502651CE5567700AB4B68 /* PEGKitiOS-Info.plist */, @@ -1923,11 +1927,11 @@ targets = ( D3F8A3DA175817DF00056188 /* PEGKit */, D305025C1CE5560F00AB4B68 /* PEGKitiOS */, + 6CB12BFF1DBD80980061F891 /* PEGKittvOS */, D366C55318D1F29D00AF3EFB /* libPEGKitOSX */, D317C12A18D1F5EB0036BE75 /* libPEGKitIOS */, D37D8DC51571A4F700CDB822 /* PEGKitTests */, D338302E171C923700CCE513 /* ParserGenApp */, - 6CB12BFF1DBD80980061F891 /* PEGKittvOS */, ); }; /* End PBXProject section */ @@ -2631,11 +2635,12 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = module.modulemap; + MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2680,11 +2685,12 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = module.modulemap; + MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -2734,6 +2740,8 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = module.modulemap; + MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; @@ -2782,6 +2790,8 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = module.modulemap; + MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; diff --git a/module.modulemap b/module.modulemap new file mode 100644 index 0000000..0119c22 --- /dev/null +++ b/module.modulemap @@ -0,0 +1,3 @@ +module PEGKit { + umbrella header "Headers/PEGKit.h" +} diff --git a/module.private.modulemap b/module.private.modulemap new file mode 100644 index 0000000..fb0a8fb --- /dev/null +++ b/module.private.modulemap @@ -0,0 +1,3 @@ +explicit module Alchemic.Private { + umbrella "PrivateHeaders" +} From 2422e898d09f080aed773b9b353f5016bbe0f792 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 11:02:59 +1100 Subject: [PATCH 17/19] Fixing module maps --- PEGKit.xcodeproj/project.pbxproj | 6 ------ module.private.modulemap | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 45d3343..08d4e29 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -594,7 +594,6 @@ /* Begin PBXFileReference section */ 6CB12C401DBD80980061F891 /* PEGKittvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKittvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6CB12C421DBD853B0061F891 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; - 6CB12C431DBD853B0061F891 /* module.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.private.modulemap; sourceTree = ""; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D305025D1CE5560F00AB4B68 /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D30502651CE5567700AB4B68 /* PEGKitiOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "PEGKitiOS-Info.plist"; path = "res/PEGKitiOS-Info.plist"; sourceTree = ""; }; @@ -1076,7 +1075,6 @@ isa = PBXGroup; children = ( 6CB12C421DBD853B0061F891 /* module.modulemap */, - 6CB12C431DBD853B0061F891 /* module.private.modulemap */, D3503E1C18D0B89C002F3F5B /* PEGKit_Prefix.pch */, D3F8A4921758187300056188 /* PEGKit-Info.plist */, D30502651CE5567700AB4B68 /* PEGKitiOS-Info.plist */, @@ -2636,7 +2634,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; - MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; @@ -2686,7 +2683,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; - MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; @@ -2741,7 +2737,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; - MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; @@ -2791,7 +2786,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; - MODULEMAP_PRIVATE_FILE = module.private.modulemap; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = PEGKit; SDKROOT = iphoneos; diff --git a/module.private.modulemap b/module.private.modulemap index fb0a8fb..ab369a2 100644 --- a/module.private.modulemap +++ b/module.private.modulemap @@ -1,3 +1,3 @@ -explicit module Alchemic.Private { +explicit module PEGKit.Private { umbrella "PrivateHeaders" } From 81718fc2276df263b34be521810d28fd4b043ed7 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 11:22:41 +1100 Subject: [PATCH 18/19] Fixing product name for tvOS --- PEGKit.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PEGKit.xcodeproj/project.pbxproj b/PEGKit.xcodeproj/project.pbxproj index 08d4e29..e4913eb 100644 --- a/PEGKit.xcodeproj/project.pbxproj +++ b/PEGKit.xcodeproj/project.pbxproj @@ -592,7 +592,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 6CB12C401DBD80980061F891 /* PEGKittvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKittvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6CB12C401DBD80980061F891 /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6CB12C421DBD853B0061F891 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; D302272A17020F9400594F16 /* PGClassImplementationTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PGClassImplementationTemplate.txt; path = res/PGClassImplementationTemplate.txt; sourceTree = ""; }; D305025D1CE5560F00AB4B68 /* PEGKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEGKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1045,7 +1045,7 @@ D366C55418D1F29D00AF3EFB /* libPEGKitOSX.a */, D317C12B18D1F5EB0036BE75 /* libPEGKitIOS.a */, D305025D1CE5560F00AB4B68 /* PEGKit.framework */, - 6CB12C401DBD80980061F891 /* PEGKittvOS.framework */, + 6CB12C401DBD80980061F891 /* PEGKit.framework */, ); name = Products; sourceTree = ""; @@ -1780,7 +1780,7 @@ ); name = PEGKittvOS; productName = PEGKitiOS; - productReference = 6CB12C401DBD80980061F891 /* PEGKittvOS.framework */; + productReference = 6CB12C401DBD80980061F891 /* PEGKit.framework */; productType = "com.apple.product-type.framework"; }; D305025C1CE5560F00AB4B68 /* PEGKitiOS */ = { @@ -2635,7 +2635,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = PEGKit; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -2684,7 +2684,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = module.modulemap; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = PEGKit; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.0; From c073643cce704f781c3af63a97d9a6daaeeea045 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 24 Oct 2016 14:04:13 +1100 Subject: [PATCH 19/19] Fixing tvOS name --- .../xcshareddata/xcschemes/PEGKit tvOS.xcscheme | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme index 8dbe9a3..e90efd6 100644 --- a/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme +++ b/PEGKit.xcodeproj/xcshareddata/xcschemes/PEGKit tvOS.xcscheme @@ -15,7 +15,7 @@ @@ -51,6 +51,15 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> + + + +