summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 18:21:49 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 18:21:49 +0000
commitf3704e95a0d38f416587cc1c73021bdbffdb13b4 (patch)
tree2becdb172edc7314f7fdaeed68d872b1168310ba /webkit
parent9439f1830c8070a2c390b809f3735b6ff52ded74 (diff)
downloadchromium_src-f3704e95a0d38f416587cc1c73021bdbffdb13b4.zip
chromium_src-f3704e95a0d38f416587cc1c73021bdbffdb13b4.tar.gz
chromium_src-f3704e95a0d38f416587cc1c73021bdbffdb13b4.tar.bz2
update name file generation
bring the scons build inline with DerivedSources.make that got updated in r3306. Review URL: http://codereview.chromium.org/7306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/build/port/SConscript44
1 files changed, 20 insertions, 24 deletions
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 584c572..b1e27e2 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -494,28 +494,26 @@ i = env.Install('$SHARED_DIR',
env.Alias('webkit', i)
# HTML tag and attribute names
+# If we add ENABLE_ flags via HTML_FLAGS, we need to pass in
+# --extraDefines $HTML_FLAGS.
env.Command(['$DERIVED_DIR/HTMLNames.cpp',
'$DERIVED_DIR/HTMLNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/html/HTMLTagNames.in',
'$WEBKIT_PORT_DIR/html/HTMLAttributeNames.in'],
- '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
- '--tags ${SOURCES[1].posix} ' + \
- '--attrs ${SOURCES[2].posix} ' + \
- '--namespace HTML --namespacePrefix xhtml ' + \
- '--cppNamespace WebCore ' + \
- '--namespaceURI "http://www.w3.org/1999/xhtml" ' + \
- '--attrsNullNamespace --output $DERIVED_DIR')
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} '
+ '--tags ${SOURCES[1].posix} '
+ '--attrs ${SOURCES[2].posix} '
+ '--wrapperFactory '
+ '--outputDir $DERIVED_DIR')
env.Command(['$DERIVED_DIR/XMLNames.cpp',
'$DERIVED_DIR/XMLNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/xml/xmlattrs.in'],
- '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
- '--attrs ${SOURCES[1].posix} ' + \
- '--namespace XML --cppNamespace WebCore ' + \
- '--namespaceURI "http://www.w3.org/XML/1998/namespace" ' + \
- '--output $DERIVED_DIR')
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} '
+ '--attrs ${SOURCES[1].posix} '
+ '--outputDir $DERIVED_DIR')
env.Command(['$DERIVED_DIR/SVGElementFactory.cpp',
'$DERIVED_DIR/SVGElementFactory.h',
@@ -524,23 +522,21 @@ env.Command(['$DERIVED_DIR/SVGElementFactory.cpp',
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/svg/svgtags.in',
'$WEBKIT_PORT_DIR/svg/svgattrs.in'],
- '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
- '--tags ${SOURCES[1].posix} ' + \
- '--attrs ${SOURCES[2].posix} ' + \
- '--extraDefines "$SVG_FLAGS" ' + \
- '--namespace SVG --cppNamespace WebCore ' + \
- '--namespaceURI "http://www.w3.org/2000/svg" ' + \
- '--factory --attrsNullNamespace --output $DERIVED_DIR')
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} '
+ '--tags ${SOURCES[1].posix} '
+ '--attrs ${SOURCES[2].posix} '
+ '--extraDefines "$SVG_FLAGS" '
+ '--factory '
+ '--wrapperFactory '
+ '--outputDir $DERIVED_DIR')
env.Command(['$DERIVED_DIR/XLinkNames.cpp',
'$DERIVED_DIR/XLinkNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/svg/xlinkattrs.in'],
- '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
- '--attrs ${SOURCES[1].posix} ' + \
- '--namespace XLink --cppNamespace WebCore ' + \
- '--namespaceURI "http://www.w3.org/1999/xlink" ' + \
- '--output $DERIVED_DIR')
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} '
+ '--attrs ${SOURCES[1].posix} '
+ '--outputDir $DERIVED_DIR')
# Add SVG Symbols to the WebCore exported symbols file
# TODO(bradnelson): fix this