diff --git a/MulleScion.xcodeproj/project.pbxproj b/MulleScion.xcodeproj/project.pbxproj index ee3a336..d2b6ac1 100644 --- a/MulleScion.xcodeproj/project.pbxproj +++ b/MulleScion.xcodeproj/project.pbxproj @@ -85,6 +85,18 @@ 410C7FD716E0D85500DC2465 /* MulleScionObjectModel+BlockExpansion.h in Headers */ = {isa = PBXBuildFile; fileRef = 410C7FD116E0CE4100DC2465 /* MulleScionObjectModel+BlockExpansion.h */; settings = {ATTRIBUTES = (Private, ); }; }; 410C7FD816E0D85800DC2465 /* MulleScionObjectModel+MacroExpansion.h in Headers */ = {isa = PBXBuildFile; fileRef = 4178D2FB16DFD2D4001C9FB0 /* MulleScionObjectModel+MacroExpansion.h */; settings = {ATTRIBUTES = (Private, ); }; }; 410C7FD916E0D85E00DC2465 /* MulleScionObjectModel+Parsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 410C7FD416E0CF5A00DC2465 /* MulleScionObjectModel+Parsing.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 411826F61B86104D00A57A95 /* MulleObjCCompilerSettings.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BA616DA590000560FCF /* MulleObjCCompilerSettings.h */; }; + 411826F71B86104D00A57A95 /* MulleScionObjectModel.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BA316DA53BE00560FCF /* MulleScionObjectModel.h */; }; + 411826F81B86104D00A57A95 /* MulleScionTemplate+CompressedArchive.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 4121DB0516DD36EC00BFD60C /* MulleScionTemplate+CompressedArchive.h */; }; + 411826F91B86104D00A57A95 /* NSFileHandle+MulleOutputFileHandle.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41F0CDD318296756000057D5 /* NSFileHandle+MulleOutputFileHandle.h */; }; + 411826FA1B86104D00A57A95 /* MulleScionObjectModel+TraceDescription.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 410B32E516DB7732005D0EAD /* MulleScionObjectModel+TraceDescription.h */; }; + 411826FB1B86109800A57A95 /* MulleScionOutputProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41D6DEA916DE3900004833D6 /* MulleScionOutputProtocol.h */; }; + 411826FC1B86109800A57A95 /* MulleScionDataSourceProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 4121DB1516DD8A0900BFD60C /* MulleScionDataSourceProtocol.h */; }; + 411826FD1B86109800A57A95 /* MulleScionPrinter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BA016DA51B700560FCF /* MulleScionPrinter.h */; }; + 411826FE1B86109800A57A95 /* MulleScionPrintingException.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41D6DEA316DE32A9004833D6 /* MulleScionPrintingException.h */; }; + 411826FF1B86109800A57A95 /* MulleScionObjectModel+Printing.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BA716DA5B2B00560FCF /* MulleScionObjectModel+Printing.h */; }; + 411827001B86109800A57A95 /* NSObject+MulleScionDescription.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BAA16DA5E1600560FCF /* NSObject+MulleScionDescription.h */; }; + 411827011B8610E000A57A95 /* MulleScionParser.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764B9D16DA51A200560FCF /* MulleScionParser.h */; }; 411EEA92182D30B600361ADF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41764B8F16DA511200560FCF /* Foundation.framework */; }; 411EEA9B182D310100361ADF /* MulleScionOutputProtocol.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41D6DEA916DE3900004833D6 /* MulleScionOutputProtocol.h */; }; 411EEA9C182D310100361ADF /* MulleScionDataSourceProtocol.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4121DB1516DD8A0900BFD60C /* MulleScionDataSourceProtocol.h */; }; @@ -217,7 +229,7 @@ 41D6DF0516DE51C9004833D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41764B8F16DA511200560FCF /* Foundation.framework */; }; 41D6DF2516DE523D004833D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41764B8F16DA511200560FCF /* Foundation.framework */; }; 41D6DF3016DE5270004833D6 /* MulleScion.m in Sources */ = {isa = PBXBuildFile; fileRef = 41764BCD16DAF4C600560FCF /* MulleScion.m */; }; - 41D6DF3116DE5279004833D6 /* MulleScion.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41764BCC16DAF4C500560FCF /* MulleScion.h */; }; + 41D6DF3116DE5279004833D6 /* MulleScion.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 41764BCC16DAF4C500560FCF /* MulleScion.h */; }; 41D6DF3C16DE52CE004833D6 /* MulleScionParser.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41764B9D16DA51A200560FCF /* MulleScionParser.h */; }; 41D6DF3D16DE52D4004833D6 /* MulleScionParser+Parsing.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4121DAFB16DCFFD600BFD60C /* MulleScionParser+Parsing.h */; }; 41D6DF3E16DE52D6004833D6 /* MulleScionParser+Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 4121DAFC16DCFFD600BFD60C /* MulleScionParser+Parsing.m */; }; @@ -634,14 +646,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 41D6DF2216DE523D004833D6 /* CopyFiles */ = { + 41D6DF2216DE523D004833D6 /* Copy Headers */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 12; dstPath = "include/${PROJECT_NAME}"; dstSubfolderSpec = 16; files = ( - 41D6DF3116DE5279004833D6 /* MulleScion.h in CopyFiles */, - ); + 411827011B8610E000A57A95 /* MulleScionParser.h in Copy Headers */, + 411826FB1B86109800A57A95 /* MulleScionOutputProtocol.h in Copy Headers */, + 411826FC1B86109800A57A95 /* MulleScionDataSourceProtocol.h in Copy Headers */, + 411826FD1B86109800A57A95 /* MulleScionPrinter.h in Copy Headers */, + 411826FE1B86109800A57A95 /* MulleScionPrintingException.h in Copy Headers */, + 411826FF1B86109800A57A95 /* MulleScionObjectModel+Printing.h in Copy Headers */, + 411827001B86109800A57A95 /* NSObject+MulleScionDescription.h in Copy Headers */, + 411826F61B86104D00A57A95 /* MulleObjCCompilerSettings.h in Copy Headers */, + 411826F71B86104D00A57A95 /* MulleScionObjectModel.h in Copy Headers */, + 411826F81B86104D00A57A95 /* MulleScionTemplate+CompressedArchive.h in Copy Headers */, + 411826F91B86104D00A57A95 /* NSFileHandle+MulleOutputFileHandle.h in Copy Headers */, + 411826FA1B86104D00A57A95 /* MulleScionObjectModel+TraceDescription.h in Copy Headers */, + 41D6DF3116DE5279004833D6 /* MulleScion.h in Copy Headers */, + ); + name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; }; 41EC0142182D301A00A17DBD /* CopyFiles */ = { @@ -1461,7 +1486,7 @@ 41741ADD18303A560065E5FD /* Remove Library */, 41D6DF2016DE523D004833D6 /* Sources */, 41D6DF2116DE523D004833D6 /* Frameworks */, - 41D6DF2216DE523D004833D6 /* CopyFiles */, + 41D6DF2216DE523D004833D6 /* Copy Headers */, 4146F1FA182D31E20020594C /* Add Dependency Libraries */, ); buildRules = ( diff --git a/examples/ExampleDatasource.xcodeproj/project.pbxproj b/examples/ExampleDatasource.xcodeproj/project.pbxproj index 2e703b8..2f97364 100644 --- a/examples/ExampleDatasource.xcodeproj/project.pbxproj +++ b/examples/ExampleDatasource.xcodeproj/project.pbxproj @@ -196,7 +196,7 @@ 413AFCC3183BC2710055F936 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0620; ORGANIZATIONNAME = "Mulle kybernetiK"; }; buildConfigurationList = 413AFCC6183BC2710055F936 /* Build configuration list for PBXProject "ExampleDatasource" */; @@ -294,6 +294,7 @@ 413AFCDE183BC2710055F936 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "ExampleDatasource/ExampleDatasource-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -304,6 +305,7 @@ 413AFCDF183BC2710055F936 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "ExampleDatasource/ExampleDatasource-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -314,6 +316,10 @@ 4162B1FB183BC2B00034CC68 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + /Library/Frameworks, + ); GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -325,6 +331,10 @@ 4162B1FC183BC2B00034CC68 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + /Library/Frameworks, + ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/examples/ExampleDatasource/ExampleBase.m b/examples/ExampleDatasource/ExampleBase.m index 6ce015f..ce4a7b3 100644 --- a/examples/ExampleDatasource/ExampleBase.m +++ b/examples/ExampleDatasource/ExampleBase.m @@ -26,7 +26,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator NSManagedObjectModel *model; NSBundle *bundle; - bundle = [NSBundle bundleForClass:isa]; + bundle = [NSBundle bundleForClass:[self class]]; model = [NSManagedObjectModel mergedModelFromBundles:[NSArray arrayWithObject:bundle]]; NSAssert( [[model entityVersionHashesByName] count], @"No model found"); diff --git a/examples/ExampleDatasource/TestExampleDatasource/main.m b/examples/ExampleDatasource/TestExampleDatasource/main.m index 907a97d..21b3993 100644 --- a/examples/ExampleDatasource/TestExampleDatasource/main.m +++ b/examples/ExampleDatasource/TestExampleDatasource/main.m @@ -8,10 +8,10 @@ #import - // // to make things a little more interesting (and more useful for use in -// MulleScionDrake) the actual code is separated out into a bundle +// MulleScionist) the actual code is separated out into a bundle +// http://www.mulle-kybernetik.com/software/git/MulleScionist/ // int main(int argc, const char * argv[]) { diff --git a/examples/inline-mulle-scion.xcodeproj/project.pbxproj b/examples/inline-mulle-scion.xcodeproj/project.pbxproj index e83fa01..a357486 100644 --- a/examples/inline-mulle-scion.xcodeproj/project.pbxproj +++ b/examples/inline-mulle-scion.xcodeproj/project.pbxproj @@ -7,16 +7,118 @@ objects = { /* Begin PBXBuildFile section */ + 413886311B860C440003C7F7 /* MulleScion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 415238581B860C1B00E74581 /* MulleScion.framework */; }; 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41820CB017E0A88900E0F019 /* Foundation.framework */; }; 41820CB417E0A88900E0F019 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 41820CB317E0A88900E0F019 /* main.m */; }; - 41F2D88A17E335F400E00498 /* MulleScionTemplates.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41F2D88917E335F400E00498 /* MulleScionTemplates.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 4138862F1B860C3E0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 41D6DF5B16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; + 415238551B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41764B8C16DA511200560FCF; + remoteInfo = "mulle-scion"; + }; + 415238571B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF5C16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; + 415238591B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF2416DE523D004833D6; + remoteInfo = "MulleScion (OSX Library)"; + }; + 4152385B1B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41FAED81182D275E002CD114; + remoteInfo = "MulleScionFoundation (OSX Library)"; + }; + 4152385D1B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41AEA214182D097300840887; + remoteInfo = "MulleScionGraphviz (OSX Library)"; + }; + 4152385F1B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF0416DE51C9004833D6; + remoteInfo = "MulleScionParser (OSX Library)"; + }; + 415238611B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DED916DE509E004833D6; + remoteInfo = "MulleScionPrinter (OSX Library)"; + }; + 415238631B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412905341830E99800489CE5; + remoteInfo = "MulleScion (iOS Framework)"; + }; + 415238651B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 410300721701DBE200197713; + remoteInfo = "MulleScion (iOS Library)"; + }; + 415238671B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEAB5182D311F00361ADF; + remoteInfo = "MulleScionFoundation (iOS Library)"; + }; + 415238691B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412E8006182D2F80008A7FCC; + remoteInfo = "MulleScionGraphviz (iOS Library)"; + }; + 4152386B1B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41EC0149182D301A00A17DBD; + remoteInfo = "MulleScionParser (iOS Library)"; + }; + 4152386D1B860C1B00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEA9A182D30B600361ADF; + remoteInfo = "MulleScionPrinter (iOS Library)"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ + 415238401B860C1B00E74581 /* MulleScion.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MulleScion.xcodeproj; path = ../MulleScion.xcodeproj; sourceTree = ""; }; 41820CB017E0A88900E0F019 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 41820CB317E0A88900E0F019 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 419966FA17E0B1180088EA83 /* inline-mulle-scion */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "inline-mulle-scion"; sourceTree = BUILT_PRODUCTS_DIR; }; - 41F2D88917E335F400E00498 /* MulleScionTemplates.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MulleScionTemplates.framework; path = ../Build/Products/Debug/MulleScionTemplates.framework; sourceTree = ""; }; + 41F2D88917E335F400E00498 /* MulleScion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MulleScion.framework; path = ../../../../../Library/Frameworks/MulleScion.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -24,17 +126,38 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 413886311B860C440003C7F7 /* MulleScion.framework in Frameworks */, 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */, - 41F2D88A17E335F400E00498 /* MulleScionTemplates.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 415238411B860C1B00E74581 /* Products */ = { + isa = PBXGroup; + children = ( + 415238561B860C1B00E74581 /* mulle-scion */, + 415238581B860C1B00E74581 /* MulleScion.framework */, + 4152385A1B860C1B00E74581 /* libMulleScion.a */, + 4152385C1B860C1B00E74581 /* libMulleScionFoundation.a */, + 4152385E1B860C1B00E74581 /* libMulleScionGraphviz.a */, + 415238601B860C1B00E74581 /* libMulleScionParser.a */, + 415238621B860C1B00E74581 /* libMulleScionPrinter.a */, + 415238641B860C1B00E74581 /* MulleScion.framework */, + 415238661B860C1B00E74581 /* libMulleScion.a */, + 415238681B860C1B00E74581 /* libMulleScionFoundation.a */, + 4152386A1B860C1B00E74581 /* libMulleScionGraphviz.a */, + 4152386C1B860C1B00E74581 /* libMulleScionParser.a */, + 4152386E1B860C1B00E74581 /* libMulleScionPrinter.a */, + ); + name = Products; + sourceTree = ""; + }; 41820CA417E0A88900E0F019 = { isa = PBXGroup; children = ( + 415238401B860C1B00E74581 /* MulleScion.xcodeproj */, 41820CB217E0A88900E0F019 /* inline-mulle-scion */, 41820CAF17E0A88900E0F019 /* Frameworks */, 419966FA17E0B1180088EA83 /* inline-mulle-scion */, @@ -44,7 +167,7 @@ 41820CAF17E0A88900E0F019 /* Frameworks */ = { isa = PBXGroup; children = ( - 41F2D88917E335F400E00498 /* MulleScionTemplates.framework */, + 41F2D88917E335F400E00498 /* MulleScion.framework */, 41820CB017E0A88900E0F019 /* Foundation.framework */, ); name = Frameworks; @@ -71,6 +194,7 @@ buildRules = ( ); dependencies = ( + 413886301B860C3E0003C7F7 /* PBXTargetDependency */, ); name = "inline-mulle-scion"; productName = "minimal-mulle-scion"; @@ -96,6 +220,12 @@ mainGroup = 41820CA417E0A88900E0F019; productRefGroup = 41820CA417E0A88900E0F019; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 415238411B860C1B00E74581 /* Products */; + ProjectRef = 415238401B860C1B00E74581 /* MulleScion.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 41820CAC17E0A88900E0F019 /* inline-mulle-scion */, @@ -103,6 +233,100 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 415238561B860C1B00E74581 /* mulle-scion */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = "mulle-scion"; + remoteRef = 415238551B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238581B860C1B00E74581 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MulleScion.framework; + remoteRef = 415238571B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152385A1B860C1B00E74581 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 415238591B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152385C1B860C1B00E74581 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 4152385B1B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152385E1B860C1B00E74581 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 4152385D1B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238601B860C1B00E74581 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 4152385F1B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238621B860C1B00E74581 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 415238611B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238641B860C1B00E74581 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework.static; + path = MulleScion.framework; + remoteRef = 415238631B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238661B860C1B00E74581 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 415238651B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238681B860C1B00E74581 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 415238671B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152386A1B860C1B00E74581 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 415238691B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152386C1B860C1B00E74581 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 4152386B1B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152386E1B860C1B00E74581 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 4152386D1B860C1B00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXSourcesBuildPhase section */ 41820CA917E0A88900E0F019 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -114,13 +338,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 413886301B860C3E0003C7F7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "MulleScion (OSX Framework)"; + targetProxy = 4138862F1B860C3E0003C7F7 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 41820CB917E0A88900E0F019 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; @@ -150,8 +380,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; @@ -175,8 +403,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/../Build/Products/Debug\"", + /Library/Frameworks, ); PRODUCT_NAME = "inline-mulle-scion"; }; @@ -187,8 +414,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/../Build/Products/Debug\"", + /Library/Frameworks, ); PRODUCT_NAME = "inline-mulle-scion"; }; diff --git a/examples/inline-mulle-scion/main.m b/examples/inline-mulle-scion/main.m index bf562e9..bfd6263 100644 --- a/examples/inline-mulle-scion/main.m +++ b/examples/inline-mulle-scion/main.m @@ -1,8 +1,8 @@ #import -#import +#import -static NSString *templateContents = @"This is just a {{ stupid }} little test."; +static NSString *templateContents = @"This is just a {{ stupid }} little test.\n"; int main(int argc, const char * argv[]) diff --git a/examples/minimal-mulle-scion.xcodeproj/project.pbxproj b/examples/minimal-mulle-scion.xcodeproj/project.pbxproj index 83dbda4..51862f3 100644 --- a/examples/minimal-mulle-scion.xcodeproj/project.pbxproj +++ b/examples/minimal-mulle-scion.xcodeproj/project.pbxproj @@ -7,13 +7,114 @@ objects = { /* Begin PBXBuildFile section */ + 4152383F1B860A4E00E74581 /* MulleScion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 415238261B860A3A00E74581 /* MulleScion.framework */; }; 418118DA17E0AB9E00CF2B4D /* test.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41820CC017E0A92F00E0F019 /* test.plist */; }; 418118DB17E0ABA200CF2B4D /* test.scion in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41820CC117E0A94E00E0F019 /* test.scion */; }; 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41820CB017E0A88900E0F019 /* Foundation.framework */; }; 41820CB417E0A88900E0F019 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 41820CB317E0A88900E0F019 /* main.m */; }; - 41B07E2A1820223F0003B67F /* MulleScionTemplates.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41B07E291820223F0003B67F /* MulleScionTemplates.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 415238231B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41764B8C16DA511200560FCF; + remoteInfo = "mulle-scion"; + }; + 415238251B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF5C16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; + 415238271B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF2416DE523D004833D6; + remoteInfo = "MulleScion (OSX Library)"; + }; + 415238291B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41FAED81182D275E002CD114; + remoteInfo = "MulleScionFoundation (OSX Library)"; + }; + 4152382B1B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41AEA214182D097300840887; + remoteInfo = "MulleScionGraphviz (OSX Library)"; + }; + 4152382D1B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF0416DE51C9004833D6; + remoteInfo = "MulleScionParser (OSX Library)"; + }; + 4152382F1B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DED916DE509E004833D6; + remoteInfo = "MulleScionPrinter (OSX Library)"; + }; + 415238311B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412905341830E99800489CE5; + remoteInfo = "MulleScion (iOS Framework)"; + }; + 415238331B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 410300721701DBE200197713; + remoteInfo = "MulleScion (iOS Library)"; + }; + 415238351B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEAB5182D311F00361ADF; + remoteInfo = "MulleScionFoundation (iOS Library)"; + }; + 415238371B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412E8006182D2F80008A7FCC; + remoteInfo = "MulleScionGraphviz (iOS Library)"; + }; + 415238391B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41EC0149182D301A00A17DBD; + remoteInfo = "MulleScionParser (iOS Library)"; + }; + 4152383B1B860A3A00E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEA9A182D30B600361ADF; + remoteInfo = "MulleScionPrinter (iOS Library)"; + }; + 4152383D1B860A4400E74581 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 41D6DF5B16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 418118D917E0AB9300CF2B4D /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -29,12 +130,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MulleScion.xcodeproj; path = ../MulleScion.xcodeproj; sourceTree = ""; }; 41820CB017E0A88900E0F019 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 41820CB317E0A88900E0F019 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 41820CC017E0A92F00E0F019 /* test.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = test.plist; sourceTree = ""; }; 41820CC117E0A94E00E0F019 /* test.scion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = test.scion; sourceTree = ""; }; 419966FA17E0B1180088EA83 /* minimal-mulle-scion */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "minimal-mulle-scion"; sourceTree = BUILT_PRODUCTS_DIR; }; - 41B07E291820223F0003B67F /* MulleScionTemplates.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MulleScionTemplates.framework; path = ../../../../../Library/Frameworks/MulleScionTemplates.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -42,7 +143,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 41B07E2A1820223F0003B67F /* MulleScionTemplates.framework in Frameworks */, + 4152383F1B860A4E00E74581 /* MulleScion.framework in Frameworks */, 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -50,9 +151,30 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4152380F1B860A3A00E74581 /* Products */ = { + isa = PBXGroup; + children = ( + 415238241B860A3A00E74581 /* mulle-scion */, + 415238261B860A3A00E74581 /* MulleScion.framework */, + 415238281B860A3A00E74581 /* libMulleScion.a */, + 4152382A1B860A3A00E74581 /* libMulleScionFoundation.a */, + 4152382C1B860A3A00E74581 /* libMulleScionGraphviz.a */, + 4152382E1B860A3A00E74581 /* libMulleScionParser.a */, + 415238301B860A3A00E74581 /* libMulleScionPrinter.a */, + 415238321B860A3A00E74581 /* MulleScion.framework */, + 415238341B860A3A00E74581 /* libMulleScion.a */, + 415238361B860A3A00E74581 /* libMulleScionFoundation.a */, + 415238381B860A3A00E74581 /* libMulleScionGraphviz.a */, + 4152383A1B860A3A00E74581 /* libMulleScionParser.a */, + 4152383C1B860A3A00E74581 /* libMulleScionPrinter.a */, + ); + name = Products; + sourceTree = ""; + }; 41820CA417E0A88900E0F019 = { isa = PBXGroup; children = ( + 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */, 41820CB217E0A88900E0F019 /* minimal-mulle-scion */, 41820CAF17E0A88900E0F019 /* Frameworks */, 419966FA17E0B1180088EA83 /* minimal-mulle-scion */, @@ -62,7 +184,6 @@ 41820CAF17E0A88900E0F019 /* Frameworks */ = { isa = PBXGroup; children = ( - 41B07E291820223F0003B67F /* MulleScionTemplates.framework */, 41820CB017E0A88900E0F019 /* Foundation.framework */, ); name = Frameworks; @@ -100,6 +221,7 @@ buildRules = ( ); dependencies = ( + 4152383E1B860A4400E74581 /* PBXTargetDependency */, ); name = "minimal-mulle-scion"; productName = "minimal-mulle-scion"; @@ -125,6 +247,12 @@ mainGroup = 41820CA417E0A88900E0F019; productRefGroup = 41820CA417E0A88900E0F019; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 4152380F1B860A3A00E74581 /* Products */; + ProjectRef = 4152380E1B860A3A00E74581 /* MulleScion.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 41820CAC17E0A88900E0F019 /* minimal-mulle-scion */, @@ -132,6 +260,100 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 415238241B860A3A00E74581 /* mulle-scion */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = "mulle-scion"; + remoteRef = 415238231B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238261B860A3A00E74581 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MulleScion.framework; + remoteRef = 415238251B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238281B860A3A00E74581 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 415238271B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152382A1B860A3A00E74581 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 415238291B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152382C1B860A3A00E74581 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 4152382B1B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152382E1B860A3A00E74581 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 4152382D1B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238301B860A3A00E74581 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 4152382F1B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238321B860A3A00E74581 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework.static; + path = MulleScion.framework; + remoteRef = 415238311B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238341B860A3A00E74581 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 415238331B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238361B860A3A00E74581 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 415238351B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 415238381B860A3A00E74581 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 415238371B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152383A1B860A3A00E74581 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 415238391B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4152383C1B860A3A00E74581 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 4152383B1B860A3A00E74581 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXSourcesBuildPhase section */ 41820CA917E0A88900E0F019 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -143,33 +365,39 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 4152383E1B860A4400E74581 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "MulleScion (OSX Framework)"; + targetProxy = 4152383D1B860A4400E74581 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 41820CB917E0A88900E0F019 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; + FRAMEWORK_SEARCH_PATHS = ( + /Library/Frameworks, + "$(inherited)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.4; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -178,9 +406,6 @@ 41820CBA17E0A88900E0F019 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; @@ -188,13 +413,16 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; + FRAMEWORK_SEARCH_PATHS = ( + /Library/Frameworks, + "$(inherited)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = macosx; }; name = Release; @@ -202,11 +430,6 @@ 41820CBC17E0A88900E0F019 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -214,11 +437,6 @@ 41820CBD17E0A88900E0F019 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/examples/minimal-mulle-scion/main.m b/examples/minimal-mulle-scion/main.m index 27bc0dd..8269557 100644 --- a/examples/minimal-mulle-scion/main.m +++ b/examples/minimal-mulle-scion/main.m @@ -1,5 +1,5 @@ #import -#import +#import int main(int argc, const char * argv[]) diff --git a/examples/protected-mulle-scion.xcodeproj/project.pbxproj b/examples/protected-mulle-scion.xcodeproj/project.pbxproj index bce5c6c..a142dc1 100644 --- a/examples/protected-mulle-scion.xcodeproj/project.pbxproj +++ b/examples/protected-mulle-scion.xcodeproj/project.pbxproj @@ -7,12 +7,113 @@ objects = { /* Begin PBXBuildFile section */ + 413886641B860CB70003C7F7 /* MulleScion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4138864A1B860C8F0003C7F7 /* MulleScion.framework */; }; 418118DB17E0ABA200CF2B4D /* ptest.scion in CopyFiles */ = {isa = PBXBuildFile; fileRef = 41820CC117E0A94E00E0F019 /* ptest.scion */; }; 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41820CB017E0A88900E0F019 /* Foundation.framework */; }; 41820CB417E0A88900E0F019 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 41820CB317E0A88900E0F019 /* main.m */; }; - 41F2D88817E3357600E00498 /* MulleScionTemplates.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41F2D88717E3357600E00498 /* MulleScionTemplates.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 413886471B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41764B8C16DA511200560FCF; + remoteInfo = "mulle-scion"; + }; + 413886491B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF5C16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; + 4138864B1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF2416DE523D004833D6; + remoteInfo = "MulleScion (OSX Library)"; + }; + 4138864D1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41FAED81182D275E002CD114; + remoteInfo = "MulleScionFoundation (OSX Library)"; + }; + 4138864F1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41AEA214182D097300840887; + remoteInfo = "MulleScionGraphviz (OSX Library)"; + }; + 413886511B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DF0416DE51C9004833D6; + remoteInfo = "MulleScionParser (OSX Library)"; + }; + 413886531B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41D6DED916DE509E004833D6; + remoteInfo = "MulleScionPrinter (OSX Library)"; + }; + 413886551B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412905341830E99800489CE5; + remoteInfo = "MulleScion (iOS Framework)"; + }; + 413886571B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 410300721701DBE200197713; + remoteInfo = "MulleScion (iOS Library)"; + }; + 413886591B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEAB5182D311F00361ADF; + remoteInfo = "MulleScionFoundation (iOS Library)"; + }; + 4138865B1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 412E8006182D2F80008A7FCC; + remoteInfo = "MulleScionGraphviz (iOS Library)"; + }; + 4138865D1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 41EC0149182D301A00A17DBD; + remoteInfo = "MulleScionParser (iOS Library)"; + }; + 4138865F1B860C8F0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 411EEA9A182D30B600361ADF; + remoteInfo = "MulleScionPrinter (iOS Library)"; + }; + 413886611B860C9B0003C7F7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 41D6DF5B16DE53AE004833D6; + remoteInfo = "MulleScion (OSX Framework)"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 418118D917E0AB9300CF2B4D /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -27,6 +128,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MulleScion.xcodeproj; path = ../MulleScion.xcodeproj; sourceTree = ""; }; 41820CB017E0A88900E0F019 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 41820CB317E0A88900E0F019 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 41820CC117E0A94E00E0F019 /* ptest.scion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ptest.scion; sourceTree = ""; }; @@ -39,17 +141,38 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 413886641B860CB70003C7F7 /* MulleScion.framework in Frameworks */, 41820CB117E0A88900E0F019 /* Foundation.framework in Frameworks */, - 41F2D88817E3357600E00498 /* MulleScionTemplates.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 413886331B860C8F0003C7F7 /* Products */ = { + isa = PBXGroup; + children = ( + 413886481B860C8F0003C7F7 /* mulle-scion */, + 4138864A1B860C8F0003C7F7 /* MulleScion.framework */, + 4138864C1B860C8F0003C7F7 /* libMulleScion.a */, + 4138864E1B860C8F0003C7F7 /* libMulleScionFoundation.a */, + 413886501B860C8F0003C7F7 /* libMulleScionGraphviz.a */, + 413886521B860C8F0003C7F7 /* libMulleScionParser.a */, + 413886541B860C8F0003C7F7 /* libMulleScionPrinter.a */, + 413886561B860C8F0003C7F7 /* MulleScion.framework */, + 413886581B860C8F0003C7F7 /* libMulleScion.a */, + 4138865A1B860C8F0003C7F7 /* libMulleScionFoundation.a */, + 4138865C1B860C8F0003C7F7 /* libMulleScionGraphviz.a */, + 4138865E1B860C8F0003C7F7 /* libMulleScionParser.a */, + 413886601B860C8F0003C7F7 /* libMulleScionPrinter.a */, + ); + name = Products; + sourceTree = ""; + }; 41820CA417E0A88900E0F019 = { isa = PBXGroup; children = ( + 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */, 41820CB217E0A88900E0F019 /* protected-mulle-scion */, 41820CAF17E0A88900E0F019 /* Frameworks */, 419966FA17E0B1180088EA83 /* protected-mulle-scion */, @@ -96,6 +219,7 @@ buildRules = ( ); dependencies = ( + 413886621B860C9B0003C7F7 /* PBXTargetDependency */, ); name = "protected-mulle-scion"; productName = "minimal-mulle-scion"; @@ -121,6 +245,12 @@ mainGroup = 41820CA417E0A88900E0F019; productRefGroup = 41820CA417E0A88900E0F019; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 413886331B860C8F0003C7F7 /* Products */; + ProjectRef = 413886321B860C8F0003C7F7 /* MulleScion.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 41820CAC17E0A88900E0F019 /* protected-mulle-scion */, @@ -128,6 +258,100 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 413886481B860C8F0003C7F7 /* mulle-scion */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = "mulle-scion"; + remoteRef = 413886471B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138864A1B860C8F0003C7F7 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MulleScion.framework; + remoteRef = 413886491B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138864C1B860C8F0003C7F7 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 4138864B1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138864E1B860C8F0003C7F7 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 4138864D1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886501B860C8F0003C7F7 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 4138864F1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886521B860C8F0003C7F7 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 413886511B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886541B860C8F0003C7F7 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 413886531B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886561B860C8F0003C7F7 /* MulleScion.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework.static; + path = MulleScion.framework; + remoteRef = 413886551B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886581B860C8F0003C7F7 /* libMulleScion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScion.a; + remoteRef = 413886571B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138865A1B860C8F0003C7F7 /* libMulleScionFoundation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionFoundation.a; + remoteRef = 413886591B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138865C1B860C8F0003C7F7 /* libMulleScionGraphviz.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionGraphviz.a; + remoteRef = 4138865B1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4138865E1B860C8F0003C7F7 /* libMulleScionParser.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionParser.a; + remoteRef = 4138865D1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 413886601B860C8F0003C7F7 /* libMulleScionPrinter.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMulleScionPrinter.a; + remoteRef = 4138865F1B860C8F0003C7F7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXSourcesBuildPhase section */ 41820CA917E0A88900E0F019 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -139,6 +363,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 413886621B860C9B0003C7F7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "MulleScion (OSX Framework)"; + targetProxy = 413886611B860C9B0003C7F7 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 41820CB917E0A88900E0F019 /* Debug */ = { isa = XCBuildConfiguration; @@ -165,7 +397,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.4; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -190,7 +422,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = macosx; }; name = Release; @@ -199,9 +431,8 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( + /Library/Frameworks, "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/../Build/Products/Debug\"", ); PRODUCT_NAME = "protected-mulle-scion"; }; @@ -211,9 +442,8 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( + /Library/Frameworks, "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/../Build/Products/Debug\"", ); PRODUCT_NAME = "protected-mulle-scion"; }; diff --git a/examples/protected-mulle-scion/main.m b/examples/protected-mulle-scion/main.m index e545e1a..f60d17b 100644 --- a/examples/protected-mulle-scion/main.m +++ b/examples/protected-mulle-scion/main.m @@ -1,5 +1,5 @@ #import -#import +#import @implementation NSDictionary ( ProtectionHacque) @@ -20,7 +20,7 @@ - (id) mulleScionMethodSignatureForSelector:(SEL) sel @end -int main(int argc, const char * argv[]) +int main(int argc, const char * argv[]) { NSAutoreleasePool *pool; NSDictionary *info; diff --git a/src/MulleScion.h b/src/MulleScion.h index c3af636..d2c6ecf 100644 --- a/src/MulleScion.h +++ b/src/MulleScion.h @@ -34,7 +34,6 @@ // POSSIBILITY OF SUCH DAMAGE. // - #import "MulleScionObjectModel.h" #import "MulleScionObjectModel+TraceDescription.h" @@ -44,6 +43,7 @@ #import "MulleScionParser.h" #import "MulleScionPrintingException.h" + @protocol MulleScionStringOrURL @end