rhodes 3.3.3.beta.4 → 3.3.3

data/platform/wm/build/build_inf.js

@@ -5,9 +5,9 @@ var fso,output_file;
 var stdout = WScript.StdOut;
 
 var settings = new Object();
-settings['wm6'] = ['Windows Mobile 6 Professional SDK (ARMV4I)','VersionMin=5.02','VersionMax=6.99'];
-settings['wm653'] = ['Windows Mobile 6.5.3 Professional DTK (ARMV4I)','VersionMin=5.02','VersionMax=6.99'];
-settings['ce5'] = ['MC3000c50b (ARMV4I)','VersionMin=5.00','VersionMax=6.99'];
+settings['wm6'] = ['Windows Mobile 6 Professional SDK (ARMV4I)','VersionMin=5.02','VersionMax=7.99'];
+settings['wm653'] = ['Windows Mobile 6.5.3 Professional DTK (ARMV4I)','VersionMin=5.02','VersionMax=7.99'];
+settings['ce5'] = ['MC3000c50b (ARMV4I)','VersionMin=5.00','VersionMax=7.99'];
 
 main();
 
@@ -41,7 +41,7 @@ function expand_source(es,name,path,section,destination,flag) {
     }
 }
 
-function expand_sources(sources) {
+function expand_sources_rho(sources) {
     var es = new Array();
     for (var i in sources) {
         expand_source(es,sources[i][0],sources[i][1],"copyfiles","rho",false);
@@ -49,7 +49,7 @@ function expand_sources(sources) {
     return es;
 }
 
-function expand_sources1(es, sources) {
+function expand_sources(es, sources) {
     for (var i in sources) {
         expand_source(es, sources[i][0], sources[i][1], "copyfiles", "",true);
     }
@@ -204,7 +204,20 @@ function fill_extensions_files(exts) {
     }
 }
 
-function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,rhogempath,usereruntime) {
+function fill_registry_keys() {
+	var regfName = "regs.txt";
+	
+	if (fso.FileExists(regfName)) {
+		var regf = fso.OpenTextFile(regfName);
+		var contents = regf.ReadAll();
+		regf.Close();
+		
+		p(contents);
+		p("")
+	}
+}
+
+function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,rhogempath,usereruntime,include_motocaps,is_custom_config) {
     p("[Version]");
     p("Signature=\"$Windows NT$\"");
     p("Provider=\""+vendor+"\"");
@@ -227,7 +240,7 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
         p("CEShortcuts=Shortcuts");
     }
     p("AddReg=RegKeys");
-    p("CopyFiles=CopyToInstallDir"+((!usereruntime) && webkit ? ",CopyWebKitBin,CopyNPAPI,CopyConfig" : "")+(show_shortcut && usereruntime ? ",Shortcuts" : "")+get_copyfiles_sections(es));
+    p("CopyFiles=CopyToInstallDir"+((!usereruntime) && webkit ? ",CopyWebKitBin,CopyNPAPI,CopyConfig,CopySystemFiles" : "")+((!usereruntime) && (!webkit) && include_motocaps? ",CopyConfig" : "")+(show_shortcut && usereruntime ? ",Shortcuts" : "")+get_copyfiles_sections(es));
     p("");
     p("[SourceDisksNames]");
     if (usereruntime) {
@@ -238,6 +251,12 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
             p("2=,\"\",," + rhogempath + "\"\\\"");
             p("3=,\"\",," + rhogempath + "\"\\NPAPI\\\"");
             p("4=,\"\",," + rhogempath + "\"\\Config\\\"");
+        }else
+        {
+            if(include_motocaps)
+            {
+                p("2=,\"\",," + rhogempath + "\"\\Config\\\"");
+            }
         }
     }
     get_source_disks_names(es);
@@ -249,15 +268,27 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
         p("\"" + name + ".exe\"=1");
         if (webkit) {
             p("\"eklibrary.dll\"=2");
+            p("\"prtlib.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");
+            if (!is_custom_config) {
+                p("\"Config.xml\"=4");
+            }
             p("\"Plugin.xml\"=4");
             p("\"RegEx.xml\"=4");
+        }else
+        {
+            if(include_motocaps)
+            {
+                if (!is_custom_config) {
+                    p("\"Config.xml\"=2");
+                }
+                p("\"Plugin.xml\"=2");
+                p("\"RegEx.xml\"=2");
+            }
         }
     }
     fill_extensions_source_disk_files(exts);
@@ -267,12 +298,19 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
     if (show_shortcut){
         p("Shortcuts=0,\"%CE11%\"");
     }
-    p("CopyToInstallDir=0,\"%InstallDir%\"");
+    if ((!usereruntime) && webkit) {
+        p("CopySystemFiles=0,\"%CE2%\"");
+    }
+    p("CopyToInstallDir=0,\"%InstallDir%\"");    
     if ((!usereruntime) && webkit) {
         p("CopyWebKitBin=0,\"%InstallDir%\"");
         p("CopyNPAPI=0,\"%InstallDir%\\NPAPI\"");
         p("CopyConfig=0,\"%InstallDir%\\Config\"");
     }
+    if ((!usereruntime) && (!webkit) && include_motocaps) {
+        p("CopyConfig=0,\"%InstallDir%\\Config\"");
+    }
+    
     get_destination_dirs(es);
     p("");
     p("[CopyToInstallDir]");
@@ -280,12 +318,12 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
         p("\"" + name + ".lnk\",\"" + name + ".lnk\",,0");
     } else {
         p("\"" + name + ".exe\",\"" + name + ".exe\",,0");
+        p("\"license_rc.dll\",\"license_rc.dll\",,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("");
@@ -294,9 +332,26 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
             p("\"npwtg_legacy.dll\",\"npwtg_legacy.dll\",,0");
             p("");
             p("[CopyConfig]");
-            p("\"Config.xml\",\"Config.xml\",,0");
+            if (!is_custom_config) {
+                p("\"Config.xml\",\"Config.xml\",,0");
+            }
             p("\"Plugin.xml\",\"Plugin.xml\",,0");
             p("\"RegEx.xml\",\"RegEx.xml\",,0");
+            p("");
+            p("[CopySystemFiles]");
+            p("\"prtlib.dll\",\"prtlib.dll\",,0");
+        }else
+        {
+            if(include_motocaps)
+            {
+                p("");
+                p("[CopyConfig]");
+                if (!is_custom_config) {
+                    p("\"Config.xml\",\"Config.xml\",,0");
+                }
+                p("\"Plugin.xml\",\"Plugin.xml\",,0");
+                p("\"RegEx.xml\",\"RegEx.xml\",,0");
+            }
         }
     }
     fill_extensions_files(exts);
