RubyGems - rhodes - Versions diffs - 3.3.3.beta.3 → 3.3.3.beta.4 - Mend

rhodes 3.3.3.beta.3 → 3.3.3.beta.4

Files changed (133) hide show

data/platform/shared/logging/RhoLogSink.cpp CHANGED Viewed

@@ -165,9 +165,9 @@ void CLogOutputSink::writeLogMessage( String& strMsg )
 CLogSocketSink::CLogSocketSink(const LogSettings& oSettings)
 {
-	m_addrHost = "http://"+oSettings.getLogHost() + ":" + oSettings.getLogPort();
+	m_URL = oSettings.getLogURL();
-	CThreadQueue::setLogCategory(LogCategory("NO_LOGGING"));
+    CThreadQueue::setLogCategory(LogCategory("NO_LOGGING"));
     setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
     start(epLow);
 }
@@ -180,7 +180,7 @@ CLogSocketSink::~CLogSocketSink()
 void CLogSocketSink::writeLogMessage( String& strMsg )
 {
-	addQueueCommand(new LogCommand(m_addrHost.c_str(), strMsg.c_str()));
+	addQueueCommand(new LogCommand(m_URL.c_str(), strMsg.c_str()));
 }
 void CLogSocketSink::processCommand(IQueueCommand* pCmd)

data/platform/shared/logging/RhoLogSink.h CHANGED Viewed

@@ -70,7 +70,7 @@ public:
 };
 class CLogSocketSink : public ILogSink, common::CThreadQueue{
-    String m_addrHost;
+    String m_URL;
 public:
     CLogSocketSink(const LogSettings& oSettings);

data/platform/shared/net/HttpServer.cpp CHANGED Viewed

@@ -280,7 +280,7 @@ CHttpServer::CHttpServer(int port, String const &root, String const &user_root,
 {
     m_root = CFilePath::normalizePath(root);
     m_strRhoRoot = m_root.substr(0, m_root.length()-5);
-    m_strRuntimeRoot = runtime_root.substr(0, runtime_root.length()-5);
+    m_strRuntimeRoot = runtime_root.substr(0, runtime_root.length()-5) + "/rho/apps";
     m_userroot = CFilePath::normalizePath(user_root);
     m_strRhoUserRoot = m_userroot;
 }
@@ -289,7 +289,7 @@ CHttpServer::CHttpServer(int port, String const &root)
     :m_active(false), m_port(port), verbose(true)
 {
     m_root = CFilePath::normalizePath(root);
-    m_strRuntimeRoot = m_strRhoRoot = m_root.substr(0, m_root.length()-5);
+    m_strRuntimeRoot = (m_strRhoRoot = m_root.substr(0, m_root.length()-5)) + "/rho/apps";
     m_userroot = CFilePath::normalizePath(root);
     m_strRhoUserRoot = m_root.substr(0, m_root.length()-5);
 }
@@ -975,8 +975,6 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0 && fullPath.find(m_strRuntimeRoot) != 0 && fullPath.find(m_userroot) != 0 && fullPath.find(m_strRhoUserRoot) != 0)
         fullPath = CFilePath::join( m_root, path );
-    if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
     struct stat st;
     bool bCheckExist = true;
 #ifdef RHODES_EMULATOR
@@ -999,11 +997,21 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
 #endif
-     if ( bCheckExist && (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode))) {
-        RAWLOG_ERROR1("The file %s was not found", path.c_str());
-        String error = "<html><font size=\"+4\"><h2>404 Not Found.</h2> The file " + path + " was not found.</font></html>";
-        send_response(create_response("404 Not Found",error));
-        return false;
+    bool doesNotExists = bCheckExist && (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode));
+    if ( doesNotExists ) {
+        // looking for files at 'rho/apps' at runtime folder
+        fullPath = CFilePath::join( m_strRuntimeRoot, path );
+    }
+    if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
+    if ( doesNotExists ) {
+        if ( stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode) ) {
+            RAWLOG_ERROR1("The file %s was not found", path.c_str());
+            String error = "<html><font size=\"+4\"><h2>404 Not Found.</h2> The file " + path + " was not found.</font></html>";
+            send_response(create_response("404 Not Found",error));
+            return false;
+        }
     }
     FILE *fp = fopen(fullPath.c_str(), "rb");

data/platform/shared/qt/rhodes/main.cpp CHANGED Viewed

