rhodes 7.1.17 → 7.4.1

data/platform/shared/qt/sailfish/qml/pages/BarcodePage.qml

@@ -156,73 +156,43 @@ Page {
         }
 
 
-        Rectangle {
+        Button{
             id: okButton
-            width: 100
+            width: 200
             height: 100
-            x: parent.width - 2*width
+            x: parent.width - width - 50
             y: parent.height - 2*height
             z:1
-            color: (scale > 1)?"#00ff00":"#20ff20"
-            radius: 50
-            scale: captureMouseArea.pressed ? 1.5 : 1
-
-            Text {
-                anchors.centerIn: parent
-                font.pixelSize: 20
-                color: "black"
-                text: "Ok"
+            text: "OK"
+            onClicked: {
+                barcodeModel[0].done();
+                pageStack.pop();
             }
-
-            MouseArea {
-                id: captureMouseArea
-                anchors.fill: parent;
-                onClicked: {
-                    barcodeModel[0].done();
-                    pageStack.pop();
-                }
-
-            }
-
-         }
-
+        }
 
         Text {
             id: textResult
+            elide: Text.ElideRight
             //anchors.verticalCenter: parent.verticalCenter
             y: (parent.height / 8)
             x: (parent.width - width) / 2
             color: "white"
         }
 
-        Rectangle {
+
+        Button{
             id: repeakButton
-            width: 100
+            width: 200
             height: 100
-            x: width
+            x: 50
             y: parent.height - 2*height
-            z: 1
-            color: (scale > 1)?"#ff00ff":"#ff20ff"
-            radius: 50
-            scale: cancelMouseArea.pressed ? 1.5 : 1
-
-            Text {
-                anchors.centerIn: parent
-                font.pixelSize: 20
-                color: "black"
-                text: "Repeak"
-            }
-
-            MouseArea {
-                id: cancelMouseArea
-                anchors.fill: parent;
-                onClicked: {
-                    barcodeModel[0].restart();
-                }
+            z:1
+            text: "Retake"
+            onClicked: {
+                barcodeModel[0].restart();
             }
-
-
         }
+
     }
     on_NavigationChanged: {
         barcodeModel[0].cancel();

data/platform/shared/qt/sqlite3/sqlite3.pro

@@ -1,14 +1,13 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += CPP_ELEVEN
-    DEFINES += RHODES_VERSION_2
-}
-
 equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6) {
         DEFINES += OS_SAILFISH OS_LINUX CPP_ELEVEN
         CONFIG += c++14
     }
+    greaterThan(QT_MINOR_VERSION, 6): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
 }
 
 lessThan(QT_MINOR_VERSION, 6): {
@@ -49,11 +48,18 @@ win32 {
 }
 
 unix:!macx {
-  DESTDIR = ../../../linux/bin/sqlite3
-  OBJECTS_DIR = ../../../linux/bin/sqlite3/tmp
+    DEFINES += OS_LINUX
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+
+    DESTDIR = ../../../linux/bin/sqlite3
+    OBJECTS_DIR = ../../../linux/bin/sqlite3/tmp
+
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
 
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 
 DEFINES += RHODES_QT_PLATFORM

data/platform/shared/qt/syncengine/syncengine.pro

@@ -1,15 +1,13 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += CPP_ELEVEN
-    DEFINES += RHODES_VERSION_2
-}
-
-
 equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6) {
         DEFINES += OS_SAILFISH OS_LINUX CPP_ELEVEN
         CONFIG += c++14
     }
