Changeset 79905 in webkit


Ignore:
Timestamp:
Feb 28, 2011 1:07:24 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-02-28 Adam Barth <abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Use more xcconfig files in JavaScriptGlue gyp build
https://bugs.webkit.org/show_bug.cgi?id=55395

Technically this patch breaks the build because the generated project
can't find the Info.plist file or the list of exported symbols. I'll
fix that in a follow-up patch.

  • gyp/JavaScriptGlue.gyp:
Location:
trunk/Source/JavaScriptGlue
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptGlue/ChangeLog

    r79890 r79905  
     12011-02-28  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Use more xcconfig files in JavaScriptGlue gyp build
     6        https://bugs.webkit.org/show_bug.cgi?id=55395
     7
     8        Technically this patch breaks the build because the generated project
     9        can't find the Info.plist file or the list of exported symbols.  I'll
     10        fix that in a follow-up patch.
     11
     12        * gyp/JavaScriptGlue.gyp:
     13
    1142011-02-28  Dimitri Glazkov  <dglazkov@chromium.org>
    215
  • trunk/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp

    r79890 r79905  
    33    'JavaScriptGlue.gypi',
    44  ],
     5  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
    56  'targets': [
    67    {
     
    2324        '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
    2425      ],
     26      'xcode_config_file': '../Configurations/JavaScriptGlue.xcconfig',
    2527      'configurations': {
    2628        'Debug': {},
     
    5355        ['OS=="mac"', {
    5456          'mac_bundle': 1,
    55           'xcode_settings': {
    56             'DEAD_CODE_STRIPPING': 'YES',
    57             'DEBUG_INFORMATION_FORMAT': 'dwarf',
    58             'GCC_C_LANGUAGE_STANDARD': 'gnu99',
    59             'GCC_DEBUGGING_SYMBOLS': 'default',
    60             'GCC_DYNAMIC_NO_PIC': 'NO',
    61             'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
    62             'GCC_ENABLE_CPP_RTTI': 'NO',
    63             'GCC_ENABLE_OBJC_EXCEPTIONS': 'YES',
    64             'GCC_ENABLE_OBJC_GC': 'supported',
    65             'GCC_ENABLE_SYMBOL_SEPARATION': 'NO',
    66             'GCC_FAST_OBJC_DISPATCH': 'YES',
    67             'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES',
    68             'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
    69             'GCC_MODEL_TUNING': 'G5',
    70             'GCC_PRECOMPILE_PREFIX_HEADER': 'YES',
    71             'GCC_STRICT_ALIASING': 'YES',
    72             'GCC_THREADSAFE_STATICS': 'NO',
    73             'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
    74             'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'NO',
    75             'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
    76             'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'NO',
    77             'GCC_WARN_NON_VIRTUAL_DESTRUCTOR': 'YES',
    78             'LINKER_DISPLAYS_MANGLED_NAMES': 'YES',
    79             'PREBINDING': 'NO',
    80             'VALID_ARCHS': 'i386 ppc x86_64 ppc64',
    81             'WARNING_CFLAGS': '$(WARNING_CFLAGS_$(CURRENT_ARCH))',
    82             'WARNING_CFLAGS_BASE': [
    83               '-Wall',
    84               '-W',
    85               '-Wchar-subscripts',
    86               '-Wformat-security',
    87               '-Wmissing-format-attribute',
    88               '-Wpointer-arith',
    89               '-Wwrite-strings',
    90               '-Wno-format-y2k',
    91               '-Wno-unused-parameter',
    92               '-Wundef',
    93               '-Wno-strict-aliasing',
    94             ],
    95             'WARNING_CFLAGS_': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',
    96             'WARNING_CFLAGS_i386': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',
    97             'WARNING_CFLAGS_ppc': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',
    98             # FIXME: JavaScriptGlue 64-bit builds should build with -Wshorten-64-to-32
    99             'WARNING_CFLAGS_ppc64': '$(WARNING_CFLAGS_BASE)',
    100             'WARNING_CFLAGS_x86_64': '$(WARNING_CFLAGS_BASE)',
    101 
    102             'TARGET_MAC_OS_X_VERSION_MAJOR': '$(MAC_OS_X_VERSION_MAJOR)',
    103 
    104             # DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL and STRIP_INSTALLED_PRODUCT vary between the debug and normal variants.
    105             # We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
    106             'DEBUG_DEFINES_debug': '',
    107             'DEBUG_DEFINES_normal': 'NDEBUG',
    108             'DEBUG_DEFINES': '$(DEBUG_DEFINES_$(CURRENT_VARIANT))',
    109 
    110             'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT))',
    111             'GCC_OPTIMIZATION_LEVEL_normal': 's',
    112             'GCC_OPTIMIZATION_LEVEL_debug': '0',
    113 
    114             'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT))',
    115             'STRIP_INSTALLED_PRODUCT_normal': 'YES',
    116             'STRIP_INSTALLED_PRODUCT_debug': 'NO',
    117 
    118             # Use GCC 4.2 with Xcode 3.1, which includes GCC 4.2 but defaults to GCC 4.0.
    119             # Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
    120             # number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    121             # XCODE_VERSION_ACTUAL for the full version number.
    122             'TARGET_GCC_VERSION': '$(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR))',
    123             'TARGET_GCC_VERSION_': '$(TARGET_GCC_VERSION_1040)',
    124             'TARGET_GCC_VERSION_1040': 'GCC_40',
    125             'TARGET_GCC_VERSION_1050': '$(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR))',
    126             'TARGET_GCC_VERSION_1050_': '$(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL))',
    127             'TARGET_GCC_VERSION_1050_0310': 'GCC_42',
    128             'TARGET_GCC_VERSION_1050_0320': 'GCC_42',
    129             'TARGET_GCC_VERSION_1060': 'GCC_42',
    130             'TARGET_GCC_VERSION_1070': 'LLVM_GCC_42',
    131 
    132             'GCC_VERSION': '$(GCC_VERSION_$(TARGET_GCC_VERSION))',
    133             'GCC_VERSION_GCC_40': '4.0',
    134             'GCC_VERSION_GCC_42': '4.2',
    135             'GCC_VERSION_LLVM_GCC_42': 'com.apple.compilers.llvmgcc42',
    136 
    137             # 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.
    138             'SDKROOT': '$(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR))',
    139             'SDKROOT_1050_1040': 'macosx10.4',
    140             'SDKROOT_1060_1040': 'macosx10.4',
    141             'SDKROOT_1060_1050': 'macosx10.5',
    142             'SDKROOT_1070_1040': 'macosx10.4',
    143             'SDKROOT_1070_1050': 'macosx10.5',
    144             'SDKROOT_1070_1060': 'macosx10.6',
    145 
    146             ##### From DebugRelease #####
    147 
    148             'ARCHS': '$(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR))',
    149             'ARCHS_': '$(ARCHS_1040)',
    150             'ARCHS_1040': '$(NATIVE_ARCH)',
    151             'ARCHS_1050': '$(NATIVE_ARCH)',
    152             'ARCHS_1060': '$(ARCHS_STANDARD_32_64_BIT)',
    153             'ARCHS_1070': '$(ARCHS_STANDARD_32_64_BIT)',
    154 
    155             'ONLY_ACTIVE_ARCH': 'YES',
    156 
    157             'MACOSX_DEPLOYMENT_TARGET': '$(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))',
    158             'MACOSX_DEPLOYMENT_TARGET_': '10.4',
    159             'MACOSX_DEPLOYMENT_TARGET_1040': '10.4',
    160             'MACOSX_DEPLOYMENT_TARGET_1050': '10.5',
    161             'MACOSX_DEPLOYMENT_TARGET_1060': '10.6',
    162             'MACOSX_DEPLOYMENT_TARGET_1070': '10.7',
    163 
    164             'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES',
    165 
    166             ##### From JavaScriptGlue #####
    167 
    168             'EXPORTED_SYMBOLS_FILE': '../JavaScriptGlue.exp',
    169             'GCC_PREPROCESSOR_DEFINITIONS': '$(DEBUG_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS)',
    170             'INFOPLIST_FILE': '../Info.plist',
    171             'INSTALL_PATH': '$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks',
    172             'OTHER_CFLAGS': '-Wno-deprecated-declarations',
    173             'PRODUCT_NAME': 'JavaScriptGlue',
    174 
    175             ##### From Version #####
    176 
    177             'MAJOR_VERSION': '534',
    178             'MINOR_VERSION': '21',
    179             'TINY_VERSION': '0',
    180             'FULL_VERSION': '$(MAJOR_VERSION).$(MINOR_VERSION)',
    181 
    182             # The bundle version and short version string are set based on the current build configuration, see below.
    183             'BUNDLE_VERSION': '$(BUNDLE_VERSION_$(CONFIGURATION))',
    184             'SHORT_VERSION_STRING': '$(SHORT_VERSION_STRING_$(CONFIGURATION))',
    185 
    186             # The system version prefix is based on the current system version.
    187             'SYSTEM_VERSION_PREFIX': '$(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR))',
    188             'SYSTEM_VERSION_PREFIX_': '4', # Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR.
    189             'SYSTEM_VERSION_PREFIX_1040': '4',
    190             'SYSTEM_VERSION_PREFIX_1050': '5',
    191             'SYSTEM_VERSION_PREFIX_1060': '6',
    192             'SYSTEM_VERSION_PREFIX_1070': '7',
    193 
    194             # The production build always uses the full version with a system version prefix.
    195             'BUNDLE_VERSION_Production': '$(SYSTEM_VERSION_PREFIX)$(FULL_VERSION)',
    196             'BUNDLE_VERSION_': '$(BUNDLE_VERSION_Production)',
    197 
    198             # The production build always uses the major version with a system version prefix
    199             'SHORT_VERSION_STRING_Production': '$(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION)',
    200             'SHORT_VERSION_STRING_': '$(SHORT_VERSION_STRING_Production)',
    201 
    202             # Local builds are the full version with a plus suffix.
    203             'BUNDLE_VERSION_Release': '$(FULL_VERSION)+',
    204             'BUNDLE_VERSION_Debug': '$(BUNDLE_VERSION_Release)',
    205 
    206             # Local builds use the major version with a plus suffix
    207             'SHORT_VERSION_STRING_Release': '$(MAJOR_VERSION)+',
    208             'SHORT_VERSION_STRING_Debug': '$(SHORT_VERSION_STRING_Release)',
    209 
    210             'DYLIB_COMPATIBILITY_VERSION': '1',
    211             'DYLIB_CURRENT_VERSION': '$(FULL_VERSION)',
    212           },
    21357        }],
    21458      ],
Note: See TracChangeset for help on using the changeset viewer.