Mac WTF build checks dependencies before copying header files
authormsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Oct 2012 01:04:35 +0000 (01:04 +0000)
committermsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Oct 2012 01:04:35 +0000 (01:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=99770

Reviewed by Mark Rowe.

Fixed up build rules per Mark Rowe. Made new target an Aggregate and removed "WTF copy".

* Configurations/CopyWTFHeaders.xcconfig: Added.
* Configurations/WTF.xcconfig:
* WTF.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/Configurations/CopyWTFHeaders.xcconfig [new file with mode: 0644]
Source/WTF/Configurations/WTF.xcconfig
Source/WTF/WTF.xcodeproj/project.pbxproj

index 7b18597e03ad989576f72d04bdfaa1a03c6a4ce3..7474582f698c77503086fee99a2b221592614c32 100644 (file)
@@ -1,3 +1,16 @@
+2012-10-18  Michael Saboff  <msaboff@apple.com>
+
+        Mac WTF build checks dependencies before copying header files
+        https://bugs.webkit.org/show_bug.cgi?id=99770
+
+        Reviewed by Mark Rowe.
+
+        Fixed up build rules per Mark Rowe. Made new target an Aggregate and removed "WTF copy".
+
+        * Configurations/CopyWTFHeaders.xcconfig: Added.
+        * Configurations/WTF.xcconfig:
+        * WTF.xcodeproj/project.pbxproj:
+
 2012-10-18  Michael Saboff  <msaboff@apple.com>
 
         Mac WTF build checks dependencies before copying header files
diff --git a/Source/WTF/Configurations/CopyWTFHeaders.xcconfig b/Source/WTF/Configurations/CopyWTFHeaders.xcconfig
new file mode 100644 (file)
index 0000000..112af7a
--- /dev/null
@@ -0,0 +1,26 @@
+// Copyright (C) 2011 Apple 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:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. 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.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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. 
+
+
+PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/wtf;
+INSTALLHDRS_SCRIPT_PHASE = YES;
index badf04be43c954cd82b45b86fc6cc5cbf2e399c1..8d7887edc0b343c63e06a859ca17361288f5a4b9 100644 (file)
@@ -24,6 +24,4 @@
 EXECUTABLE_PREFIX = lib;
 PRODUCT_NAME = WTF;
 
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/wtf;
-INSTALLHDRS_SCRIPT_PHASE = YES;
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
index 211314cbd46041f9dfe4efd4f70eae1ad5ef2951..39d739b676666fed8674f0dbc67d361fde36e491 100644 (file)
@@ -6,6 +6,20 @@
        objectVersion = 46;
        objects = {
 
+/* Begin PBXAggregateTarget section */
+               65AFA16F1630B977003D723C /* Copy WTF Headers */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 65AFA2881630B977003D723C /* Build configuration list for PBXAggregateTarget "Copy WTF Headers" */;
+                       buildPhases = (
+                               65AFA1701630B977003D723C /* Copy WTF Headers */,
+                       );
+                       dependencies = (
+                       );
+                       name = "Copy WTF Headers";
+                       productName = "Copy WTF Headers";
+               };
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
                0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD81AC4154FB22E00983E72 /* FastBitVector.h */; settings = {ATTRIBUTES = (); }; };
                143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 143F611D1565F0F900DB514A /* RAMSize.cpp */; };
                5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
                5D247B7314689C4700E78B76 /* WTF.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WTF.xcconfig; sourceTree = "<group>"; };
                5D247EB11468B01500E78B76 /* HeaderDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HeaderDetection.h; path = DerivedSources/WTF/HeaderDetection.h; sourceTree = BUILT_PRODUCTS_DIR; };
+               6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyWTFHeaders.xcconfig; sourceTree = "<group>"; };
                7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjcRuntimeExtras.h; sourceTree = "<group>"; };
                8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
                8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
                5D247B6D14689C4700E78B76 /* Configurations */ = {
                        isa = PBXGroup;
                        children = (
+                               6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */,
                                5D247B6E14689C4700E78B76 /* Base.xcconfig */,
                                5D247B6F14689C4700E78B76 /* CompilerVersion.xcconfig */,
                                5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */,
                        productReference = 5D247B6214689B8600E78B76 /* libWTF.a */;
                        productType = "com.apple.product-type.library.static";
                };
-               65AFA16F1630B977003D723C /* Copy WTF Headers */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 65AFA2881630B977003D723C /* Build configuration list for PBXNativeTarget "Copy WTF Headers" */;
-                       buildPhases = (
-                               65AFA1701630B977003D723C /* Copy WTF Headers */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = "Copy WTF Headers";
-                       productName = "Copy WTF Headers";
-                       productType = "com.apple.product-type.tool";
-               };
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
                };
                65AFA2891630B977003D723C /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+                       baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
                        buildSettings = {
-                               PRODUCT_NAME = "WTF copy";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                65AFA28A1630B977003D723C /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+                       baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
                        buildSettings = {
-                               PRODUCT_NAME = "WTF copy";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                65AFA28B1630B977003D723C /* Production */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+                       baseConfigurationReference = 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */;
                        buildSettings = {
-                               PRODUCT_NAME = "WTF copy";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Production;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               65AFA2881630B977003D723C /* Build configuration list for PBXNativeTarget "Copy WTF Headers" */ = {
+               65AFA2881630B977003D723C /* Build configuration list for PBXAggregateTarget "Copy WTF Headers" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                65AFA2891630B977003D723C /* Debug */,