Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

Commit

Permalink
Develop (#5)
Browse files Browse the repository at this point in the history
* Fixed dependency issue

* Removed un-necessary framework references, exposed scheme for parser

* Set ALWAYS_SEARCH_USER_PATHS to NO to avoid warning.

* Removed parser from workspace and made it part of the Cartfile to prevent embedding issues.

* Fixed header search path for parser
  • Loading branch information
AlexanderN authored Sep 12, 2016
1 parent d41479d commit b3eb7f1
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 15 deletions.
3 changes: 0 additions & 3 deletions ccdamobile.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions ccdaparser/ccdaparser.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3071,18 +3071,20 @@
56A583C01CB20529007B8F3E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
INFOPLIST_FILE = ccdaparser/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = coladapp.com.ccdaparser;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -3094,17 +3096,19 @@
56A583C11CB20529007B8F3E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
INFOPLIST_FILE = ccdaparser/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = coladapp.com.ccdaparser;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
BuildableName = "ccdaparser.framework"
BlueprintName = "ccdaparser"
ReferencedContainer = "container:ccdaparser.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56A583B41CB20529007B8F3E"
BuildableName = "ccdaparserTests.xctest"
BlueprintName = "ccdaparserTests"
ReferencedContainer = "container:ccdaparser.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
BuildableName = "ccdaparser.framework"
BlueprintName = "ccdaparser"
ReferencedContainer = "container:ccdaparser.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
BuildableName = "ccdaparser.framework"
BlueprintName = "ccdaparser"
ReferencedContainer = "container:ccdaparser.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56A583AA1CB20528007B8F3E"
BuildableName = "ccdaparser.framework"
BlueprintName = "ccdaparser"
ReferencedContainer = "container:ccdaparser.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
3 changes: 2 additions & 1 deletion ccdaviewer/Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "SVProgressHUD/SVProgressHUD"
github "SVProgressHUD/SVProgressHUD"
github "alexandern/ccdaviewer" "develop"
2 changes: 1 addition & 1 deletion ccdaviewer/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "MatiBot/MBCircularProgressBar" "0.3.4"
github "SVProgressHUD/SVProgressHUD" "2.0.3"
github "alexandern/ccdaviewer" "9384a0cf6a25ab38a252a2db5eda2955b1ff5305"
14 changes: 6 additions & 8 deletions ccdaviewer/ccdaviewer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@
56A584161CB205F9007B8F3E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56A584141CB205F9007B8F3E /* Main.storyboard */; };
56A5841B1CB205F9007B8F3E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56A584191CB205F9007B8F3E /* LaunchScreen.storyboard */; };
56A584261CB205F9007B8F3E /* ccdaviewerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 56A584251CB205F9007B8F3E /* ccdaviewerTests.m */; };
56ACDE401CE7AB1900E43AB3 /* ccdaparser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */; };
56ACDE411CE7AB1900E43AB3 /* ccdaparser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
56B168C81CF1D56F008E7324 /* MMStopwatchARC.m in Sources */ = {isa = PBXBuildFile; fileRef = 56B168C71CF1D56F008E7324 /* MMStopwatchARC.m */; };
56B16EC21D3C141D00170694 /* Patient.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56B16EC11D3C141D00170694 /* Patient.storyboard */; };
56B16EC61D3C3A5600170694 /* PatientViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56B16EC51D3C3A5600170694 /* PatientViewController.m */; };
Expand All @@ -103,6 +101,8 @@
56E50D041CE2A65B00705FED /* FHIRPeriod.m in Sources */ = {isa = PBXBuildFile; fileRef = 56E50CFD1CE2A65B00705FED /* FHIRPeriod.m */; };
56E50D051CE2A65B00705FED /* FHIRTelecom.m in Sources */ = {isa = PBXBuildFile; fileRef = 56E50CFF1CE2A65B00705FED /* FHIRTelecom.m */; };
56EF9AEC1CDE2522002ED9B3 /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 56EF9AEB1CDE2522002ED9B3 /* ReadMe.txt */; };
87D53B5C1D871B3B00B5C758 /* ccdaparser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */; };
87D53B5D1D871B3B00B5C758 /* ccdaparser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -122,8 +122,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
87D53B5D1D871B3B00B5C758 /* ccdaparser.framework in Embed Frameworks */,
56C71A881CF804440024CFF2 /* SVProgressHUD.framework in Embed Frameworks */,
56ACDE411CE7AB1900E43AB3 /* ccdaparser.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -188,7 +188,6 @@
5649E7731D66D72B000DBA11 /* NSDate+Formatting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Formatting.m"; sourceTree = "<group>"; };
564A00DB1CFB716D0011A5EE /* UIColor+LightAndDark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+LightAndDark.h"; sourceTree = "<group>"; };
564A00DC1CFB716D0011A5EE /* UIColor+LightAndDark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+LightAndDark.m"; sourceTree = "<group>"; };
564A00E51CFB8CDB0011A5EE /* MBCircularProgressBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MBCircularProgressBar.framework; path = Carthage/Build/iOS/MBCircularProgressBar.framework; sourceTree = "<group>"; };
564DD2881D6A6391002D4E0C /* ViewerResultsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewerResultsCell.xib; sourceTree = "<group>"; };
564DD28A1D6A63FC002D4E0C /* ViewerResultsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewerResultsCell.h; sourceTree = "<group>"; };
564DD28B1D6A63FC002D4E0C /* ViewerResultsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewerResultsCell.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -261,7 +260,6 @@
56A584211CB205F9007B8F3E /* ccdaviewerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ccdaviewerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
56A584251CB205F9007B8F3E /* ccdaviewerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ccdaviewerTests.m; sourceTree = "<group>"; };
56A584271CB205F9007B8F3E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = ccdaparser.framework; path = "/Users/us/Library/Developer/Xcode/DerivedData/ccdamobile-hbscwdcilsoearakyedfonktpubr/Build/Products/Debug-iphoneos/ccdaparser.framework"; sourceTree = "<absolute>"; };
56B168C61CF1D56F008E7324 /* MMStopwatchARC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMStopwatchARC.h; sourceTree = "<group>"; };
56B168C71CF1D56F008E7324 /* MMStopwatchARC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMStopwatchARC.m; sourceTree = "<group>"; };
56B16EC11D3C141D00170694 /* Patient.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Patient.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -300,15 +298,16 @@
56E50CFE1CE2A65B00705FED /* FHIRTelecom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FHIRTelecom.h; sourceTree = "<group>"; };
56E50CFF1CE2A65B00705FED /* FHIRTelecom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FHIRTelecom.m; sourceTree = "<group>"; };
56EF9AEB1CDE2522002ED9B3 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ccdaparser.framework; path = Carthage/Build/iOS/ccdaparser.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
56A584051CB205F9007B8F3E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
87D53B5C1D871B3B00B5C758 /* ccdaparser.framework in Frameworks */,
56C71A871CF804440024CFF2 /* SVProgressHUD.framework in Frameworks */,
56ACDE401CE7AB1900E43AB3 /* ccdaparser.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -325,6 +324,7 @@
2ADA1228C5A01C27B2A8559C /* Frameworks */ = {
isa = PBXGroup;
children = (
87D53B5A1D871AEA00B5C758 /* ccdaparser.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -608,9 +608,7 @@
56A583FF1CB205F9007B8F3E = {
isa = PBXGroup;
children = (
564A00E51CFB8CDB0011A5EE /* MBCircularProgressBar.framework */,
56C71A861CF804430024CFF2 /* SVProgressHUD.framework */,
56ACDE3F1CE7AB1900E43AB3 /* ccdaparser.framework */,
5665084C1CE03FE4001D8AD1 /* Localizable.strings */,
56A5840A1CB205F9007B8F3E /* ccdaviewer */,
56A584241CB205F9007B8F3E /* ccdaviewerTests */,
Expand Down

0 comments on commit b3eb7f1

Please sign in to comment.