@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 #endif
     // PreMessageLoop:
-    rho_logconf_Init(m_strRootPath.c_str(), m_logPort.c_str());
+    rho_logconf_Init(m_strRootPath.c_str(), m_strRootPath.c_str(), m_logPort.c_str());
 #ifdef RHODES_EMULATOR
     RHOSIMCONF().setAppConfFilePath(CFilePath::join(m_strRootPath, RHO_EMULATOR_DIR"/rhosimconfig.txt").c_str());
     RHOSIMCONF().loadFromFile();

data/platform/shared/ruby/ext/rho/rhoruby.c CHANGED Viewed

@@ -255,6 +255,10 @@ void RhoRubyStart()
     Init_Extensions();
 #endif //RHO_SYMBIAN
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    rb_require("rhomotoapi");
+#endif //APP_BUILD_CAPABILITY_MOTOROLA
 #ifdef ENABLE_RUBY_VM_STAT
     struct timeval  start;
     struct timeval  end;

data/platform/shared/ruby/ext/webview/webview.i CHANGED Viewed

@@ -3,11 +3,11 @@
 %{
 extern void rho_webview_refresh(int index);
 #define refresh rho_webview_refresh
-extern void rho_webview_navigate(const char* url, int index);
+extern void rho_webview_navigate(const char* url, int tab_index);
 #define navigate rho_webview_navigate
 extern char* rho_webview_current_location(int index);
 #define current_location rho_webview_current_location
-extern char* rho_webview_execute_js(const char* js, int index);
+extern char* rho_webview_execute_js(const char* js, int tab_index);
 #define execute_js rho_webview_execute_js
 extern void rho_webview_set_menu_items(VALUE argv);
 #define set_menu_items rho_webview_set_menu_items
@@ -29,10 +29,15 @@ extern void rho_webview_navigate_back();
   $1 = -1;
 }
+%typemap(default) int tab_index {
+  $1 = -1;
+}
 extern void refresh(int index);
-extern void navigate(const char* url, int index);
+extern void navigate(const char* url, int tab_index);
 extern const char* current_location(int index);
-extern const char* execute_js(const char* js, int index);
+extern const char* execute_js(const char* js, int tab_index);
 extern void set_menu_items(VALUE argv);
 extern int active_tab();
 extern void full_screen_mode(int enable);

data/platform/shared/ruby/ext/webview/webview_wrap.c CHANGED Viewed

@@ -1827,11 +1827,11 @@ static VALUE mWebView;
 extern void rho_webview_refresh(int index);
 #define refresh rho_webview_refresh
-extern void rho_webview_navigate(const char* url, int index);
+extern void rho_webview_navigate(const char* url, int tab_index);
 #define navigate rho_webview_navigate
 extern char* rho_webview_current_location(int index);
 #define current_location rho_webview_current_location
-extern char* rho_webview_execute_js(const char* js, int index);
+extern char* rho_webview_execute_js(const char* js, int tab_index);
 #define execute_js rho_webview_execute_js
 extern void rho_webview_set_menu_items(VALUE argv);
 #define set_menu_items rho_webview_set_menu_items

data/platform/shared/test/Tests.cpp CHANGED Viewed

@@ -36,7 +36,7 @@
 void runAllLogTests();
 extern "C" void runAllProfilingTests();
-extern "C" void rho_logconf_Init(const char* path, const char* logPort);
+extern "C" void rho_logconf_Init(const char* logPath, const char* path, const char* logPort);
 extern "C" const char* RhoGetRootPath();
 #ifdef OS_MACOSX
@@ -56,7 +56,7 @@ int _tmain(int argc, _TCHAR* argv[])
 #endif
-    rho_logconf_Init(RhoGetRootPath(), "");
+    rho_logconf_Init(RhoGetRootPath(), RhoGetRootPath(), "");
     //runAllLogTests();
     //runAllProfilingTests();

data/platform/wm/build/build_inf.js CHANGED Viewed

@@ -204,8 +204,7 @@ function fill_extensions_files(exts) {
     }
 }
