rhodes 3.0.2 → 3.1.0.beta.1

data/platform/shared/ruby/gc.c

@@ -61,6 +61,10 @@ static VALUE gc_profile_result(void);
 
 int rb_io_fptr_finalize(struct rb_io_t*);
 
+#ifdef _DEBUG
+extern void rhoGCReport(VALUE valReport);
+#endif
+
 #define rb_setjmp(env) RUBY_SETJMP(env)
 #define rb_jmp_buf rb_jmpbuf_t
 

data/platform/shared/ruby/hash.c

@@ -14,6 +14,7 @@
 #include "ruby/ruby.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
+#include "common/RhoDefs.h"
 
 #ifdef __APPLE__
 #include <crt_externs.h>
@@ -1801,8 +1802,10 @@ rb_hash_compare_by_id_p(VALUE hash)
 static int path_tainted = -1;
 //RHO
 //static char **origenviron;
+#if !defined(RHO_SYMBIAN) || defined(OS_SYMBIAN)
 static char * __environ = "";
 static char ** environ = &__environ;
+#endif
 #ifdef _WIN32
 #define GET_ENVIRON(e) ""//(e = rb_w32_get_environ())
 #define FREE_ENVIRON(e) //rb_w32_free_environ(e)

data/platform/shared/ruby/include/ruby/defines.h

