Changeset 20783 for lang

Timestamp:

10/05/08 16:29:09 (5 years ago)

Author:

tokuhirom

Message:

r27052@skinny: tokuhirom | 2008-10-05 14:29:13 +0900
scons++ python++

Location:

lang/cplusplus/llv8call/trunk

Files:

• Sconstruct (modified) (1 diff)
• v8ext/v8ext.cc (modified) (5 diffs)

lang/cplusplus/llv8call/trunk/Sconstruct

@@ -50 +50 @@
 
 env.Append(
-    CCFLAGS=['-DUSING_V8_SHARED'],
+    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/'],

lang/cplusplus/llv8call/trunk/v8ext/v8ext.cc

@@ -51 +51 @@
 using namespace v8;
 
-#ifdef _WIN32
-#  define DIRECTORY_SEPARATOR "\\"
-#  define DLL_PREFIX ""
-#  define DLL_SUFFIX ".dll"
-#elif defined(__APPLE__)
-#  define DIRECTORY_SEPARATOR "/"
-#  define DLL_PREFIX "lib"
-#  define DLL_SUFFIX ".dylib"
-#else
-#  define DIRECTORY_SEPARATOR "/"
-#  define DLL_PREFIX "lib"
-#  define DLL_SUFFIX ".so"
-#endif
-
 static inline Handle<Object> _find_or_create_target(Handle<Object> &target, const char *name) {
     Handle<String> key = String::New(name);
@@ -99 +85 @@
 static inline void mmmm(const char *libpath, const char*libname, std::string & dirbuf, std::string & basenamebuf) {
     dirbuf  = libpath;
-    dirbuf += DIRECTORY_SEPARATOR;
+    dirbuf += DIRSEP;
     dirbuf += libname;
 
@@ -109 +95 @@
     unsigned int pos = 0;
     while ((pos = dirbuf.find(".", pos+1)) != std::string::npos) {
-        dirbuf.replace(pos, 1, DIRECTORY_SEPARATOR);
+        dirbuf.replace(pos, 1, DIRSEP);
     }
 }
@@ -118 +104 @@
     mmmm(libpath, libname, dir, basename);
 
-    std::string npath(dir + DIRECTORY_SEPARATOR);
-    if (basename.find(DLL_PREFIX) != 0) {
-        npath += DLL_PREFIX;
-    }
-    npath += basename + DLL_SUFFIX;
+    std::string npath(dir + DIRSEP);
+    if (basename.find(SHLIBPREFIX) != 0) {
+        npath += SHLIBPREFIX;
+    }
+    npath += basename + SHLIBSUFFIX;
     char * buf = new char [npath.length()+1];
     strcpy(buf, npath.c_str());
@@ -183 +169 @@
     std::string path;
     path  = dir.c_str();
-    path += DIRECTORY_SEPARATOR;
+    path += DIRSEP;
     path += basename.c_str();
     path += ".js";