Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: wscript

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebKit/qt/ChangeLog ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #! /usr/bin/env python 1 #! /usr/bin/env python
2 2
3 # Copyright (C) 2009 Kevin Ollivier All rights reserved. 3 # Copyright (C) 2009 Kevin Ollivier All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions 6 # modification, are permitted provided that the following conditions
7 # are met: 7 # are met:
8 # 1. Redistributions of source code must retain the above copyright 8 # 1. Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright 10 # 2. Redistributions in binary form must reproduce the above copyright
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 if build_port == "wx": 61 if build_port == "wx":
62 webcore_sources['wx'] = ['WebCore/platform/KillRingNone.cpp', 'WebCore/bindi ngs/cpp/WebDOMEventTarget.cpp'] 62 webcore_sources['wx'] = ['WebCore/platform/KillRingNone.cpp', 'WebCore/bindi ngs/cpp/WebDOMEventTarget.cpp']
63 63
64 if building_on_win32: 64 if building_on_win32:
65 # make sure platform/wx comes after this so we get the right 65 # make sure platform/wx comes after this so we get the right
66 # FontPlatformData.h 66 # FontPlatformData.h
67 webcore_dirs.extend(['WebCore/platform/wx/wxcode/win', 'WebCore/plugins/ win']) 67 webcore_dirs.extend(['WebCore/platform/wx/wxcode/win', 'WebCore/plugins/ win'])
68 webcore_sources['wx-win'] = [ 68 webcore_sources['wx-win'] = [
69 'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp', 69 'WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
70 'WebCore/platform/graphics/win/TransformationMatrixWin.cpp', 70 'WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
71 'WebCore/platform/win/ScrollAnimatorWin.cpp',
72 'WebCore/platform/win/ScrollAnimatorWin.h',
71 # wxTimer on Windows has a bug that causes it to eat crashes in c allbacks 73 # wxTimer on Windows has a bug that causes it to eat crashes in c allbacks
72 # so we need to use the Win port's implementation until the wx bu g fix is 74 # so we need to use the Win port's implementation until the wx bu g fix is
73 # widely available (it was fixed in 2.8.10). 75 # widely available (it was fixed in 2.8.10).
74 'WebCore/platform/win/SharedTimerWin.cpp', 76 'WebCore/platform/win/SharedTimerWin.cpp',
75 'WebCore/platform/win/WebCoreInstanceHandle.cpp', 77 'WebCore/platform/win/WebCoreInstanceHandle.cpp',
76 # Use the Windows plugin architecture 78 # Use the Windows plugin architecture
77 #'WebCore/plugins/win/PluginDataWin.cpp', 79 #'WebCore/plugins/win/PluginDataWin.cpp',
78 'WebCore/plugins/win/PluginDatabaseWin.cpp', 80 'WebCore/plugins/win/PluginDatabaseWin.cpp',
79 'WebCore/plugins/win/PluginMessageThrottlerWin.cpp', 81 'WebCore/plugins/win/PluginMessageThrottlerWin.cpp',
80 'WebCore/plugins/win/PluginPackageWin.cpp', 82 'WebCore/plugins/win/PluginPackageWin.cpp',
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 if sys.platform.startswith('darwin'): 309 if sys.platform.startswith('darwin'):
308 webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac ' 310 webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac '
309 webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm" 311 webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm"
310 312
311 webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.c pp']) 313 webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.c pp'])
312 314
313 bld.add_group() 315 bld.add_group()
314 316
315 if build_port == "wx": 317 if build_port == "wx":
316 bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python']) 318 bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python'])
OLDNEW
« no previous file with comments | « WebKit/qt/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698