Changeset 132729 in webkit


Ignore:
Timestamp:
Oct 27, 2012, 9:14:53 AM (13 years ago)
Author:
mitz@apple.com
Message:

REAL_PLATFORM_NAME build setting is no longer needed
​https://bugs.webkit.org/show_bug.cgi?id=100587

Reviewed by Mark Rowe.

Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
to PLATFORM_NAME.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig:
  • Configurations/CompilerVersion.xcconfig:
  • Configurations/DebugRelease.xcconfig:
  • Configurations/FeatureDefines.xcconfig:
  • Configurations/JSC.xcconfig:
  • Configurations/JavaScriptCore.xcconfig:
  • Configurations/ToolExecutable.xcconfig:

Source/ThirdParty:

  • gtest/xcode/Config/CompilerVersion.xcconfig:
  • gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig:
  • Configurations/CompilerVersion.xcconfig:

Source/WebCore:

  • Configurations/Base.xcconfig:
  • Configurations/CompilerVersion.xcconfig:
  • Configurations/DebugRelease.xcconfig:
  • Configurations/FeatureDefines.xcconfig:
  • Configurations/Version.xcconfig:
  • Configurations/WebCore.xcconfig:

Source/WebKit/mac:

  • Configurations/Base.xcconfig:
  • Configurations/CompilerVersion.xcconfig:
  • Configurations/DebugRelease.xcconfig:
  • Configurations/FeatureDefines.xcconfig:
  • Configurations/Version.xcconfig:
  • Configurations/WebKit.xcconfig:

Source/WebKit2:

  • Configurations/Base.xcconfig:
  • Configurations/BaseTarget.xcconfig:
  • Configurations/CompilerVersion.xcconfig:
  • Configurations/FeatureDefines.xcconfig:
  • Configurations/WebKit2.xcconfig:

