diff options
-rw-r--r-- | fish.xcodeproj/project.pbxproj | 5 | ||||
-rw-r--r-- | fish.xcodeproj/xcshareddata/xcschemes/Makefile.xcscheme | 13 | ||||
-rw-r--r-- | fish.xcodeproj/xcshareddata/xcschemes/base.xcscheme | 13 | ||||
-rw-r--r-- | fish.xcodeproj/xcshareddata/xcschemes/fish.app.xcscheme | 13 | ||||
-rw-r--r-- | fish.xcodeproj/xcshareddata/xcschemes/fish_tests.xcscheme | 13 | ||||
-rw-r--r-- | fish.xcodeproj/xcshareddata/xcschemes/install_tree.xcscheme | 13 | ||||
-rw-r--r-- | osx/Info.plist | 8 |
7 files changed, 48 insertions, 30 deletions
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 9f23ff33..f6b662e7 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -964,7 +964,7 @@ D0A084F213B3AC130099B651 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 0700; TargetAttributes = { D04F7FCF1BA4E29300B0F227 = { CreatedOnToolsVersion = 6.4; @@ -1541,6 +1541,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; INFOPLIST_FILE = osx/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = "com.ridiculousfish.fish-shell"; PRODUCT_NAME = fish; WRAPPER_EXTENSION = app; }; @@ -1810,6 +1811,7 @@ ); GCC_WARN_UNINITIALIZED_AUTOS = YES; INFOPLIST_FILE = osx/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = "com.ridiculousfish.fish-shell"; PRODUCT_NAME = fish; WRAPPER_EXTENSION = app; }; @@ -1826,6 +1828,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; INFOPLIST_FILE = osx/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = "com.ridiculousfish.fish-shell"; PRODUCT_NAME = fish; WRAPPER_EXTENSION = app; }; diff --git a/fish.xcodeproj/xcshareddata/xcschemes/Makefile.xcscheme b/fish.xcodeproj/xcshareddata/xcschemes/Makefile.xcscheme index 489ced05..a6dcc297 100644 --- a/fish.xcodeproj/xcshareddata/xcschemes/Makefile.xcscheme +++ b/fish.xcodeproj/xcshareddata/xcschemes/Makefile.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0640" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,21 +23,24 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> <MacroExpansion> <BuildableReference @@ -52,10 +55,10 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> </ProfileAction> <AnalyzeAction diff --git a/fish.xcodeproj/xcshareddata/xcschemes/base.xcscheme b/fish.xcodeproj/xcshareddata/xcschemes/base.xcscheme index 5ffa4282..3021b7f3 100644 --- a/fish.xcodeproj/xcshareddata/xcschemes/base.xcscheme +++ b/fish.xcodeproj/xcshareddata/xcschemes/base.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0640" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,21 +23,24 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> <MacroExpansion> <BuildableReference @@ -52,10 +55,10 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> </ProfileAction> <AnalyzeAction diff --git a/fish.xcodeproj/xcshareddata/xcschemes/fish.app.xcscheme b/fish.xcodeproj/xcshareddata/xcschemes/fish.app.xcscheme index e24ea7c6..df558ed7 100644 --- a/fish.xcodeproj/xcshareddata/xcschemes/fish.app.xcscheme +++ b/fish.xcodeproj/xcshareddata/xcschemes/fish.app.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0640" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,10 +23,10 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> <MacroExpansion> @@ -38,15 +38,18 @@ ReferencedContainer = "container:fish.xcodeproj"> </BuildableReference> </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> <BuildableProductRunnable runnableDebuggingMode = "0"> @@ -62,10 +65,10 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> <BuildableProductRunnable runnableDebuggingMode = "0"> diff --git a/fish.xcodeproj/xcshareddata/xcschemes/fish_tests.xcscheme b/fish.xcodeproj/xcshareddata/xcschemes/fish_tests.xcscheme index 46b88891..8e5c8726 100644 --- a/fish.xcodeproj/xcshareddata/xcschemes/fish_tests.xcscheme +++ b/fish.xcodeproj/xcshareddata/xcschemes/fish_tests.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0640" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,10 +23,10 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> <MacroExpansion> @@ -38,15 +38,18 @@ ReferencedContainer = "container:fish.xcodeproj"> </BuildableReference> </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> <BuildableProductRunnable runnableDebuggingMode = "0"> @@ -69,10 +72,10 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> <BuildableProductRunnable runnableDebuggingMode = "0"> diff --git a/fish.xcodeproj/xcshareddata/xcschemes/install_tree.xcscheme b/fish.xcodeproj/xcshareddata/xcschemes/install_tree.xcscheme index cfeca409..3d5d87a2 100644 --- a/fish.xcodeproj/xcshareddata/xcschemes/install_tree.xcscheme +++ b/fish.xcodeproj/xcshareddata/xcschemes/install_tree.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0640" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,21 +23,24 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> <MacroExpansion> <BuildableReference @@ -52,10 +55,10 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> </ProfileAction> <AnalyzeAction diff --git a/osx/Info.plist b/osx/Info.plist index a5a98697..68fdbe1f 100644 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -7,9 +7,9 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIconFile</key> - <string>fish_term_icon</string> + <string>fish_term_icon</string> <key>CFBundleIdentifier</key> - <string>com.ridiculousfish.fish-shell</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -24,8 +24,8 @@ <string>public.app-category.productivity</string> <key>LSMinimumSystemVersion</key> <string>10.6</string> - <key>LSUIElement</key> - <true/> + <key>LSUIElement</key> + <true/> <key>NSHumanReadableCopyright</key> <string>Copyright © 2012, ridiculous_fish All rights reserved.</string> |