@@ -312,10 +367,12 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit,r
     }
     p("");
     p("[RegKeys]");
+    fill_registry_keys()
     p("");
 }
 
 function main() {
+	
     // args(0) = .inf filename
     // args(1) = platform ('wm6' or 'ce5')
     // args(2) = app_name
@@ -325,43 +382,46 @@ function main() {
     // args(6) = include motorola webkit binaries and configs?
     // args(7) = rhoelements gem folder path
     // args(8) = use RhoElements runtime?
-    // args(9)... = additional files
+    // args(9) = use Motorola extextension?
+    // args(10)... = 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 srcdir = args(4)
+    var is_icon = fso.FileExists(srcdir+"/icon/icon.ico");
+    var show_shortcut = (args(5) == "0");
+    var include_webkit = (args(6) == "1");
+    var usereruntime = (args(8) == "1");
+    var include_motocaps = (args(9) == "1");
+    var is_custom_config = fso.FileExists(srcdir+"/apps/Config.xml");
 
     var sources = new Object();
     sources['db'] = ["db","..\\..\\..\\platform\\shared\\db\\res\\db"];
-    //sources['sqlite3']= ["sqlite3","..\\..\\shared\\sqlite3"];
+
     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);
+    var es = expand_sources_rho(sources);
     
-    for (var idx = 9; idx < args.length; idx++)
+    for (var idx = 10; 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);
+        es  = expand_sources(es, sources_add);
     }
 
     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);