Source/WTF:

  • Configurations/Base.xcconfig:
  • Configurations/CompilerVersion.xcconfig:
  • Configurations/DebugRelease.xcconfig:

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
  • MiniBrowser/Configurations/Base.xcconfig:
  • MiniBrowser/Configurations/CompilerVersion.xcconfig:
  • TestWebKitAPI/Configurations/Base.xcconfig:
  • TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
  • WebKitTestRunner/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/CompilerVersion.xcconfig:
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig:
Location:
trunk
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r132701 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/CompilerVersion.xcconfig:
     13        * Configurations/DebugRelease.xcconfig:
     14        * Configurations/FeatureDefines.xcconfig:
     15        * Configurations/JSC.xcconfig:
     16        * Configurations/JavaScriptCore.xcconfig:
     17        * Configurations/ToolExecutable.xcconfig:
     18
    1192012-10-25  Filip Pizlo  <fpizlo@apple.com>
    220

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r122404 r132729  
    3535GCC_ENABLE_CPP_RTTI = NO;
    3636GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    37 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(REAL_PLATFORM_NAME));
     37GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    3838GCC_ENABLE_OBJC_GC_iphoneos = NO;
    3939GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    … …  
    4343GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    4444GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    45 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(REAL_PLATFORM_NAME));
     45GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    4646GCC_MODEL_TUNING_macosx = G5;
    4747GCC_OBJC_CALL_CXX_CDTORS = YES;
    … …  
    5858LINKER_DISPLAYS_MANGLED_NAMES = YES;
    5959PREBINDING = NO;
    60 VALID_ARCHS = $(VALID_ARCHS_$(REAL_PLATFORM_NAME));
     60VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
    6161VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    6262VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    6363VALID_ARCHS_macosx = i386 ppc x86_64 ppc64 $(ARCHS_UNIVERSAL_IPHONE_OS);
    6464WARNING_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;
    65 WARNING_CFLAGS = $(WARNING_CFLAGS_$(REAL_PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
     65WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
    6666WARNING_CFLAGS_iphoneos = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    6767WARNING_CFLAGS_iphonesimulator = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    … …  
    8181CLANG_CXX_LIBRARY_1090 = libc++;
    8282
    83 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    84 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    85 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    86 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    87 REAL_PLATFORM_NAME_macosx = macosx;
    88 
    8983TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    9084
    … …  
    9488STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    9589
    96 NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     90NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    9791NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    9892NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
    9993NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    10094
    101 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     95JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    10296JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
    10397JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
    … …  
    140134
    141135// HAVE_DTRACE is disabled on Leopard due to <rdar://problem/5628149>
    142 HAVE_DTRACE = $(HAVE_DTRACE_$(REAL_PLATFORM_NAME));
     136HAVE_DTRACE = $(HAVE_DTRACE_$(PLATFORM_NAME));
    143137HAVE_DTRACE_iphoneos = 1;
    144138HAVE_DTRACE_iphonesimulator = 1;

  • trunk/Source/JavaScriptCore/Configurations/CompilerVersion.xcconfig

    r100039 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_COMPILER;
    5858TARGET_GCC_VERSION_iphonesimulator = $(TARGET_GCC_VERSION_iphoneos);

  • trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r115501 r132729  
    2424#include "Base.xcconfig"
    2525
    26 ARCHS = $(ARCHS_$(REAL_PLATFORM_NAME));
     26ARCHS = $(ARCHS_$(PLATFORM_NAME));
    2727ARCHS_iphoneos = $(ARCHS_UNIVERSAL_IPHONE_OS);
    2828ARCHS_iphonesimulator = $(NATIVE_ARCH);
    … …  
    3636ONLY_ACTIVE_ARCH = YES;
    3737
    38 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(REAL_PLATFORM_NAME));
     38MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    3939MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    4040MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r132600 r132729  
    5252ENABLE_CSS3_TEXT = ;
    5353ENABLE_CUSTOM_SCHEME_HANDLER = ;
    54 ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
     54ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
    5555ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
    5656ENABLE_DATALIST_ELEMENT = ;
    … …  
    6161ENABLE_DIRECTORY_UPLOAD = ;
    6262ENABLE_DRAGGABLE_REGION = ;
    63 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(REAL_PLATFORM_NAME));
     63ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(PLATFORM_NAME));
    6464ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    6565ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
    … …  
    6767ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
    6868ENABLE_FILE_SYSTEM = ;
    69 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
     69ENABLE_FILTERS = $(ENABLE_FILTERS_$(PLATFORM_NAME));
    7070ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7171ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
    7272ENABLE_GAMEPAD = ;
    7373ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    74 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(REAL_PLATFORM_NAME));
     74ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(PLATFORM_NAME));
    7575ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx = HIDDEN_PAGE_DOM_TIMER_THROTTLING;
    7676ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
    77 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
     77ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
    7878ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
    7979ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
    … …  
    8181ENABLE_INPUT_SPEECH = ;
    8282ENABLE_INPUT_TYPE_COLOR = ;
    83 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(REAL_PLATFORM_NAME));
     83ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
    8484ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
    8585ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
    86 ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(REAL_PLATFORM_NAME));
     86ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(PLATFORM_NAME));
    8787ENABLE_INPUT_TYPE_DATETIME_iphoneos = ENABLE_INPUT_TYPE_DATETIME;
    8888ENABLE_INPUT_TYPE_DATETIME_iphonesimulator = ENABLE_INPUT_TYPE_DATETIME;
    89 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(REAL_PLATFORM_NAME));
     89ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(PLATFORM_NAME));
    9090ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    9191ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    92 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(REAL_PLATFORM_NAME));
     92ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(PLATFORM_NAME));
    9393ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
    9494ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
    95 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(REAL_PLATFORM_NAME));
     95ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(PLATFORM_NAME));
    9696ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
    9797ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
    98 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(REAL_PLATFORM_NAME));
     98ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(PLATFORM_NAME));
    9999ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
    100100ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
    101101ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
    102102ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
    103 ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     103ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(PLATFORM_NAME));
    104104ENABLE_LEGACY_NOTIFICATIONS_macosx = $(ENABLE_LEGACY_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    105105ENABLE_LEGACY_NOTIFICATIONS_macosx_1070 = ;
    … …  
    118118ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
    119119ENABLE_NAVIGATOR_CONTENT_UTILS = ;
    120 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     120ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
    121121ENABLE_NOTIFICATIONS_macosx = $(ENABLE_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    122122ENABLE_NOTIFICATIONS_macosx_1070 = ;
    … …  
    133133ENABLE_STYLE_SCOPED = ;
    134134ENABLE_SVG = ENABLE_SVG;
    135 ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(REAL_PLATFORM_NAME));
     135ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(PLATFORM_NAME));
    136136ENABLE_SVG_DOM_OBJC_BINDINGS_macosx = ENABLE_SVG_DOM_OBJC_BINDINGS;
    137137ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
    … …  
    141141ENABLE_UNDO_MANAGER = ;
    142142ENABLE_VIDEO = ENABLE_VIDEO;
    143 ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));
     143ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(PLATFORM_NAME));
    144144ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;
    145145ENABLE_WEBGL = ENABLE_WEBGL;

  • trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig

    r104664 r132729  
    2424INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources
    2525PRODUCT_NAME = jsc;
    26 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(REAL_PLATFORM_NAME));
     26CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));
    2727CODE_SIGN_ENTITLEMENTS_iphoneos = entitlements.plist;

  • trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r111786 r132729  
    3737OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-all_load;
    3838OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
    39 OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
     39OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    4040OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
    4141OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);

  • trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

    r112562 r132729  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
     24INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    2525INSTALL_PATH_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
    2626INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r131933 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/CompilerVersion.xcconfig:
     13
    1142012-10-18  Dean Jackson  <dino@apple.com>
    215

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r122404 r132729  
    3131CLANG_CXX_LIBRARY_1090 = libc++;
    3232
    33 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    34 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    35 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    36 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    37 REAL_PLATFORM_NAME_macosx = macosx;
    38 
    3933TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    4034

  • trunk/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Source/ThirdParty/ChangeLog

    r126479 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * gtest/xcode/Config/CompilerVersion.xcconfig:
     12        * gtest/xcode/Config/General.xcconfig:
     13
    1142012-08-23  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/Source/ThirdParty/gtest/xcode/Config/CompilerVersion.xcconfig

    r93798 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

    r122404 r132729  
    4545CLANG_CXX_LIBRARY_1090 = libc++;
    4646
    47 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    48 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    49 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    50 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    51 REAL_PLATFORM_NAME_macosx = macosx;
    52 
    5347TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    5448

  • trunk/Source/WTF/ChangeLog

    r132711 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/CompilerVersion.xcconfig:
     13        * Configurations/DebugRelease.xcconfig:
     14
    1152012-10-26  Sheriff Bot  <webkit.review.bot@gmail.com>
    216

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r122404 r132729  
    3535GCC_ENABLE_CPP_RTTI = NO;
    3636GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    37 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(REAL_PLATFORM_NAME));
     37GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    3838GCC_ENABLE_OBJC_GC_iphoneos = NO;
    3939GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    … …  
    4343GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    4444GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    45 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(REAL_PLATFORM_NAME));
     45GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    4646GCC_MODEL_TUNING_macosx = G5;
    4747GCC_OBJC_CALL_CXX_CDTORS = YES;
    … …  
    5858LINKER_DISPLAYS_MANGLED_NAMES = YES;
    5959PREBINDING = NO;
    60 VALID_ARCHS = $(VALID_ARCHS_$(REAL_PLATFORM_NAME));
     60VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
    6161VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    6262VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    6363VALID_ARCHS_macosx = i386 ppc x86_64 ppc64 $(ARCHS_UNIVERSAL_IPHONE_OS);
    6464WARNING_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;
    65 WARNING_CFLAGS = $(WARNING_CFLAGS_$(REAL_PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
     65WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
    6666WARNING_CFLAGS_iphoneos = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    6767WARNING_CFLAGS_iphonesimulator = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    … …  
    7676
    7777
    78 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    79 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    80 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    81 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    82 REAL_PLATFORM_NAME_macosx = macosx;
    83 
    8478TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    8579
    8680
    87 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     81JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    8882JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    8983JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);

  • trunk/Source/WTF/Configurations/CompilerVersion.xcconfig

    r100850 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_COMPILER;
    5858TARGET_GCC_VERSION_iphonesimulator = $(TARGET_GCC_VERSION_iphoneos);

  • trunk/Source/WTF/Configurations/DebugRelease.xcconfig

    r115501 r132729  
    2424#include "Base.xcconfig"
    2525
    26 ARCHS = $(ARCHS_$(REAL_PLATFORM_NAME));
     26ARCHS = $(ARCHS_$(PLATFORM_NAME));
    2727ARCHS_iphoneos = $(ARCHS_UNIVERSAL_IPHONE_OS);
    2828ARCHS_iphonesimulator = $(NATIVE_ARCH);
    … …  
    3535ONLY_ACTIVE_ARCH = YES;
    3636
    37 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(REAL_PLATFORM_NAME));
     37MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    3838MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    3939MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;

  • trunk/Source/WebCore/ChangeLog

    r132726 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/CompilerVersion.xcconfig:
     13        * Configurations/DebugRelease.xcconfig:
     14        * Configurations/FeatureDefines.xcconfig:
     15        * Configurations/Version.xcconfig:
     16        * Configurations/WebCore.xcconfig:
     17
    1182012-10-27  Tony Chang  <tony@chromium.org>
    219

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r122404 r132729  
    3535GCC_ENABLE_CPP_RTTI = NO;
    3636GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    37 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(REAL_PLATFORM_NAME));
     37GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    3838GCC_ENABLE_OBJC_GC_iphoneos = NO;
    3939GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    … …  
    4242GCC_FAST_OBJC_DISPATCH = YES;
    4343GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    44 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(REAL_PLATFORM_NAME));
     44GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    4545GCC_MODEL_TUNING_macosx = G5;
    4646GCC_OBJC_CALL_CXX_CDTORS = YES;
    … …  
    5555LINKER_DISPLAYS_MANGLED_NAMES = YES;
    5656PREBINDING = NO;
    57 VALID_ARCHS = $(VALID_ARCHS_$(REAL_PLATFORM_NAME));
     57VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
    5858VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    5959VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    6060VALID_ARCHS_macosx = i386 ppc x86_64 ppc64;
    6161WARNING_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;
    62 WARNING_CFLAGS = $(WARNING_CFLAGS_$(REAL_PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
     62WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
    6363WARNING_CFLAGS_iphoneos = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    6464WARNING_CFLAGS_iphonesimulator = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
    … …  
    7676CLANG_CXX_LIBRARY_1080 = libc++;
    7777CLANG_CXX_LIBRARY_1090 = libc++;
    78 
    79 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    80 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    81 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    82 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    83 REAL_PLATFORM_NAME_macosx = macosx;
    8478
    8579TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    … …  
    107101
    108102WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
    109 SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
     103SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(PLATFORM_NAME));
    110104SQLITE3_HEADER_SEARCH_PATHS_macosx = $(SQLITE3_HEADER_SEARCH_PATHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    111105SQLITE3_HEADER_SEARCH_PATHS_macosx_1050 = $(WEBCORE_SQLITE3_HEADER_SEARCH_PATHS);
    … …  
    113107// FIXME: The size of the debug symbols generated for WebCore exceeds that which a 32-bit linker can deal with.
    114108// To allow the Leopard build bots to successfully compile WebCore we're disabling debug symbols in debug builds.
    115 GCC_GENERATE_DEBUGGING_SYMBOLS = $(GCC_GENERATE_DEBUGGING_SYMBOLS_$(REAL_PLATFORM_NAME));
     109GCC_GENERATE_DEBUGGING_SYMBOLS = $(GCC_GENERATE_DEBUGGING_SYMBOLS_$(PLATFORM_NAME));
    116110GCC_GENERATE_DEBUGGING_SYMBOLS_iphoneos = YES;
    117111GCC_GENERATE_DEBUGGING_SYMBOLS_iphonesimulator = YES;

  • trunk/Source/WebCore/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r115501 r132729  
    2424#include "Base.xcconfig"
    2525
    26 ARCHS = $(ARCHS_$(REAL_PLATFORM_NAME));
     26ARCHS = $(ARCHS_$(PLATFORM_NAME));
    2727ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    2828ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    … …  
    3636ONLY_ACTIVE_ARCH = YES;
    3737
    38 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(REAL_PLATFORM_NAME));
     38MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    3939MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    4040MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r132600 r132729  
    5353ENABLE_CSS3_TEXT = ;
    5454ENABLE_CUSTOM_SCHEME_HANDLER = ;
    55 ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
     55ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
    5656ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
    5757ENABLE_DATALIST_ELEMENT = ;
    … …  
    6262ENABLE_DIRECTORY_UPLOAD = ;
    6363ENABLE_DRAGGABLE_REGION = ;
    64 ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(REAL_PLATFORM_NAME));
     64ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(PLATFORM_NAME));
    6565ENABLE_ENCRYPTED_MEDIA_macosx = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    6666ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
    … …  
    6868ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
    6969ENABLE_FILE_SYSTEM = ;
    70 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
     70ENABLE_FILTERS = $(ENABLE_FILTERS_$(PLATFORM_NAME));
    7171ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7272ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
    7373ENABLE_GAMEPAD = ;
    7474ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    75 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(REAL_PLATFORM_NAME));
     75ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(PLATFORM_NAME));
    7676ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
    7777ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
    78 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
     78ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
    7979ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
    8080ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
    … …  
    8282ENABLE_INPUT_SPEECH = ;
    8383ENABLE_INPUT_TYPE_COLOR = ;
    84 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(REAL_PLATFORM_NAME));
     84ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
    8585ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
    8686ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
    87 ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(REAL_PLATFORM_NAME));
     87ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(PLATFORM_NAME));
    8888ENABLE_INPUT_TYPE_DATETIME_iphoneos = ENABLE_INPUT_TYPE_DATETIME;
    8989ENABLE_INPUT_TYPE_DATETIME_iphonesimulator = ENABLE_INPUT_TYPE_DATETIME;
    90 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(REAL_PLATFORM_NAME));
     90ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(PLATFORM_NAME));
    9191ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    9292ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    93 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(REAL_PLATFORM_NAME));
     93ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(PLATFORM_NAME));
    9494ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
    9595ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
    96 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(REAL_PLATFORM_NAME));
     96ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(PLATFORM_NAME));
    9797ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
    9898ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
    99 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(REAL_PLATFORM_NAME));
     99ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(PLATFORM_NAME));
    100100ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
    101101ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
    102102ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
    103103ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
    104 ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     104ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(PLATFORM_NAME));
    105105ENABLE_LEGACY_NOTIFICATIONS_macosx = $(ENABLE_LEGACY_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    106106ENABLE_LEGACY_NOTIFICATIONS_macosx_1070 = ;
    … …  
    119119ENABLE_NAVIGATOR_CONTENT_UTILS = ;
    120120ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
    121 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     121ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
    122122ENABLE_NOTIFICATIONS_macosx = $(ENABLE_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    123123ENABLE_NOTIFICATIONS_macosx_1070 = ;
    … …  
    134134ENABLE_STYLE_SCOPED = ;
    135135ENABLE_SVG = ENABLE_SVG;
    136 ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(REAL_PLATFORM_NAME));
     136ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(PLATFORM_NAME));
    137137ENABLE_SVG_DOM_OBJC_BINDINGS_macosx = ENABLE_SVG_DOM_OBJC_BINDINGS;
    138138ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
    … …  
    142142ENABLE_UNDO_MANAGER = ;
    143143ENABLE_VIDEO = ENABLE_VIDEO;
    144 ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));
     144ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(PLATFORM_NAME));
    145145ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;
    146146ENABLE_WEBGL = ENABLE_WEBGL;

  • trunk/Source/WebCore/Configurations/Version.xcconfig

    r132437 r132729  
    3232
    3333// The system version prefix is based on the current system version.
    34 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(REAL_PLATFORM_NAME));
     34SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
    3535SYSTEM_VERSION_PREFIX_iphoneos = 6; // iOS is most like SnowLeopard currently.
    3636SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r115089 r132729  
    2929EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv6.exp;
    3030EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7.exp;
    31 EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(REAL_PLATFORM_NAME));
     31EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
    3232EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.i386.exp;
    3333EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
    … …  
    3737GCC_PREFIX_HEADER = WebCorePrefix.h;
    3838GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
    39 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
     39FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
    4040FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    4141FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
    … …  
    5050HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
    5151INFOPLIST_FILE = Info.plist;
    52 INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
     52INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    5353INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    5454INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
    5555INSTALL_PATH_macosx = $(WEBCORE_FRAMEWORKS_DIR);
    56 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(REAL_PLATFORM_NAME));
     56INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    5757INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
    58 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(REAL_PLATFORM_NAME));
     58DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
    5959DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
    6060DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    … …  
    6464PRODUCT_NAME = WebCore;
    6565OTHER_LDFLAGS_BASE = -l$(SQLITE3_LIBRARY) -lobjc -lANGLE -allowable_client WebCoreTestSupport;
    66 OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
     66OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    6767OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework QuartzCore;
    6868OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    … …  
    7272OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);
    7373
    74 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     74NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    7575NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
    7676NORMAL_WEBCORE_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
    7777NORMAL_WEBCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    7878
    79 WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     79WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    8080WEBCORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos);
    8181WEBCORE_FRAMEWORKS_DIR_iphonesimulator = $(WEBCORE_FRAMEWORKS_DIR_iphoneos);
    … …  
    8585WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    8686
    87 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     87NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    8888NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    8989NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    9090NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
    9191
    92 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     92PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    9393PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    9494PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    … …  
    115115EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS_ENABLE_SVG_DOM_OBJC_BINDINGS = ;
    116116
    117 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
     117EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)_$(PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS);
    118118EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm EventHandlerMac.mm HTMLConverter.mm KillRingMac.mm PlatformEventFactoryMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js;
    119119EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    … …  
    121121EXCLUDED_SOURCE_FILE_NAMES_Production_macosx = localizedStrings.js;
    122122
    123 SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(REAL_PLATFORM_NAME));
     123SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(PLATFORM_NAME));
    124124SQLITE3_LIBRARY_iphoneos = sqlite3;
    125125SQLITE3_LIBRARY_iphonesimulator = sqlite3;

  • trunk/Source/WebKit/mac/ChangeLog

    r132600 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/CompilerVersion.xcconfig:
     13        * Configurations/DebugRelease.xcconfig:
     14        * Configurations/FeatureDefines.xcconfig:
     15        * Configurations/Version.xcconfig:
     16        * Configurations/WebKit.xcconfig:
     17
    1182012-10-26  Thiago Marcos P. Santos  <thiago.santos@intel.com>
    219

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r122404 r132729  
    3535GCC_ENABLE_CPP_RTTI = NO;
    3636GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    37 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(REAL_PLATFORM_NAME));
     37GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    3838GCC_ENABLE_OBJC_GC_iphoneos = NO;
    3939GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    … …  
    4242GCC_FAST_OBJC_DISPATCH = YES;
    4343GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    44 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(REAL_PLATFORM_NAME));
     44GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    4545GCC_MODEL_TUNING_macosx = G5;
    4646GCC_OBJC_CALL_CXX_CDTORS = YES;
    … …  
    5656OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
    5757PREBINDING = NO;
    58 VALID_ARCHS = $(VALID_ARCHS_$(REAL_PLATFORM_NAME));
     58VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
    5959VALID_ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    6060VALID_ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    … …  
    6262// FIXME: <rdar://problem/5070292> WebKit should build with -Wshorten-64-to-32
    6363WARNING_CFLAGS_BASE = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings;
    64 WARNING_CFLAGS = $(WARNING_CFLAGS_$(REAL_PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
     64WARNING_CFLAGS = $(WARNING_CFLAGS_$(PLATFORM_NAME)) $(COMPILER_SPECIFIC_WARNING_CFLAGS);
    6565WARNING_CFLAGS_iphoneos = $(WARNING_CFLAGS_BASE);
    6666WARNING_CFLAGS_iphonesimulator = $(WARNING_CFLAGS_BASE);
    … …  
    7272CLANG_CXX_LIBRARY_1080 = libc++;
    7373CLANG_CXX_LIBRARY_1090 = libc++;
    74 
    75 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    76 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    77 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    78 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    79 REAL_PLATFORM_NAME_macosx = macosx;
    8074
    8175TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);

  • trunk/Source/WebKit/mac/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig

    r122352 r132729  
    2424#include "Base.xcconfig"
    2525
    26 ARCHS = $(ARCHS_$(REAL_PLATFORM_NAME));
     26ARCHS = $(ARCHS_$(PLATFORM_NAME));
    2727ARCHS_iphoneos = $(ARCHS_STANDARD_32_BIT);
    2828ARCHS_iphonesimulator = $(ARCHS_STANDARD_32_BIT);
    … …  
    3636ONLY_ACTIVE_ARCH = YES;
    3737
    38 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(REAL_PLATFORM_NAME));
     38MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    3939MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    4040MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;
    … …  
    5151SECTORDER_FLAGS = ;
    5252
    53 WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(REAL_PLATFORM_NAME));
     53WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
    5454WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
    5555WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r132600 r132729  
    5353ENABLE_CSS3_TEXT = ;
    5454ENABLE_CUSTOM_SCHEME_HANDLER = ;
    55 ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
     55ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
    5656ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
    5757ENABLE_DATALIST_ELEMENT = ;
    … …  
    6363ENABLE_DRAGGABLE_REGION = ;
    6464ENABLE_FILE_SYSTEM = ;
    65 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
     65ENABLE_FILTERS = $(ENABLE_FILTERS_$(PLATFORM_NAME));
    6666ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    6767ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
    6868ENABLE_GAMEPAD = ;
    6969ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    70 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(REAL_PLATFORM_NAME));
     70ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(PLATFORM_NAME));
    7171ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
    7272ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
    73 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
     73ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
    7474ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
    7575ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
    … …  
    7777ENABLE_INPUT_SPEECH = ;
    7878ENABLE_INPUT_TYPE_COLOR = ;
    79 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(REAL_PLATFORM_NAME));
     79ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
    8080ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
    8181ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
    82 ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(REAL_PLATFORM_NAME));
     82ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(PLATFORM_NAME));
    8383ENABLE_INPUT_TYPE_DATETIME_iphoneos = ENABLE_INPUT_TYPE_DATETIME;
    8484ENABLE_INPUT_TYPE_DATETIME_iphonesimulator = ENABLE_INPUT_TYPE_DATETIME;
    85 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(REAL_PLATFORM_NAME));
     85ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(PLATFORM_NAME));
    8686ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    8787ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    88 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(REAL_PLATFORM_NAME));
     88ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(PLATFORM_NAME));
    8989ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
    9090ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
    91 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(REAL_PLATFORM_NAME));
     91ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(PLATFORM_NAME));
    9292ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
    9393ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
    94 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(REAL_PLATFORM_NAME));
     94ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(PLATFORM_NAME));
    9595ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
    9696ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
    9797ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
    9898ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
    99 ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     99ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(PLATFORM_NAME));
    100100ENABLE_LEGACY_NOTIFICATIONS_macosx = $(ENABLE_LEGACY_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    101101ENABLE_LEGACY_NOTIFICATIONS_macosx_1070 = ;
    … …  
    114114ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
    115115ENABLE_NAVIGATOR_CONTENT_UTILS = ;
    116 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     116ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
    117117ENABLE_NOTIFICATIONS_macosx = $(ENABLE_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    118118ENABLE_NOTIFICATIONS_macosx_1070 = ;
    … …  
    130130ENABLE_STYLE_SCOPED = ;
    131131ENABLE_SVG = ENABLE_SVG;
    132 ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(REAL_PLATFORM_NAME));
     132ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(PLATFORM_NAME));
    133133ENABLE_SVG_DOM_OBJC_BINDINGS_macosx = ENABLE_SVG_DOM_OBJC_BINDINGS;
    134134ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
    … …  
    138138ENABLE_UNDO_MANAGER = ;
    139139ENABLE_VIDEO = ENABLE_VIDEO;
    140 ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));
     140ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(PLATFORM_NAME));
    141141ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;
    142142ENABLE_WEBGL = ENABLE_WEBGL;

  • trunk/Source/WebKit/mac/Configurations/Version.xcconfig

    r132437 r132729  
    3232
    3333// The system version prefix is based on the current system version.
    34 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(REAL_PLATFORM_NAME));
     34SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
    3535SYSTEM_VERSION_PREFIX_iphoneos = 6; // iPhone OS is most like SnowLeopard currently.
    3636SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);

  • trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig

    r131350 r132729  
    2525#include "Version.xcconfig"
    2626
    27 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME));
     27EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    2828EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.tiff;
    2929EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    … …  
    3838EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
    3939
    40 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
     40FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
    4141FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    4242FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
    … …  
    5353HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);
    5454INFOPLIST_FILE = mac/Info.plist;
    55 INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
     55INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    5656INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    5757INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
    5858INSTALL_PATH_macosx = $(WEBKIT_FRAMEWORKS_DIR);
    59 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(REAL_PLATFORM_NAME));
     59INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    6060INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
    61 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(REAL_PLATFORM_NAME));
     61DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
    6262DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
    6363DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    … …  
    6969
    7070OTHER_LDFLAGS_BASE = -licucore -framework JavaScriptCore -framework QuartzCore -framework WebCore;
    71 OTHER_LDFLAGS = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
     71OTHER_LDFLAGS = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    7272OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO;
    7373OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    … …  
    7777OTHER_LDFLAGS_macosx_1090 = $(OTHER_LDFLAGS_macosx_1070);
    7878
    79 NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     79NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    8080NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
    8181NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
    8282NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    8383
    84 WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     84WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    8585WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos);
    8686WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_FRAMEWORKS_DIR_iphoneos);
    … …  
    9090WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    9191
    92 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     92NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    9393NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    9494NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    9595NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
    9696
    97 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     97PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    9898PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    9999PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
    … …  
    112112WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
    113113WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
    114 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(REAL_PLATFORM_NAME));
     114WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
    115115WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    116116WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
    … …  
    125125WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    126126WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
    127 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(REAL_PLATFORM_NAME));
     127WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
    128128WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
    129129WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;

  • trunk/Source/WebKit2/ChangeLog

    r132721 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * Configurations/Base.xcconfig:
     12        * Configurations/BaseTarget.xcconfig:
     13        * Configurations/CompilerVersion.xcconfig:
     14        * Configurations/FeatureDefines.xcconfig:
     15        * Configurations/WebKit2.xcconfig:
     16
    1172012-10-26  Brady Eidson  <beidson@apple.com>
    218

  • trunk/Source/WebKit2/Configurations/Base.xcconfig

    r126478 r132729  
    6868CLANG_CXX_LIBRARY_1090 = libc++;
    6969
    70 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    71 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    72 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    73 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    74 REAL_PLATFORM_NAME_macosx = macosx;
    75 
    7670TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    7771

  • trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig

    r110804 r132729  
    3030HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
    3131
    32 NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     32NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    3333NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    3434
    35 WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     35WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    3636WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    3737WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
    … …  
    3939WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    4040
    41 UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME)_$(CONFIGURATION));
     41UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(PLATFORM_NAME)_$(CONFIGURATION));
    4242UMBRELLA_FRAMEWORKS_DIR_macosx_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
    4343UMBRELLA_FRAMEWORKS_DIR_macosx_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);

  • trunk/Source/WebKit2/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r132600 r132729  
    5353ENABLE_CSS3_TEXT = ;
    5454ENABLE_CUSTOM_SCHEME_HANDLER = ;
    55 ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
     55ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(PLATFORM_NAME));
    5656ENABLE_DASHBOARD_SUPPORT_macosx = ENABLE_DASHBOARD_SUPPORT;
    5757ENABLE_DATALIST_ELEMENT = ;
    … …  
    6363ENABLE_DRAGGABLE_REGION = ;
    6464ENABLE_FILE_SYSTEM = ;
    65 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
     65ENABLE_FILTERS = $(ENABLE_FILTERS_$(PLATFORM_NAME));
    6666ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    6767ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
    6868ENABLE_GAMEPAD = ;
    6969ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    70 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(REAL_PLATFORM_NAME));
     70ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(PLATFORM_NAME));
    7171ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
    7272ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
    73 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
     73ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(PLATFORM_NAME));
    7474ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
    7575ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
    … …  
    7777ENABLE_INPUT_SPEECH = ;
    7878ENABLE_INPUT_TYPE_COLOR = ;
    79 ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(REAL_PLATFORM_NAME));
     79ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
    8080ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
    8181ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
    82 ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(REAL_PLATFORM_NAME));
     82ENABLE_INPUT_TYPE_DATETIME = $(ENABLE_INPUT_TYPE_DATETIME_$(PLATFORM_NAME));
    8383ENABLE_INPUT_TYPE_DATETIME_iphoneos = ENABLE_INPUT_TYPE_DATETIME;
    8484ENABLE_INPUT_TYPE_DATETIME_iphonesimulator = ENABLE_INPUT_TYPE_DATETIME;
    85 ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(REAL_PLATFORM_NAME));
     85ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(PLATFORM_NAME));
    8686ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    8787ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
    88 ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(REAL_PLATFORM_NAME));
     88ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(PLATFORM_NAME));
    8989ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
    9090ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
    91 ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(REAL_PLATFORM_NAME));
     91ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(PLATFORM_NAME));
    9292ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
    9393ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
    94 ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(REAL_PLATFORM_NAME));
     94ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(PLATFORM_NAME));
    9595ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
    9696ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
    9797ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
    9898ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
    99 ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     99ENABLE_LEGACY_NOTIFICATIONS = $(ENABLE_LEGACY_NOTIFICATIONS_$(PLATFORM_NAME));
    100100ENABLE_LEGACY_NOTIFICATIONS_macosx = $(ENABLE_LEGACY_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    101101ENABLE_LEGACY_NOTIFICATIONS_macosx_1070 = ;
    … …  
    114114ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
    115115ENABLE_NAVIGATOR_CONTENT_UTILS = ;
    116 ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(REAL_PLATFORM_NAME));
     116ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
    117117ENABLE_NOTIFICATIONS_macosx = $(ENABLE_NOTIFICATIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    118118ENABLE_NOTIFICATIONS_macosx_1070 = ;
    … …  
    120120ENABLE_NOTIFICATIONS_macosx_1090 = ENABLE_NOTIFICATIONS;
    121121ENABLE_PAGE_VISIBILITY_API = ;
    122 ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(REAL_PLATFORM_NAME));
     122ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
    123123ENABLE_PDFKIT_PLUGIN_macosx = $(ENABLE_PDFKIT_PLUGIN_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    124124ENABLE_PDFKIT_PLUGIN_macosx_1070 = ;
    … …  
    135135ENABLE_STYLE_SCOPED = ;
    136136ENABLE_SVG = ENABLE_SVG;
    137 ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(REAL_PLATFORM_NAME));
     137ENABLE_SVG_DOM_OBJC_BINDINGS = $(ENABLE_SVG_DOM_OBJC_BINDINGS_$(PLATFORM_NAME));
    138138ENABLE_SVG_DOM_OBJC_BINDINGS_macosx = ENABLE_SVG_DOM_OBJC_BINDINGS;
    139139ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
    … …  
    143143ENABLE_UNDO_MANAGER = ;
    144144ENABLE_VIDEO = ENABLE_VIDEO;
    145 ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(REAL_PLATFORM_NAME));
     145ENABLE_VIDEO_TRACK = $(ENABLE_VIDEO_TRACK_$(PLATFORM_NAME));
    146146ENABLE_VIDEO_TRACK_macosx = ENABLE_VIDEO_TRACK;
    147147ENABLE_WEBGL = ENABLE_WEBGL;

  • trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

    r119066 r132729  
    3232FRAMEWORK_AND_LIBRARY_LDFLAGS = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework JavaScriptCore -licucore -framework QuartzCore -framework Security -framework WebCore;
    3333
    34 OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)) $(OTHER_LDFLAGS);
     34OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS);
    3535OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
    3636OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction;

  • trunk/Tools/ChangeLog

    r132713 r132729  
     12012-10-27  Dan Bernstein  <mitz@apple.com>
     2
     3        REAL_PLATFORM_NAME build setting is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=100587
     5
     6        Reviewed by Mark Rowe.
     7
     8        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
     9        to PLATFORM_NAME.
     10
     11        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     12        * DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig:
     13        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     14        * MiniBrowser/Configurations/Base.xcconfig:
     15        * MiniBrowser/Configurations/CompilerVersion.xcconfig:
     16        * TestWebKitAPI/Configurations/Base.xcconfig:
     17        * TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
     18        * WebKitTestRunner/Configurations/Base.xcconfig:
     19        * WebKitTestRunner/Configurations/CompilerVersion.xcconfig:
     20        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     21
    1222012-10-26  Anders Carlsson  <andersca@apple.com>
    223

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r130720 r132729  
    4747CLANG_CXX_LIBRARY_1090 = libc++;
    4848
    49 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    50 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    51 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    52 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    53 REAL_PLATFORM_NAME_macosx = macosx;
    54 
    5549TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    5650

  • trunk/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r129566 r132729  
    4040MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
    4141
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(REAL_PLATFORM_NAME));
     42WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
    4343WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
    4444WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);

  • trunk/Tools/MiniBrowser/Configurations/Base.xcconfig

    r122404 r132729  
    4343CLANG_CXX_LIBRARY_1090 = libc++;
    4444
    45 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    46 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    47 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    48 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    49 REAL_PLATFORM_NAME_macosx = macosx;
    50 
    5145TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    5246

  • trunk/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r122404 r132729  
    5555
    5656
    57 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    58 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    59 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    60 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    61 REAL_PLATFORM_NAME_macosx = macosx;
    62 
    6357TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    6458

  • trunk/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r129576 r132729  
    5353CLANG_CXX_LIBRARY_1090 = libc++;
    5454
    55 REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
    56 REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
    57 REAL_PLATFORM_NAME_iphoneos = iphoneos;
    58 REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
    59 REAL_PLATFORM_NAME_macosx = macosx;
    60 
    6155TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    6256

  • trunk/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig

    r93249 r132729  
    5454// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    5555// XCODE_VERSION_ACTUAL for the full version number.
    56 TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
     56TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(PLATFORM_NAME));
    5757TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    5858TARGET_GCC_VERSION_iphonesimulator = GCC_42;

  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r129566 r132729  
    4242WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
    4343
    44 WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(REAL_PLATFORM_NAME));
     44WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
    4545WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
    4646WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
Note: See TracChangeset for help on using the changeset viewer.