Skip to content

Commit

Permalink
Remove PPC compilation and require 10.6.
Browse files Browse the repository at this point in the history
Todo:
- adopt blocks
- adopt more for/in loops
- clean up createStaticLibs.sh
- benchmark compilers

git-svn-id: https://svn.perian.org/trunk@1460 621663c8-3916-0410-8f58-edc14a8543d5
  • Loading branch information
astrange committed Jul 24, 2011
1 parent a32ba9a commit d54129e
Show file tree
Hide file tree
Showing 15 changed files with 2,411 additions and 1,768 deletions.
11 changes: 4 additions & 7 deletions CPFPerianPrefPaneController.m
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -752,9 +752,8 @@ - (NSArray *)installedComponentsForUser:(BOOL)user
NSString *path = [self basePathForType:ComponentTypeQuickTime user:user]; NSString *path = [self basePathForType:ComponentTypeQuickTime user:user];
NSArray *installedComponents = [[NSFileManager defaultManager] directoryContentsAtPath:path]; NSArray *installedComponents = [[NSFileManager defaultManager] directoryContentsAtPath:path];
NSMutableArray *retArray = [[NSMutableArray alloc] initWithCapacity:[installedComponents count]]; NSMutableArray *retArray = [[NSMutableArray alloc] initWithCapacity:[installedComponents count]];
NSEnumerator *componentEnum = [installedComponents objectEnumerator];
NSString *component; NSString *component;
while ((component = [componentEnum nextObject])) { for (component in installedComponents) {
if ([[component pathExtension] isEqualToString:@"component"]) if ([[component pathExtension] isEqualToString:@"component"])
[retArray addObject:component]; [retArray addObject:component];
} }
Expand Down Expand Up @@ -799,21 +798,19 @@ - (NSArray *)installedComponents
NSMutableArray *components = [[NSMutableArray alloc] initWithCapacity:numComponents]; NSMutableArray *components = [[NSMutableArray alloc] initWithCapacity:numComponents];
NSEnumerator *compEnum = [userComponents objectEnumerator]; NSEnumerator *compEnum = [userComponents objectEnumerator];
NSString *compName; NSString *compName;
while ((compName = [compEnum nextObject])) for (compName in userComponents)
[components addObject:[self componentInfoForComponent:compName userInstalled:YES]]; [components addObject:[self componentInfoForComponent:compName userInstalled:YES]];


compEnum = [systemComponents objectEnumerator]; for (compName in systemComponents)
while ((compName = [compEnum nextObject]))
[components addObject:[self componentInfoForComponent:compName userInstalled:NO]]; [components addObject:[self componentInfoForComponent:compName userInstalled:NO]];
return [components autorelease]; return [components autorelease];
} }


- (NSString *)checkComponentStatusByBundleIdentifier:(NSString *)bundleID - (NSString *)checkComponentStatusByBundleIdentifier:(NSString *)bundleID
{ {
NSString *status = @"OK"; NSString *status = @"OK";
NSEnumerator *infoEnum = [componentReplacementInfo objectEnumerator];
NSDictionary *infoDict; NSDictionary *infoDict;
while ((infoDict = [infoEnum nextObject])) { for (infoDict in componentReplacementInfo) {
NSEnumerator *stringsEnum = [[infoDict objectForKey:ObsoletesKey] objectEnumerator]; NSEnumerator *stringsEnum = [[infoDict objectForKey:ObsoletesKey] objectEnumerator];
NSString *obsoletedID; NSString *obsoletedID;
while ((obsoletedID = [stringsEnum nextObject])) while ((obsoletedID = [stringsEnum nextObject]))
Expand Down
29 changes: 0 additions & 29 deletions Patches/0002-Use-faltivec-instead-of-maltivec.patch

This file was deleted.

161 changes: 47 additions & 114 deletions Perian.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F59E09EA0A670E3D0019A3F0"
BuildableName = "Debug in QuickTime Player"
BlueprintName = "Debug in QuickTime Player"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Deployment+Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment+Debug"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
displayScaleIsEnabled = "NO"
displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment+Debug"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Deployment+Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Deployment"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
61 changes: 61 additions & 0 deletions Perian.xcodeproj/xcshareddata/xcschemes/PerianPane.xcscheme
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "83D1D6C70B4C794700E09EC9"
BuildableName = "Perian.prefPane"
BlueprintName = "PerianPane"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Deployment+Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment+Debug"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
displayScaleIsEnabled = "NO"
displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment+Debug"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Deployment+Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Deployment"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
76 changes: 76 additions & 0 deletions Perian.xcodeproj/xcshareddata/xcschemes/ssa2html.xcscheme
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3DAD08070FBF7C6F001E156F"
BuildableName = "ssa2html"
BlueprintName = "ssa2html"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Development">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Development">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3DAD08070FBF7C6F001E156F"
BuildableName = "ssa2html"
BlueprintName = "ssa2html"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
displayScaleIsEnabled = "NO"
displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3DAD08070FBF7C6F001E156F"
BuildableName = "ssa2html"
BlueprintName = "ssa2html"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Development">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Deployment"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
76 changes: 76 additions & 0 deletions Perian.xcodeproj/xcshareddata/xcschemes/ssa2pdf.xcscheme
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D802EA61032B8B00034BF4A"
BuildableName = "ssa2pdf"
BlueprintName = "ssa2pdf"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Development">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Development">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D802EA61032B8B00034BF4A"
BuildableName = "ssa2pdf"
BlueprintName = "ssa2pdf"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
displayScaleIsEnabled = "NO"
displayScale = "1.00"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Deployment">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D802EA61032B8B00034BF4A"
BuildableName = "ssa2pdf"
BlueprintName = "ssa2pdf"
ReferencedContainer = "container:Perian.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Development">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Deployment"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit d54129e

Please sign in to comment.