From 1bdf06836ac6075ec1728a77050447c980b6f8a1 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Wed, 7 Oct 2015 11:01:03 -0700 Subject: Factor running the xcode_version_gen.sh Instead of duplicating the script invocation across targets, put it into a separate target and add dependencies. This also requires moving its output into the SHARED_DERIVED_FILE_DIR (which may be undocumented)? --- fish.xcodeproj/project.pbxproj | 177 ++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 92 deletions(-) (limited to 'fish.xcodeproj/project.pbxproj') diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index bd500fe3..f89cc540 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -7,6 +7,17 @@ objects = { /* Begin PBXAggregateTarget section */ + D008D0C41BC58F8800841177 /* generate-version-header */ = { + isa = PBXAggregateTarget; + buildConfigurationList = D008D0C81BC58F8800841177 /* Build configuration list for PBXAggregateTarget "generate-version-header" */; + buildPhases = ( + D008D0C91BC58F9500841177 /* ShellScript */, + ); + dependencies = ( + ); + name = "generate-version-header"; + productName = "generate-version-header"; + }; D07D265615E33B86009E43F6 /* install_tree */ = { isa = PBXAggregateTarget; buildConfigurationList = D07D266F15E33B86009E43F6 /* Build configuration list for PBXAggregateTarget "install_tree" */; @@ -258,6 +269,27 @@ /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ + D008D0CA1BC58FDD00841177 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D0A084F213B3AC130099B651 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D008D0C41BC58F8800841177; + remoteInfo = "generate-version-header"; + }; + D008D0CC1BC58FE100841177 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D0A084F213B3AC130099B651 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D008D0C41BC58F8800841177; + remoteInfo = "generate-version-header"; + }; + D008D0CE1BC58FE500841177 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D0A084F213B3AC130099B651 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D008D0C41BC58F8800841177; + remoteInfo = "generate-version-header"; + }; D031890715E36CC000D9CC39 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D0A084F213B3AC130099B651 /* Project object */; @@ -854,23 +886,6 @@ }; /* End PBXHeadersBuildPhase section */ -/* Begin PBXLegacyTarget section */ - D0A084F713B3AC130099B651 /* Makefile */ = { - isa = PBXLegacyTarget; - buildArgumentsString = " -f Makefile -k ${ACTION}"; - buildConfigurationList = D0A084FA13B3AC130099B651 /* Build configuration list for PBXLegacyTarget "Makefile" */; - buildPhases = ( - ); - buildToolPath = /usr/bin/make; - buildWorkingDirectory = ""; - dependencies = ( - ); - name = Makefile; - passBuildSettingsInEnvironment = 1; - productName = FishsFish; - }; -/* End PBXLegacyTarget section */ - /* Begin PBXNativeTarget section */ D00769101990137800CA4627 /* fish_tests */ = { isa = PBXNativeTarget; @@ -882,6 +897,7 @@ buildRules = ( ); dependencies = ( + D008D0CF1BC58FE500841177 /* PBXTargetDependency */, D04F7FED1BA4E3DF00B0F227 /* PBXTargetDependency */, ); name = fish_tests; @@ -929,13 +945,13 @@ isa = PBXNativeTarget; buildConfigurationList = D0D02AD31598642A008E62BD /* Build configuration list for PBXNativeTarget "fish_indent" */; buildPhases = ( - 8307B7561BB711880088A2A6 /* ShellScript */, D0D02ACC1598642A008E62BD /* Sources */, D0D02ACD1598642A008E62BD /* Frameworks */, ); buildRules = ( ); dependencies = ( + D008D0CD1BC58FE100841177 /* PBXTargetDependency */, ); name = fish_indent; productName = fish_indent; @@ -946,13 +962,13 @@ isa = PBXNativeTarget; buildConfigurationList = D0D26943159835CA005D9B9C /* Build configuration list for PBXNativeTarget "fish_shell" */; buildPhases = ( - 8307B7551BB7116A0088A2A6 /* ShellScript */, D0D26938159835CA005D9B9C /* Sources */, D0D26939159835CA005D9B9C /* Frameworks */, ); buildRules = ( ); dependencies = ( + D008D0CB1BC58FDD00841177 /* PBXTargetDependency */, D04F7FEB1BA4E3DB00B0F227 /* PBXTargetDependency */, ); name = fish_shell; @@ -968,6 +984,9 @@ attributes = { LastUpgradeCheck = 0700; TargetAttributes = { + D008D0C41BC58F8800841177 = { + CreatedOnToolsVersion = 7.0.1; + }; D04F7FCF1BA4E29300B0F227 = { CreatedOnToolsVersion = 6.4; }; @@ -991,9 +1010,9 @@ D0D2693B159835CA005D9B9C /* fish_shell */, D0D02ACF1598642A008E62BD /* fish_indent */, D0A564E6168CFDD800AF6161 /* man_pages */, - D0A084F713B3AC130099B651 /* Makefile */, D00769101990137800CA4627 /* fish_tests */, D04F7FCF1BA4E29300B0F227 /* pcre2 */, + D008D0C41BC58F8800841177 /* generate-version-header */, ); }; /* End PBXProject section */ @@ -1014,23 +1033,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 8307B7551BB7116A0088A2A6 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/fish-build-version.h", - "$(DERIVED_FILE_DIR)/force-fish-build-version.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/bash; - shellScript = ./build_tools/xcode_version_gen.sh; - showEnvVarsInLog = 0; - }; - 8307B7561BB711880088A2A6 /* ShellScript */ = { + D008D0C91BC58F9500841177 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1038,13 +1041,12 @@ inputPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/fish-build-version.h", - "$(DERIVED_FILE_DIR)/force-fish-build-version.h", + "$(SHARED_DERIVED_FILE_DIR)/fish-build-version.h", + "$(SHARED_DERIVED_FILE_DIR)/force-fish-build-version.h", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = ./build_tools/xcode_version_gen.sh; - showEnvVarsInLog = 0; }; D01A25E01AF58CD0002F9E92 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1427,6 +1429,21 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + D008D0CB1BC58FDD00841177 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D008D0C41BC58F8800841177 /* generate-version-header */; + targetProxy = D008D0CA1BC58FDD00841177 /* PBXContainerItemProxy */; + }; + D008D0CD1BC58FE100841177 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D008D0C41BC58F8800841177 /* generate-version-header */; + targetProxy = D008D0CC1BC58FE100841177 /* PBXContainerItemProxy */; + }; + D008D0CF1BC58FE500841177 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D008D0C41BC58F8800841177 /* generate-version-header */; + targetProxy = D008D0CE1BC58FE500841177 /* PBXContainerItemProxy */; + }; D031890815E36CC000D9CC39 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D0F019EC15A976F30034B3B1 /* base */; @@ -1536,7 +1553,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.7; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers $(SHARED_DERIVED_FILE_DIR)"; WARNING_CFLAGS = ( "-Wall", "-Wunused-macros", @@ -1612,16 +1629,23 @@ }; name = "Release_C++11"; }; - D007FDE317136EAA00A52BE6 /* Release_C++11 */ = { + D008D0C51BC58F8800841177 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + D008D0C61BC58F8800841177 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + D008D0C71BC58F8800841177 /* Release_C++11 */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = "Release_C++11"; @@ -1743,7 +1767,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers $(SHARED_DERIVED_FILE_DIR)"; WARNING_CFLAGS = ( "-Wall", "-Wunused-macros", @@ -1774,7 +1798,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers $(SHARED_DERIVED_FILE_DIR)"; WARNING_CFLAGS = ( "-Wall", "-Wunused-macros", @@ -1782,37 +1806,6 @@ }; name = Release; }; - D0A084FB13B3AC130099B651 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - D0A084FC13B3AC130099B651 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; D0A564E7168CFDD800AF6161 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1950,6 +1943,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + D008D0C81BC58F8800841177 /* Build configuration list for PBXAggregateTarget "generate-version-header" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D008D0C51BC58F8800841177 /* Debug */, + D008D0C61BC58F8800841177 /* Release */, + D008D0C71BC58F8800841177 /* Release_C++11 */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; D04F7FD11BA4E29300B0F227 /* Build configuration list for PBXNativeTarget "pcre2" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1980,16 +1983,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D0A084FA13B3AC130099B651 /* Build configuration list for PBXLegacyTarget "Makefile" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D0A084FB13B3AC130099B651 /* Debug */, - D0A084FC13B3AC130099B651 /* Release */, - D007FDE317136EAA00A52BE6 /* Release_C++11 */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; D0A564E9168CFDD800AF6161 /* Build configuration list for PBXAggregateTarget "man_pages" */ = { isa = XCConfigurationList; buildConfigurations = ( -- cgit v1.2.3