Skip to content
Permalink
Browse files

[HOR-69] Making DICOMPrint a binary dependency

  • Loading branch information...
fvpolpeta committed Sep 18, 2018
1 parent b9307f4 commit dabc7d7b3dccdd85ac9d6a44789bafd77da6330b
@@ -36,3 +36,4 @@ Binaries/homephone.framework/
Binaries/EmbeddedPlugins/HorosCloud.horosplugin

*.xcscmblueprint
DICOMPrint/DICOMPrint
Binary file not shown.
@@ -499,7 +499,6 @@
71CE3C19157F489C00AC0112 /* List.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 71CE3C18157F489C00AC0112 /* List.pdf */; };
71E6C0801FB5943B00FF75B6 /* O2HMigrationAssistant.xib in Resources */ = {isa = PBXBuildFile; fileRef = 71E6C0821FB5943B00FF75B6 /* O2HMigrationAssistant.xib */; };
71E6C0851FB597FC00FF75B6 /* Decompress in Resources */ = {isa = PBXBuildFile; fileRef = AB724FF60ADE6ECB00A212A0 /* Decompress */; };
71E6C0861FB597FF00FF75B6 /* DICOMPrint in Resources */ = {isa = PBXBuildFile; fileRef = CEDF6DD00B46FE99008B45B8 /* DICOMPrint */; };
71E6C0AF1FB5B0BF00FF75B6 /* 3DconnexionClient.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 439B8C131A19CCC300F396D7 /* 3DconnexionClient.framework */; settings = {ATTRIBUTES = (); }; };
71EB83C016DCB7FF00D48646 /* O2DicomPredicateEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 71EB83B216DCB7FF00D48646 /* O2DicomPredicateEditor.h */; };
71EB83C116DCB7FF00D48646 /* O2DicomPredicateEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EB83B316DCB7FF00D48646 /* O2DicomPredicateEditor.m */; };
@@ -695,6 +694,11 @@
999B0B671BB711ED00AF018A /* CurvedArrowGrayLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 999B0B661BB711ED00AF018A /* CurvedArrowGrayLeft.png */; };
999B0B681BB7309200AF018A /* Osirix.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9966A1AF1AE09FFE00F2D81A /* Osirix.icns */; };
99BA4CD820A4BE0B00B5CD02 /* HorosCloud.horosplugin.zip in Copy HorosCloud */ = {isa = PBXBuildFile; fileRef = 99BA4CD620A4BDDA00B5CD02 /* HorosCloud.horosplugin.zip */; };
99BA8A232151280E00AF87B7 /* libdcmprintscu.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE586CC30C74B75D00DB7D5A /* libdcmprintscu.dylib */; };
99BA8A242151284E00AF87B7 /* libxerces-c.27.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6693C60AF551210073D923 /* libxerces-c.27.dylib */; };
99BA8A252151289000AF87B7 /* libdcmprintscu.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CE586CC30C74B75D00DB7D5A /* libdcmprintscu.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
99BA8A262151289000AF87B7 /* libxerces-c.27.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CE6693C60AF551210073D923 /* libxerces-c.27.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
99BA8A2821512F3500AF87B7 /* DICOMPrint in Resources */ = {isa = PBXBuildFile; fileRef = 99BA8A2721512F3500AF87B7 /* DICOMPrint */; };
99C32EEF1CFF78E7001E71F3 /* PluginFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = AB2C24E10677861300A08910 /* PluginFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
A0344496143DE4AA003E1AFA /* DCMUSRegion.m in Sources */ = {isa = PBXBuildFile; fileRef = A085E104141E53210072BF0D /* DCMUSRegion.m */; };
A90202BE0B980CD60001A00B /* PluginManagerController.h in Headers */ = {isa = PBXBuildFile; fileRef = A90202BA0B980CD60001A00B /* PluginManagerController.h */; };
@@ -3189,13 +3193,6 @@
remoteGlobalIDString = AB724F300ADE6ECB00A212A0;
remoteInfo = Decompress;
};
71C99EA21D19A80C00208F3B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = CEDF6C600B46FE99008B45B8;
remoteInfo = DICOMPrint;
};
71E6A23D1FC5ED720099B327 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -3275,6 +3272,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
99BA8A252151289000AF87B7 /* libdcmprintscu.dylib in Copy Frameworks */,
99BA8A262151289000AF87B7 /* libxerces-c.27.dylib in Copy Frameworks */,
992264FB2028CE79004C4995 /* homephone.framework in Copy Frameworks */,
992335892009A75A000E10BA /* Horos.framework in Copy Frameworks */,
71E6C0AF1FB5B0BF00FF75B6 /* 3DconnexionClient.framework in Copy Frameworks */,
999B0B611BB70F0800AF018A /* O2HMigrationAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = O2HMigrationAssistant.m; path = Horos.xcodeproj/../O2HMigrationAssistant.m; sourceTree = "<group>"; };
999B0B661BB711ED00AF018A /* CurvedArrowGrayLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CurvedArrowGrayLeft.png; sourceTree = "<group>"; };
99BA4CD620A4BDDA00B5CD02 /* HorosCloud.horosplugin.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = HorosCloud.horosplugin.zip; path = Binaries/EmbeddedPlugins/HorosCloud.horosplugin.zip; sourceTree = SOURCE_ROOT; };
99BA8A2721512F3500AF87B7 /* DICOMPrint */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = DICOMPrint; sourceTree = "<group>"; };
99C0EE22202A70CB00D88E8D /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
A085E103141E53210072BF0D /* DCMUSRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCMUSRegion.h; sourceTree = "<group>"; };
A085E104141E53210072BF0D /* DCMUSRegion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMUSRegion.m; sourceTree = "<group>"; };
7E3E38660715FFDC0049E72E /* PreferencePanes.framework in Frameworks */,
7E54303D07A05E7100500ABB /* DiscRecording.framework in Frameworks */,
7E54303E07A05E7100500ABB /* DiscRecordingUI.framework in Frameworks */,
99BA8A242151284E00AF87B7 /* libxerces-c.27.dylib in Frameworks */,
CE2C82EC0C708B380093C162 /* CoreVideo.framework in Frameworks */,
BFBF3AA309B681F500545F5E /* libxml2.dylib in Frameworks */,
BFBF3AA409B681F500545F5E /* libz.dylib in Frameworks */,
841524C5113D6BDB008250E6 /* QuartzCore.framework in Frameworks */,
439B8C141A19CCC300F396D7 /* 3DconnexionClient.framework in Frameworks */,
9966A2E71AE0C55600F2D81A /* DCM.framework in Frameworks */,
99BA8A232151280E00AF87B7 /* libdcmprintscu.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CEDF6E1E0B46FF46008B45B8 /* DICOMPrint */ = {
isa = PBXGroup;
children = (
99BA8A2721512F3500AF87B7 /* DICOMPrint */,
CEDF6E1C0B46FF40008B45B8 /* DICOMPrint.mm */,
AB80EBA40AF1F5B600E7E934 /* AYDcmPrintSCU.h */,
AB80EBA90AF1F5B600E7E934 /* AYPrintManager.h */,
71C99E991D19A7FB00208F3B /* PBXTargetDependency */,
71C99E9B1D19A7FD00208F3B /* PBXTargetDependency */,
71C99EA11D19A80A00208F3B /* PBXTargetDependency */,
71C99EA31D19A80C00208F3B /* PBXTargetDependency */,
);
name = Horos;
productName = Deployment;
71AD67691FC4256E00A1E2F8 /* Tiling2x2.pdf in Resources */,
B7CDACFB0AB3003300068D70 /* PAGES in Resources */,
B7CDAD020AB30E7700068D70 /* page.tif in Resources */,
71E6C0861FB597FF00FF75B6 /* DICOMPrint in Resources */,
B7CDAD030AB30E7700068D70 /* pdf.tif in Resources */,
B78DA71C0ACEDA9A005C2C04 /* Shutter.tif in Resources */,
A9ADBBD10ADE80E60022DFC7 /* ReportPages.icns in Resources */,
A934924215CFC45D0029326E /* WLWW.pdf in Resources */,
A9B23D0315CFDF62000E47C3 /* Move.pdf in Resources */,
A9B23D0715CFDF76000E47C3 /* Stack.pdf in Resources */,
99BA8A2821512F3500AF87B7 /* DICOMPrint in Resources */,
A9B23D0A15CFDF81000E47C3 /* Zoom.pdf in Resources */,
A9B23D0D15CFDF8E000E47C3 /* Rotate.pdf in Resources */,
A9B23D1015CFE3EB000E47C3 /* Rectangle.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "sh \"Horos/Scripts/Horos/API.sh\"";
shellScript = "sh \"Horos/Scripts/Horos/API.sh\"\n";
};
710BAF711FB33751004909E4 /* Store Product Path */ = {
isa = PBXShellScriptBuildPhase;
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#path=$(cat \"$TARGET_TEMP_DIR/../Horos API.build/Product.path\")\n#rsync --exclude=\".DS_Store\" -rtlv \"$path\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\"";
shellScript = "#path=$(cat \"$TARGET_TEMP_DIR/../Horos API.build/Product.path\")\n#rsync --exclude=\".DS_Store\" -rtlv \"$path\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\"\n";
};
71E6C0B41FBAD32800FF75B6 /* Submodules */ = {
isa = PBXShellScriptBuildPhase;
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /usr/bin/perl;
shellScript = "use strict;\nuse warnings;\n\ndie \"$0: Must be run from Xcode\" unless $ENV{\"BUILT_PRODUCTS_DIR\"};\n\nmy $FH;\nmy $output;\n\n# SHA hash :\n\nopen $FH, \"xcrun git rev-parse HEAD|\" or die;\n$output = <$FH>;\nclose($FH);\n\nchomp( $output );\nmy $GitHash = $output;\n\n# clean state :\n\n$output = `xcrun git status`;\n\nmy $GitState;\nif ( index( $output, \"nothing to commit (working directory clean)\" ) != -1 ) {\n $GitState = \"clean\";\n} else {\n $GitState = \"dirty\";\n}\n\nprint \"GitHash : $GitHash\\n\";\nprint \"GitState : $GitState\";\n\n# Update Info.plist in build product. Use defaults command\n\n#my $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Info\"; #iOS\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info\"; #OSX\n\nmy @defaults = ( 'defaults', 'write', $INFO, 'GitHash', \"$GitHash\" );\nsystem( @defaults );\n\n@defaults = ( 'defaults', 'write', $INFO, 'GitState', \"$GitState\" );\nsystem( @defaults );";
shellScript = "use strict;\nuse warnings;\n\ndie \"$0: Must be run from Xcode\" unless $ENV{\"BUILT_PRODUCTS_DIR\"};\n\nmy $FH;\nmy $output;\n\n# SHA hash :\n\nopen $FH, \"xcrun git rev-parse HEAD|\" or die;\n$output = <$FH>;\nclose($FH);\n\nchomp( $output );\nmy $GitHash = $output;\n\n# clean state :\n\n$output = `xcrun git status`;\n\nmy $GitState;\nif ( index( $output, \"nothing to commit (working directory clean)\" ) != -1 ) {\n $GitState = \"clean\";\n} else {\n $GitState = \"dirty\";\n}\n\nprint \"GitHash : $GitHash\\n\";\nprint \"GitState : $GitState\";\n\n# Update Info.plist in build product. Use defaults command\n\n#my $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Info\"; #iOS\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info\"; #OSX\n\nmy @defaults = ( 'defaults', 'write', $INFO, 'GitHash', \"$GitHash\" );\nsystem( @defaults );\n\n@defaults = ( 'defaults', 'write', $INFO, 'GitState', \"$GitState\" );\nsystem( @defaults );\n";
};
CED7488F158F07B500120143 /* Code Signing */ = {
isa = PBXShellScriptBuildPhase;
target = AB724F300ADE6ECB00A212A0 /* Decompress */;
targetProxy = 71C99EA01D19A80A00208F3B /* PBXContainerItemProxy */;
};
71C99EA31D19A80C00208F3B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = CEDF6C600B46FE99008B45B8 /* DICOMPrint */;
targetProxy = 71C99EA21D19A80C00208F3B /* PBXContainerItemProxy */;
};
71E6A23E1FC5ED720099B327 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4A2F5931078D148300C514A2 /* Unzip Binaries */;
$CONFIGURATION_TEMP_DIR/VTK.build/Install/wlib,
$CONFIGURATION_TEMP_DIR/Grok.build/Install/lib,
$CONFIGURATION_TEMP_DIR/CharLS.build/Install/lib,
"$(PROJECT_DIR)/DICOMPrint",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
OTHER_CFLAGS = "-fvisibility=default";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = DICOMPrint;
USER_HEADER_SEARCH_PATHS = DICOMPrint;
VALID_ARCHS = i386;
VALID_ARCHS = x86_64;
};
name = Release;
};
$CONFIGURATION_TEMP_DIR/VTK.build/Install/wlib,
$CONFIGURATION_TEMP_DIR/Grok.build/Install/lib,
$CONFIGURATION_TEMP_DIR/CharLS.build/Install/lib,
"$(PROJECT_DIR)/DICOMPrint",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
OTHER_CFLAGS = "-fvisibility=default";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = DICOMPrint;
USER_HEADER_SEARCH_PATHS = DICOMPrint;
VALID_ARCHS = i386;
VALID_ARCHS = x86_64;
};
name = Debug;
};
@@ -26,6 +26,7 @@ cd "$SRCROOT/Binaries/PAGES"
rm ._*

cd "$SRCROOT/DICOMPrint"
unzip -uo DICOMPrint.zip
unzip -uo libdcmprintscu.dylib.zip
unzip -uo libxerces-c.27.dylib.zip
unzip -uo xercesc.zip
@@ -64,7 +64,7 @@ This file is part of the Horos Project (www.horosproject.org)

#import "DCMWaveform.h"

#import <DCMView.h>
#import "DCMView.h"

#import "ThickSlabController.h"
#import "DicomFile.h"

0 comments on commit dabc7d7

Please sign in to comment.
You can’t perform that action at this time.