+    greaterThan(QT_MINOR_VERSION, 6): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
 }
 
 lessThan(QT_MINOR_VERSION, 6): {
@@ -47,14 +45,19 @@ win32 {
 }
 
 unix:!macx {
-  DESTDIR = $$PWD/../../../linux/bin/syncengine
-  OBJECTS_DIR = $$PWD/../../../linux/bin/syncengine/tmp
-  DEFINES += _GNU_SOURCE OS_LINUX OS_SAILFISH
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
-
-  INCLUDEPATH += $$PWD/../../ruby/include\
-                 $$PWD/../../ruby/sailfish
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+    DESTDIR = $$PWD/../../../linux/bin/syncengine
+    OBJECTS_DIR = $$PWD/../../../linux/bin/syncengine/tmp
+    DEFINES += _GNU_SOURCE OS_LINUX
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+    INCLUDEPATH += $$PWD/../../ruby/include\
+                 $$PWD/../../ruby/linux
+
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 
 DEFINES += RHODES_QT_PLATFORM

data/platform/shared/qt/unzip/unzip.pro

@@ -0,0 +1,133 @@
+equals(QT_MAJOR_VERSION, 5) {
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
+        DEFINES += OS_SAILFISH OS_LINUX
+        CONFIG +=  c++14
+        QT += core
+    }
+    greaterThan(QT_MINOR_VERSION, 7): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2 AJAXSERVER
+    }
+}
+
+TARGET = unzip
+TEMPLATE = lib
+
+CONFIG += staticlib warn_on
+#CONFIG += debug
+
+INCLUDEPATH += ../..\
+../../ruby\
+../../../../lib/commonAPI\
+../../ruby/include
+
+macx {
+  greaterThan(QT_MINOR_VERSION, 6): {
+      DEFINES += RHODES_MAC_BUILD
+  }
+  DESTDIR = ../../../osx/bin/unzip
+  OBJECTS_DIR = ../../../osx/bin/unzip/tmp
+  INCLUDEPATH += ../../curl/include\
+                 ../../ruby/osx
+}
+
+win32 {
+  greaterThan(QT_MINOR_VERSION, 6): {
+      DEFINES += CPP_ELEVEN
+  }
+  DESTDIR = ../../../win32/bin/unzip
+  OBJECTS_DIR = ../../../win32/bin/unzip/tmp
+  DEFINES += WIN32 _WINDOWS _CRT_SECURE_NO_WARNINGS _UNICODE UNICODE WIN32_LEAN_AND_MEAN
+  DEFINES += _XKEYCHECK_H
+
+  Debug {
+    DEFINES += _DEBUG DEBUG
+  }
+  Release {
+    DEFINES += _NDEBUG NDEBUG
+  }
+  INCLUDEPATH += ../../../win32/include\
+                 ../../ruby/win32
+
+    QMAKE_CXXFLAGS_RELEASE += /MP9 /O2
+    QMAKE_CXXFLAGS_DEBUG += /MP9 /O2
+
+    QMAKE_CFLAGS_RELEASE += /O2 /MD
+    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += /O2
+    QMAKE_CFLAGS_DEBUG += /Zi /MDd
+}
+
+unix:!macx {
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+    DESTDIR = $$PWD/../../../linux/bin/unzip
+    OBJECTS_DIR = $$PWD/../../../linux/bin/unzip/tmp
+    INCLUDEPATH += $$PWD/../../curl/include
+    DEFINES += _GNU_SOURCE
+
+    DEFINES += OS_LINUX
+
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2
+}
+
+DEFINES += RHODES_QT_PLATFORM
+
+!isEmpty(RHOSIMULATOR_BUILD) {
+  DEFINES += RHODES_EMULATOR
+}
+
+!win32 {
+  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  # QMAKE_CFLAGS += -fvisibility=hidden
+  # QMAKE_CXXFLAGS += -fvisibility=hidden
+  QMAKE_CFLAGS_DEBUG -= -O2
+  QMAKE_CXXFLAGS_DEBUG -= -O2
+}
+win32 {
+  QMAKE_CFLAGS_WARN_ON += /wd4189 /wd4018 /wd4189 /wd4996
+  QMAKE_CXXFLAGS_WARN_ON += /wd4189 /wd4018 /wd4189 /wd4996
+  QMAKE_CFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += /O2
+}
+
+HEADERS += ../../unzip/zip.h\
+../../unzip/unzip.h\
+../../unzip/gunzip.h\
+../../unzip/crc32.h\
+../../unzip/deflate.h\
+../../unzip/inffast.h\
+../../unzip/inffixed.h\
+../../unzip/inflate.h\
+../../unzip/gzguts.h\
+../../unzip/inftrees.h\
+../../unzip/trees.h\
+../../unzip/unzip.h\
+../../unzip/zconf.h\
+../../unzip/zip.h\
+../../unzip/zlib.h\
+../../unzip/zutil.h
+SOURCES += ../../unzip/unzip.cpp\
+../../unzip/adler32.cpp\
+../../unzip/crc32.cpp\
+../../unzip/deflate.cpp\
+../../unzip/gunzip.cpp\
+../../unzip/gzclose.cpp\
+../../unzip/gzlib.cpp\
+../../unzip/gzread.cpp\
+../../unzip/gzwrite.cpp\
+../../unzip/infback.cpp\
+../../unzip/inffast.cpp\
+../../unzip/inflate.cpp\
+../../unzip/inftrees.cpp\
+../../unzip/trees.cpp\
+../../unzip/unzip.cpp\
+../../unzip/zip.cpp\
+../../unzip/zutil.cpp