+    pinf(args(1),es,exts,args(2),args(3),srcdir,show_shortcut,is_icon,include_webkit,args(7),usereruntime,include_motocaps,is_custom_config);
 
     output_file.Close();
 }

data/platform/wm/build/wm.rake

@@ -25,7 +25,10 @@
 #------------------------------------------------------------------------
 
 def kill_detool
-  `taskkill /F /IM detool.exe`
+  begin 
+    `taskkill /F /IM detool.exe`
+  rescue Exception => e
+  end  
 end
 
 def sign (cabfile)
@@ -99,17 +102,21 @@ namespace "config" do
     $cabwiz = File.join($config["env"]["paths"]["cabwiz"], "cabwiz.exe") if $config["env"]["paths"]["cabwiz"]
     $cabwiz = "cabwiz" if $cabwiz.nil?
     $webkit_capability = !($app_config["capabilities"].nil? or $app_config["capabilities"].index("webkit_browser").nil?) 
+    $motorola_capability = !($app_config["capabilities"].nil? or $app_config["capabilities"].index("motorola").nil?) 
     $wk_data_dir = "/Program Files" # its fake value for running without motorola extensions. do not delete
     $additional_dlls_path = nil
+    $additional_regkeys = nil
+    $use_direct_deploy = "yes"
 
     begin
-      if $webkit_capability
+      if $webkit_capability || $motorola_capability
         require "rhoelements-data"
         $wk_data_dir = $data_dir[0]
       end
-    rescue
+    rescue Exception => e
       puts "rhoelements gem is't found, webkit capability is disabled"
-      $webkit_capability = "0"
+      $webkit_capability = false
+      $motorola_capability = false
     end
         
     unless $build_solution
@@ -133,22 +140,24 @@ 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
+    $use_shared_runtime = (($app_config["use_shared_runtime"].nil? && ($app_config["wm"].nil? || $app_config["wm"]["use_shared_runtime"].nil?)) ? nil : 1 )
+    #puts $app_config["wm"]["use_shared_runtime"].inspect
+    #puts $use_shared_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 not $use_shared_runtime.nil? then next end
 
       if $additional_dlls_path.nil?
         puts 'new $additional_dlls_paths'
         $additional_dlls_paths = Array.new
       end
-
+      
+      $regkeys = Array.new
+      
       $app_config["extensions"].each do |ext|
         $app_config["extpaths"].each do |p|
           extpath = File.join(p, ext, 'ext')
@@ -169,6 +178,15 @@ namespace "build" do
               puts "ext_config[files] - " + ext_config["files"].to_s
               $additional_dlls_paths << File.expand_path(ext_config["files"])
             end
+            
+            puts 'start read reg key'
+            if ext_config != nil && ext_config["regkeys"] != nil
+              ext_config["regkeys"].each do |key|
+                puts "extension " + ext + " add regkey to cab. key: " + key
+                $regkeys << key
+              end
+            end
+            puts 'end read reg key'
           chdir $startdir
 
           ENV['RHO_PLATFORM'] = $current_platform
@@ -188,10 +206,11 @@ namespace "build" do
           break
         end
       end
+      
       #test
-      $additional_dlls_paths.each do |x|
-        puts " - " + x.to_s
-      end
+      #$additional_dlls_paths.each do |x|
+      #  puts " - " + x.to_s
+      #end
       #exit
     end
 
@@ -201,7 +220,7 @@ namespace "build" do
     end
 
     task :rhodes => ["config:wm", "build:wm:rhobundle"] do
-      if not $use_re_runtime.nil? then next end
+      if not $use_shared_runtime.nil? then next end
 
       chdir $config["build"]["wmpath"]
 
@@ -285,7 +304,7 @@ namespace "build" do
 
     end
 
-    task :rhosimulator => ["config:set_win32_platform", "config:wm"] do
+    task :rhosimulator => ["config:set_win32_platform", "config:wm", "build:rhosimulator_version"] do
       $rhosimulator_build = true
       $config["platform"] = $current_platform
       chdir $startdir
