rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/shared/common/RhodesApp.h

@@ -52,7 +52,7 @@ public:
 
 private:
 
-    CRhodesApp(const String& strRootPath, const String& strUserPath);
+    CRhodesApp(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
     boolean m_bExit, m_bRestartServer;
 
     String m_strListeningPorts;
@@ -61,7 +61,6 @@ private:
     CSplashScreen m_oSplashScreen;
     CAppMenu m_oAppMenu;
     CRhoTimer m_oTimer;
-    CExtManager m_oExtManager;
 
     String m_strLoadingPagePath, m_strLoadingPngPath;
     String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl;//, m_strFirstStartUrl;
@@ -86,11 +85,12 @@ private:
 
     common::CAutoPtr<common::CThreadQueue> m_appCallbacksQueue;
     boolean m_bSendingLog;
+    CExtManager* m_pExtManager;
 
 public:
     ~CRhodesApp(void);
 
-    static CRhodesApp* Create(const String& strRootPath, const String& strUserPath);
+    static CRhodesApp* Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
     static void Destroy();
     static CRhodesApp* getInstance(){ return (CRhodesApp*)m_pInstance; }
     void startApp();
@@ -105,6 +105,7 @@ public:
 
     const String& getRhobundleReloadUrl();
     const String& getBaseUrl();
+    void  setBaseUrl(const String& strBaseUrl);
     const String& getStartUrl();
     const String& getOptionsUrl();
     const String& getCurrentUrl(int index = 0);
@@ -125,6 +126,7 @@ public:
     StringW getAppNameW();
 
     void callBarcodeCallback(String strCallbackUrl, const String& strBarcode, bool isError);
+    void callCallbackWithData(String strCallbackUrl, String strBody, const String& strCallbackData, bool bWaitForResponse);
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );
@@ -138,7 +140,9 @@ public:
     CAppMenu& getAppMenu (void) { return m_oAppMenu; }
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
     CRhoTimer&     getTimer(){ return m_oTimer; }
-    CExtManager&   getExtManager(){ return m_oExtManager; }
+
+    void setExtManager( CExtManager* pExtManager ){m_pExtManager = pExtManager; }
+    CExtManager&   getExtManager(){ return *m_pExtManager; }
 
     boolean sendLog(const String& strCallbackUrl);
 
@@ -192,6 +196,7 @@ extern "C" {
 	
 void rho_rhodesapp_create(const char* szRootPath);
 void rho_rhodesapp_create_with_separate_user_path(const char* szRootPath, const char* szUserPath);    
+void rho_rhodesapp_create_with_separate_runtime(const char* szRootPath, const char* szRuntimePath);    
 void rho_rhodesapp_start();	
 void rho_rhodesapp_destroy();
 	

data/platform/shared/common/RhodesAppBase.cpp

@@ -36,12 +36,12 @@ namespace common{
 IMPLEMENT_LOGCLASS(CRhodesAppBase,"RhodesApp");
 CRhodesAppBase* CRhodesAppBase::m_pInstance = 0;
 
-/*static*/ CRhodesAppBase* CRhodesAppBase::Create(const String& strRootPath, const String& strUserPath)
+/*static*/ CRhodesAppBase* CRhodesAppBase::Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath)
 {
     if ( m_pInstance != null) 
         return m_pInstance;
 
-    m_pInstance = new CRhodesAppBase(strRootPath, strUserPath);
+    m_pInstance = new CRhodesAppBase(strRootPath, strUserPath, strRuntimePath);
     return m_pInstance;
 }
 
@@ -53,10 +53,11 @@ CRhodesAppBase* CRhodesAppBase::m_pInstance = 0;
     m_pInstance = 0;
 }
 
-CRhodesAppBase::CRhodesAppBase(const String& strRootPath, const String& strUserPath) : CRhoThread()
+CRhodesAppBase::CRhodesAppBase(const String& strRootPath, const String& strUserPath, const String& strRuntimePath) : CRhoThread()
 {
     m_strRhoRootPath = strRootPath;
     m_strAppUserPath = strUserPath;
+    m_strRuntimePath = strRuntimePath;
 
     initAppUrls();
 }

data/platform/shared/common/RhodesAppBase.h

@@ -47,12 +47,12 @@ protected:
 
     static CRhodesAppBase* m_pInstance;
 
-    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath, m_strAppUserPath;//, m_strRhodesPath;
+    String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath, m_strAppRootPath, m_strAppUserPath, m_strRuntimePath;//, m_strRhodesPath;
     String m_strHomeUrl;
 