-function pinf(platform,es,exts,name,vendor,show_shortcut,webkit,rhogempath) {
+function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,rhogempath,usereruntime) {
     p("[Version]");
     p("Signature=\"$Windows NT$\"");
     p("Provider=\""+vendor+"\"");
@@ -224,43 +223,52 @@ function pinf(platform,es,exts,name,vendor,show_shortcut,webkit,rhogempath) {
     p("BuildMax=0xE0000000");
     p("");
     p("[DefaultInstall]");
-    if (show_shortcut){
+    if (show_shortcut && (!usereruntime)){
         p("CEShortcuts=Shortcuts");
     }
     p("AddReg=RegKeys");
-    p("CopyFiles=CopyToInstallDir"+(webkit ? ",CopyWebKitBin,CopyNPAPI,CopyConfig" : "")+get_copyfiles_sections(es));
+    p("CopyFiles=CopyToInstallDir"+((!usereruntime) && webkit ? ",CopyWebKitBin,CopyNPAPI,CopyConfig" : "")+(show_shortcut && usereruntime ? ",Shortcuts" : "")+get_copyfiles_sections(es));
     p("");
     p("[SourceDisksNames]");
-    p("1=,\"\",,\"..\\bin\\"+settings[platform][0]+"\\rhodes\\Release\\\"");
-    if (webkit) {
-        p("2=,\"\",," + rhogempath + "\"\\\"");
-        p("3=,\"\",," + rhogempath + "\"\\NPAPI\\\"");
-        p("4=,\"\",," + rhogempath + "\"\\Config\\\"");
+    if (usereruntime) {
+        p("1=,\"\",,\"" + srcdir + "\\..\\\"");
+    } else {
+        p("1=,\"\",,\"..\\bin\\"+settings[platform][0]+"\\rhodes\\Release\\\"");
+        if (webkit) {
+            p("2=,\"\",," + rhogempath + "\"\\\"");
+            p("3=,\"\",," + rhogempath + "\"\\NPAPI\\\"");
+            p("4=,\"\",," + rhogempath + "\"\\Config\\\"");
+        }
     }
     get_source_disks_names(es);
     p("");
     p("[SourceDisksFiles]");
-    p("\"" + name + ".exe\"=1");
-    if (webkit) {
-        p("\"eklibrary.dll\"=2");
-        p("\"webkit.dll\"=2");
-        p("\"license_rc.dll\"=2");
-        p("\"openssl.dll\"=2");
-        p("\"PBEngine_WK.dll\"=2");
-        p("\"npwtg_jsobjects.dll\"=3");
-        p("\"Config.xml\"=4");
-        p("\"Plugin.xml\"=4");
-        p("\"RegEx.xml\"=4");
+    if (usereruntime) {
+        p("\"" + name + ".lnk\"=1");
+    } else {
+        p("\"" + name + ".exe\"=1");
+        if (webkit) {
+            p("\"eklibrary.dll\"=2");
+            p("\"webkit.dll\"=2");
+            p("\"license_rc.dll\"=2");
+            p("\"openssl.dll\"=2");
+            p("\"PBEngine_WK.dll\"=2");
+            p("\"npwtg_jsobjects.dll\"=3");
+            p("\"npwtg_legacy.dll\"=3");
+            p("\"Config.xml\"=4");
+            p("\"Plugin.xml\"=4");
+            p("\"RegEx.xml\"=4");
+        }
     }
     fill_extensions_source_disk_files(exts);
     var f = get_source_disks_files(es);
     p("");
     p("[DestinationDirs]");
     if (show_shortcut){
-        p("Shortcuts=0,%CE2%\Start Menu");
+        p("Shortcuts=0,\"%CE11%\"");
     }
     p("CopyToInstallDir=0,\"%InstallDir%\"");
-    if (webkit) {
+    if ((!usereruntime) && webkit) {
         p("CopyWebKitBin=0,\"%InstallDir%\"");
         p("CopyNPAPI=0,\"%InstallDir%\\NPAPI\"");
         p("CopyConfig=0,\"%InstallDir%\\Config\"");
@@ -268,23 +276,28 @@ function pinf(platform,es,exts,name,vendor,show_shortcut,webkit,rhogempath) {
     get_destination_dirs(es);
     p("");
     p("[CopyToInstallDir]");
-    p("\"" + name + ".exe\",\"" + name + ".exe\",,0");
-    if (webkit) {
-        p("");
-        p("[CopyWebKitBin]");
-        p("\"eklibrary.dll\",\"eklibrary.dll\",,0");
-        p("\"webkit.dll\",\"webkit.dll\",,0");
-        p("\"license_rc.dll\",\"license_rc.dll\",,0");
-        p("\"openssl.dll\",\"openssl.dll\",,0");
-        p("\"PBEngine_WK.dll\",\"PBEngine_WK.dll\",,0");
-        p("");
-        p("[CopyNPAPI]");
-        p("\"npwtg_jsobjects.dll\",\"npwtg_jsobjects.dll\",,0");
-        p("");
-        p("[CopyConfig]");
-        p("\"Config.xml\",\"Config.xml\",,0");
-        p("\"Plugin.xml\",\"Plugin.xml\",,0");
-        p("\"RegEx.xml\",\"RegEx.xml\",,0");
+    if (usereruntime) {
+        p("\"" + name + ".lnk\",\"" + name + ".lnk\",,0");
+    } else {
+        p("\"" + name + ".exe\",\"" + name + ".exe\",,0");
+        if (webkit) {
+            p("");
+            p("[CopyWebKitBin]");
+            p("\"eklibrary.dll\",\"eklibrary.dll\",,0");
+            p("\"webkit.dll\",\"webkit.dll\",,0");
+            p("\"license_rc.dll\",\"license_rc.dll\",,0");
+            p("\"openssl.dll\",\"openssl.dll\",,0");
+            p("\"PBEngine_WK.dll\",\"PBEngine_WK.dll\",,0");
+            p("");
+            p("[CopyNPAPI]");
+            p("\"npwtg_jsobjects.dll\",\"npwtg_jsobjects.dll\",,0");
+            p("\"npwtg_legacy.dll\",\"npwtg_legacy.dll\",,0");
+            p("");
+            p("[CopyConfig]");
+            p("\"Config.xml\",\"Config.xml\",,0");
+            p("\"Plugin.xml\",\"Plugin.xml\",,0");
+            p("\"RegEx.xml\",\"RegEx.xml\",,0");
+        }
     }
     fill_extensions_files(exts);
     p("");
@@ -292,7 +305,10 @@ function pinf(platform,es,exts,name,vendor,show_shortcut,webkit,rhogempath) {
     if (show_shortcut){
         p("");
         p("[Shortcuts]");
-        p("\""+name+"\",0,\"" + name + ".exe\",%CE11%");
+        if (usereruntime)
+            p("\"" + name + ".lnk\",\"" + name + ".lnk\",,0");
+        else
+            p("\""+name+"\",0,\"" + name + ".exe\",%CE11%");
     }
     p("");
     p("[RegKeys]");
@@ -306,23 +322,32 @@ function main() {
     // args(3) = vendor
     // args(4) = srcdir
     // args(5) = hidden_app
-    // args(6) = include motorola webkit binaries and configs
+    // args(6) = include motorola webkit binaries and configs?
     // args(7) = rhoelements gem folder path
-    // args(8) = additional files
+    // args(8) = use RhoElements runtime?
+    // args(9)... = additional files
     var args = WScript.Arguments;
     fso = new ActiveXObject("Scripting.FileSystemObject");
     output_file = fso.CreateTextFile(args(0));
+    srcdir = args(4)
+    is_icon = fso.FileExists(srcdir+"/icon/icon.ico");
+    show_shortcut = (args(5) == "0");
+    include_webkit = (args(6) == "1");
+    usereruntime = (args(8) == "1");
     var sources = new Object();
     sources['db'] = ["db","..\\..\\..\\platform\\shared\\db\\res\\db"];
     //sources['sqlite3']= ["sqlite3","..\\..\\shared\\sqlite3"];
-    sources['lib']= ["lib",args(4)+"/lib"];
-    sources['apps']= ["apps",args(4)+"/apps"];
+    if (!usereruntime)
+        sources['lib']= ["lib",srcdir+"/lib"];
+    else if (is_icon)
+        sources['icon']= ["icon",srcdir+"/icon"];
+    sources['apps']= ["apps",srcdir+"/apps"];
     var es = expand_sources(sources);
-    for (var idx = 8; idx < args.length; idx++)
+    for (var idx = 9; idx < args.length; idx++)
     {
     	if (args(idx) == null)
     		break;
@@ -332,8 +357,11 @@ function main() {
         es  = expand_sources1(es, sources_add);
     }
-    var exts = expand_extensions(args(1));
-    pinf(args(1),es,exts,args(2),args(3), (args(5) == "0"), (args(6) == "1"), args(7));
+    var exts;
+    if (!usereruntime) {
+        exts = expand_extensions(args(1));
+    }
+    pinf(args(1),es,exts,args(2),args(3),srcdir,show_shortcut,is_icon,include_webkit,args(7),usereruntime);
     output_file.Close();
 }

data/platform/wm/build/wm.rake CHANGED Viewed

@@ -66,12 +66,6 @@ namespace "config" do
     $sdk = "Win32"
   end
-  task :set_motce_platform do
-    $current_platform = "wm" unless $current_platform
-    $build_solution = 'rhoelements.sln' unless $build_solution
-    $sdk = "MC3000c50b (ARMV4I)"
-  end
   task :wm => [:set_wm_platform, "config:common"] do
     puts " $current_platform : #{$current_platform}"
@@ -138,12 +132,17 @@ namespace "config" do
     $wm_emulator = $app_config["wm"]["emulator"] if $app_config["wm"] and $app_config["wm"]["emulator"]
     $wm_emulator = "Windows Mobile 6 Professional Emulator" unless $wm_emulator
+    $use_re_runtime = (($app_config["wm"].nil? || $app_config["wm"]["use_re_runtime"].nil?) ? nil : 1 )
+    #puts $app_config["wm"]["use_re_runtime"].inspect
+    #puts $use_re_runtime.inspect
   end
 end
 namespace "build" do
   namespace "wm" do
     task :extensions => "config:wm" do
+      if not $use_re_runtime.nil? then next end
       if $additional_dlls_path.nil?
         puts 'new $additional_dlls_paths'
@@ -202,6 +201,8 @@ namespace "build" do
     end
     task :rhodes => ["config:wm", "build:wm:rhobundle"] do
+      if not $use_re_runtime.nil? then next end
       chdir $config["build"]["wmpath"]
       cp $app_path + "/icon/icon.ico", "rhodes/resources" if File.exists? $app_path + "/icon/icon.ico"
@@ -353,18 +354,22 @@ end
 namespace "device" do
-  namespace "motce" do
-    desc "Build production for Motorola device"
-    task :production => ["config:set_motce_platform", "device:wm:production"] do
-    end
-  end
   namespace "wm" do
     desc "Build production for device or emulator"
     task :production => ["config:wm","build:wm:rhobundle","build:wm:rhodes"] do
-      out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
-      cp  out_dir + "rhodes.exe", out_dir + $appname + ".exe"
+      wm_icon = $app_path + '/icon/icon.ico'
+      if $use_re_runtime.nil? then
+        out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
+        cp out_dir + "rhodes.exe", out_dir + $appname + ".exe"
+      else
+        shortcut_content = '"\\Program Files\\RhoElements2\\RhoElements2.exe" -approot="\\Program Files\\' + $appname + '"'
+        if File.exists? wm_icon then
+          shortcut_content = shortcut_content + '?"\\Program Files\\' + $appname + '\\rho\\icon\\icon.ico"'
+        end
+        shortcut_content = shortcut_content.length().to_s + '#' + shortcut_content
+        File.open($srcdir + '/../' + $appname + ".lnk", "w") { |f| f.write(shortcut_content) }
+      end
       chdir $builddir
@@ -372,26 +377,22 @@ namespace "device" do
       build_platform = 'wm653' if $sdk == "Windows Mobile 6.5.3 Professional DTK (ARMV4I)"
       build_platform = 'ce5' if $sdk == "MC3000c50b (ARMV4I)"
-      if $webkit_capability and $wk_data_dir != nil
-        wk_config_dir = $wk_data_dir + "/Config"
-        config_files = ['Config','Plugin','RegEx']
-        config_files.each do |filename|
-          filepath = File.join(wk_config_dir,filename + ".xml.template")
-          if not File.exists?(filepath)
-            puts "Cannot find required config template: #{filepath}"
-            exit 1
-          end
-          template = File.read(filepath)
-          config = template.to_s.gsub('(%APPNAME%)',$app_config["name"]);
-          filepath = File.join(wk_config_dir,filename + ".xml")
-          File.open(filepath, "w") { |f| f.write(config) }
+      icon_dest = $srcdir + '/icon'
+      rm_rf icon_dest
+      if not $use_re_runtime.nil? then
+        rm_rf $srcdir + '/lib'
+        if File.exists? wm_icon then
+          mkdir_p icon_dest if not File.exists? icon_dest
+          cp wm_icon, icon_dest
         end
       end
-      args = ['build_inf.js', $appname + ".inf", build_platform, '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"', $hidden_app, ($webkit_capability ? "1" : "0"), $wk_data_dir]
+      args = ['build_inf.js', $appname + ".inf", build_platform, '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"', $hidden_app, ($webkit_capability ? "1" : "0"), $wk_data_dir, (($use_re_runtime.nil?) ? "0" : "1")]
-      $additional_dlls_paths.each do |path|
-         args << path
+      if $use_re_runtime.nil? then
+         $additional_dlls_paths.each do |path|
+            args << path
+         end
       end
       puts Jake.run('cscript',args)
@@ -435,10 +436,6 @@ end
 namespace "clean" do
-  desc "Clean Motorola device build"
-  task :motce => ["config:set_motce_platform", "clean:wm:all"] do
-  end
   desc "Clean wm"
   task :wm => "clean:wm:all" do
   end
@@ -489,19 +486,19 @@ namespace "run" do
       sleep(1)
     end
-    if $webkit_capability
+    if $webkit_capability and ($use_re_runtime.nil?)
       wk_args   = [ 'wk-emu', "\"#{$wm_emulator}\"", '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
       Jake.run2( detool, wk_args, {:nowait => false})
     end
-    #if $additional_dlls_paths
-    #  $additional_dlls_paths.each do |path|
-    #    add_files_args   = [ 'wk-emu', "\"#{$wm_emulator}\"", '"'+ path.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
-    #    Jake.run2( detool, add_files_args, {:nowait => false})
-    #  end
-    #end
+    if $additional_dlls_paths
+      $additional_dlls_paths.each do |path|
+        add_files_args   = [ 'wk-emu', "\"#{$wm_emulator}\"", '"'+ path.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
+        Jake.run2( detool, add_files_args, {:nowait => false})
+      end
+    end
-    args   = [ 'emu', "\"#{$wm_emulator}\"", '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"' , $port]
+    args = [ 'emu', "\"#{$wm_emulator}\"", '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+((not $use_re_runtime.nil?) ? $srcdir + '/../' + $appname + '.lnk' : $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"' , $port]
     Jake.run2( detool, args, {:nowait => false})
   end
@@ -543,19 +540,19 @@ namespace "run" do
         sleep(1)
       end
-      if $webkit_capability
+      if $webkit_capability and ($use_re_runtime.nil?)
         wk_args   = [ 'wk-dev', '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
         Jake.run2( detool, wk_args, {:nowait => false})
       end
-      #if $additional_dlls_paths
-      #  $additional_dlls_paths.each do |path|
-      #    add_files_args   = [ 'wk-dev', '"'+ path.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
-      #    Jake.run2( detool, add_files_args, {:nowait => false})
-      #  end
-      #end
+      if $additional_dlls_paths
+        $additional_dlls_paths.each do |path|
+          add_files_args   = [ 'wk-dev', '"'+ path.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
+          Jake.run2( detool, add_files_args, {:nowait => false})
+        end
+      end
-      args   = [ 'dev', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"', $port ]
+      args = [ 'dev', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+((not $use_re_runtime.nil?) ? $srcdir + '/../' + $appname + '.lnk' : $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"', $port ]
       Jake.run2( detool, args, {:nowait => false})
     end
@@ -648,14 +645,14 @@ namespace "run" do
     end
     namespace "device" do
-      desc "Build, install .cab  and run on the Windows Phone"
+      desc "Build, install .cab and run on the Windows Mobile device"
       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]
+        args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname, (($use_re_runtime.nil?) ? "0" : "1")]
         puts "\nStarting application on the device"
         puts "Please, connect you device via ActiveSync.\n\n"
         log_file = gelLogPath
@@ -673,7 +670,7 @@ namespace "run" do
       cd $startdir + "/res/build-tools"
       detool = "detool.exe"
-      args   = ['emucab', "\"#{$wm_emulator}\"", $targetdir + '/' +  $appname + ".cab", $appname, $port]
+      args   = ['emucab', "\"#{$wm_emulator}\"", $targetdir + '/' +  $appname + ".cab", $appname, (($use_re_runtime.nil?) ? "0" : "1")]
       log_file = gelLogPath
       Jake.run2( detool, ['log', log_file, $port], {:nowait => true})