Changeset 19936

Timestamp:

09/26/08 09:32:45 (5 years ago)

Author:

tokuhirom

Message:

better library detection

Location:

lang/cplusplus/llv8call/trunk

Files:

• src/v8ext.cc (modified) (1 diff)
• t/util.js (modified) (1 diff)

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

@@ -93 +93 @@
     HandleScope handle_scope;
 
+    String::Utf8Value _lib(args[0]);
     String::Utf8Value _libpath(args.This()->Get(String::New("LibraryPath")));
     char *libpath = *_libpath;
 
-    if (_file_exists(libpath)) {
-        String::Utf8Value _lib(args[0]);
-        return _load_lib(libpath, *_lib);
-    } else {
-        std::string e("library not found in : ");
-        e += *_libpath;
-        return ThrowException(String::New(e.c_str()));
+    char* p;
+    while ((p = strchr(libpath, ':')) > 0) {
+        *p = '\0';
+        if (_file_exists(libpath)) { return _load_lib(libpath, *_lib); }
+        libpath = p+1;
     }
+    if (_file_exists(libpath)) { return _load_lib(libpath, *_lib); }
+
+    // not found
+    std::string e(*_lib);
+    e += "is not found in : ";
+    e += *_libpath;
+    return ThrowException(String::New(e.c_str()));
 }
 

lang/cplusplus/llv8call/trunk/t/util.js

@@ -5 +5 @@
 require("t/Test.Simple/Test/More.js");
 
-v8ext.LibraryPath = "blib/";
+v8ext.LibraryPath = "foo:blib/:bar";
 v8ext.LoadLibrary( "org.coderepos.nspr" );