@@ -17,6 +17,25 @@ extern "C" {
 #endif
 #endif
 
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+
+#include <net/socket.h>
+/* intern.h needs fd_set definition */
+
+#elif defined (__SYMBIAN32__) && defined (HAVE_SYS_SELECT_H)
+
+#include <sys/select.h>
+
+#endif
+
+#ifdef __SYMBIAN32__
+
+#define FALSE 0
+
+#define TRUE 1
+
+#endif
+
 #define RUBY
 
 #include <stdlib.h>
@@ -188,7 +207,7 @@ void xfree(void*);
 #endif /* __APPLE__ */
 #endif /* NeXT */
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #include "ruby/win32.h"
 #endif
 

data/platform/shared/ruby/include/ruby/intern.h

@@ -782,6 +782,8 @@ VALUE rb_time_succ(VALUE);
 void rb_frame_pop(void);
 int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
 
+VALUE rb_str_chop_bang(VALUE str);
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/platform/shared/ruby/include/ruby/ruby.h

@@ -114,6 +114,7 @@ typedef unsigned LONG_LONG ID;
 #define PRIxPTRDIFF PRI_PTRDIFF_PREFIX"x"
 #define PRIXPTRDIFF PRI_PTRDIFF_PREFIX"X"
 
+# define PRI_SIZE_PREFIX
 #if SIZEOF_SIZE_T == SIZEOF_INT
 # define PRI_SIZE_PREFIX
 #elif SIZEOF_SIZE_T == SIZEOF_LONG
@@ -461,16 +462,18 @@ VALUE rb_int2big(SIGNED_VALUE);
 static inline VALUE
 INT2NUM(int v)
 {
-    if (!FIXABLE(v))
-	return rb_int2big(v);
+    long vv = v;
+    if (!FIXABLE(vv))
+        return rb_int2big(v);
     return INT2FIX(v);
 }
 
 static inline VALUE
 UINT2NUM(unsigned int v)
 {
-    if (!POSFIXABLE(v))
-	return rb_uint2big(v);
+    unsigned long vv = v;
+    if (!POSFIXABLE(vv))
+        return rb_uint2big(v);
     return LONG2FIX(v);
 }
 #endif

data/platform/shared/ruby/io.c

@@ -4485,13 +4485,14 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
     VALUE port;
     rb_io_t *write_fptr;
     VALUE write_port;
+    struct rb_exec_arg sarg;
 #if defined(HAVE_FORK)
     int status;
     struct popen_arg arg;
 #elif defined(_WIN32)
     volatile VALUE argbuf;
     char **args = NULL;
-    struct rb_exec_arg sarg;
+    //struct rb_exec_arg sarg;
     int pair[2], write_pair[2];
 #endif
     FILE *fp = 0;

data/platform/shared/ruby/iphone/ruby/config.h

@@ -51,7 +51,9 @@
 #define NOINLINE(x) __attribute__ ((noinline)) x
 #define FUNC_STDCALL(x) __attribute__ ((stdcall)) x
 #define FUNC_CDECL(x) __attribute__ ((cdecl)) x
+#if !defined(__IA64__) && !defined(__x86_64__)
 #define FUNC_FASTCALL(x) __attribute__ ((fastcall)) x
+#endif
 #define RUBY_ALIAS_FUNCTION(old_prot, new_name, args) VALUE old_prot {return new_name args;}
 #define HAVE_DECL_SYS_NERR 1
 #define BROKEN_CRYPT 1

data/platform/shared/ruby/missing/dup2.c

@@ -12,6 +12,7 @@
  */
 
 #include "ruby/config.h"
+#include "ruby/defines.h"
 
 #if defined(HAVE_FCNTL)
 # include <fcntl.h>

data/platform/shared/ruby/signal.c

@@ -409,7 +409,7 @@ static struct {
 #endif
 
 typedef RETSIGTYPE (*sighandler_t)(int);
-#ifdef SA_SIGINFO
+#if defined SA_SIGINFO && !defined __SYMBIAN32__
 typedef void ruby_sigaction_t(int, siginfo_t*, void*);
 #define SIGINFO_ARG , siginfo_t *info, void *ctx
 #else
@@ -458,7 +458,7 @@ ruby_signal(int signum, sighandler_t handler)
 #endif
 
     sigemptyset(&sigact.sa_mask);
-#ifdef SA_SIGINFO
+#if defined SA_SIGINFO && !defined __SYMBIAN32__
     sigact.sa_sigaction = (ruby_sigaction_t*)handler;
     sigact.sa_flags = SA_SIGINFO;
 #else
@@ -476,7 +476,7 @@ ruby_signal(int signum, sighandler_t handler)
 #endif
     if (sigaction(signum, &sigact, &old) < 0) {
 	if (errno != 0 && errno != EINVAL) {
-	    rb_bug("sigaction error.\n");
+            rb_bug("sigaction error.\n");
 	}
     }
     return old.sa_handler;
@@ -534,7 +534,7 @@ static int trap_last_mask;
 void
 rb_disable_interrupt(void)
 {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__SYMBIAN32__)
     sigset_t mask;
     sigfillset(&mask);
     sigdelset(&mask, SIGVTALRM);
@@ -546,7 +546,7 @@ rb_disable_interrupt(void)
 void
 rb_enable_interrupt(void)
 {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__SYMBIAN32__)
     sigset_t mask;
     sigemptyset(&mask);
     pthread_sigmask(SIG_SETMASK, &mask, NULL);

data/platform/shared/ruby/symbian/assert.h

@@ -1,14 +1,14 @@
 #ifndef _ASSERT_H_
 #define _ASSERT_H_
 
-#ifdef  NDEBUG
+#if defined( NDEBUG ) || !defined( DEBUG )
 
 #define assert(_Expression)     ((void)0)
 
 #else
 
 //void assert( int expression );
-#include "logging/RhoPlainLog.h"
+//#include "logging/RhoPlainLog.h"
 
 #define assert(exp) RHO_ASSERT(exp)
 

data/platform/shared/ruby/symbian/ruby/config.h

@@ -1,3 +1,8 @@
+#define close _symbian_close
+#define fclose _symbian_fclose
+#if defined(WIN32)
+#include "../../win32/ruby/config.h"
+#else
 #pragma c99 on
 #pragma enumsalwaysint on
 #pragma warn_unusedvar off
@@ -11,6 +16,9 @@
 #pragma warn_illegal_instructions off
 #pragma suppress_warnings on 
 
+#define HAVE_INET_NTOP 1
+#define HAVE_INET_PTON 1
+#define HAVE_GAI_STRERROR 1
 #define PACKAGE_NAME ""
 #define PACKAGE_TARNAME ""
 #define PACKAGE_VERSION ""
@@ -163,7 +171,7 @@
 #define HAVE_TM_ZONE 1
 #define HAVE_STRUCT_TM_TM_GMTOFF 1
 #define NEGATIVE_TIME_T 1
-#define POSIX_SIGNAL 1
+//#define POSIX_SIGNAL 1
 #define RSHIFT(x,y) ((x)>>(int)y)
 #define FILE_COUNT _r
 #define FILE_READPTR _p
@@ -177,8 +185,8 @@
 #define DLEXT_MAXLEN 3
 #define DLEXT ".so"
 #define RUBY_LIB "/lib"
-#define RUBY_SITE_LIB "/lib"
-#define RUBY_SITE_LIB2 "/lib"
+#define RUBY_SITE_LIB "/apps"
+#define RUBY_SITE_LIB2 "/apps/app"
 #define RUBY_VENDOR_LIB "/lib"
 #define RUBY_VENDOR_LIB2 "/lib"
 #define RUBY_PLATFORM "arm-symbianelf"
@@ -197,8 +205,10 @@
 
 #ifdef __GCCE__
 #include <glib/galloca.h>
+#include <select.h>
 #undef FALSE
 #undef TRUE
 #endif //__GCCE32__
 
 #include "tcmalloc/rhomem.h"
+#endif

data/platform/shared/ruby/symbian/symbian.h

@@ -3,8 +3,8 @@
 
 #include <sys/types.h>
 
-#define close _symbian_close
-#define fclose _symbian_fclose
+//#define close _symbian_close
+//#define fclose _symbian_fclose
 #define Sleep sleep
 
 extern void* alloca ( unsigned int size);// defined in ext/alloca

data/platform/shared/ruby/thread_pthread.c

@@ -765,7 +765,7 @@ thread_timer(void *dummy)
 	}
 	else rb_bug("thread_timer/timedwait: %d", err);
 
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__SYMBIAN32__)
 	if (signal_thread_list_anchor.next) {
 	    FGLOCK(&signal_thread_list_lock, {
 		struct signal_thread_list *list;

data/platform/shared/ruby/win32/assert.h

@@ -1,7 +1,33 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef _ASSERT_H_
 #define _ASSERT_H_
 
-#ifdef  NDEBUG
+#if defined( NDEBUG ) || !defined( DEBUG )
 
 #define assert(_Expression)     ((void)0)
 

data/platform/shared/rubyext/GeoLocation.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "GeoLocation.h"
 #include "common/RhodesApp.h"
 #include "common/RhoMutexLock.h"

data/platform/shared/rubyext/GeoLocation.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef _RHOGEOLOCATION_H_
 #define _RHOGEOLOCATION_H_
 

data/platform/shared/rubyext/NativeToolbarExt.h

@@ -0,0 +1,35 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#ifndef _NATIVETOOLBAREXT_H_
+#define _NATIVETOOLBAREXT_H_
+
+#define TOOLBAR_TYPE		0
+#define TABBAR_TYPE			1
+#define NOBAR_TYPE			2
+#define VTABBAR_TYPE		3
+
+#endif //_NATIVETOOLBAREXT_H_

data/platform/shared/rubyext/RhoAppAdapter.cpp

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "common/RhoAppAdapter.h"
 #include "sync/SyncThread.h"
 #include "ruby/ext/rho/rhoruby.h"

data/platform/shared/rubyext/System.cpp

@@ -1,7 +1,34 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "common/RhoPort.h"
 #include "ruby/ext/rho/rhoruby.h"
 #include "sync/ClientRegister.h"
 #include "common/RhodesApp.h"
+#include "common/RhoConf.h"
 #include "logging/RhoLog.h"
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhoSystem"
@@ -13,6 +40,24 @@ extern VALUE rho_sys_has_network();
 extern VALUE rho_sys_get_locale();
 extern int rho_sys_get_screen_width();
 extern int rho_sys_get_screen_height();
+#ifdef RHODES_EMULATOR
+int rho_simimpl_get_property(char* szPropName, VALUE* resValue)
+{
+	if (strcasecmp("os_version",szPropName) == 0)
+	{
+        *resValue = rho_ruby_create_string( RHOSIMCONF().getString("os_version").c_str());
+		return 1;
+	}
+
+	if (strcasecmp("is_emulator",szPropName) == 0)
+    {
+        *resValue = rho_ruby_create_boolean(1);
+        return 1;
+    }
+
+    return 0;
+}
+#endif
 
 VALUE rho_sys_get_property(char* szPropName) 
 {
@@ -20,6 +65,11 @@ VALUE rho_sys_get_property(char* szPropName)
         return rho_ruby_get_NIL();
     
     VALUE res;
+#ifdef RHODES_EMULATOR
+    if (rho_simimpl_get_property(szPropName, &res))
+        return res;
+#endif
+
     if (rho_sysimpl_get_property(szPropName, &res))
         return res;
 
@@ -47,6 +97,9 @@ VALUE rho_sys_get_property(char* szPropName)
         return rho_ruby_create_string(strDeviceID.c_str());
     }
 
+    if (strcasecmp("phone_id", szPropName) == 0)
+        return rho_ruby_create_string(""); 
+
 	if (strcasecmp("full_browser",szPropName) == 0) 
         return rho_ruby_create_boolean(1);
 
@@ -90,7 +143,7 @@ void rho_sys_unzip_file(const char *url)
     rho_unzip_file(url);
 }
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_LINUX)
   // implemented in platform code
 #else
 int rho_sys_set_sleeping(int sleeping)