Changeset 19321

Timestamp:

09/15/08 10:31:26 (5 years ago)

Author:

tokuhirom

Message:

urlfetch is ext libs

Location:

lang/cplusplus/fcgi-v8/trunk

Files:

• Sconstruct (modified) (2 diffs)
• ext/Sconstruct (modified) (2 diffs)
• ext/curl.cc (moved) (moved from lang/cplusplus/fcgi-v8/trunk/src/urlfetch.cc) (2 diffs)
• src/llv8call.cc (modified) (1 diff)
• t/02_urlfetch.js (modified) (1 diff)

lang/cplusplus/fcgi-v8/trunk/Sconstruct

@@ -8 +8 @@
   "util.cc",
   "core.cc",
-  "urlfetch.cc",
   "file.cc",
   "dir.cc",
@@ -29 +28 @@
 OS_GUESS = GuessOS()
 
-libs=['v8', 'pthread', 'curl']
+libs=['v8', 'pthread']
 
 if OS_GUESS == 'win32':

lang/cplusplus/fcgi-v8/trunk/ext/Sconstruct

@@ -3 +3 @@
 env = Environment()
 conf = Configure(env)
-include = ['../../v8/include/']
+
+env.Append(
+    CPPPATH = ['../../v8/include/'],
+    LIBPATH = ['../../v8/'],
+);
 
 if conf.CheckLib('memcached'):
@@ -10 +14 @@
         ['libmemcached.cc'],
         LIBS=['v8', 'memcached'],
-        CPPPATH=include,
-        LIBPATH=['../../v8/'],
     )
 
+if conf.CheckLib('curl'):
+    env.SharedLibrary(
+        "curl",
+        ['curl.cc'],
+        LIBS=['v8', 'curl', 'iconv'],
+    )
+

lang/cplusplus/fcgi-v8/trunk/ext/curl.cc

@@ -6 +6 @@
 #include <iconv.h>
 #include <errno.h>
-#include "v8-util.h"
 
 #ifdef _WIN32
@@ -215 +214 @@
 }
 
-void setup_curl(v8::Handle<v8::ObjectTemplate> target) {
-    target->Set(v8::String::New("urlfetch"), v8::FunctionTemplate::New(UrlFetch));
-}
-
+extern "C"
+void init_lib(v8::Handle<v8::Object> target) {
+    target->Set(v8::String::New("urlfetch"), v8::FunctionTemplate::New(UrlFetch)->GetFunction());
+}
+

lang/cplusplus/fcgi-v8/trunk/src/llv8call.cc

@@ -85 +85 @@
     setup_core(global);
     setup_io(global);
-    setup_curl(global);
     setup_sqlite3(global);
 #ifdef ENABLE_MEMCACHED

lang/cplusplus/fcgi-v8/trunk/t/02_urlfetch.js

@@ -2 +2 @@
 
 Test.More.plan({tests:1});
+
+if (!File.isFile("ext/libcurl.dylib")) {
+    try {
+        Test.More.skipRest("this test requires memcached");
+    } catch(e) {
+    }
+} else {
+    load_dll("ext/libcurl.dylib");
+}
+
 var t = urlfetch("http://search.cpan.org/").responseText;
 Test.More.like(t, /Perl6/i);