rhodes 3.2.3 → 3.3.0.beta.1

data/lib/extensions/fcntl/ext/build

@@ -1,4 +1,12 @@
 #!/bin/sh
 
-rake
+if [ "$RHO_PLATFORM" = "iphone" ]; then
 
+cd iphone
+rake --trace
+
+else
+
+rake --trace
+
+fi

data/lib/extensions/fcntl/ext/iphone/Fcntl.xcodeproj/project.pbxproj

@@ -0,0 +1,262 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		FA64197214A253B6001BDDEC /* fcntl.c in Sources */ = {isa = PBXBuildFile; fileRef = FA64197114A253B6001BDDEC /* fcntl.c */; };
+		FAC155E7145855CF0016F3BD /* Fcntl_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = FAD45FD51225FED600141873 /* Fcntl_Prefix.pch */; };
+		FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
+		FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD4602C12260A8500141873 /* UIKit.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		FA64197114A253B6001BDDEC /* fcntl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fcntl.c; path = ../fcntl.c; sourceTree = "<group>"; };
+		FAC155F3145855CF0016F3BD /* libFcntl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFcntl.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		FAD45FD51225FED600141873 /* Fcntl_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fcntl_Prefix.pch; sourceTree = "<group>"; };
+		FAD4602C12260A8500141873 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		FAC155ED145855CF0016F3BD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */,
+				FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DFFF38A50411DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				FAC155F3145855CF0016F3BD /* libFcntl.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* Barcode */ = {
+			isa = PBXGroup;
+			children = (
+				08FB77AEFE84172EC02AAC07 /* Classes */,
+				32C88DFF0371C24200C91783 /* Other Sources */,
+				0867D69AFE84028FC02AAC07 /* Frameworks */,
+				034768DFFF38A50411DB9C8B /* Products */,
+			);
+			name = Barcode;
+			sourceTree = "<group>";
+		};
+		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
+				FAD4602C12260A8500141873 /* UIKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		08FB77AEFE84172EC02AAC07 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				FA64197114A253B6001BDDEC /* fcntl.c */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		32C88DFF0371C24200C91783 /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				FAD45FD51225FED600141873 /* Fcntl_Prefix.pch */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		FAC155E6145855CF0016F3BD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FAC155E7145855CF0016F3BD /* Fcntl_Prefix.pch in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		FAC155E5145855CF0016F3BD /* Fcntl */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FAC155F0145855CF0016F3BD /* Build configuration list for PBXNativeTarget "Fcntl" */;
+			buildPhases = (
+				FAC155E6145855CF0016F3BD /* Headers */,
+				FAC155E9145855CF0016F3BD /* Sources */,
+				FAC155ED145855CF0016F3BD /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Fcntl;
+			productName = Barcode;
+			productReference = FAC155F3145855CF0016F3BD /* libFcntl.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Fcntl" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 0867D691FE84028FC02AAC07 /* Barcode */;
+			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				FAC155E5145855CF0016F3BD /* Fcntl */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		FAC155E9145855CF0016F3BD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FA64197214A253B6001BDDEC /* fcntl.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		1DEB922308733DC00010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(RHO_ROOT)/platform/shared/common",
+					"$(RHO_ROOT)/platform/shared/rubyext",
+					"$(RHO_ROOT)/platform/shared/ruby/include",
+					"$(RHO_ROOT)/platform/shared/ruby/iphone",
+					"$(RHO_ROOT)/platform/shared",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				ONLY_ACTIVE_ARCH = NO;
+				PREBINDING = NO;
+				SDKROOT = iphonesimulator4.1;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
+			};
+			name = Debug;
+		};
+		1DEB922408733DC00010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(RHO_ROOT)/platform/shared/common",
+					"$(RHO_ROOT)/platform/shared/rubyext",
+					"$(RHO_ROOT)/platform/shared/ruby/include",
+					"$(RHO_ROOT)/platform/shared/ruby/iphone",
+					"$(RHO_ROOT)/platform/shared",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				ONLY_ACTIVE_ARCH = NO;
+				PREBINDING = NO;
+				SDKROOT = iphonesimulator4.1;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
+			};
+			name = Release;
+		};
+		FAC155F1145855CF0016F3BD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv7,
+					armv6,
+				);
+				COPY_PHASE_STRIP = NO;
+				DSTROOT = /tmp/Fcntl.dst;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = Fcntl_Prefix.pch;
+				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				PRODUCT_NAME = Fcntl;
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 armv6 armv7";
+			};
+			name = Debug;
+		};
+		FAC155F2145855CF0016F3BD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv7,
+					armv6,
+				);
+				DSTROOT = /tmp/Fcntl.dst;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = Fcntl_Prefix.pch;
+				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				PRODUCT_NAME = Fcntl;
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 armv6 armv7";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Fcntl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB922308733DC00010E9CD /* Debug */,
+				1DEB922408733DC00010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		FAC155F0145855CF0016F3BD /* Build configuration list for PBXNativeTarget "Fcntl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FAC155F1145855CF0016F3BD /* Debug */,
+				FAC155F2145855CF0016F3BD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}