@@ -317,6 +336,7 @@ namespace "build" do
       end
       cp File.join($startdir, $vcbindir, "win32/rhodes/SimulatorRelease/rhosimulator.exe"), target_path
 
+      cp File.join(qtdir, "bin/phonon4.dll"), target_path
       cp File.join(qtdir, "bin/QtCore4.dll"), target_path
       cp File.join(qtdir, "bin/QtGui4.dll"), target_path
       cp File.join(qtdir, "bin/QtNetwork4.dll"), target_path
@@ -359,11 +379,12 @@ namespace "device" do
     task :production => ["config:wm","build:wm:rhobundle","build:wm:rhodes"] do
 
       wm_icon = $app_path + '/icon/icon.ico'
-      if $use_re_runtime.nil? then
+      if $use_shared_runtime.nil? then
         out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
         cp out_dir + "rhodes.exe", out_dir + $appname + ".exe"
+        cp $startdir + "/res/build-tools/license_rc.dll", out_dir + "license_rc.dll"
       else
-        shortcut_content = '"\\Program Files\\RhoElements2\\RhoElements2.exe" -approot="\\Program Files\\' + $appname + '"'
+        shortcut_content = '"\\Program Files\\RhoElements\\RhoElements.exe" -approot="\\Program Files\\' + $appname + '"'
         if File.exists? wm_icon then
           shortcut_content = shortcut_content + '?"\\Program Files\\' + $appname + '\\rho\\icon\\icon.ico"'
         end
@@ -379,7 +400,7 @@ namespace "device" do
 
       icon_dest = $srcdir + '/icon'
       rm_rf icon_dest
-      if not $use_re_runtime.nil? then
+      if not $use_shared_runtime.nil? then
         rm_rf $srcdir + '/lib'
         if File.exists? wm_icon then
           mkdir_p icon_dest if not File.exists? icon_dest
@@ -387,14 +408,32 @@ namespace "device" do
         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, (($use_re_runtime.nil?) ? "0" : "1")]
+      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_shared_runtime.nil?) ? "0" : "1"), ($motorola_capability ? "1" : "0")]
 
-      if $use_re_runtime.nil? then
+      if $use_shared_runtime.nil? then
          $additional_dlls_paths.each do |path|
             args << path
          end
       end
+      
+      reg_keys_filename = File.join(File.dirname(__FILE__), "regs.txt");
+      puts 'remove file with registry keys'
+      if File.exists? reg_keys_filename  
+        rm reg_keys_filename 
+      end
+      
+       if $regkeys && $regkeys.size > 0
+        puts 'add registry keys to file'
+        $regkey_file = File.new(reg_keys_filename, "w+")
+      
+        $regkeys.each do |key|
+          $regkey_file.puts(key + "\n")
+        end
         
+        $regkey_file.close   
+      end  
+      
       puts Jake.run('cscript',args)
       unless $? == 0
         puts "Error running build_inf"
@@ -429,7 +468,6 @@ namespace "device" do
       rm_f "cleanup.js"
 
       chdir $startdir
-
     end
   end
 end
@@ -456,9 +494,9 @@ namespace "clean" do
 end
 
 namespace "run" do
-    task :mylogserver => ["config:wm"] do
-        Jake.run_rho_log_server($app_path)
-    end
+  task :mylogserver => ["config:wm"] do
+    Jake.run_rho_log_server($app_path)
+  end
 
   def gelLogPath
     log_file_path =  File.join($app_path, $log_file)
@@ -467,46 +505,51 @@ namespace "run" do
 
   desc "Build and run on WM6 emulator"
   task :wm => ["device:wm:production"] do
-    # kill all running detool
-    kill_detool
+    if $use_direct_deploy == "no" 
+      Rake::Task["run:wm:cab"].execute
+    else
+      # kill all running detool
+      kill_detool
 
-    cd $startdir + "/res/build-tools"
-    detool = "detool.exe"
+      cd $startdir + "/res/build-tools"
+      detool = "detool.exe"
     
-    puts "\nStarting application on the WM6 emulator\n\n"
-    log_file = gelLogPath
+      puts "\nStarting application on the WM6 emulator\n\n"
+      log_file = gelLogPath
 