data/platform/shared/rhoruby/impl/RhoRubyImpl.cpp

@@ -117,7 +117,7 @@ namespace ruby {
 
     void RhoRubyImpl::init()
     {
-        rho::common::CRhodesApp::getInstance()->registerLocalServerUrl(RHOLIB_LOCAL_SERVER_URL, rholib_local_server_callback_func);
+        /*
         if(lateInit)
         {
 
@@ -131,10 +131,7 @@ namespace ruby {
                 LateInit() {}
                 void run() override
                 {
-                    rb_api_mParent = rb_define_module("Rho");
-                    rb_api_mRubyNative = rb_define_class_under(rb_api_mParent, "Ruby", rb_cObject);
-                    rb_define_alloc_func(rb_api_mRubyNative, _allocate_class_object);
-                    rb_define_singleton_method(rb_api_mRubyNative, "callNativeCallback", (ruby_method_func_type)c_rb_Rho_Ruby_callNativeCallback, -1);
+                    initRhoRuby_fromRubyThread();
                     lateWaiter.notify_one();
                 }
             } late_init;
@@ -143,27 +140,21 @@ namespace ruby {
             executeInRubyThread(&late_init);
             late_init.lateWaiter.wait(lock);
         }
+        */
     }
 
 
     RhoRubyImpl::RhoRubyImpl(bool _lateInit) : lateInit(_lateInit) {
         // register Rho::Ruby.callNativeCallback(callback_id, param)
 
+        /*
         if(!_lateInit)
         {
-            rb_api_mParent = rb_define_module("Rho");
-
-            rb_api_mRubyNative = rb_define_class_under(rb_api_mParent, "Ruby", rb_cObject);
-
-            rb_define_alloc_func(rb_api_mRubyNative, _allocate_class_object);
+            initRhoRuby_fromRubyThread();
 
-            rb_define_singleton_method(rb_api_mRubyNative, "callNativeCallback", (ruby_method_func_type)c_rb_Rho_Ruby_callNativeCallback, -1);
-
-
-            rho::common::CRhodesApp::getInstance()->registerLocalServerUrl(RHOLIB_LOCAL_SERVER_URL, rholib_local_server_callback_func);
         }
-        
-        
+        */
+
     }
     
     void RhoRubyImpl::rholib_local_server_callback() {
@@ -792,8 +783,22 @@ namespace ruby {
         return rho_ruby_get_NIL();
     }
 
-    
-    
-    
+    void RhoRubyImpl::initRhoRuby_fromRubyThread() {
+        rho::common::CRhodesApp::getInstance()->registerLocalServerUrl(RHOLIB_LOCAL_SERVER_URL, rholib_local_server_callback_func);
+
+        rb_api_mParent = rb_define_module("Rho");
+        rb_api_mRubyNative = rb_define_class_under(rb_api_mParent, "Ruby", rb_cObject);
+        rb_define_alloc_func(rb_api_mRubyNative, _allocate_class_object);
+        rb_define_singleton_method(rb_api_mRubyNative, "callNativeCallback", (ruby_method_func_type)c_rb_Rho_Ruby_callNativeCallback, -1);
+    }
+
+
+
+}
 }
+
+
+extern "C" void InitRhoRuby_fromRubyThread() {
+    rho::ruby::RhoRubyImpl* rr = (rho::ruby::RhoRubyImpl*)(rho::ruby::RhoRubySingletone::getRhoRuby());
+    rr->initRhoRuby_fromRubyThread();
 }