data/lib/extensions/fcntl/ext/iphone/Fcntl_Prefix.pch

@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'CocoaTouchStaticLibrary' target in the 'CocoaTouchStaticLibrary' project.
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif

data/lib/extensions/fcntl/ext/iphone/Rakefile

@@ -0,0 +1,79 @@
+require 'fileutils'
+
+USE_STLPORT = true
+
+puts "Fcntl extension !"
+
+namespace "build" do
+
+  task :config do
+
+    $targetdir = ENV['TARGET_TEMP_DIR']
+    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
+
+    $tempdir = ENV['TEMP_FILES_DIR']
+    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
+
+    $rootdir = ENV['RHO_ROOT']
+    raise "RHO_ROOT is not set" if $rootdir.nil?
+
+    $xcodebuild = ENV['XCODEBUILD']	
+    raise "XCODEBUILD is not set" if $xcodebuild.nil?
+ 
+    $configuration = ENV['CONFIGURATION']	
+    raise "CONFIGURATION is not set" if $configuration.nil?
+
+    $sdk = ENV['SDK_NAME']	
+    raise "SDK_NAME is not set" if $sdk.nil?
+
+    $bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
+    raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
+    
+    $sdkroot = ENV['SDKROOT']
+    raise "SDKROOT is not set" if $sdkroot.nil?
+
+    $arch = ENV['ARCHS']
+    raise "ARCHS is not set" if $arch.nil?
+    
+    $gccbin = $bindir + '/gcc-4.2'
+    $arbin = $bindir + '/ar'
+
+  end
+
+  task :all => :config do
+
+    iphone_path = '.'
+
+    simulator = $sdk =~ /iphonesimulator/
+
+    if $configuration == 'Distribution'
+       $configuration = 'Release'
+    end
+
+    result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libFcntl.a'
+    target_lib = $targetdir + '/libfcntl.a'
+
+    rm_rf 'build'
+    rm_rf target_lib
+
+    args = ['build', '-target', 'Fcntl', '-configuration', $configuration, '-sdk', $sdk]
+
+    if simulator
+        args << '-arch'
+        args << 'i386'
+    end
+
+    require   $rootdir + '/lib/build/jake.rb'
+
+    puts Jake.run($xcodebuild,args)
+    ret = $?
+
+    # copy result to $targetdir
+    cp result_lib,target_lib
+
+  end
+
+
+end
+
+task :default => "build:all"

data/lib/extensions/net-http/net/http.rb

@@ -628,9 +628,9 @@ module Net   #:nodoc:
         iv_list = instance_variables
         SSL_ATTRIBUTES.each do |name|
           ivname = "@#{name}".intern
-          if iv_list.include?(ivname) and
-             value = instance_variable_get(ivname)
-            ssl_parameters[name] = value
+          if iv_list.include?(ivname)
+	   
+            ssl_parameters[name] = value if value = instance_variable_get(ivname)
           end
         end
         if platform != 'Blackberry'
@@ -659,10 +659,12 @@ module Net   #:nodoc:
             @socket.writeline ''
             HTTPResponse.read_new(@socket).value
           end
-          timeout(@open_timeout) { s.connect }
-          if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-            s.post_connection_check(@address)
-          end
+	  if platform != 'Blackberry'
+            timeout(@open_timeout) { s.connect }
+            if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+              s.post_connection_check(@address)
+            end
+	  end   
         rescue => exception
           D "Conn close because of connect error #{exception}"
           @socket.close if @socket and not @socket.closed?

data/lib/extensions/nfc/ext/nfc/shared/ruby/nfc_wrap.c

@@ -985,6 +985,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
 #endif
 
