Commit f53f1f84 authored by dpranke@chromium.org's avatar dpranke@chromium.org

.: Add Tools/Tool.xcodeproj,

Source/WebKit/chromium/WebKitUnitTests.xcodeproj,
Source/WebKit/chromium/All.xcodeproj to .gitignore

https://bugs.webkit.org/show_bug.cgi?id=73823

Reviewed by Tony Chang.

* .gitignore:

Source/WebKit/chromium: binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382

Reviewed by Tony Chang.

XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.

* WebKit.gyp:
* All.gyp:
* WebKitUnitTests.gyp:
* gyp_webkit:

Tools: binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382

Reviewed by Tony Chang.

XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.

* Tools.gyp: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@102201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5f805ea9
......@@ -51,7 +51,10 @@ Source/WebKit/chromium/*.mk
Source/WebKit/chromium/*.ninja
Source/WebKit/chromium/*.sln
Source/WebKit/chromium/*.vcproj*
Source/WebKit/chromium/All.xcodeproj
Source/WebKit/chromium/WebKit.xcodeproj
Source/WebKit/chromium/WebKitUnitTests.xcodeproj
Tools/Tools.xcodeproj
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
# Ignore status files that manage Chromium dependencies.
......
2011-12-06 Dirk Pranke <dpranke@chromium.org>
Add Tools/Tool.xcodeproj,
Source/WebKit/chromium/WebKitUnitTests.xcodeproj,
Source/WebKit/chromium/All.xcodeproj to .gitignore
https://bugs.webkit.org/show_bug.cgi?id=73823
Reviewed by Tony Chang.
* .gitignore:
2011-12-06 Simon Hausmann <simon.hausmann@nokia.com>
[Qt] build-jsc script doesn't work
......
#
# Copyright (C) 2011 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
{
'includes': [
'features.gypi',
],
'targets': [
{
# These two targets should be sufficient to cause everything
# else to build (incl. webkit); if they aren't, we have our
# dependencies wrong.
'target_name': 'all_webkit',
'type': 'none',
'dependencies': [
'WebKitUnitTests.gyp:webkit_unit_tests',
'../../../Tools/Tools.gyp:DumpRenderTree',
],
}
],
}
2011-12-06 Dirk Pranke <dpranke@chromium.org>
binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382
Reviewed by Tony Chang.
XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.
* WebKit.gyp:
* All.gyp:
* WebKitUnitTests.gyp:
* gyp_webkit:
2011-12-06 Adrienne Walker <enne@google.com>
[chromium] setNeedsCommit on non-composited host layers should trigger commit
......
This diff is collapsed.
#
# Copyright (C) 2011 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
{
# FIXME: Remove this conditional check once chromium's
# build/common.gypi is setting this flag to 0 by default. See
# https://bugs.webkit.org/show_bug.cgi?id=68463.
'conditions': [
['build_webkit_exes_from_webkit_gyp==0', {
'includes': [
'features.gypi',
'WebKit.gypi',
],
'variables': {
'conditions': [
# Location of the chromium src directory and target type is different
# if webkit is built inside chromium or as standalone project.
['inside_chromium_build==0', {
# Webkit is being built outside of the full chromium project.
# e.g. via build-webkit --chromium
'chromium_src_dir': '../../WebKit/chromium',
},{
# WebKit is checked out in src/chromium/third_party/WebKit
'chromium_src_dir': '../../../../..',
}],
],
},
'targets': [
{
'target_name': 'webkit_unit_tests',
'type': 'executable',
'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
'dependencies': [
'WebKit.gyp:webkit',
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
'<(chromium_src_dir)/testing/gtest.gyp:gtest',
'<(chromium_src_dir)/testing/gmock.gyp:gmock',
'<(chromium_src_dir)/base/base.gyp:base',
'<(chromium_src_dir)/base/base.gyp:base_i18n',
'<(chromium_src_dir)/base/base.gyp:test_support_base',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_user_agent',
],
'sources': [
'tests/RunAllTests.cpp',
],
'include_dirs': [
'public',
'src',
],
'conditions': [
['inside_chromium_build==1 and component=="shared_library"', {
'defines': [
'WEBKIT_DLL_UNITTEST',
],
}, {
'sources': [
'<@(webkit_unittest_files)',
],
'conditions': [
['toolkit_uses_gtk == 1', {
'include_dirs': [
'public/gtk',
],
'variables': {
# FIXME: Enable warnings on other platforms.
'chromium_code': 1,
},
}],
],
}],
['inside_chromium_build==1 and OS=="win" and component!="shared_library"', {
'configurations': {
'Debug_Base': {
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
},
},
},
},
}],
],
}
], # targets
'conditions': [
['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types.
'cflags_cc': ['-Wno-c++0x-compat'],
},
}],
],
}],
],
}
......@@ -120,6 +120,7 @@ if __name__ == '__main__':
'-Dv8_use_snapshot=false',
'-Dmsvs_use_common_release=0',
'-Ddisable_nacl=1',
'-Dbuild_webkit_exes_from_webkit_gyp=0',
# WebKit doesn't use the chromium style checker.
'-Dmake_clang_dir=Source/WebKit/chromium/third_party/llvm-build/Release+Asserts',
......@@ -129,7 +130,7 @@ if __name__ == '__main__':
'--depth=./',
# gyp file to execute.
'WebKit.gyp'])
'All.gyp'])
print 'Updating webkit projects from gyp files...'
sys.stdout.flush()
......
2011-12-06 Dirk Pranke <dpranke@chromium.org>
binaries in webkit.gyp should be split into a new file to break circular dependencies on webkit_support
https://bugs.webkit.org/show_bug.cgi?id=73382
Reviewed by Tony Chang.
XCode (and hence GYP) can't handle circular dependencies between
files (and projects). Accordingly, although the binaries in
WebKit.gyp depend on webkit_support and webkit_support depends
on webkit, we don't mention the latter dependency in the file.
To fix this, this change moves the binaries like DRT into a new
GYP file, and modifies gyp_webkit to build from that file
instead of WebKit.gyp.
* Tools.gyp: Added.
2011-12-06 Adam Roben <aroben@apple.com>
Add a pid parameter to CrashLogs.find_newest_log
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment