Changeset 60315 in webkit for trunk/JavaScriptCore/wscript

Timestamp:

May 27, 2010, 12:02:53 PM (15 years ago)

Author:

[email protected]

Message:

[wx] Build fixes for Windows after recent changes.

File:

• trunk/JavaScriptCore/wscript (modified) (3 diffs)

trunk/JavaScriptCore/wscript

@@ -30 +30 @@
 from settings import *
 
-jscore_excludes = ['jsc.cpp', 'ucptable.cpp']
+jscore_excludes = ['jsc.cpp', 'ucptable.cpp','ProfilerServer.mm']
 jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp']))
 
@@ -56 +56 @@
     os.chdir(derived_sources_dir)
 
+    # DerivedSources.make expects Cygwin (i.e. Unix-style) python, so use that instead.
+    if building_on_win32:
+        oldpath = os.environ["PATH"]
+        os.environ["PATH"] = "/usr/bin" + os.pathsep + os.environ["PATH"]
     command = 'make -f %s/DerivedSources.make JavaScriptCore=%s BUILT_PRODUCTS_DIR=%s all FEATURE_DEFINES="%s"' % (js_dir, js_dir, js_dir, ' '.join(feature_defines))
     os.system(command)
+    if building_on_win32:
+        os.environ["PATH"] = oldpath
     os.chdir(olddir)
 
@@ -87 +93 @@
 
     jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)  
+
         
     obj = bld.new_task_gen(