Changeset 141308 in webkit
- Timestamp:
- Jan 30, 2013 2:24:53 PM (11 years ago)
- Location:
- trunk/Source/WTF
- Files:
-
- 1 added
- 6 edited
-
ChangeLog (modified) (1 diff)
-
Configurations/Base.xcconfig (modified) (4 diffs)
-
Configurations/CopyWTFHeaders.xcconfig (modified) (1 diff)
-
Configurations/DebugRelease.xcconfig (modified) (1 diff)
-
Configurations/WTF.xcconfig (modified) (1 diff)
-
Configurations/iOS.xcconfig (added)
-
WTF.xcodeproj/project.pbxproj (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r141295 r141308 1 2013-01-30 David Kilzer <ddkilzer@apple.com> 2 3 Upstream iOS build file changes for WTF 4 <http://webkit.org/b/108221> 5 6 Reviewed by Mark Rowe. 7 8 * Configurations/Base.xcconfig: 9 - Import iOS.xcconfig. 10 - Remove VALID_ARCHS. Modern Xcodes define these correctly. 11 - Make HEADER_SEARCH_PATHS work with iOS Simulator builds. 12 - Add SUPPORTED_PLATFORMS so both Mac and iOS SDKs appear in 13 schemes. 14 - Define INSTALL_PATH when building for macosx SDK. 15 * Configurations/CopyWTFHeaders.xcconfig: 16 - Make PRIVATE_HEADERS_FOLDER_PATH work with iOS Simulator 17 builds. 18 * Configurations/DebugRelease.xcconfig: 19 - Simplify ARCHS. This works correctly on 32-bit-only SDKs. 20 * Configurations/WTF.xcconfig: 21 - Fix installation directory for iOS Simulator builds by 22 defining INSTALL_PATH_ACTUAL. 23 * Configurations/iOS.xcconfig: Add. 24 * WTF.xcodeproj/project.pbxproj: 25 - Add iOS.xcconfig to the project. 26 1 27 2013-01-29 Mark Hahnenberg <mhahnenberg@apple.com> 2 28 -
trunk/Source/WTF/Configurations/Base.xcconfig
r132925 r141308 21 21 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 24 #include "iOS.xcconfig" 23 25 24 26 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x; … … 56 58 LINKER_DISPLAYS_MANGLED_NAMES = YES; 57 59 PREBINDING = NO; 58 VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));59 VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);60 VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);61 VALID_ARCHS_macosx = i386 ppc x86_64 ppc64 $(ARCHS_UNIVERSAL_IPHONE_OS);62 60 WARNING_CFLAGS_BASE = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare; 63 61 WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME)); … … 70 68 // FIXME: JavaScriptCore 64-bit builds should build with -Wshorten-64-to-32 71 69 WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE); 72 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS); 73 70 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/$(INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)/$(INSTALL_PATH_PREFIX)/usr/local/include icu $(HEADER_SEARCH_PATHS); 74 71 75 72 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 76 73 74 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx; 77 75 78 76 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)); … … 105 103 TARGETING_SAME_OS_X_VERSION_1090_1090 = YES; 106 104 105 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL); 106 107 107 // Don't build against an SDK unless we're targeting an older OS version. 108 108 SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION)); -
trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig
r131833 r141308 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 24 25 PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/wtf; 24 PRIVATE_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/wtf; 26 25 INSTALLHDRS_SCRIPT_PHASE = YES; -
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
r132860 r141308 24 24 #include "Base.xcconfig" 25 25 26 ARCHS = $(ARCHS_$(PLATFORM_NAME)); 27 ARCHS_iphoneos = $(ARCHS_UNIVERSAL_IPHONE_OS); 28 ARCHS_iphonesimulator = $(NATIVE_ARCH); 29 ARCHS_macosx = $(ARCHS_STANDARD_32_64_BIT); 30 26 ARCHS = $(ARCHS_STANDARD_32_64_BIT); 31 27 ONLY_ACTIVE_ARCH = YES; 32 28 -
trunk/Source/WTF/Configurations/WTF.xcconfig
r131833 r141308 23 23 24 24 EXECUTABLE_PREFIX = lib; 25 INSTALL_PATH_ACTUAL = /usr/local/lib; 25 26 PRODUCT_NAME = WTF; 26 27 -
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
r141219 r141308 366 366 2CCD892915C0390200285083 /* GregorianDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GregorianDateTime.cpp; sourceTree = "<group>"; }; 367 367 4330F38E15745B0500AAFA8F /* URLString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLString.cpp; sourceTree = "<group>"; }; 368 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; }; 368 369 4F0321BB156AA8D1006EBAF6 /* BitArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitArray.h; sourceTree = "<group>"; }; 369 370 4F1B2DB5160B44AA00586559 /* MemoryInstrumentationHashSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentationHashSet.h; sourceTree = "<group>"; }; … … 660 661 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */, 661 662 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */, 663 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */, 662 664 5D247B7314689C4700E78B76 /* WTF.xcconfig */, 663 665 );
Note: See TracChangeset
for help on using the changeset viewer.
