rhodes 3.0.2 → 3.1.0.beta.1

data/platform/win32/replaceicon/replaceicon.cpp

@@ -1,5 +1,28 @@
-// replaceicon.cpp : Defines the entry point for the console application.
-//
+/*------------------------------------------------------------------------
+* (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 "stdafx.h"
 

data/platform/win32/replaceicon/stdafx.cpp

@@ -1,6 +1,28 @@
-// stdafx.cpp : source file that includes just the standard includes
-// replaceicon.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
+/*------------------------------------------------------------------------
+* (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 "stdafx.h"
 

data/platform/win32/replaceicon/stdafx.h

@@ -1,7 +1,28 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
 
 #pragma once
 

data/platform/win32/updateresstring/stdafx.cpp

@@ -1,6 +1,28 @@
-// stdafx.cpp : source file that includes just the standard includes
-// updateresstring.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
+/*------------------------------------------------------------------------
+* (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 "stdafx.h"
 

data/platform/win32/updateresstring/stdafx.h

@@ -1,7 +1,28 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
 
 #pragma once
 

data/platform/win32/updateresstring/updateresstring.cpp

@@ -1,5 +1,28 @@
-// updateresstring.cpp : Defines the entry point for the console application.
-//
+/*------------------------------------------------------------------------
+* (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 "stdafx.h"
 

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -66,6 +66,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -140,6 +141,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -208,6 +210,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -284,6 +287,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -358,6 +362,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -431,6 +436,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -498,6 +504,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -573,6 +580,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -616,7 +624,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -649,6 +657,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -692,7 +701,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Win32"
+			Name="SimulatorDebug|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -724,6 +733,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -759,7 +769,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorDebug|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -792,6 +802,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -835,7 +846,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Smartphone 2003 (ARMV4)"
+			Name="SimulatorDebug|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -868,6 +879,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -911,7 +923,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -943,6 +955,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -986,7 +999,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Win32"
+			Name="SimulatorRelease|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1017,6 +1030,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1052,7 +1066,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorRelease|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1084,6 +1098,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1127,7 +1142,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Smartphone 2003 (ARMV4)"
+			Name="SimulatorRelease|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1159,6 +1174,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1234,6 +1250,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1309,6 +1326,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1384,6 +1402,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1458,6 +1477,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1532,6 +1552,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1606,6 +1627,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4018;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1755,6 +1777,14 @@
 				RelativePath="..\..\shared\common\RhoPort.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\common\RhoSimConf.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\common\RhoSimConf.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\common\RhoStd.h"
 				>

data/platform/wm/build/wm.rake

@@ -1,4 +1,38 @@
-#
+#------------------------------------------------------------------------
+# (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
+#------------------------------------------------------------------------
+
+
+def kill_detool
+  if RUBY_PLATFORM =~ /windows|cygwin|mingw/
+    # Windows
+    `taskkill /F /IM detool.exe`
+  else
+    `killall -9 detool`
+  end
+end
 
 def sign (cabfile)	
 	puts "Singing .cab file"
@@ -55,6 +89,13 @@ namespace "config" do
     $cabwiz = "cabwiz" if $cabwiz.nil?
     $sdk = "Windows Mobile 6 Professional SDK (ARMV4I)"
     $sdk = $app_config["wmsdk"] unless $app_config["wmsdk"].nil?
+    $startdir = $app_config["sdk"]
+
+    if $app_config["wm"].nil?
+      $port = "11000"
+    else
+      $port = $app_config["wm"]["logport"].nil? ? "11000" : $app_config["wm"]["logport"] 
+    end
 
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
 
@@ -169,7 +210,7 @@ namespace "build" do
           exit 1
         end
 
-        args = ['/M4', 'rhodes.sln', '"EmulatorRelease|win32"']
+        args = ['/M4', 'rhodes.sln', '"SimulatorRelease|win32"']
         puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
         puts Jake.run($vcbuild,args)
 
@@ -184,7 +225,7 @@ namespace "build" do
         if not File.directory?(target_path)
           Dir.mkdir(target_path)
         end
-        cp File.join($startdir, $vcbindir, "win32/rhodes/EmulatorRelease/rhosimulator.exe"), target_path
+        cp File.join($startdir, $vcbindir, "win32/rhodes/SimulatorRelease/rhosimulator.exe"), target_path
 
         cp File.join(qtdir, "bin/QtCore4.dll"), target_path
         cp File.join(qtdir, "bin/QtGui4.dll"), target_path
@@ -299,19 +340,17 @@ namespace "run" do
 
     desc "Build and run on WM6 emulator"
     task :wm => ["device:wm:production"] do
+          # kill all running detool
+          kill_detool
+
    	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"    
-	  args   = [ 'emu', '"Windows Mobile 6 Professional Emulator"', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe" ]
+	  args   = [ 'emu', '"Windows Mobile 6 Professional Emulator"', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"' , $port]
 	  puts "\nStarting application on the WM6 emulator\n\n"
 	  log_file = gelLogPath
 
-	  Thread.new { 
-            Jake.run(detool,['log', log_file])
-          }
-
-	  Thread.new { 
-            Jake.run(detool,args)
-          }
+	  Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+	  Jake.run2( detool, args, {:nowait => false})
     end
 
   namespace "wm" do
@@ -322,38 +361,50 @@ namespace "run" do
 
     desc "Build and run on the Windows Phone"
     task :device => ["device:wm:production"] do
+          # kill all running detool
+          kill_detool
+
    	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"    
-	  args   = [ 'dev', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe" ]
+	  args   = [ 'dev', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"', $port ]
 	  puts "\nStarting application on the device"
 	  puts "Please, connect you device via ActiveSync.\n\n"
+	  log_file = gelLogPath
 
-	  Thread.new { 
-            Jake.run(detool,['log', log_file])
-          }
-
-	  Thread.new { 
-            Jake.run(detool,args)
-          }
+	  Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+	  Jake.run2( detool, args, {:nowait => false})
     end
 
-  namespace "device" do
-		desc "Build, install .cab  and run on the Windows Phone"
-		task :cab => ["device:wm:production"] do
-   			cd $startdir + "/res/build-tools"
-			detool = "detool.exe"    
-			args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname]
-			puts "\nStarting application on the device"
-			puts "Please, connect you device via ActiveSync.\n\n"
-			Jake.run(detool,args)
-		end
-  end
+    namespace "device" do
+	desc "Build, install .cab  and run on the Windows Phone"
+	task :cab => ["device:wm:production"] do
+            # kill all running detool
+            kill_detool
+
+   	    cd $startdir + "/res/build-tools"
+	    detool = "detool.exe"    
+	    args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname, $port]
+	    puts "\nStarting application on the device"
+	    puts "Please, connect you device via ActiveSync.\n\n"
+	    log_file = gelLogPath
+
+	    Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+	    Jake.run(detool,args)
+        end
+    end
 
     desc "Build, install .cab and run on WM6 emulator"
     task :cab => ["device:wm:production"] do
+          # kill all running detool
+          kill_detool
+
   	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"
-	  args   = ['emucab', '"Windows Mobile 6 Professional Emulator"', $targetdir + '/' +  $appname + ".cab", $appname]
+	  args   = ['emucab', '"Windows Mobile 6 Professional Emulator"', $targetdir + '/' +  $appname + ".cab", $appname, $port]
+	  log_file = gelLogPath
+
+	  Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+
 	  puts "\nStarting application on the WM6 emulator\n\n"
 	  Jake.run(detool,args)
     end
@@ -375,54 +426,19 @@ namespace "run" do
     end
   end
 
-	namespace "rhosimulator" do
-        task :get_log => "config:common" do
+  namespace "rhosimulator" do
+    task :get_log => "config:common" do
             $log_file = $app_config["applog"].nil? ? "applog.txt" : $app_config["applog"] 	    
             puts "log_file=" + File.join($app_path, "rhosimulator", $log_file)
-        end
     end
-    
-	namespace "win32" do
-	    desc "Run application on RhoSimulator"
-		task :rhosimulator => "config:common" do
-            $appname = $app_config["name"].nil? ? "Rhodes" : $app_config["name"] 
-    
-            if $config['env']['paths']['rhosimulator']
-		        path = File.join( $config['env']['paths']['rhosimulator'], "rhosimulator.exe")
-		    else
-		        path = File.join( $startdir, "platform/win32/RhoSimulator/rhosimulator.exe")
-		    end
-    		    
-            if !File.exists?(path)
-                puts "Cannot find RhoSimulator: '#{path}' does not exists"
-                puts "Install Rhodes gem OR"
-                puts "Install RhoSimulator and modify 'rhosimulator' section in '<rhodes>/rhobuild.yml'"
-                exit 1
-            end
-            
-		    args = []
-		    args << "-approot='#{$app_path}'"
-		    args << "-rhodespath='#{$startdir}'"
-            args << "-appname='#{$appname}'"		    
-            
-		    if $debug_port
-                args << "-debugport=#{$debug_port}"
-                args << "-debughost='127.0.0.1'"
-            end
-                
-		    Jake.run2 path, args, {:nowait => true}
-                
-		end
-		
-        task :rhosimulator_debug, :debug_port do |t, args|
-        
-            puts "Args were: #{args}"
-            $debug_port = args[:debug_port].to_i
-            Rake::Task["run:win32:rhosimulator"].invoke
-                    
-        end
-		
-	end
+  end
+  
+  namespace "wm" do    
+    task :rhosimulator => "config:common" do    
+       $rhosim_config = "platform='wm'\r\n"
+       Rake::Task["run:rhosimulator"].invoke            
+    end
+  end
 
   namespace "win32" do