[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:35:12 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 6fe9ead1e96f3d3941063411c8dbe0c821a0e90d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 28 20:30:52 2009 +0000
2009-09-28 Yaar Schnitman <yaar at chromium.org>
Reviewed by Dimitri Glazkov.
Chromium port - recognize we are being built independently
of chromium and look for dependencies under webkit/chromium rather
than chromium/src.
https://bugs.webkit.org/show_bug.cgi?id=29722
* JavaScriptCore.gyp/JavaScriptCore.gyp:
2009-09-28 Yaar Schnitman <yaar at chromium.org>
Reviewed by Dimitri Glazkov.
Chromium port - recognize we are being built independently
of chromium and look for dependencies under webkit/chromium rather
than chromium/src.
https://bugs.webkit.org/show_bug.cgi?id=29722
* WebCore.gyp/WebCore.gyp: See above. Also removed a few files from
the sources list, since they are not supposed to be built here.
2009-09-28 Yaar Schnitman <yaar at chromium.org>
Reviewed by Dimitri Glazkov.
https://bugs.webkit.org/show_bug.cgi?id=29722
* chromium/DEPS: Describes the chromium port's dependencies and
is used by gclient to fetch them.
* chromium/webkit.gyp: Currently only builds webcore but in
the future will also build the webkit api.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48827 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 671d8f1..8eb6315 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-28 Yaar Schnitman <yaar at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Chromium port - recognize we are being built independently
+ of chromium and look for dependencies under webkit/chromium rather
+ than chromium/src.
+
+ https://bugs.webkit.org/show_bug.cgi?id=29722
+
+ * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
2009-09-28 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index 8a96d14..88fe484 100644
--- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -36,9 +36,16 @@
'../JavaScriptCore.gypi',
],
'variables': {
- # FIXME: Sense whether upstream or downstream build, and
- # point to the right src dir
- 'chromium_src_dir': '../../../..',
+ # Location of the chromium src directory.
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ # Webkit is being built outside of the full chromium project.
+ 'chromium_src_dir': '../../WebKit/chromium',
+ },{
+ # WebKit is checked out in src/chromium/third_party/WebKit
+ 'chromium_src_dir': '../../../..',
+ }],
+ ],
},
'targets': [
{
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8f07c1..7ef816b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-28 Yaar Schnitman <yaar at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Chromium port - recognize we are being built independently
+ of chromium and look for dependencies under webkit/chromium rather
+ than chromium/src.
+
+ https://bugs.webkit.org/show_bug.cgi?id=29722
+
+ * WebCore.gyp/WebCore.gyp: See above. Also removed a few files from
+ the sources list, since they are not supposed to be built here.
+
2009-09-28 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index ebe468e..3dec92a 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -35,11 +35,18 @@
'../../WebKit/chromium/features.gypi',
'../WebCore.gypi',
],
- 'variables': {
- # FIXEME: Sense whether upstream or downstream build, and
- # point to the right src dir
- 'chromium_src_dir': '../../../..',
+ # Location of the chromium src directory.
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ # Webkit is being built outside of the full chromium project.
+ 'variables': {'chromium_src_dir': '../../WebKit/chromium'},
+ },{
+ # WebKit is checked out in src/chromium/third_party/WebKit
+ 'variables': {'chromium_src_dir': '../../../..'},
+ }],
+ ],
+ 'variables': {
# If set to 1, doesn't compile debug symbols into webcore reducing the
# size of the binary and increasing the speed of gdb. gcc only.
'remove_webcore_debug_symbols%': 0,
@@ -412,19 +419,6 @@
'<@(webcore_files)',
- '<(chromium_src_dir)/webkit/extensions/v8/gc_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/gc_extension.h',
- '<(chromium_src_dir)/webkit/extensions/v8/gears_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/gears_extension.h',
- '<(chromium_src_dir)/webkit/extensions/v8/interval_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/interval_extension.h',
- '<(chromium_src_dir)/webkit/extensions/v8/playback_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/playback_extension.h',
- '<(chromium_src_dir)/webkit/extensions/v8/profiler_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/profiler_extension.h',
- '<(chromium_src_dir)/webkit/extensions/v8/benchmarking_extension.cc',
- '<(chromium_src_dir)/webkit/extensions/v8/benchmarking_extension.h',
-
# For WebCoreSystemInterface, Mac-only.
'../../WebKit/mac/WebCoreSupport/WebSystemInterface.m',
],
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7d55d82..f914a11 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-28 Yaar Schnitman <yaar at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ https://bugs.webkit.org/show_bug.cgi?id=29722
+
+ * chromium/DEPS: Describes the chromium port's dependencies and
+ is used by gclient to fetch them.
+ * chromium/webkit.gyp: Currently only builds webcore but in
+ the future will also build the webkit api.
+
2009-09-26 David Kilzer <ddkilzer at apple.com>
Part 2 of 2: <http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
new file mode 100644
index 0000000..22dc205
--- /dev/null
+++ b/WebKit/chromium/DEPS
@@ -0,0 +1,157 @@
+#
+# Copyright (C) 2009 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.
+#
+
+# This file is used by gclient to fetch the projects that the webkit
+# chromium port depends on.
+
+vars = {
+ 'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
+ 'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
+
+ 'chromium_rev': '27239',
+}
+
+deps = {
+ # build tools
+ 'build':
+ Var('chromium_svn')+'/build@'+Var('chromium_rev'),
+ 'webkit/build':
+ Var('chromium_svn')+'/webkit/build@'+Var('chromium_rev'),
+ 'tools/gyp':
+ 'http://gyp.googlecode.com/svn/trunk@668',
+
+ # Basic tools
+ 'base':
+ Var('chromium_svn')+'/base@'+Var('chromium_rev'),
+
+ # skia dependencies
+ 'skia':
+ Var('chromium_svn')+'/skia@'+Var('chromium_rev'),
+ 'third_party/skia':
+ 'http://skia.googlecode.com/svn/trunk@341',
+
+ # testing
+ 'testing':
+ Var('chromium_svn')+'/testing@'+Var('chromium_rev'),
+
+ # v8 javascript engine
+ 'v8':
+ 'http://v8.googlecode.com/svn/trunk@2966',
+ 'webkit/extensions/v8':
+ Var('chromium_svn')+'/webkit/extensions/v8@'+Var('chromium_rev'),
+
+ # net dependencies
+ 'net':
+ Var('chromium_svn')+'/net@'+Var('chromium_rev'),
+ 'sdch':
+ Var('chromium_svn')+'/sdch@'+Var('chromium_rev'),
+ 'sdch/open-vcdiff':
+ 'http://open-vcdiff.googlecode.com/svn/trunk@26',
+ 'googleurl':
+ 'http://google-url.googlecode.com/svn/trunk@118',
+
+ # other third party
+ 'third_party/icu':
+ Var('chromium_deps_svn')+'/icu42 at 26673',
+
+ 'third_party/bzip2':
+ Var('chromium_svn')+'/third_party/bzip2@'+Var('chromium_rev'),
+
+ 'third_party/libevent':
+ Var('chromium_svn')+'/third_party/libevent@'+Var('chromium_rev'),
+
+ 'third_party/libjpeg':
+ Var('chromium_svn')+'/third_party/libjpeg@'+Var('chromium_rev'),
+
+ 'third_party/libpng':
+ Var('chromium_svn')+'/third_party/libpng@'+Var('chromium_rev'),
+
+ 'third_party/libxml':
+ Var('chromium_svn')+'/third_party/libxml@'+Var('chromium_rev'),
+
+ 'third_party/libxslt':
+ Var('chromium_svn')+'/third_party/libxslt@'+Var('chromium_rev'),
+
+ 'third_party/modp_b64':
+ Var('chromium_svn')+'/third_party/modp_b64@'+Var('chromium_rev'),
+
+ 'third_party/npapi':
+ Var('chromium_svn')+'/third_party/npapi@'+Var('chromium_rev'),
+
+ 'third_party/sqlite':
+ Var('chromium_svn')+'/third_party/sqlite@'+Var('chromium_rev'),
+
+ 'third_party/zlib':
+ Var('chromium_svn')+'/third_party/zlib@'+Var('chromium_rev'),
+
+}
+
+skip_child_includes = [
+ # Don't look for dependencies in the following folders:
+ 'base',
+ 'build',
+ 'googleurl',
+ 'net',
+ 'sdch',
+ 'skia',
+ 'testing',
+ 'third_party',
+ 'tools',
+ 'v8',
+ 'webkit',
+]
+
+include_rules = [
+ # Everybody can use some things.
+ '+base',
+ '+build',
+ '+ipc',
+
+ # For now, we allow ICU to be included by specifying 'unicode/...', although
+ # this should probably change.
+ '+unicode',
+ '+testing',
+
+ # Allow anybody to include files from the 'public' Skia directory in the
+ # webkit port. This is shared between the webkit port and Chromium.
+ '+webkit/port/platform/graphics/skia/public',
+]
+
+
+hooks = [
+ {
+ # A change to any file in this directory should run the gyp generator.
+ 'pattern': '.',
+ 'action': ['python',
+ 'build/gyp_chromium',
+ '-Dinside_chromium_build=0',
+ '--depth=./',
+ 'webkit.gyp'],
+ },
+]
diff --git a/WebKit/chromium/webkit.gyp b/WebKit/chromium/webkit.gyp
new file mode 100644
index 0000000..04d1bad
--- /dev/null
+++ b/WebKit/chromium/webkit.gyp
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2009 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.
+#
+
+{
+ 'targets': [
+ {
+ # This target only builds webcore right now, but it will also build
+ # the chromium webkit api once the api is upstreamed.
+ 'target_name': 'webkit',
+ 'type': 'none',
+ 'dependencies': [
+ '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
+ ],
+ },
+ ], # targets
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list