-    CRhodesAppBase(const String& strRootPath, const String& strUserPath);
+    CRhodesAppBase(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
 public:
-    static CRhodesAppBase* Create(const String& strRootPath, const String& strUserPath);
+    static CRhodesAppBase* Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
     static void Destroy();
     static CRhodesAppBase* getInstance(){ return m_pInstance; }
 
@@ -60,6 +60,7 @@ public:
     String getRelativeDBFilesPath(const String& strFilePath);
     const String& getRhoRootPath(){return m_strRhoRootPath;}
     const String& getRhoUserPath(){return m_strAppUserPath;}
+    const String& getRhoRuntimePath(){return m_strRuntimePath;}
     //const String& getRhodesPath(){return m_strRhodesPath;}
     //void setRhodesPath(const String& path){m_strRhodesPath = path;}
     const String& getAppRootPath(){return m_strAppRootPath;}
@@ -87,6 +88,7 @@ inline rho::common::CRhodesAppBase& RHODESAPPBASE(){ return *rho::common::CRhode
 extern "C" {
 #endif //__cplusplus
 
+const char* rho_native_reruntimepath();
 const char* rho_native_rhopath();
 const char* rho_native_rhouserpath();
 const char* rho_native_rhodbpath();    

data/platform/shared/net/HttpServer.cpp

@@ -275,11 +275,12 @@ static VALUE create_request_hash(String const &application, String const &model,
     return hash;
 }
 
-CHttpServer::CHttpServer(int port, String const &root, String const &user_root)
+CHttpServer::CHttpServer(int port, String const &root, String const &user_root, String const &runtime_root)
     :m_active(false), m_port(port), verbose(true)
 {
     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_userroot = CFilePath::normalizePath(user_root);
     m_strRhoUserRoot = m_userroot;
 }
@@ -288,10 +289,9 @@ CHttpServer::CHttpServer(int port, String const &root)
     :m_active(false), m_port(port), verbose(true)
 {
     m_root = CFilePath::normalizePath(root);
-    m_strRhoRoot = m_root.substr(0, m_root.length()-5);
+    m_strRuntimeRoot = m_strRhoRoot = m_root.substr(0, m_root.length()-5);
     m_userroot = CFilePath::normalizePath(root);
     m_strRhoUserRoot = m_root.substr(0, m_root.length()-5);
-        
 }
 
 CHttpServer::~CHttpServer()
@@ -972,7 +972,7 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
 
     if (String_startsWith(fullPath,"/app/db/db-files") )
         fullPath = CFilePath::join( rho_native_rhodbpath(), path.substr(4) );
-    else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0 && fullPath.find(m_userroot) != 0 && fullPath.find(m_strRhoUserRoot) != 0)
+    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());

data/platform/shared/net/HttpServer.h

@@ -94,7 +94,7 @@ public:
     
 public:
     CHttpServer(int port, String const &root);
-    CHttpServer(int port, String const &root, String const &user_root);
+    CHttpServer(int port, String const &root, String const &user_root, String const &runtime_root);
     ~CHttpServer();
     
     void register_uri(String const &uri, callback_t const &callback);
@@ -140,7 +140,7 @@ private:
 private:
     bool m_active;
     int m_port;
-    String m_root, m_userroot, m_strRhoRoot, m_strRhoUserRoot;
+    String m_root, m_userroot, m_strRhoRoot, m_strRhoUserRoot, m_strRuntimeRoot;
     SOCKET m_listener;
     SOCKET m_sock;
     std::map<String, callback_t> m_registered;

data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp

@@ -429,7 +429,7 @@ void CMainWindow::createToolbar(rho_param *p)
 #ifdef RHODES_EMULATOR
                         strImagePath = strImagePath.length() > 0 ? CFilePath::join( RHOSIMCONF().getRhodesPath(), "lib/framework/" + strImagePath) : String();
 #else
-                        strImagePath = strImagePath.length() > 0 ? CFilePath::join( rho_native_rhopath() , "lib/" + strImagePath) : String();
+                        strImagePath = strImagePath.length() > 0 ? CFilePath::join( rho_native_reruntimepath() , "lib/" + strImagePath) : String();
 #endif
                     }
 

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

@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
         setenv("rho_debug_port", RHOSIMCONF().getString("debug_port").c_str(), 1 );
 #endif // OS_WINDOWS
 #endif // RHODES_EMULATOR
-    rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath);
+    rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath, m_strRootPath);
 
     // Create the main application window
 #ifdef RHODES_EMULATOR

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

@@ -36,6 +36,7 @@
 #include "../stat/stat.h"
 #endif
 
+#include "common/app_build_capabilities.h"
 #include "logging/RhoLog.h"
 
 #ifdef RHODES_EMULATOR
@@ -77,6 +78,7 @@ extern void Init_RhoSupport(void);
 extern VALUE require_compiled(VALUE fname, VALUE* result);
 extern VALUE RhoPreparePath(VALUE path);
 extern const char* rho_native_rhopath();
+extern const char* rho_native_reruntimepath();
 extern const char* rho_native_rhouserpath();
 //extern void RhoSetCurAppPath(char* path);
 
@@ -192,7 +194,7 @@ void RhoRubyStart()
     //rb_funcall(rb_mGC, rb_intern("stress="), 1, Qtrue);
 
     ruby_init_loadpath(szRoot);
-#ifdef RHODES_EMULATOR
+#if defined(RHODES_EMULATOR) || defined(APP_BUILD_CAPABILITY_MOTOROLA)
     {
         VALUE load_path = GET_VM()->load_path;
         char* app_path = malloc(strlen(szRoot)+100);
@@ -200,12 +202,20 @@ void RhoRubyStart()
         rb_ary_clear(load_path);
 
         strcpy(app_path, szRoot);
+#if defined(RHODES_EMULATOR)
         strcat(app_path, "app");
-
+#else
+        strcat(app_path, "apps/app");
+#endif
         rb_ary_push(load_path, rb_str_new2(app_path) );
 
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+        strcpy(app_path, rho_native_reruntimepath());
+        strcat(app_path, "lib");
+#else
         strcpy(app_path, rho_simconf_getRhodesPath());
         strcat(app_path, "/lib/framework");
+#endif
         rb_ary_push(load_path, rb_str_new2(app_path) );
     }
 

data/platform/shared/ruby/ext/rho/rhosupport.c

@@ -60,6 +60,11 @@ VALUE __rhoGetCurrentDir(void)
     return rb_str_new2(rho_native_rhopath());
 }
 
+VALUE __rhoGetRuntimeDir(void)
+{
+    return rb_str_new2(rho_native_reruntimepath());
+}
+
 VALUE __rhoGetUserDir(void)
 {
     return rb_str_new2(rho_native_rhouserpath());
@@ -271,8 +276,8 @@ static VALUE check_extension(VALUE res, VALUE fname, int nAddExtName)
 
 static VALUE check_app_file_exist(VALUE dir, VALUE fname1, const char* szPlatform)
 {
-    //RAWLOG_INFO1("find_file: check dir %s", RSTRING_PTR(dir));
     VALUE res = rb_str_dup(dir);
+    //RAWLOG_INFO1("find_file: check dir %s", RSTRING_PTR(dir));
 
     #ifdef __SYMBIAN32__
         if(*RSTRING_PTR(res) == '/')
@@ -309,6 +314,10 @@ static VALUE find_file(VALUE fname)
         res = rb_str_dup(fname);
         rb_str_cat(res,RHO_RB_EXT,strlen(RHO_RB_EXT));
         //RAWLOG_INFO1("find_file: res: %s", RSTRING_PTR(res));
+    } else if ( strncmp(RSTRING_PTR(fname), rho_native_reruntimepath(), strlen(rho_native_reruntimepath())) == 0 ){
+        res = rb_str_dup(fname);
+        rb_str_cat(res,RHO_RB_EXT,strlen(RHO_RB_EXT));
+        //RAWLOG_INFO1("find_file: res: %s", RSTRING_PTR(res));
     }else{
         int i = 0;
         VALUE load_path = GET_VM()->load_path;
@@ -582,6 +591,7 @@ void Init_RhoSupport()
     rb_define_global_function("__rhoGetRhodesDir", __rhoGetRhodesDir, 0);
 #endif
 	rb_define_global_function("__rhoGetCurrentDir", __rhoGetCurrentDir, 0);
+	rb_define_global_function("__rhoGetRuntimeDir", __rhoGetRuntimeDir, 0);
 	rb_define_global_function("__rhoGetUserDir", __rhoGetUserDir, 0);
 	rb_define_global_function("__rhoGetDBDir", __rhoGetDBDir, 0);
 	rb_define_global_function("load", rb_load_compiled, 1);

data/platform/shared/ruby/thread_win32.c

@@ -495,6 +495,7 @@ thread_start_func_1(void *th_ptr)
     volatile HANDLE thread_id = th->thread_id;
 
     native_thread_init_stack(th);
+//RHO		
 /*    th->native_thread_data.interrupt_event = CreateEvent(0, TRUE, FALSE, 0);
 
     if ( !th->native_thread_data.interrupt_event)
@@ -503,7 +504,7 @@ thread_start_func_1(void *th_ptr)
         thread_debug("thread interrupt_event error: %d\n", dwErr );
     }
 */
-
+//RHO
     /* run */
     thread_debug("thread created (th: %p, thid: %p, event: %p)\n", th,
 		 th->thread_id, th->native_thread_data.interrupt_event);

data/platform/shared/rubyext/System.cpp

@@ -141,6 +141,12 @@ VALUE rho_sys_get_property(char* szPropName)
         return rho_ruby_create_boolean(0);
 #endif
 
+	if (strcasecmp("has_cell_network",szPropName) == 0) 
+        return rho_sys_has_network();
+
+	if (strcasecmp("has_wifi_network",szPropName) == 0) 
+        return rho_sys_has_network();
+
     RAWLOG_ERROR1("Unknown Rho::System property : %s", szPropName);
 
     return rho_ruby_get_NIL();

data/platform/shared/sync/SyncSource.cpp

@@ -867,6 +867,14 @@ void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const Strin
         for( ; !attrIter.isEnd(); attrIter.next() )
         {
             CAttrValue oAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+
+            String strFreezedProps = getSync().getSourceOptions().getProperty(getID(), "freezed");
+            if ( strFreezedProps.length() > 0 && strFreezedProps.find(oAttrValue.m_strAttrib) == String::npos )
+            {
+                LOG(INFO) + "Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName();
+                continue;
+            }
+
             if ( !processBlob(strCmd,strObject,oAttrValue) )
                 break;
 
@@ -1045,6 +1053,13 @@ void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strO
 
     if ( strCmd.compare("insert") == 0 )
     {
+        String strFreezedProps = getSync().getSourceOptions().getProperty(getID(), "freezed");
+        if ( strFreezedProps.length() > 0 && strFreezedProps.find(oAttrValue.m_strAttrib) == String::npos )
+        {
+            LOG(INFO) + "Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName();
+            return;
+        }
+
         if ( !processBlob(strCmd,strObject,oAttrValue) )
             return;
 

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -2319,10 +2319,6 @@
 				RelativePath="..\..\shared\common\BundleManager.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\shared\common\ExtManager.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\shared\common\ExtManager.h"
 				>

data/platform/wm/build/build_inf.js

@@ -15,25 +15,43 @@ function p(str) {
     output_file.WriteLine(str);
 }
 
-function expand_source(es,name,path,section,destination) {
+function expand_source(es,name,path,section,destination,flag) {
     var s = new Object();
     s.name = name;
     s.path = path;
     s.section = ""+section+"_"+name.replace(/ /g,"_");
-    s.destination = destination+"\\"+name;
+    
+    if (destination == null || destination == "")
+    {
+      if (flag == true)
+        s.destination = "";
+      else
+	    s.destination = name;
+    }
+    else {
+      s.destination = destination+"\\"+name;	
+    }
+    
     s.folder = fso.GetFolder(path);
     es.push(s);
 
     var fc = new Enumerator(s.folder.SubFolders);
     for (; !fc.atEnd(); fc.moveNext()) {
-        expand_source(es,fc.item().Name,fc.item().Path,s.section,s.destination);
+        expand_source(es,fc.item().Name,fc.item().Path,s.section,s.destination,false);
     }
 }
 
 function expand_sources(sources) {
     var es = new Array();
     for (var i in sources) {
-        expand_source(es,sources[i][0],sources[i][1],"copyfiles","rho");
+        expand_source(es,sources[i][0],sources[i][1],"copyfiles","rho",false);
+    }
+    return es;
+}
+
+function expand_sources1(es, sources) {
+    for (var i in sources) {
+        expand_source(es, sources[i][0], sources[i][1], "copyfiles", "",true);
     }
     return es;
 }
@@ -290,6 +308,7 @@ function main() {
     // args(5) = hidden_app
     // args(6) = include motorola webkit binaries and configs
     // args(7) = rhoelements gem folder path
+    // args(8) = additional files 
 
     var args = WScript.Arguments;
     fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -302,6 +321,17 @@ function main() {
     sources['apps']= ["apps",args(4)+"/apps"];
 
     var es = expand_sources(sources);
+    
+    for (var idx = 8; idx < args.length; idx++) 
+    {
+    	if (args(idx) == null)
+    		break;
+    		
+    	var sources_add = new Object();
+        sources_add['files']= ["add" + idx,args(idx)];
+        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));
 

data/platform/wm/build/wm.rake

@@ -106,6 +106,7 @@ namespace "config" do
     $cabwiz = "cabwiz" if $cabwiz.nil?
     $webkit_capability = !($app_config["capabilities"].nil? or $app_config["capabilities"].index("webkit_browser").nil?) 
     $wk_data_dir = "/Program Files" # its fake value for running without motorola extensions. do not delete
+    $additional_dlls_path = nil
 
     begin
       if $webkit_capability
@@ -144,10 +145,32 @@ namespace "build" do
   namespace "wm" do
     task :extensions => "config:wm" do
 
+      if $additional_dlls_path.nil?
+        puts 'new $additional_dlls_paths'
+        $additional_dlls_paths = Array.new
+      end
+
       $app_config["extensions"].each do |ext|
         $app_config["extpaths"].each do |p|
           extpath = File.join(p, ext, 'ext')
+          commin_ext_path = File.join(p, ext)
+          ext_config_path = File.join(p, ext, "ext.yml")
+          ext_config = nil
+
           next unless File.exists? File.join(extpath, "build.bat")
+          
+          puts "ext_config_path - " + ext_config_path.to_s
+          if File.exist? ext_config_path
+            ext_config = YAML::load_file(ext_config_path)
+          end
+
+          puts "extpath - " + commin_ext_path.to_s
+          chdir commin_ext_path 
+            if ext_config != nil && ext_config["files"] != nil
+              puts "ext_config[files] - " + ext_config["files"].to_s
+              $additional_dlls_paths << File.expand_path(ext_config["files"])
+            end
+          chdir $startdir
 
           ENV['RHO_PLATFORM'] = $current_platform
           ENV['RHO_BUILD_CONFIG'] = 'Release'
@@ -159,7 +182,6 @@ namespace "build" do
           ENV['VCBUILD'] = $vcbuild
           ENV['SDK'] = $sdk
 
-          #puts Jake.run("build.bat", [], extpath)
           chdir extpath
           puts `build.bat`
           chdir $startdir
@@ -167,6 +189,11 @@ namespace "build" do
           break
         end
       end
+      #test
+      $additional_dlls_paths.each do |x|
+        puts " - " + x.to_s
+      end
+      #exit
     end
 
     #    desc "Build wm rhobundle"
@@ -360,8 +387,12 @@ namespace "device" do
           File.open(filepath, "w") { |f| f.write(config) }
         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]
+
+      $additional_dlls_paths.each do |path|
+         args << path
+      end
         
       puts Jake.run('cscript',args)
       unless $? == 0
@@ -448,23 +479,28 @@ namespace "run" do
     puts "\nStarting application on the WM6 emulator\n\n"
     log_file = gelLogPath
 
-    #Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
-
-	File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
-	Jake.run_rho_log_server($app_path)
-	puts "RhoLogServer is starting"
-	while true do
-		if File.exists?($app_path + "/started")
-			break
-		end
-		sleep(1)
-	end
+    File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+    Jake.run_rho_log_server($app_path)
+    puts "RhoLogServer is starting"
+    while true do
+      if File.exists?($app_path + "/started")
+        break
+      end
+      sleep(1)
+    end
 
     if $webkit_capability
       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
+
     args   = [ 'emu', "\"#{$wm_emulator}\"", '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"' , $port]
     Jake.run2( detool, args, {:nowait => false})
   end
@@ -496,25 +532,29 @@ namespace "run" do
       puts "Please, connect you device via ActiveSync.\n\n"
       log_file = gelLogPath
 
-      # temporary disable log from device (caused enormous delays)
-      # Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
-
-	  File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+      File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
 	  
       Jake.run_rho_log_server($app_path)
-	  puts "RhoLogServer is starting"
-	  while true do
-	    if File.exists?($app_path + "/started")
-		    break
-	    end
-	    sleep(1)
-	  end    
+      puts "RhoLogServer is starting"
+      while true do
+        if File.exists?($app_path + "/started")
+          break
+        end
+        sleep(1)
+      end    
 
       if $webkit_capability
         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
+
       args   = [ 'dev', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+($startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"', $port ]
       Jake.run2( detool, args, {:nowait => false})
     end
@@ -532,10 +572,20 @@ namespace "run" do
         #remove log file
         rm_rf log_file if File.exists?(log_file)
 
+        File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+        Jake.run_rho_log_server($app_path)
+        puts "RhoLogServer is starting"
+        while true do
+          if File.exists?($app_path + "/started")
+            break
+          end
+          sleep(1)
+        end
+
         Jake.before_run_spec
         start = Time.now
         
-        Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+        #Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
         Jake.run2( detool, args, {:nowait => false})
 
         puts "waiting for log: " + log_file