-    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
+      File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+      Jake.run_rho_log_server($app_path)
+      puts "Start Log Server. Wating while Log Server is started..."
+      while true do
+        if File.exists?($app_path + "/started")
+          break
+        end
+        sleep(1)
       end
-      sleep(1)
-    end
 
-    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 $webkit_capability and ($use_shared_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})
+      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
-    end
 
-    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})
+      args = [ 'emu', "\"#{$wm_emulator}\"", '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+((not $use_shared_runtime.nil?) ? $srcdir + '/../' + $appname + '.lnk' : $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"' , $port,  '"'+$startdir + "/res/build-tools/license_rc.dll" + '"']
+      Jake.run2( detool, args, {:nowait => false})
+    end
   end
 
   namespace "wm" do
     task :get_log => "config:wm" do
       puts "log_file=" + gelLogPath
     end
-    
+
+    desc "Run application on RhoSimulator"    
     task :rhosimulator => ["config:set_wm_platform", "config:common"] do
       $rhosim_config = "platform='wm'\r\n"
       Rake::Task["run:rhosimulator"].invoke
@@ -517,43 +560,47 @@ namespace "run" do
       Rake::Task["run:rhosimulator_debug"].invoke
     end
 
-    desc "Build and run on the Windows Phone"
+    desc "Build and run on the Windows Mobile device"
     task :device => ["device:wm:production"] do
-      # kill all running detool
-      kill_detool
+      if $use_direct_deploy == "no" 
+        Rake::Task["run:wm:device:cab"].execute
+      else
+        # kill all running detool
+        kill_detool
 
-      cd $startdir + "/res/build-tools"
-      detool = "detool.exe"     
+        cd $startdir + "/res/build-tools"
+        detool = "detool.exe"     
 
-      puts "\nStarting application on the device"
-      puts "Please, connect you device via ActiveSync.\n\n"
-      log_file = gelLogPath
+        puts "\nStarting application on the device"
+        puts "Please, connect you device via ActiveSync.\n\n"
+        log_file = gelLogPath
 
-      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 and ($use_re_runtime.nil?)
-        wk_args   = [ 'wk-dev', '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
-        Jake.run2( detool, wk_args, {:nowait => false})
-      end
+        if $webkit_capability and ($use_shared_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})
+        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
-      end
 
-      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})
+        args = [ 'dev', '"'+$appname.gsub(/"/,'\\"')+'"', '"'+$srcdir.gsub(/"/,'\\"')+'"', '"'+((not $use_shared_runtime.nil?) ? $srcdir + '/../' + $appname + '.lnk' : $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe").gsub(/"/,'\\"')+'"', $port,  '"'+$startdir + "/res/build-tools/license_rc.dll" + '"']
+        Jake.run2( detool, args, {:nowait => false})
+      end
     end
 
     task :spec => ["device:wm:production"] do
@@ -652,7 +699,7 @@ namespace "run" do
 
         cd $startdir + "/res/build-tools"
         detool = "detool.exe"
-        args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname, (($use_re_runtime.nil?) ? "0" : "1")]
+        args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname, (($use_shared_runtime.nil?) ? "0" : "1")]
         puts "\nStarting application on the device"
         puts "Please, connect you device via ActiveSync.\n\n"
         log_file = gelLogPath
@@ -670,7 +717,7 @@ namespace "run" do
 
       cd $startdir + "/res/build-tools"
       detool = "detool.exe"
-      args   = ['emucab', "\"#{$wm_emulator}\"", $targetdir + '/' +  $appname + ".cab", $appname, (($use_re_runtime.nil?) ? "0" : "1")]
+      args   = ['emucab', "\"#{$wm_emulator}\"", $targetdir + '/' +  $appname + ".cab", $appname, (($use_shared_runtime.nil?) ? "0" : "1")]
       log_file = gelLogPath
 
       Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
@@ -789,7 +836,6 @@ namespace "run" do
       puts Jake.run2($nsis, args, {:nowait => false} )
 
     end
-
   end
 
 end