rhodes 2.3.0 → 2.3.1.beta.1

data/platform/wm/rhodes/rhodes.vcproj

@@ -413,7 +413,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -435,8 +435,9 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="false"
+				TargetEnvironment="1"
 				GenerateStublessProxies="true"
 				TypeLibraryName="$(IntDir)/Rhodes.tlb"
 				HeaderFileName="Rhodes.h"
@@ -447,11 +448,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="2"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;DEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -460,7 +461,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
+				PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -474,16 +475,14 @@
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
 				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib bthutil.lib"
-				OutputFile="$(OutDir)/rhodes.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(OutDir)"
+				OutputFile="$(OutDir)/Rhodes.exe"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -510,7 +509,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -543,9 +542,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="2"
 				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
-				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -568,25 +568,22 @@
 				RegisterOutput="false"
 				IgnoreImportLibrary="true"
 				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="wininet.lib comsuppwd.lib ws2_32.lib Crypt32.lib gdiplus.lib"
+				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
+				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib bthutil.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -594,20 +591,22 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+			Name="Release|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -640,10 +639,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
+				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -666,20 +664,25 @@
 				RegisterOutput="false"
 				IgnoreImportLibrary="true"
 				UseUnicodeResponseFiles="false"
-				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
-				AdditionalDependencies="aygshell.lib Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppwd.lib pimstore.lib"
-				OutputFile="$(OutDir)/Rhodes.exe"
+				AdditionalDependencies="wininet.lib comsuppwd.lib ws2_32.lib Crypt32.lib gdiplus.lib"
+				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="$(OutDir)"
+				GenerateDebugInformation="false"
 				SubSystem="0"
-				StackReserveSize="65536"
+				StackReserveSize="196608"
+				StackCommitSize="4096"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -687,22 +690,20 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCAppVerifierTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
+			<Tool
+				Name="VCWebDeploymentTool"
 			/>
-			<DebuggerTool
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -726,7 +727,6 @@
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="false"
-				TargetEnvironment="1"
 				GenerateStublessProxies="true"
 				TypeLibraryName="$(IntDir)/Rhodes.tlb"
 				HeaderFileName="Rhodes.h"
@@ -738,9 +738,10 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"
 				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -762,17 +763,15 @@
 				IgnoreImportLibrary="true"
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
-				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib bthutil.lib"
+				AdditionalDependencies="aygshell.lib Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppwd.lib pimstore.lib"
 				OutputFile="$(OutDir)/Rhodes.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="0"
-				StackReserveSize="196608"
-				StackCommitSize="4096"
+				StackReserveSize="65536"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
-				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -799,7 +798,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -821,7 +820,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
@@ -834,11 +833,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
 				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;DEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
+				RuntimeLibrary="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -847,7 +845,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
+				PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -862,11 +860,13 @@
 				AdditionalOptions=" /subsystem:windowsce,5.01 /machine:THUMB"
 				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib bthutil.lib"
 				OutputFile="$(OutDir)/Rhodes.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
 				TargetMachine="0"
 			/>
@@ -1025,23 +1025,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\MetaHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\MetaHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SyncStatusDlg.cpp"
+				RelativePath=".\menubar.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SyncStatusDlg.h"
+				RelativePath=".\MetaHandler.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\menubar.cpp"
+				RelativePath=".\MetaHandler.h"
 				>
 			</File>
 			<File
@@ -1092,7 +1084,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1100,7 +1092,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1108,7 +1100,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1116,7 +1108,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1124,7 +1116,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1140,6 +1132,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\SyncStatusDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SyncStatusDlg.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Utils.cpp"
 				>
@@ -1244,14 +1244,6 @@
 			<Filter
 				Name="net"
 				>
-				<File
-					RelativePath=".\rho\net\NetRequest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\rho\net\NetRequest.h"
-					>
-				</File>
 				<File
 					RelativePath=".\rho\net\NetRequestImpl.cpp"
 					>
@@ -1304,14 +1296,14 @@
 					RelativePath=".\rho\rubyext\GeoLocationImpl.h"
 					>
 				</File>
-                <File
+				<File
 					RelativePath=".\rho\rubyext\NativeToolbar.cpp"
 					>
 				</File>
 				<File
 					RelativePath=".\rho\rubyext\NativeToolbar.h"
 					>