+#define _mSWIG_defined
 static VALUE _mSWIG = Qnil;
 
 /* -----------------------------------------------------------------------------
@@ -1000,26 +1001,27 @@ static VALUE _mSWIG = Qnil;
    exceptions.  Note this only works for C++ since a global cannot be
    initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
 
+#define SWIG_rb_eNullReferenceError_defined
+static VALUE SWIG_rb_eNullReferenceError  = Qnil;
+
+
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
-  static int init = 0;
-  static VALUE rb_eNullReferenceError ;
-  if (!init) {
-    init = 1;
-    rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
+  if (SWIG_rb_eNullReferenceError == Qnil) {
+      SWIG_rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
   }
-  return rb_eNullReferenceError;
+  return SWIG_rb_eNullReferenceError;
 } 
 
+#define SWIG_rb_eObjectPreviouslyDeleted_defined
+static  VALUE SWIG_rb_eObjectPreviouslyDeleted = Qnil;
+
 SWIGINTERN VALUE 
 getObjectPreviouslyDeletedError(void) {
-  static int init = 0;
-  static VALUE rb_eObjectPreviouslyDeleted ;
-  if (!init) {
-    init = 1;
-    rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
+  if (SWIG_rb_eObjectPreviouslyDeleted == Qnil) {
+      SWIG_rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
   }
-  return rb_eObjectPreviouslyDeleted;
+  return SWIG_rb_eObjectPreviouslyDeleted;
 } 
 
 
@@ -1170,11 +1172,13 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
+#define swig_ruby_trackings_defined
 static VALUE swig_ruby_trackings = Qnil;
 
 /* Global variable that stores a reference to the ruby
    hash table delete function. */
-static ID swig_ruby_hash_delete;
+#define swig_ruby_hash_delete_defined
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
@@ -1413,11 +1417,17 @@ typedef struct {
 
 
 /* Global pointer used to keep some internal SWIG stuff */
+#define _cSWIG_Pointer_defined
 static VALUE _cSWIG_Pointer = Qnil;
+
+#define swig_runtime_data_type_pointer_defined
 static VALUE swig_runtime_data_type_pointer = Qnil;
 
 /* Global IDs used to keep some internal SWIG stuff */
+#define swig_arity_id_defined
 static ID swig_arity_id = 0;
+
+#define swig_call_id_defined
 static ID swig_call_id  = 0;
 
 /*
@@ -1438,7 +1448,8 @@ static ID swig_call_id  = 0;
 #  define Ruby_DirectorTypeMismatchException(x) \
           rb_raise( rb_eTypeError, "%s", x ); return c_result;
 
-      static unsigned int swig_virtual_calls = 0;
+#define swig_virtual_calls_defined
+static unsigned int swig_virtual_calls = 0;
 
 #else  /* normal non-embedded extension */
 
@@ -1452,12 +1463,12 @@ static ID swig_call_id  = 0;
 
 SWIGRUNTIME VALUE 
 getExceptionClass(void) {
-  static int init = 0;
+  //static int init = 0;
   static VALUE rubyExceptionClass ;
-  if (!init) {
-    init = 1;
+  //if (!init) {
+    //init = 1;
     rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
-  }
+  //}
   return rubyExceptionClass;
 } 
 
@@ -1479,11 +1490,11 @@ SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) {
 SWIGRUNTIME void
 SWIG_Ruby_InitRuntime(void)
 {
-  if (_mSWIG == Qnil) {
+  //if (_mSWIG == Qnil) {
     _mSWIG = rb_define_module("SWIG");
     swig_call_id  = rb_intern("call");
     swig_arity_id = rb_intern("arity");
-  }
+  //}
 }
 
 /* Define Ruby class for C type */
@@ -3398,6 +3409,39 @@ SWIG_InitializeModule(void *clientdata) {
   int found, init;
 
   clientdata = clientdata;
+  
+  // clear static variables for support reinitialization
+  #ifdef SWIG_rb_eNullReferenceError_defined
+    SWIG_rb_eNullReferenceError  = Qnil;
+  #endif
+  #ifdef SWIG_rb_eObjectPreviouslyDeleted_defined
+    SWIG_rb_eObjectPreviouslyDeleted = Qnil;
+  #endif
+  //#ifdef _mSWIG_defined
+  //  _mSWIG = Qnil;
+  //#endif
+  #ifdef _cSWIG_Pointer_defined
+    _cSWIG_Pointer = Qnil;
+  #endif
+  #ifdef swig_runtime_data_type_pointer_defined
+    swig_runtime_data_type_pointer = Qnil;
+  #endif
+  #ifdef swig_arity_id_defined
+    swig_arity_id = 0;
+  #endif
+  #ifdef swig_call_id_defined
+    swig_call_id  = 0;
+  #endif 
+  #ifdef swig_virtual_calls_defined
+    swig_virtual_calls = 0;
+  #endif
+  #ifdef swig_ruby_trackings_defined
+    swig_ruby_trackings = Qnil;
+  #endif
+  #ifdef swig_ruby_hash_delete_defined
+    swig_ruby_hash_delete = 0;
+  #endif
+  
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {