Changeset 80323 in webkit


Ignore:
Timestamp:
Mar 3, 2011 9:36:17 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-03-03 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Add jsc to JavaScriptCore GYP build
​https://bugs.webkit.org/show_bug.cgi?id=55711

  • JavaScriptCore.gypi:
    • Move jsc.cpp into jsc_files because it's really part of the jsc target.
  • JavaScriptCore.xcodeproj/project.pbxproj:
    • Remove extraneous files from the normal jsc build. I probably added these by mistake at some point.
  • gyp/JavaScriptCore.gyp:
    • Add the jsc target to the GYP file.
Location:
trunk/Source/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r80321 r80323  
     12011-03-03  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Add jsc to JavaScriptCore GYP build
     6        https://bugs.webkit.org/show_bug.cgi?id=55711
     7
     8        * JavaScriptCore.gypi:
     9            - Move jsc.cpp into jsc_files because it's really part of the jsc
     10              target.
     11        * JavaScriptCore.xcodeproj/project.pbxproj:
     12            - Remove extraneous files from the normal jsc build.  I probably
     13              added these by mistake at some point.
     14        * gyp/JavaScriptCore.gyp:
     15            - Add the jsc target to the GYP file.
     16
    1172011-03-03  Adam Barth  <abarth@webkit.org>
    218

  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r80321 r80323  
    352352            'jit/SpecializedThunkJIT.h',
    353353            'jit/ThunkGenerators.cpp',
    354             'jsc.cpp',
    355354            'os-win32/WinMain.cpp',
    356355            'os-win32/inttypes.h',
    … …  
    674673            'API/tests/testapi.c',
    675674        ],
     675        'jsc_files': [
     676            'jsc.cpp',
     677        ],
    676678    }
    677679}

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r80303 r80323  
    329329                9714AF60122F32070092D9F5 /* URLString.h in Headers */ = {isa = PBXBuildFile; fileRef = 9714AF59122F31F50092D9F5 /* URLString.h */; };
    330330                971EDEA61169E0D3005E4262 /* Terminator.h in Headers */ = {isa = PBXBuildFile; fileRef = 97F6903A1169DF7F00A6BB46 /* Terminator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    331                 972A485F12661E0800F4514F /* URLCharacterTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972A485D12661E0800F4514F /* URLCharacterTypes.cpp */; };
    332                 972A48771266256F00F4514F /* URLEscape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972A48741266256F00F4514F /* URLEscape.cpp */; };
    333331                97941A5713029AAB004A3447 /* OSRandomSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97941A3F130299DB004A3447 /* OSRandomSource.cpp */; };
    334332                97941A5A13029ACC004A3447 /* OSRandomSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 97941A40130299DB004A3447 /* OSRandomSource.h */; };
    … …  
    28902888                        files = (
    28912889                                932F5BDD0822A1C700736975 /* jsc.cpp in Sources */,
    2892                                 972A485F12661E0800F4514F /* URLCharacterTypes.cpp in Sources */,
    2893                                 972A48771266256F00F4514F /* URLEscape.cpp in Sources */,
    28942890                        );
    28952891                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

    r80321 r80323  
    4444        '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
    4545        '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
    46         'libedit.dylib',
    4746        'libicucore.dylib',
    4847        'libobjc.dylib',
    … …  
    233232      ],
    234233    },
     234    {
     235      'target_name': 'jsc',
     236      'type': 'executable',
     237      'dependencies': [
     238        'JavaScriptCore',
     239      ],
     240      # FIXME: We should use a header map instead of listing these explicitly.
     241      'include_dirs': [
     242        '<@(javascriptcore_include_dirs)',
     243      ],
     244      'sources': [
     245        '<@(jsc_files)',
     246        '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
     247        'libedit.dylib',
     248      ],
     249      'configurations': {
     250        'Debug': {},
     251        'Release': {},
     252        'Production': {},
     253      },
     254      'default_configuration': 'Debug',
     255      'conditions': [
     256        ['OS=="mac"', {
     257          'xcode_settings': {
     258            'USE_HEADERMAP': 'NO',
     259          }
     260        }],
     261      ],
     262    },
    235263  ], # targets
    236264}
Note: See TracChangeset for help on using the changeset viewer.