Add more useful settings to the xcconfigs.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@988 0039d316-1c4b-4281-b951-d872f2087c98
trevorlinton · Aug 18, 2008 · c9b778d · c9b778d
1 parent 80179e1
commit c9b778d
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 3 deletions.
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
@@ -288,6 +288,8 @@
 		7BD9E84E0DA447F800FC7A01 /* singleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = singleton.h; sourceTree = "<group>"; };
 		7BEB81100D9AD288009BA8DD /* prcpucfg_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prcpucfg_mac.h; path = third_party/nspr/prcpucfg_mac.h; sourceTree = "<group>"; };
 		7BEB81490D9B0F33009BA8DD /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; };
+		7BED30C60E59F63000A747DB /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+		7BED30C70E59F63000A747DB /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
 		7BEFC29C0D99832D000829AD /* lock_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lock_impl.h; sourceTree = "<group>"; };
 		7BEFC29D0D99832D000829AD /* lock_impl_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lock_impl_posix.cc; sourceTree = "<group>"; };
 		820EB4EB0E3A60FE009668FC /* idle_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idle_timer.cc; sourceTree = "<group>"; };
@@ -582,7 +584,9 @@
 			children = (
 				7B836C4C0E55C6AC00F6AD31 /* common.xcconfig */,
 				7B836C4D0E55C6AC00F6AD31 /* debug.xcconfig */,
+				7BED30C60E59F63000A747DB /* executable.xcconfig */,
 				7B836C4E0E55C6AC00F6AD31 /* release.xcconfig */,
+				7BED30C70E59F63000A747DB /* staticlib.xcconfig */,
 			);
 			name = Configuration;
 			path = ../build;
@@ -1206,6 +1210,7 @@
 		};
 		825402BD0D92D0FB0006B936 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C70E59F63000A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					..,
@@ -1218,6 +1223,7 @@
 		};
 		825402BE0D92D0FB0006B936 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C70E59F63000A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					..,
@@ -1230,6 +1236,7 @@
 		};
 		825403B20D92D2E50006B936 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C70E59F63000A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				HEADER_SEARCH_PATHS = (
@@ -1244,6 +1251,7 @@
 		};
 		825403B30D92D2E50006B936 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C70E59F63000A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				HEADER_SEARCH_PATHS = (
@@ -1272,6 +1280,7 @@
 		};
 		E49F18C10E4CBAC300386AEC /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C60E59F63000A747DB /* executable.xcconfig */;
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
@@ -1290,6 +1299,7 @@
 		};
 		E49F18C20E4CBAC300386AEC /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30C60E59F63000A747DB /* executable.xcconfig */;
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",

diff --git a/build/common.xcconfig b/build/common.xcconfig
@@ -28,11 +28,14 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ALWAYS_SEARCH_USER_PATHS = NO
+GCC_C_LANGUAGE_STANDARD = c99
 GCC_CW_ASM_SYNTAX = NO
 GCC_DYNAMIC_NO_PIC = YES
 GCC_ENABLE_PASCAL_STRINGS = NO
 GCC_INLINES_ARE_PRIVATE_EXTERN = YES
+GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_SYMBOLS_PRIVATE_EXTERN = YES
+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(CODECOVERAGE_OTHER_LDFLAGS)
 PREBINDING = NO
 
 // Each project file must set XCODEPROJ_DEPTH as a project-wide setting.  It
@@ -43,4 +46,4 @@ PREBINDING = NO
 SYMROOT = $(XCODEPROJ_DEPTH)/xcodebuild
 
 USE_HEADERMAP = NO
-WARNING_CFLAGS = -Wall
+WARNING_CFLAGS = $(WARNING_CFLAGS) -Wall -Wendif-labels -Wnewline-eof
diff --git a/build/debug.xcconfig b/build/debug.xcconfig
@@ -30,5 +30,10 @@
 #include "common.xcconfig"
 
 COPY_PHASE_STRIP = NO
+GCC_GENERATE_TEST_COVERAGE_FILES = YES
+GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES
 GCC_OPTIMIZATION_LEVEL = 0
-GCC_PREPROCESSOR_DEFINITIONS = DEBUG
+GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) DEBUG _GLIBCXX_CONCEPT_CHECKS _GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC
+OTHER_CFLAGS = $(OTHER_CFLAGS) -fstack-protector -fstack-protector-all
+
+CODECOVERAGE_OTHER_LDFLAGS = -lgcov
diff --git a/build/executable.xcconfig b/build/executable.xcconfig
@@ -0,0 +1,28 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/build/release.xcconfig b/build/release.xcconfig
@@ -31,4 +31,6 @@
 
 DEAD_CODE_STRIPPING = YES
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-GCC_PREPROCESSOR_DEFINITIONS = NDEBUG
+DEPLOYMENT_POSTPROCESSING = YES
+GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) NDEBUG
+STRIP_STYLE = all
diff --git a/build/staticlib.xcconfig b/build/staticlib.xcconfig
@@ -0,0 +1,32 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+DEPLOYMENT_POSTPROCESSING = NO
+STRIP_STYLE = debugging
+CODECOVERAGE_OTHER_LDFLAGS =
diff --git a/testing/gtest.xcodeproj/project.pbxproj b/testing/gtest.xcodeproj/project.pbxproj
@@ -18,6 +18,8 @@
 		7B836C740E55C8CC00F6AD31 /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
 		7B836C750E55C8CC00F6AD31 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
 		7B836C760E55C8CC00F6AD31 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+		7BED30DF0E59F69A00A747DB /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+		7BED30E00E59F69A00A747DB /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
 		D2AAC046055464E500DB518D /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E45A2BB60E47A20200DB1196 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; };
 		E45A2BB70E47A20200DB1196 /* gtest-death-test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-death-test.cc"; sourceTree = "<group>"; };
@@ -75,7 +77,9 @@
 			children = (
 				7B836C740E55C8CC00F6AD31 /* common.xcconfig */,
 				7B836C750E55C8CC00F6AD31 /* debug.xcconfig */,
+				7BED30DF0E59F69A00A747DB /* executable.xcconfig */,
 				7B836C760E55C8CC00F6AD31 /* release.xcconfig */,
+				7BED30E00E59F69A00A747DB /* staticlib.xcconfig */,
 			);
 			name = Configuration;
 			path = ../build;
@@ -135,6 +139,7 @@
 /* Begin XCBuildConfiguration section */
 		1DEB91EC08733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30E00E59F69A00A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					gtest,
@@ -146,6 +151,7 @@
 		};
 		1DEB91ED08733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BED30E00E59F69A00A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					gtest,