Changeset 100850 in webkit
- Timestamp:
- Nov 19, 2011 12:09:22 AM (12 years ago)
- Location:
- trunk/Source/WTF
- Files:
-
- 5 added
- 1 edited
- 30 copied
-
ChangeLog (modified) (1 diff)
-
Configurations (added)
-
Configurations/Base.xcconfig (copied) (copied from trunk/Source/JavaScriptCore/Configurations/Base.xcconfig) (4 diffs)
-
Configurations/CompilerVersion.xcconfig (copied) (copied from trunk/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig) (1 diff)
-
Configurations/DebugRelease.xcconfig (copied) (copied from trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig) (3 diffs)
-
Configurations/WTF.xcconfig (copied) (copied from trunk/Source/WebKit2/Configurations/Shim.xcconfig) (2 diffs)
-
WTF.xcodeproj (added)
-
WTF.xcodeproj/project.pbxproj (added)
-
config.h (copied) (copied from trunk/Source/JavaScriptCore/config.h) (1 diff)
-
icu (added)
-
icu/LICENSE (copied) (copied from trunk/Source/JavaScriptCore/icu/LICENSE)
-
icu/README (copied) (copied from trunk/Source/JavaScriptCore/icu/README)
-
icu/unicode (added)
-
icu/unicode/parseerr.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/parseerr.h)
-
icu/unicode/platform.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/platform.h)
-
icu/unicode/putil.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/putil.h)
-
icu/unicode/uchar.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uchar.h)
-
icu/unicode/ucnv.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/ucnv.h)
-
icu/unicode/ucnv_err.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/ucnv_err.h)
-
icu/unicode/ucol.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/ucol.h)
-
icu/unicode/uconfig.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uconfig.h)
-
icu/unicode/uenum.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uenum.h)
-
icu/unicode/uiter.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uiter.h)
-
icu/unicode/uloc.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uloc.h)
-
icu/unicode/umachine.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/umachine.h)
-
icu/unicode/unorm.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/unorm.h)
-
icu/unicode/urename.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/urename.h)
-
icu/unicode/uscript.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uscript.h)
-
icu/unicode/uset.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uset.h)
-
icu/unicode/ustring.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/ustring.h)
-
icu/unicode/utf.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/utf.h)
-
icu/unicode/utf16.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/utf16.h)
-
icu/unicode/utf8.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/utf8.h)
-
icu/unicode/utf_old.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/utf_old.h)
-
icu/unicode/utypes.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/utypes.h)
-
icu/unicode/uversion.h (copied) (copied from trunk/Source/JavaScriptCore/icu/unicode/uversion.h)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r99251 r100850 1 2011-11-19 Mark Rowe <mrowe@apple.com> 2 3 WTF should have an Xcode project 4 https://bugs.webkit.org/show_bug.cgi?id=71752 5 6 Reviewed by Adam Barth. 7 8 This adds an Xcode project that includes only Stub.cpp and Stub.h. 9 They’re built in to a library at the appropriate path for each 10 configuration (WebKitBuild/{Debug,Release}/libWTF.a and 11 /usr/local/lib/libWTF.a) and headers are installed in to the 12 appropriate location (WebKitBuild/{Debug,Release}/usr/local/include/wtf 13 and /usr/local/include/wtf). I tested building WTF in this project and 14 everything appears to build except for DateMath.cpp (due to bug 71747). 15 I have not yet done any work on making JavaScriptCore and other 16 projects use the built products of this new project. 17 18 * Configurations: Added. 19 * Configurations/Base.xcconfig: Copied from Source/JavaScriptCore/Configurations/Base.xcconfig. 20 * Configurations/CompilerVersion.xcconfig: Copied from Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig. 21 * Configurations/DebugRelease.xcconfig: Copied from Source/JavaScriptCore/Configurations/DebugRelease.xcconfig. 22 * Configurations/WTF.xcconfig: Copied from Source/WebKit2/Configurations/Shim.xcconfig. 23 * WTF.xcodeproj: Added. 24 * WTF.xcodeproj/project.pbxproj: Added. 25 * config.h: Copied from Source/JavaScriptCore/config.h. 26 * icu: Added. 27 * icu/LICENSE: Copied from Source/JavaScriptCore/icu/LICENSE. 28 * icu/README: Copied from Source/JavaScriptCore/icu/README. 29 * icu/unicode: Added. 30 * icu/unicode/parseerr.h: Copied from Source/JavaScriptCore/icu/unicode/parseerr.h. 31 * icu/unicode/platform.h: Copied from Source/JavaScriptCore/icu/unicode/platform.h. 32 * icu/unicode/putil.h: Copied from Source/JavaScriptCore/icu/unicode/putil.h. 33 * icu/unicode/uchar.h: Copied from Source/JavaScriptCore/icu/unicode/uchar.h. 34 * icu/unicode/ucnv.h: Copied from Source/JavaScriptCore/icu/unicode/ucnv.h. 35 * icu/unicode/ucnv_err.h: Copied from Source/JavaScriptCore/icu/unicode/ucnv_err.h. 36 * icu/unicode/ucol.h: Copied from Source/JavaScriptCore/icu/unicode/ucol.h. 37 * icu/unicode/uconfig.h: Copied from Source/JavaScriptCore/icu/unicode/uconfig.h. 38 * icu/unicode/uenum.h: Copied from Source/JavaScriptCore/icu/unicode/uenum.h. 39 * icu/unicode/uiter.h: Copied from Source/JavaScriptCore/icu/unicode/uiter.h. 40 * icu/unicode/uloc.h: Copied from Source/JavaScriptCore/icu/unicode/uloc.h. 41 * icu/unicode/umachine.h: Copied from Source/JavaScriptCore/icu/unicode/umachine.h. 42 * icu/unicode/unorm.h: Copied from Source/JavaScriptCore/icu/unicode/unorm.h. 43 * icu/unicode/urename.h: Copied from Source/JavaScriptCore/icu/unicode/urename.h. 44 * icu/unicode/uscript.h: Copied from Source/JavaScriptCore/icu/unicode/uscript.h. 45 * icu/unicode/uset.h: Copied from Source/JavaScriptCore/icu/unicode/uset.h. 46 * icu/unicode/ustring.h: Copied from Source/JavaScriptCore/icu/unicode/ustring.h. 47 * icu/unicode/utf.h: Copied from Source/JavaScriptCore/icu/unicode/utf.h. 48 * icu/unicode/utf16.h: Copied from Source/JavaScriptCore/icu/unicode/utf16.h. 49 * icu/unicode/utf8.h: Copied from Source/JavaScriptCore/icu/unicode/utf8.h. 50 * icu/unicode/utf_old.h: Copied from Source/JavaScriptCore/icu/unicode/utf_old.h. 51 * icu/unicode/utypes.h: Copied from Source/JavaScriptCore/icu/unicode/utypes.h. 52 * icu/unicode/uversion.h: Copied from Source/JavaScriptCore/icu/unicode/uversion.h. 53 1 54 2011-11-03 Adam Barth <abarth@webkit.org> 2 55 -
trunk/Source/WTF/Configurations/Base.xcconfig
r100849 r100850 47 47 GCC_OBJC_CALL_CXX_CDTORS = YES; 48 48 GCC_PRECOMPILE_PREFIX_HEADER = YES; 49 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_DTRACE=$(HAVE_DTRACE)WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(GCC_PREPROCESSOR_DEFINITIONS);49 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(GCC_PREPROCESSOR_DEFINITIONS); 50 50 GCC_STRICT_ALIASING = YES; 51 51 GCC_THREADSAFE_STATICS = NO; … … 72 72 WARNING_CFLAGS_macosx_ppc64 = $(WARNING_CFLAGS_BASE); 73 73 WARNING_CFLAGS_macosx_x86_64 = $(WARNING_CFLAGS_BASE); 74 HEADER_SEARCH_PATHS = .icu $(HEADER_SEARCH_PATHS);74 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS); 75 75 76 76 … … 108 108 DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT)); 109 109 110 SECTORDER_FLAGS = -Wl,-order_file,JavaScriptCore.order;111 112 110 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK. 113 111 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 123 121 SDKROOT_1090_1080 = macosx10.8; 124 122 125 126 // HAVE_DTRACE is disabled on Leopard due to <rdar://problem/5628149>127 HAVE_DTRACE = $(HAVE_DTRACE_$(REAL_PLATFORM_NAME));128 HAVE_DTRACE_iphoneos = 1;129 HAVE_DTRACE_iphonesimulator = 1;130 HAVE_DTRACE_macosx = $(HAVE_DTRACE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));131 HAVE_DTRACE_macosx_1050 = 0;132 HAVE_DTRACE_macosx_1060 = 1;133 HAVE_DTRACE_macosx_1070 = 1;134 HAVE_DTRACE_macosx_1080 = 1;135 HAVE_DTRACE_macosx_1090 = 1; -
trunk/Source/WTF/Configurations/CompilerVersion.xcconfig
r100849 r100850 59 59 TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 60 60 61 TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));62 TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));63 TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;64 TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;65 66 61 TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_AND_1070_$(CONFIGURATION)); 67 62 TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1060_AND_1070_$(CONFIGURATION)); -
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
r100849 r100850 28 28 ARCHS_iphonesimulator = $(NATIVE_ARCH); 29 29 ARCHS_macosx = $(ARCHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 30 ARCHS_macosx_1050 = $(NATIVE_ARCH);31 30 ARCHS_macosx_1060 = $(ARCHS_STANDARD_32_64_BIT); 32 31 ARCHS_macosx_1070 = $(ARCHS_STANDARD_32_64_BIT); … … 40 39 MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5; 41 40 MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 42 MACOSX_DEPLOYMENT_TARGET_macosx_1050 = 10.5;43 41 MACOSX_DEPLOYMENT_TARGET_macosx_1060 = 10.6; 44 42 MACOSX_DEPLOYMENT_TARGET_macosx_1070 = 10.7; … … 47 45 48 46 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; 49 50 SECTORDER_FLAGS = ; -
trunk/Source/WTF/Configurations/WTF.xcconfig
r100849 r100850 1 // Copyright (C) 201 0, 2011 Apple Inc. All rights reserved.1 // Copyright (C) 2011 Apple Inc. All rights reserved. 2 2 // 3 3 // Redistribution and use in source and binary forms, with or without … … 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 24 #include "BaseTarget.xcconfig" 24 EXECUTABLE_PREFIX = lib; 25 PRODUCT_NAME = WTF; 25 26 26 GCC_DYNAMIC_NO_PIC = NO; 27 SKIP_INSTALL = YES; 28 27 PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/wtf; 28 INSTALLHDRS_SCRIPT_PHASE = YES; -
trunk/Source/WTF/config.h
r100849 r100850 37 37 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 38 38 #define WTF_EXPORT_PRIVATE WTF_EXPORT 39 #define JS_EXPORT_PRIVATE WTF_EXPORT40 39 #else 41 40 #define WTF_EXPORT_PRIVATE WTF_IMPORT 42 #define JS_EXPORT_PRIVATE WTF_IMPORT43 41 #endif 44 42 45 #define JS_EXPORTDATA JS_EXPORT_PRIVATE46 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE47 48 43 #else /* !USE(EXPORT_MACROS) */ 49 50 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)51 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)52 #define JS_EXPORTDATA __declspec(dllexport)53 #else54 #define JS_EXPORTDATA __declspec(dllimport)55 #endif56 #define JS_EXPORTCLASS JS_EXPORTDATA57 #else58 #define JS_EXPORTDATA59 #define JS_EXPORTCLASS60 #endif61 44 62 45 #define WTF_EXPORT_PRIVATE
Note: See TracChangeset
for help on using the changeset viewer.
