Skip to content
Permalink
Browse files

Build system refactoring.

OsiriX FMWK and API’s are being deprecate and Horos development
ecosystem is being added.
  • Loading branch information...
fvpolpeta committed Apr 17, 2015
1 parent f8294b5 commit 13e0dd207124bfb2e6723ffdb7bf802384cfdbd4
@@ -37,3 +37,5 @@ xcuserdata/

DerivedData/


*.xcworkspacedata
@@ -5733,7 +5733,7 @@ -(NSString*)weasisBasePath {

-(void)_receivingIconUpdate {
if (!_receivingDict.count)
[NSApp setApplicationIconImage:[NSImage imageNamed:@"Osirix.icns"]];
[NSApp setApplicationIconImage:[NSImage imageNamed:@"Horos.icns"]];
else [NSApp setApplicationIconImage:[NSImage imageNamed:@"OsirixDownload.icns"]];
}

Binary file not shown.
@@ -1198,7 +1198,7 @@ +(DefaultLocalDatabaseNodeIdentifier*)identifier
-(void)willDisplayCell:(PrettyCell*)cell
{
cell.font = [NSFont boldSystemFontOfSize: [[BrowserController currentBrowser] fontSize: @"dbSourceFont"]];
cell.image = [NSImage imageNamed:@"Osirix.icns"];
cell.image = [NSImage imageNamed:@"Horos.icns"];
}

-(NSString*)description
@@ -5,9 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>OsiriX</string>
<key>CFBundleIconFile</key>
<string></string>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.macrad.dcmframework</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -18,7 +16,5 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
@@ -246,7 +246,7 @@
</dict>
</array>
<key>OSAScriptingDefinition</key>
<string>OsiriX.sdef</string>
<string>Horos.sdef</string>
<key>NSContactsUsageDescription</key>
<string>Your account will be used for the built-in iChat sharing service. If you don&apos;t allow access, you cannot use the iChat functions.</string>
<key>GitHash</key>
@@ -179,7 +179,7 @@
<key>CFBundleGetInfoString</key>
<string>Horos v1.0.4</string>
<key>CFBundleIconFile</key>
<string>Osirix.icns</string>
<string>Horos.icns</string>
<key>CFBundleIdentifier</key>
<string>com.horosproject.horos</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -224,15 +224,15 @@
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSContactsUsageDescription</key>
<string>Your account will be used for the built-in iChat sharing service. If you don&apos;t allow access, you cannot use the iChat functions.</string>
<string>Your account will be used for the built-in iChat sharing service. If you don't allow access, you cannot use the iChat functions.</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2015, The Horos Project</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>OSAScriptingDefinition</key>
<string>OsiriX.sdef</string>
<string>Horos.sdef</string>
<key>UTImportedTypeDeclarations</key>
<array>
<dict>
File renamed without changes.
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string>Osirix.icns</string>
<key>CFBundleIdentifier</key>
<string>com.rossetantoine.osirix-launcher</string>
<string>com.horosproject.horos-launcher</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
@@ -246,22 +246,22 @@ int main(int argc, char** argv)
const NSString* const OsirixLiteLocation = @"/tmp/";
NSTask* task;

// make directory to hold OsiriX Lite
// make directory to hold Horos Lite
task = [NSTask launchedTaskWithLaunchPath:@"/bin/mkdir" arguments:[NSArray arrayWithObjects: @"-p", OsirixLiteLocation, NULL]];
[task waitUntilExit];

// unzip OsiriX Lite
task = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/unzip" arguments:[NSArray arrayWithObjects: @"-od", OsirixLiteLocation, [[NSBundle mainBundle] pathForResource:@"OsiriX Lite" ofType:@"zip"], NULL]];
// unzip Horos Lite
task = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/unzip" arguments:[NSArray arrayWithObjects: @"-od", OsirixLiteLocation, [[NSBundle mainBundle] pathForResource:@"Horos Lite" ofType:@"zip"], NULL]];
[task waitUntilExit];

// launch OsiriX if available
// launch Horos if available

NSString* appName = @"OsiriX.app";
NSString* appName = @"Horos.app";

BOOL launched = [[NSWorkspace sharedWorkspace] launchApplication:appName];

if (!launched) {
appName = @"OsiriX Lite.app";
appName = @"Horos Lite.app";
launched = [[NSWorkspace sharedWorkspace] launchApplication:[OsirixLiteLocation stringByAppendingPathComponent:appName]];
}

Oops, something went wrong.

0 comments on commit 13e0dd2

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