data/platform/shared/rhoruby/impl/RhoRubyImpl.h

@@ -64,6 +64,8 @@ public:
     VALUE rb_Rho_Ruby_callNativeCallback(int argc, VALUE *argv);
     void rholib_local_server_callback();
 
+    void initRhoRuby_fromRubyThread();
+
 private:
     IObject* convertJSON_to_Object(json::CJSONEntry* json_entry);
     
@@ -79,3 +81,6 @@ private:
 
 }
 }
+
+// function called from Rhodes code - after ruby and local server was created and initialized
+extern "C" void InitRhoRuby_fromRubyThread();

data/platform/shared/ruby/CMakeLists.txt.erb

@@ -7,135 +7,7 @@ add_definitions(-DRUBY_EXPORT -DOS_ANDROID)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-uninitialized -Wno-missing-field-initializers -Wno-shadow -Wno-format-security")
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/ruby/array.c
-<%= @rhoRoot %>/platform/shared/ruby/bignum.c
-<%= @rhoRoot %>/platform/shared/ruby/class.c
-<%= @rhoRoot %>/platform/shared/ruby/compar.c
-<%= @rhoRoot %>/platform/shared/ruby/compile.c
-<%= @rhoRoot %>/platform/shared/ruby/complex.c
-<%= @rhoRoot %>/platform/shared/ruby/cont.c
-<%= @rhoRoot %>/platform/shared/ruby/debug.c
-<%= @rhoRoot %>/platform/shared/ruby/dir.c
-<%= @rhoRoot %>/platform/shared/ruby/dln.c
-<%= @rhoRoot %>/platform/shared/ruby/dln_find.c
-<%= @rhoRoot %>/platform/shared/ruby/dmyencoding.c
-<%= @rhoRoot %>/platform/shared/ruby/dmyext.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/ascii.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/unicode.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/us_ascii.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/utf_8.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/encdb.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/iso_8859_1.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/iso_8859_9.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/utf_16be.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/utf_16le.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/utf_32be.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/utf_32le.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/euc_jp.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/windows_31j.c
-<%= @rhoRoot %>/platform/shared/ruby/enum.c
-<%= @rhoRoot %>/platform/shared/ruby/enumerator.c
-<%= @rhoRoot %>/platform/shared/ruby/error.c
-<%= @rhoRoot %>/platform/shared/ruby/eval.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/calendar/calendar_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/calendar/event_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/geolocation/geolocation_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/mapview/mapview_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/nativebar/nativebar_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/navbar/navbar_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/phonebook/phonebook_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/rho/extensions.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/rho/rhoruby.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/rho/rhosupport.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/ringtones/ringtones_wrap.c
-<%= @rhoRoot %>/platform/shared/ruby/file.c
-<%= @rhoRoot %>/platform/shared/ruby/gc.c
-<%= @rhoRoot %>/platform/shared/ruby/parse.c
-<%= @rhoRoot %>/platform/shared/ruby/hash.c
-<%= @rhoRoot %>/platform/shared/ruby/inits.c
-<%= @rhoRoot %>/platform/shared/ruby/io.c
-<%= @rhoRoot %>/platform/shared/ruby/iseq.c
-<%= @rhoRoot %>/platform/shared/ruby/load.c
-<%= @rhoRoot %>/platform/shared/ruby/loadpath.c
-<%= @rhoRoot %>/platform/shared/ruby/localeinit.c
-<%= @rhoRoot %>/platform/shared/ruby/marshal.c
-<%= @rhoRoot %>/platform/shared/ruby/math.c
-<%= @rhoRoot %>/platform/shared/ruby/prelude.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/acosh.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/cbrt.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/crypt.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/dup2.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/erf.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/explicit_bzero.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/hypot.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/lgamma_r.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/setproctitle.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/stdlib.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/strlcat.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/strlcpy.c
-<%= @rhoRoot %>/platform/shared/ruby/missing/tgamma.c
-<%= @rhoRoot %>/platform/shared/ruby/newline.c
-<%= @rhoRoot %>/platform/shared/ruby/node.c
-<%= @rhoRoot %>/platform/shared/ruby/numeric.c
-<%= @rhoRoot %>/platform/shared/ruby/object.c
-<%= @rhoRoot %>/platform/shared/ruby/pack.c
-<%= @rhoRoot %>/platform/shared/ruby/proc.c
-<%= @rhoRoot %>/platform/shared/ruby/process.c
-<%= @rhoRoot %>/platform/shared/ruby/random.c
-<%= @rhoRoot %>/platform/shared/ruby/range.c
-<%= @rhoRoot %>/platform/shared/ruby/rational.c
-<%= @rhoRoot %>/platform/shared/ruby/re.c
-<%= @rhoRoot %>/platform/shared/ruby/regcomp.c
-<%= @rhoRoot %>/platform/shared/ruby/regenc.c
-<%= @rhoRoot %>/platform/shared/ruby/regerror.c
-<%= @rhoRoot %>/platform/shared/ruby/regexec.c
-<%= @rhoRoot %>/platform/shared/ruby/regparse.c
-<%= @rhoRoot %>/platform/shared/ruby/regsyntax.c
-<%= @rhoRoot %>/platform/shared/ruby/ruby.c
-<%= @rhoRoot %>/platform/shared/ruby/safe.c
-<%= @rhoRoot %>/platform/shared/ruby/signal.c
-<%= @rhoRoot %>/platform/shared/ruby/sprintf.c
-<%= @rhoRoot %>/platform/shared/ruby/st.c
-<%= @rhoRoot %>/platform/shared/ruby/strftime.c
-<%= @rhoRoot %>/platform/shared/ruby/string.c
-<%= @rhoRoot %>/platform/shared/ruby/struct.c
-<%= @rhoRoot %>/platform/shared/ruby/symbol.c
-<%= @rhoRoot %>/platform/shared/ruby/thread.c
-<%= @rhoRoot %>/platform/shared/ruby/time.c
-<%= @rhoRoot %>/platform/shared/ruby/transcode.c
-<%= @rhoRoot %>/platform/shared/ruby/util.c
-<%= @rhoRoot %>/platform/shared/ruby/variable.c
-<%= @rhoRoot %>/platform/shared/ruby/version.c
-<%= @rhoRoot %>/platform/shared/ruby/vm.c
-<%= @rhoRoot %>/platform/shared/ruby/vm_backtrace.c
-<%= @rhoRoot %>/platform/shared/ruby/vm_dump.c
-<%= @rhoRoot %>/platform/shared/ruby/vm_trace.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/strscan/strscan.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/stringio/stringio.c
-<%= @rhoRoot %>/platform/shared/ruby/rhoinit.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/ancdata.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/basicsocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/constants.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/ifaddr.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/init.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/ipsocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/option.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/raddrinfo.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/socket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/sockssocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/tcpserver.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/tcpsocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/udpsocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/unixserver.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/socket/unixsocket.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/io/nonblock/nonblock.c
-<%= @rhoRoot %>/platform/shared/ruby/ext/io/wait/wait.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/trans/utf_16_32.c
-<%= @rhoRoot %>/platform/shared/ruby/enc/trans/single_byte.c
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared/ruby/include)

data/platform/shared/ruby/dln_find.c

@@ -83,7 +83,7 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
 
     if (!path) {
 	path = getenv(PATH_ENV);
-	if (path) path = envpath = fpstrdup(path);
+	if (path) path = envpath = strdup(path);
     }
 
     if (!path) {

data/platform/shared/ruby/error.c

@@ -472,7 +472,7 @@ rb_bug_errno(const char *mesg, int errno_arg)
  * this is safe to call inside signal handler and timer thread
  * (which isn't a Ruby Thread object)
  */
-#define write_or_abort(fd, str, len) (fpwrite((fd), (str), (len)) < 0 ? abort() : (void)0)
+#define write_or_abort(fd, str, len) (write((fd), (str), (len)) < 0 ? abort() : (void)0)
 #define WRITE_CONST(fd,str) write_or_abort((fd),(str),sizeof(str) - 1)
 
 void