-				</File>				
+				</File>
 				<File
 					RelativePath=".\rho\rubyext\SystemImpl.cpp"
 					>

data/platform/wm/tools/detool/detool.cpp

@@ -7,6 +7,8 @@
 
 #define RHOSETUP_DLL "rhosetup.dll"
 
+TCHAR *app_name = NULL;
+
 void checkMDEstart(HRESULT hr) 
 {
 	if (FAILED(hr)) {
@@ -431,7 +433,8 @@ int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
 	
 	_tcscpy(exe_fullpath, app_dir);
 	_tcscat(exe_fullpath, _T("\\"));
-	_tcscat(exe_fullpath, _T("rhodes.exe"));
+	_tcscat(exe_fullpath, app_name);
+	_tcscat(exe_fullpath, _T(".exe"));
 
 
 	hSrc = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -604,7 +607,6 @@ int _tmain(int argc, _TCHAR* argv[])
 {
 	TCHAR *emu_name = NULL;
 	TCHAR *cab_file = NULL;
-	TCHAR *app_name = NULL;
 	TCHAR *bundle_path = NULL;
 	TCHAR *app_exe = NULL;
 	TCHAR params_buf[MAX_PATH + 16];
@@ -729,7 +731,9 @@ int _tmain(int argc, _TCHAR* argv[])
 				_tprintf( TEXT("Starting application..."));
 				_tcscpy(params_buf, TEXT("\\Program Files\\"));
 				_tcscat(params_buf, app_name);
-				_tcscat(params_buf, TEXT("\\rhodes.exe"));
+				_tcscat(params_buf, _T("\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, _T(".exe"));
 				if(!wceRunProcess(T2A(params_buf), NULL)) {
 					_tprintf( TEXT("FAILED\n"));
 					goto stop_emu_deploy;
@@ -797,7 +801,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tprintf( TEXT("Starting application..."));
 			_tcscpy(params_buf, TEXT("\\Program Files\\"));
 			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, TEXT("\\rhodes.exe"));
+			_tcscat(params_buf, _T("\\"));
+			_tcscat(params_buf, app_name);
+			_tcscat(params_buf, _T(".exe"));
 			if(!wceRunProcess(T2A(params_buf), NULL)) {
 				_tprintf( TEXT("FAILED\n"));
 				goto stop_emu_deploy;
@@ -882,7 +888,9 @@ int _tmain(int argc, _TCHAR* argv[])
 		_tprintf( TEXT("Starting application..."));
 		_tcscpy(params_buf, TEXT("\\Program Files\\"));
 		_tcscat(params_buf, app_name);
-		_tcscat(params_buf, TEXT("\\rhodes.exe"));
+		_tcscat(params_buf, _T("\\"));
+		_tcscat(params_buf, app_name);
+		_tcscat(params_buf, _T(".exe"));
 		_tprintf( TEXT("%s\n"), params_buf);
 
 		
@@ -951,7 +959,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tprintf( TEXT("Starting application..."));
 			_tcscpy(params_buf, TEXT("\\Program Files\\"));
 			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, TEXT("\\rhodes.exe"));
+			_tcscat(params_buf, _T("\\"));
+			_tcscat(params_buf, app_name);
+			_tcscat(params_buf, _T(".exe"));
 			if(!wceRunProcess (T2A(params_buf), NULL)) {
 				_tprintf( TEXT("FAILED\n"));
 				goto stop_emu_deploy;

data/rakefile.rb

@@ -351,16 +351,20 @@ def init_extensions(startdir, dest)
 
   exts = File.join($startdir, "platform", "shared", "ruby", "ext", "rho", "extensions.c")
 
-  #if $config["platform"] != "bb" && !FileUtils.uptodate?(exts,[File.join($app_path, "build.yml")])
   if $config["platform"] != "bb"
       exists = []
-      File.new(exts, "r").read.split("\n").each do |line|
-        next if line !~ /^\s*extern\s+void\s+([A-Za-z_][A-Za-z0-9_]*)/
-        exists << $1
+      
+      if ( File.exists?(exts) )
+          File.new(exts, "r").read.split("\n").each do |line|
+            next if line !~ /^\s*extern\s+void\s+([A-Za-z_][A-Za-z0-9_]*)/
+            exists << $1
+          end
       end
-
+        
       if exists.sort! != extentries.sort!
         File.open(exts, "w") do |f|
+          puts "MODIFY : #{exts}"
+          
           f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
           #f.puts "// Generated #{Time.now.to_s}"
           if $config["platform"] == "wm" || $config["platform"] == "win32"

data/rhodes.gemspec

@@ -3,8 +3,8 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = Rhodes::VERSION
-
+  #s.version = Rhodes::VERSION
+  s.version = "2.3.1.beta.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]
   s.date = Time.now

data/spec/phone_spec/app/spec/blobsync_spec.rb

@@ -137,6 +137,7 @@ describe "BlobSync_test" do
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
     
     item2 = BlobTest.find(saved_obj)
+    item2.should_not be_nil
     
     item2.image_uri.should == file_name
 #    new_file_name = File.join(Rho::RhoApplication::get_blob_path(item2.image_uri))

data/spec/phone_spec/app/spec/events_spec.rb

@@ -40,7 +40,13 @@ describe "Events" do
     event['end_date'] = end_date
 
     puts "event: #{event}"    
-    Rho::RhoEvent.create!(event)
+
+    event = Rho::RhoEvent.create!(event)
+
+    event.should_not be_nil
+    event['id'].should_not be_nil
+
+    @id = event['id']
 
     newevents = Rho::RhoEvent.find(:all)
     #puts "newevents: #{newevents.inspect.to_s}"
@@ -50,7 +56,12 @@ describe "Events" do
     c = newevents[0]
     puts "c: #{c}"
     
-    @id = c['id']
+    c['id'].should == @id
+    c['title'].should == event['title']
+    c['location'].should == event['location']
+    c['notes'].should == event['notes']
+    c['start_date'].to_s.should == event['start_date'].to_s
+    c['end_date'].to_s.should == event['end_date'].to_s
         
     c['title'].should == title
     c['location'].should == 'loc1'

data/spec/phone_spec/app/spec/mapview_spec.rb

@@ -9,7 +9,7 @@ describe "MapView" do
     MapView.create :settings => {:map_type => 'roadmap', :region => [37, -122, 10, 10]}
     w = 5
     #w = 5 if System::get_property('platform') == 'ANDROID'
-    sleep w
+    sleep 20
 
     state = MapView.state
     state.should_not be_nil
@@ -19,7 +19,7 @@ describe "MapView" do
     (state[:center][:longitude] - (-122.0)).abs.should  < delta
 
     MapView.close
-    sleep 2
+    sleep 20
 
     state = MapView.state
     state.should be_nil

data/spec/phone_spec/app/spec/nativebar_spec.rb

@@ -2,15 +2,15 @@ describe "NativeBar" do
 
   it "should create" do
     NativeBar.create Rho::RhoApplication::NOBAR_TYPE, []
-    sleep 2
+    sleep 20
     NativeBar.started.should ==  false
 
     NativeBar.create Rho::RhoApplication::TOOLBAR_TYPE, [{:action => :back}]
-    sleep 2
+    sleep 20
     NativeBar.started.should ==  true
 
     NativeBar.remove
-    sleep 2
+    sleep 20
     NativeBar.started.should ==  false
 
   end

data/spec/phone_spec/app/spec/navbar_spec.rb

@@ -7,15 +7,15 @@ describe "NavBar" do
     rescue
       # Nothing
     end
-    sleep 2
+    sleep 20
     NavBar.started.should ==  false 
 
     NavBar.create :title => "", :left => {:action => :back}
-    sleep 2
+    sleep 20
     NavBar.started.should ==  true
 
     NavBar.remove
-    sleep 2
+    sleep 20
     NavBar.started.should ==  false
 
   end

data/spec/phone_spec/app/spec/rho_spec.rb

@@ -129,7 +129,7 @@ describe "RhomSource" do
   end
   
   it "should find Product_s source" do
-    src = Rhom::RhomSource.find(Product_s.get_source_id)
+    src = Rhom::RhomSource.find("Product_s")
     src.should_not be_nil
     
     #src.get_lastsync_objectcount.should == 0

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -20,7 +20,7 @@
 require 'rhom'
 require 'rho/rhoutils'
 
-USE_HSQLDB = System.get_property('platform') == 'Blackberry' #&& System.get_property('os_version')[0].to_i() < 5
+USE_HSQLDB = !System.get_property('has_sqlite')
 USE_COPY_FILES = !defined? RHO_ME
 
 def getAccount