#
# WebCore build script for the waf build system
+import glob
+import os
+import subprocess
+
import Options
from settings import *
from TaskGen import taskgen, feature, after
import Task, ccroot
+def clean_derived_sources(ds_cmd):
+ cmd = ds_cmd + " -qp | grep -v '^# ' | grep -v '^[[:space:]]' | grep --only-matching '^.*:'"
+ output = subprocess.check_output(cmd, shell=True)
+
+ targets = []
+ lines = output.split("\n")
+ for line in lines:
+ line = line.replace(":", "")
+ base = os.path.splitext(os.path.basename(line))[0]
+ if not base in targets:
+ targets.append(base)
+ if base == "UserAgentsStyleSheet":
+ targets.append("UserAgentsStyleSheetData")
+
+ # we're in the DerivedSources directory when this command is run.
+ ds_files = glob.glob("*.*")
+ for ds_file in ds_files:
+ filename = os.path.basename(ds_file)
+ basename = os.path.splitext(filename)[0]
+ # For now, just remove JS*.h/.cpp and WebDOM*.h/.cpp when there are no longer targets
+ # for them. Other targets may generate supplemental files so we can't reliably clean them.
+ if not basename in targets and (basename.startswith("JS") or basename.startswith("WebDOM")):
+ print "INFO: %s is no longer generated but present in generated files directory. Removing." % filename
+ os.remove(ds_file)
+
def generate_webcore_derived_sources(conf):
# build the derived sources
derived_sources_dir = os.path.join(webcore_dir, 'DerivedSources')
if building_on_win32:
oldpath = os.environ["PATH"]
os.environ["PATH"] = "/usr/bin" + os.pathsep + os.environ["PATH"]
- os.system('make -f %s/DerivedSources.make WebCore=%s SOURCE_ROOT=%s all FEATURE_DEFINES="%s"' % (wc_dir, wc_dir, wc_dir, conf.env["FEATURE_DEFINES"]))
+ command = 'make -f %s/DerivedSources.make WebCore=%s SOURCE_ROOT=%s all FEATURE_DEFINES="%s"' % (wc_dir, wc_dir, wc_dir, conf.env["FEATURE_DEFINES"])
+ clean_derived_sources(command)
+ os.system(command)
if building_on_win32:
os.environ["PATH"] = oldpath
+
os.chdir(olddir)
def generate_jscore_derived_sources(conf):
generate_webcore_derived_sources(conf)
if Options.options.port == "wx" and sys.platform.startswith('win'):
graphics_dir = os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'graphics')
- # HACK ALERT: MSVC automatically adds the source file's directory as the first entry in the
- # path. Unfortunately, that means when compiling these files we will end up including
- # win/FontPlatformData.h, which breaks wx compilation. So we copy the files to the wx dir.
+ # we used to copy these files into the graphics/wx directory due to
+ # both wx and win directories having FontPlatformData.h. That is no
+ # longer the case, so we remove the old files if they exist.
for afile in ['UniscribeController.h', 'UniscribeController.cpp', 'GlyphPageTreeNodeCairoWin.cpp']:
- shutil.copy(os.path.join(graphics_dir, 'win', afile), os.path.join(graphics_dir, 'wx'))
+ wx_copy = os.path.join(graphics_dir, 'wx', afile)
+ if os.path.exists(wx_copy):
+ os.remove(wx_copy)
webcore_out_dir = os.path.join(output_dir, 'WebCore')
if not os.path.exists(webcore_out_dir):
webcore_dirs = list(webcore_dirs_common)
+ # auto-generate WebKitVersion.h if needed before we start the build.
+ # Also, remove the file from the old location where we generated it before running
+ wk_version_h = 'Source/WebCore/DerivedSources/WebKitVersion.h'
+ if os.path.exists(wk_version_h):
+ os.remove(wk_version_h)
+ bld.new_task_gen(source = "Source/WebKit/mac/Configurations/Version.xcconfig",
+ target = wk_version_h,
+ rule = 'perl %s/Source/WebKit/scripts/generate-webkitversion.pl --outputDir=${TGT[0].dir(env)} --config ${SRC}' % wk_root)
+ bld.add_group()
+
if Options.options.port == "wx":
webcore_dirs.extend(['Source/WebKit/wx', 'Source/WebKit/wx/WebKitSupport'])
wk_includes = ['.',
+ os.path.join(wk_root, 'Source', 'WTF'),
+ os.path.join(wk_root, 'Source', 'WTF', 'wtf'),
os.path.join(wk_root, 'Source', 'JavaScriptCore'),
- os.path.join(wk_root, 'Source', 'JavaScriptCore', 'wtf', 'text'),
os.path.join(wk_root, 'Source', 'WebCore'),
os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'),
os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'image-decoders'),
'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp',
'Source/WebCore/platform/KillRingNone.cpp',
'Source/WebCore/platform/text/LocalizedDateNone.cpp',
- 'Source/WebCore/platform/text/LocalizedNumberNone.cpp'
+ 'Source/WebCore/platform/text/LocalizedNumberNone.cpp',
+ 'Source/WebCore/page/scrolling/ScrollingCoordinatorNone.cpp',
]
if building_on_win32:
webcore_sources['wx-win'] = [
'Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp',
'Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp',
- 'Source/WebCore/platform/ScrollAnimatorWin.cpp',
+ 'Source/WebCore/platform/graphics/win/UniscribeController.cpp',
+ 'Source/WebCore/platform/ScrollAnimatorNone.cpp',
# wxTimer on Windows has a bug that causes it to eat crashes in callbacks
# so we need to use the Win port's implementation until the wx bug fix is
# widely available (it was fixed in 2.8.10).
'Source/WebCore/platform/win/SharedTimerWin.cpp',
+ 'Source/WebCore/platform/win/SystemInfo.cpp',
'Source/WebCore/platform/win/WebCoreInstanceHandle.cpp',
# Use the Windows plugin architecture
#'Source/WebCore/plugins/win/PluginDataWin.cpp',
elif sys.platform.startswith('darwin'):
webcore_dirs.append('Source/WebCore/plugins/mac')
webcore_dirs.append('Source/WebCore/platform/wx/wxcode/mac/carbon')
- webcore_dirs.append('Source/WebCore/platform/mac')
webcore_dirs.append('Source/WebCore/platform/text/mac')
webcore_sources['wx-mac'] = [
'Source/WebCore/platform/mac/PurgeableBufferMac.cpp',
'Source/WebCore/platform/mac/WebCoreSystemInterface.mm',
'Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp',
'Source/WebCore/platform/graphics/mac/ComplexTextController.cpp',
- 'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp',
+ 'Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm',
'Source/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp',
'Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp',
'Source/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm',
import TaskGen
- # FIXME: Does this need to be Source/JavaScriptCore?
bld.add_subdirs('Source/JavaScriptCore')
if sys.platform.startswith('darwin'):
TaskGen.task_gen.mappings['.m'] = TaskGen.task_gen.mappings['.cxx']
features = [Options.options.port.lower()]
- exclude_patterns = ['*AllInOne.cpp', '*CFNet.cpp', '*Chromium*.cpp',
- '*Efl.cpp', '*Gtk.cpp', '*Mac.cpp', '*None.cpp', '*Qt.cpp', '*Safari.cpp',
- 'test*bindings.*', '*WinCE.cpp', "WebDOMCanvas*.cpp", "WebDOMSVG*.cpp"]
- if Options.options.port == 'wx':
- features.append('curl')
- exclude_patterns.append('*Win.cpp')
-
+ thisport = Options.options.port
+
+ exclude_patterns = ['*AllInOne.cpp', '*None.cpp',]
+
if sys.platform.startswith('darwin'):
features.append('cf')
-
- else:
- exclude_patterns.append('*CF.cpp')
+ # exclude the filename patterns for all other ports.
+ exclude_patterns.extend(get_port_excludes(Options.options.port))
+
+ if Options.options.port == 'wx':
+ features.append('curl')
+ exclude_patterns.extend(['*CFNet.cpp', 'test*bindings.*', "WebDOMCanvas*.cpp", "WebDOMSVG*.cpp"])
+
full_dirs = get_dirs_for_features(wk_root, features=features, dirs=webcore_dirs)
+ # make sure we don't use the CF networking engine
+ if Options.options.port == 'wx' and sys.platform.startswith('darwin'):
+ full_dirs.remove('Source/WebCore/platform/network/cf')
+
jscore_dir = os.path.join(wk_root, 'Source', 'JavaScriptCore')
for item in os.listdir(jscore_dir):
fullpath = os.path.join(jscore_dir, item)
wk_includes.append('Source')
wk_includes.append(os.path.join(jscore_dir, 'collector', 'handles'))
- wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode'))
- wk_includes.append(os.path.join(jscore_dir, 'wtf', 'unicode', 'icu'))
wk_includes += common_includes + full_dirs
if sys.platform.startswith('darwin'):
wk_includes.append(os.path.join(webcore_dir, 'icu'))
# we have to make sure <unicode/utf8.h> picks up the ICU one first.
global msvclibs_dir
wk_includes.append(os.path.join(msvclibs_dir, 'include'))
+ wk_includes.append('Source/WebCore/platform/graphics/win')
else:
cxxflags.extend(['-include', 'WebCorePrefix.h'])
# intermediate sources
excludes.append('DocTypeStrings.cpp')
excludes.append('HTMLEntityNames.cpp')
- excludes.append('tokenizer.cpp')
# Qt specific file in common sources
excludes.append('ContextShadow.cpp')
- # FIXME: these three require headers that I can't seem to find in trunk.
+ # FIXME: these require headers that I can't seem to find in trunk.
# Investigate how to resolve these issues.
excludes.append('JSAbstractView.cpp')
+ excludes.append('JSIntentConstructor.cpp')
excludes.append('JSPositionCallback.cpp')
excludes.append('JSInspectorController.cpp')
excludes.append('JSSVGStyleTable.cpp')
excludes.append('JSSVGTests.cpp')
excludes.append('JSSVGStylable.cpp')
- excludes.append('JSSVGZoomAndPan.cpp')
# These are files that expect methods not in the base C++ class, usually XYZAnimated methods.
excludes.append('JSSVGFitToViewBox.cpp')
excludes.append('WebDOMScriptProfileNode.cpp')
excludes.append('WebNativeEventListener.cpp')
+ # FIXME: It appears these are no longer needed by any port, once this is confirmed,
+ # we should remove these sources from the tree.
+ excludes.append('WebDOMDOMWindowCustom.cpp')
+ excludes.append('WebDOMHTMLOptionsCollectionCustom.cpp')
+ excludes.append('WebDOMNodeCustom.cpp')
+ excludes.append('WebDOMHTMLDocumentCustom.cpp')
+ excludes.append('WebDOMHTMLCollectionCustom.cpp')
+ excludes.append('WebNativeNodeFilterCondition.cpp')
+ excludes.append('WebDOMNodeFilterCustom.cpp')
+
+ # this file is unused by any port, not sure why it was
+ # left in the tree
+ excludes.append('GeneratedImage.cpp')
+
+ # features we don't build / use
+ excludes.append('JSNavigatorCustom.cpp')
+ excludes.append('WebGLContextEvent.cpp')
+ excludes.append('FileSystemPOSIX.cpp')
+ excludes.append('LocaleICU.cpp')
+ excludes.append('LocalizedDateICU.cpp')
+ excludes.append('PlatformGestureRecognizer.cpp')
+ excludes.append('SharedBufferPOSIX.cpp')
+ excludes.append('TouchAdjustment.cpp')
+ excludes.append('DNSResolveQueue.cpp')
+ excludes.append('WebDOMRadioNodeList.cpp')
+
# These files appear not to build with older versions of ICU
excludes.append('LocalizedNumberICU.cpp')
excludes.append('LocaleToScriptMappingICU.cpp')
excludes.append('AuthenticationCF.cpp')
excludes.append('LoaderRunLoopCF.cpp')
excludes.append('ResourceErrorCF.cpp')
+ excludes.append('RunLoopCF.cpp')
# once we move over to the new FPD implementation, remove this.
excludes.append('FontPlatformData.cpp')
- # we don't use gestures currently
- excludes.append('PlatformGestureRecognizer.cpp')
+ # we need a better system to exclude CF stuff
+ excludes.append('HyphenationCF.cpp')
if sys.platform.startswith('darwin'):
- webcore.includes += ' Source/WebKit/mac/WebCoreSupport WebCore/platform/mac'
+ webcore.includes += ' Source/WebKit/mac/WebCoreSupport Source/WebCore/platform/mac'
webcore.source += ' Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm'
if building_on_win32:
projects / framework / web / webkit-efl.git / blobdiff