Changeset 20917 for lang/cplusplus

Timestamp:

10/07/08 19:49:47 (6 weeks ago)

Author:

mattn

Message:

use ParseFlags? and MergeFlags? for any platform.

Files:

• lang/cplusplus/llv8call/trunk/Sconstruct (modified) (3 diffs)

lang/cplusplus/llv8call/trunk/Sconstruct

@@ -4 +4 @@
 import os
 import sys
+import re
 
 opts = Options()
@@ -51 +52 @@
         return None
 
+def fixquote(s):
+    if not OS_GUESS == 'win32':
+        return '"%s"' % re.sub("\\\\", "\\\\\\\\", s)
+    else:
+        return '"""%s"""' % re.sub("\\\\", "\\\\\\\\", s)
+
+env.MergeFlags(env.ParseFlags(" ".join([
+    '-DUSING_V8_SHARED',
+    '-DDIRSEP=\'%s\'' % fixquote(re.sub("\\\\", "\\\\\\\\", os.sep)),
+    '-DPATHSEP=\'%s\'' % fixquote(re.sub("\\\\", "\\\\\\\\", os.pathsep)),
+    '-DVERSION=\'%s\'' % fixquote(VERSION),
+    '-DSHLIBPREFIX=\'%s\'' % fixquote(env.subst(env['SHLIBPREFIX'])),
+    '-DSHLIBSUFFIX=\'%s\'' % fixquote(env.subst(env['SHLIBSUFFIX'])),
+    '-DPACKAGE=llv8call',
+])))
+
 env.Append(
-    CCFLAGS=[
-        '-DUSING_V8_SHARED',
-        ["-D"+x+'''='"'''+env.subst(env[x])+""""'""" for x in ['SHLIBSUFFIX', 'SHLIBPREFIX']],
-        '''-DDIRSEP='"''' + os.sep + """"'"""
-    ],
     CPPPATH=[os.getcwd() + '/vendor/v8/include/', os.getcwd() + '/v8ext/', '/opt/local/include/'],
     LIBPATH=[os.getcwd() + '/vendor/v8/', '/opt/local/lib/'],
@@ -64 +76 @@
     env.Append(CCFLAGS = ['-Wall'])
 
+if GuessToolchain() == 'msvc':
+    env.Append(CCFLAGS = ['/EHsc'])
+
 if env['mode'] == 'debug' or OS_GUESS == 'linux' or OS_GUESS == 'macos':
     env.Append(CCFLAGS = ['-g'])
-
-env.Append(CCFLAGS = ['-DVERSION=\'"'+VERSION+'"\'', '-DPACKAGE=llv8call'])
 
 env.SConscript('src/SConscript', exports=['env','conf'])