JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / wscript

diff --git a/wscript b/wscript
index 3df3ded546839691ffaddf95668c0b6996e5f414..4afb4d26a632787467b6bd822c841cbe285c4536 100644 (file)
--- a/wscript
+++ b/wscript
@@ -33,32 +33,40 @@ def build(bld):
 
     import Options
 
 
     import Options
 

-    jscore_excludes = ['jsc.cpp', 'ProfilerServer.mm', 'ExecutableAllocatorPosix.cpp']
-    jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp']))
-
-    jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
+    jscore_excludes = ['jsc.cpp', 'ExecutableAllocatorPosix.cpp', 'LLIntOffsetsExtractor.cpp']
+    jscore_exclude_patterns = get_port_excludes(Options.options.port)
+    jscore_exclude_patterns.append('*None.cpp')

 
     sources = []
 
     if Options.options.port == "wx":
         if building_on_win32:
 
     sources = []
 
     if Options.options.port == "wx":
         if building_on_win32:

-            jscore_excludes += ['MarkStackPosix.cpp', 'OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
-            sources += ['heap/MarkStackWin.cpp']
+            jscore_excludes += ['OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
+            sources.extend(['../WTF/wtf/ThreadingWin.cpp', '../WTF/wtf/ThreadSpecificWin.cpp', '../WTF/wtf/OSAllocatorWin.cpp'])

         else:
             jscore_excludes.append('JSStringRefBSTR.cpp')
         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)
     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
+    includes = common_includes + full_dirs + [output_dir]

     if sys.platform.startswith('darwin'):
         includes.append(os.path.join(jscore_dir, 'icu'))
 
     # 1. A simple program
     jscore = bld.new_task_gen(
     if sys.platform.startswith('darwin'):
         includes.append(os.path.join(jscore_dir, 'icu'))
 
     # 1. A simple program
     jscore = bld.new_task_gen(

-        features = 'cxx cstaticlib',
-        includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+        features = 'cc cxx cshlib',
+        includes = '. .. assembler ../WTF ' + ' '.join(includes),

         source = sources,
         source = sources,

+        defines = ['BUILDING_JavaScriptCore'],

         target = 'jscore',
         uselib = 'WX ICU ' + get_config(),
         uselib_local = '',
         target = 'jscore',
         uselib = 'WX ICU ' + get_config(),
         uselib_local = '',


@@ -68,7 +76,7 @@ def build(bld):
     
     obj = bld.new_task_gen(
         features = 'cxx cprogram',
     
     obj = bld.new_task_gen(
         features = 'cxx cprogram',

-        includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+        includes = '. .. assembler ../WTF ' + ' '.join(includes),

         source = 'jsc.cpp',
         target = 'jsc',
         uselib = 'WX ICU ' + get_config(),
         source = 'jsc.cpp',
         target = 'jsc',
         uselib = 'WX ICU ' + get_config(),


@@ -82,4 +90,4 @@ def build(bld):
         myenv.CXXFLAGS.remove('/EHsc')
         obj.env = myenv
 
         myenv.CXXFLAGS.remove('/EHsc')
         obj.env = myenv
 

-    bld.install_files(os.path.join(output_dir, 'JavaScriptCore'), 'API/*.h')
+    bld.add_group()