summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 22:00:08 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 22:00:08 +0000
commit22387ba29a9da4a94c4b8dccf4145262dc4999ae (patch)
tree01aeb107af32db4c1a747968ef2fe2f659ae9408
parentadd1673cb82e5f6fc2f5bc3bcb99959611a9b38e (diff)
downloadchromium_src-22387ba29a9da4a94c4b8dccf4145262dc4999ae.zip
chromium_src-22387ba29a9da4a94c4b8dccf4145262dc4999ae.tar.gz
chromium_src-22387ba29a9da4a94c4b8dccf4145262dc4999ae.tar.bz2
Unfork and remove generate-bindings.pl from our tree.
R=levin BUG=3319 TEST=0 Review URL: http://codereview.chromium.org/115375 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16109 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xwebkit/build/rule_binding.py2
-rw-r--r--webkit/port/bindings/scripts/generate-bindings.pl69
-rw-r--r--webkit/webkit.gyp2
3 files changed, 2 insertions, 71 deletions
diff --git a/webkit/build/rule_binding.py b/webkit/build/rule_binding.py
index 96040ee..df54710 100755
--- a/webkit/build/rule_binding.py
+++ b/webkit/build/rule_binding.py
@@ -74,7 +74,7 @@ def main(args):
command.extend(['-I', include_dir])
command.append(generate_bindings)
command.extend(options)
- command.extend(['--outputdir', cppdir, input])
+ command.extend(['--outputDir', cppdir, input])
# Do it. check_call is new in 2.5, so simulate its behavior with call and
# assert.
diff --git a/webkit/port/bindings/scripts/generate-bindings.pl b/webkit/port/bindings/scripts/generate-bindings.pl
deleted file mode 100644
index da5d09a..0000000
--- a/webkit/port/bindings/scripts/generate-bindings.pl
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright (C) 2005 Apple Computer, Inc.
-# Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
-#
-# This file is part of WebKit
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# aint with this library; see the file COPYING.LIB. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-
-# This script is a temporary hack.
-# Files are generated in the source directory, when they really should go
-# to the DerivedSources directory.
-# This should also eventually be a build rule driven off of .idl files
-# however a build rule only solution is blocked by several radars:
-# <rdar://problems/4251781&4251785>
-
-use strict;
-
-use File::Path;
-use Getopt::Long;
-use Cwd;
-
-use IDLParser;
-use CodeGenerator;
-
-my @idlDirectories;
-my $outputDirectory;
-my $generator;
-my $defines;
-my $preprocessor;
-
-GetOptions('include=s@' => \@idlDirectories,
- 'outputdir=s' => \$outputDirectory,
- 'generator=s' => \$generator,
- 'defines=s' => \$defines,
- 'preprocessor=s' => \$preprocessor);
-
-my $idlFile = $ARGV[0];
-
-die('Must specify input file.') unless defined($idlFile);
-die('Must specify IDL search path.') unless @idlDirectories;
-die('Must specify generator') unless defined($generator);
-die('Must specify input file.') unless defined($idlFile);
-die('Must specify output directory.') unless defined($outputDirectory);
-die('Must specify defines') unless defined($defines);
-
-$defines =~ s/^\s+|\s+$//g; # trim whitespace
-
-# Parse the given IDL file.
-my $parser = IDLParser->new(1);
-my $document = $parser->Parse($idlFile, $defines, $preprocessor);
-
-# Generate desired output for given IDL file.
-my $codeGen = CodeGenerator->new(\@idlDirectories, $generator, $outputDirectory, 0, $preprocessor);
-$codeGen->ProcessDocument($document, $defines);
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index ca204ae..1f41666 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -598,7 +598,7 @@
'rule_name': 'binding',
'extension': 'idl',
'inputs': [
- 'port/bindings/scripts/generate-bindings.pl',
+ '../third_party/WebKit/WebCore/bindings/scripts/generate-bindings.pl',
'port/bindings/scripts/CodeGenerator.pm',
'port/bindings/scripts/CodeGeneratorV8.pm',
'port/bindings/scripts/IDLParser.pm',