Changeset 19323

Show
Ignore:
Timestamp:
09/15/08 11:16:10 (5 years ago)
Author:
tokuhirom
Message:

sqlite3 & fcgi moved to ext libs

Location:
lang/cplusplus/fcgi-v8/trunk
Files:
5 modified
4 moved

Legend:

Unmodified
Added
Removed

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

    r19321 r19323  
    1010  "file.cc", 
    1111  "dir.cc", 
    12   "sqlite3-amalgamination.c", 
    13   "sqlite3.cc", 
    1412] 
    1513include = ['../v8/include/'] 
    … …  
    4947        env.Append(CCFLAGS = ['-DREADLINE_STATIC']) 
    5048 
    51 if conf.CheckLib('fcgi'): 
    52     print "have libfcgi" 
    53     libs.append('fcgi') 
    54     env.Append(CCFLAGS = ['-DHAVE_FCGI']) 
    55     SOURCES.append('fcgi.cc') 
    56  
    5749env.Append(CCFLAGS = ['-g']) 
    5850 

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

    r19321 r19323  
    55 
    66env.Append( 
    7     CPPPATH = ['../../v8/include/'], 
     7    CPPPATH = ['../../v8/include/', '../src/'], 
    88    LIBPATH = ['../../v8/'], 
    99); 
    … …  
    1616    ) 
    1717 
    18 if conf.CheckLib('curl'): 
     18if conf.CheckLib('curl') and conf.CheckLib('iconv'): 
    1919    env.SharedLibrary( 
    2020        "curl", 
    … …  
    2323    ) 
    2424 
     25if conf.CheckLib('fcgi'): 
     26    env.SharedLibrary( 
     27        "fcgi", 
     28        ['fcgi.cc'], 
     29        LIBS=['v8', 'fcgi'], 
     30    ) 
     31 
     32env.SharedLibrary( 
     33    "sqlite3", 
     34    ["sqlite3-amalgamination.c", 'sqlite3.cc'], 
     35    LIBS=['v8'], 
     36) 

  • lang/cplusplus/fcgi-v8/trunk/ext/sqlite3.cc

    r19281 r19323  
    179179 
    180180 
    181 void setup_sqlite3(Handle<ObjectTemplate> target) { 
     181extern "C" 
     182void init_lib(Handle<Object> target) { 
    182183    HandleScope scope; 
    183184 
    … …  
    205206    target->Set( 
    206207        String::New("SQLite3"), 
    207         ft, 
    208         PropertyAttribute(ReadOnly | DontDelete) 
     208        ft->GetFunction() 
    209209    ); 
    210210} 

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

    r19322 r19323  
    8585    setup_core(global); 
    8686    setup_io(global); 
    87     setup_sqlite3(global); 
    8887#ifdef HAVE_DIR 
    8988    setup_dir(global); 
    90 #endif 
    91 #ifdef HAVE_FCGI 
    92     setup_fcgi(global); 
    9389#endif 
    9490 

  • lang/cplusplus/fcgi-v8/trunk/src/v8-util.h

    r19284 r19323  
    88void setup_curl(v8::Handle<v8::ObjectTemplate> global); 
    99void setup_sqlite3(v8::Handle<v8::ObjectTemplate> global); 
    10 #ifdef ENABLE_MEMCACHED 
    11     void setup_memcached(v8::Handle<v8::ObjectTemplate> global); 
    12 #endif 
    1310#ifdef HAVE_DIR 
    1411    void setup_dir(v8::Handle<v8::ObjectTemplate> global); 
    15 #endif 
    16 #ifdef HAVE_FCGI 
    17     void setup_fcgi(v8::Handle<v8::ObjectTemplate> global); 
    1812#endif 
    1913 

  • lang/cplusplus/fcgi-v8/trunk/t/06_sqlite.js

    r19281 r19323  
    11require('t/util.js'); 
     2 
     3load_dll("ext/libsqlite3.dylib"); 
    24 
    35Test.More.plan({tests:8});