Changeset 112017 in webkit for trunk/Source/JavaScriptCore/wscript

Timestamp:

Mar 24, 2012, 6:41:33 PM (13 years ago)

Author:

[email protected]

Message:

[wx] Unreviewed. Fix the build after WTF move.

File:

• trunk/Source/JavaScriptCore/wscript (modified) (4 diffs)

trunk/Source/JavaScriptCore/wscript

@@ -35 +35 @@
 
     jscore_excludes = ['jsc.cpp', 'ExecutableAllocatorPosix.cpp', 'LLIntOffsetsExtractor.cpp']
-    jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp', '*Symbian.cpp']))
-    jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
+    jscore_exclude_patterns = get_port_excludes(Options.options.port)
+    jscore_exclude_patterns.append('*None.cpp')
 
     sources = []
@@ -45 +45 @@
         else:
             jscore_excludes.append('JSStringRefBSTR.cpp')
-            jscore_excludes.extend(get_excludes(jscore_dir, ['*Win.cpp']))
+
+    if sys.platform.startswith('darwin'):
+        jscore_excludes.append('GCActivityCallback.cpp') # this is an empty impl.
 
     bld.env.LIBDIR = output_dir
     full_dirs = get_dirs_for_features(jscore_dir, features=[Options.options.port.lower()], dirs=jscore_dirs)
+    abs_dirs = []
+    for adir in full_dirs:
+        abs_dirs.append(os.path.join(jscore_dir, adir))
+
+    jscore_excludes.extend(get_excludes_in_dirs(abs_dirs, jscore_exclude_patterns))
 
     includes = common_includes + full_dirs
@@ -57 +64 @@
     jscore = bld.new_task_gen(
         features = 'cc cxx cshlib',
-        includes = '. .. assembler ../WTF ../WTF/wtf ' + ' '.join(includes),
+        includes = '. .. assembler ../WTF ' + ' '.join(includes),
         source = sources,
         defines = ['BUILDING_JavaScriptCore'],
@@ -82 +89 @@
         myenv.CXXFLAGS.remove('/EHsc')
         obj.env = myenv
-
-    bld.install_files(os.path.join(output_dir, 'JavaScriptCore'), 'API/*.h')