rhodes 6.2.0 → 7.1.17

data/platform/wm/build/wm.rake

@@ -25,6 +25,7 @@
 #------------------------------------------------------------------------
 require 'rubygems'
 $zippath = "res/build-tools/7za.exe"
+$rhodes_as_lib = false
 
  VS_FIXEDFILEINFO = Struct.new("VS_FIXEDFILEINFO", :Signature, :StrucVersion, :FileVersionMS, :FileVersionLS, :ProductVersionMS, :ProductVersionLS, :FileFlagsMask, :FileFlags, :FileOS, :FileType, :FileSubtype, :FileDateMS, :FileDateLS)
  
@@ -1048,6 +1049,10 @@ namespace "build" do
               ENV['RHO_QMAKE_SPEC'] = $qmake_makespec
               ENV['RHO_VSCMNTOOLS'] = $vscommontools
 
+              if($debug and !$rhosimulator_build)
+                ENV['RHO_QMAKE_VARS'] = ENV['RHO_QMAKE_VARS'] + " CONFIG+=debug CONFIG-=release"
+              end
+
               if File.exists? File.join(extpath, 'build.bat')
                 clean_ext_vsprops(commin_ext_path) if $wm_win32_ignore_vsprops
                 Jake.run3('build.bat', extpath)
@@ -1197,6 +1202,57 @@ namespace "build" do
   end #wm
   
   namespace "win32" do
+
+    task :rhodeslib_lib, [:target_path] => ["build:win32:set_release_config"] do |t, args|
+      print_timestamp('build:win32:rhodeslib_lib START')
+      $rhodes_as_lib = true
+      Rake::Task['build:win32'].invoke
+      createWin32Production(false, true)
+      target_path = args[:target_path]
+      #cp_r File.join($bindir, "#{$appname}-#{$app_config["version"]}.aar"), target_path
+
+      Dir.glob(File.join($tmpdir,'**','*.dll')) do |p|
+          Jake.copyIfNeeded p, target_path
+      end
+
+      if($debug)
+        Jake.copyIfNeeded File.join($tmpdir, "rhodeslibd.dll"), target_path
+        Jake.copyIfNeeded File.join($tmpdir, "rhodeslibd.lib"), target_path
+      else
+        Jake.copyIfNeeded File.join($tmpdir, "rhodeslib.dll"), target_path
+        Jake.copyIfNeeded File.join($tmpdir, "rhodeslib.lib"), target_path
+      end
+
+      rhoruby_dir = File.join($startdir, 'platform', 'shared', 'rhoruby', 'api')
+      rhodeslib_h = File.join($startdir, 'platform', 'shared', 'qt', 'rhodes', 'rhorubyVersion', 'rhodeslib.h')
+      mkdir_p File.join(target_path, 'rhoruby') if not File.exists?  File.join(target_path, 'rhoruby')
+      cp_r rhoruby_dir, File.join(target_path, 'rhoruby')
+      cp_r rhodeslib_h, File.join(target_path, 'rhoruby')
+
+      print_timestamp('build:win32:rhodeslib_lib FINISH')
+    end
+
+    task :rhodeslib_bundle, [:target_path]  => ["build:win32:set_release_config", "config:common"] do |t, args|
+      print_timestamp('build:win32:rhodeslib_bundle START')
+
+      target_path = args[:target_path]
+      $skip_build_rhodes_main = true
+      $skip_build_extensions = true
+      $skip_build_xmls = true
+      $use_prebuild_data = true
+
+      Rake::Task['config:win32:qt'].invoke
+
+      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+
+      Rake::Task['build:win32:rhobundle'].invoke
+
+      mkdir_p target_path if not File.exists? target_path
+      cp_r File.join($bindir, "RhoBundle"), target_path
+    end
+
+
     task :deployqt => "config:win32:qt" do
 
       FileUtils.rm_rf(Dir.glob(File.join($target_path, 'msvc*0.dll')), {:secure => true})
@@ -1504,10 +1560,14 @@ namespace "build" do
               ENV['VCBUILD'] = $vcbuild
               ENV['RHO_VSPROJ_SDK_PLATFORM'] = $sdk
               ENV['RHO_QMAKE'] = $qmake
-              ENV['RHO_QMAKE_VARS'] = $rhosimulator_build ? 'RHOSIMULATOR_BUILD=1' : ''
+              ENV['RHO_QMAKE_VARS'] = $rhosimulator_build ? 'RHOSIMULATOR_BUILD=1' : ""
               ENV['RHO_QMAKE_SPEC'] = $qmake_makespec
               ENV['RHO_VSCMNTOOLS'] = $vscommontools
 
+              if($debug and !$rhosimulator_build)
+                ENV['RHO_QMAKE_VARS'] = ENV['RHO_QMAKE_VARS'] + " CONFIG+=debug CONFIG-=release" 
+              end
+
               clean_ext_vsprops(commin_ext_path) if $wm_win32_ignore_vsprops
               Jake.run3('build.bat', extpath)
           end
@@ -1593,7 +1653,19 @@ PRE_TARGETDEPS += #{pre_targetdeps}
 
       ENV['RHO_QMAKE_SPEC'] = $qmake_makespec
       ENV['RHO_VSCMNTOOLS'] = $vscommontools
-      Jake.run3('rhosimulator_win32_build.bat "RHOSIMULATOR_BUILD=1"', $qt_project_dir)
+      if $rhodes_as_lib
+        if($debug)
+          Jake.run3('rhoruby_win32_build_debug.bat "RHOSIMULATOR_BUILD=1"', $qt_project_dir)
+        else
+          Jake.run3('rhoruby_win32_build.bat "RHOSIMULATOR_BUILD=1"', $qt_project_dir)
+        end
+      else
+        if($debug && !$rhosimulator_build)
+          Jake.run3('rhosimulator_win32_build_debug.bat "RHOSIMULATOR_BUILD=1"', $qt_project_dir)
+        else
+          Jake.run3('rhosimulator_win32_build.bat "RHOSIMULATOR_BUILD=1"', $qt_project_dir)
+        end
+      end
 
       chdir $startdir
 
@@ -1626,12 +1698,35 @@ PRE_TARGETDEPS += #{pre_targetdeps}
 
     ENV['RHO_QMAKE_SPEC'] = $qmake_makespec
     ENV['RHO_VSCMNTOOLS'] = $vscommontools
-    Jake.run3('rhosimulator_win32_build.bat "DESKTOPAPP_BUILD=1"', $qt_project_dir)
+    if ($rhodes_as_lib)
+      if($debug)
+        Jake.run3('rhoruby_win32_build_debug.bat "DESKTOPAPP_BUILD=1"', $qt_project_dir)
+      else
+        Jake.run3('rhoruby_win32_build.bat "DESKTOPAPP_BUILD=1"', $qt_project_dir)
+      end
+    else
+      if($debug)
+        Jake.run3('rhosimulator_win32_build_debug.bat "DESKTOPAPP_BUILD=1"', $qt_project_dir)
+      else
+        Jake.run3('rhosimulator_win32_build.bat "DESKTOPAPP_BUILD=1"', $qt_project_dir)
+      end
+    end
     $target_path = File.join( $startdir, $vcbindir, $sdk, 'rhodes', $buildcfg)
     if not File.directory?($target_path)
       Dir.mkdir($target_path)
     end
-    cp File.join($startdir, "platform/win32/bin/RhoSimulator/RhoSimulator.exe"), File.join($target_path, 'rhodes.exe')
+    if ($rhodes_as_lib)
+
+      if($debug)
+        cp File.join($startdir, "platform/win32/bin/RhoSimulator/rhodeslibd.dll"), File.join($target_path)
+        cp File.join($startdir, "platform/win32/bin/RhoSimulator/rhodeslibd.lib"), File.join($target_path)
+      else
+        cp File.join($startdir, "platform/win32/bin/RhoSimulator/rhodeslib.dll"), File.join($target_path)
+        cp File.join($startdir, "platform/win32/bin/RhoSimulator/rhodeslib.lib"), File.join($target_path)
+      end
+    else
+      cp File.join($startdir, "platform/win32/bin/RhoSimulator/RhoSimulator.exe"), File.join($target_path, 'rhodes.exe')
+    end
 
     chdir $startdir
   end
@@ -1757,7 +1852,17 @@ namespace "device" do
     mkdir_p $tmpdir unless skip_deployqt
     mkdir_p out_dir
 
-    cp out_dir + "rhodes.exe", $tmpdir + "/" + $appname + ".exe"
+    if($rhodes_as_lib)
+      if($debug)
+        cp_r out_dir + "rhodeslibd.dll", $tmpdir
+        cp_r out_dir + "rhodeslibd.lib", $tmpdir
+      else
+        cp_r out_dir + "rhodeslib.dll", $tmpdir
+        cp_r out_dir + "rhodeslib.lib", $tmpdir
+      end
+    else
+      cp out_dir + "rhodes.exe", $tmpdir + "/" + $appname + ".exe"
+    end
 
     script_name = File.join($startdir, "platform", "wm", "build", "rhodes.nsi")
     app_script_name = File.join($tmpdir, $appname + ".nsi")

data/platform/wm/rhodes/rho/common/ExtManager.cpp

@@ -82,7 +82,11 @@ CRhoExtData CExtManager::makeExtData()
     oData.m_hWnd = 0;
     oData.m_hInstance = 0;
 #endif
+#ifndef RHODES_VERSION_LIBRARY
     oData.m_iTabIndex = rho_webview_active_tab();
+#else
+    oData.m_iTabIndex = -1;
+#endif
 #if !defined(OS_WINDOWS_DESKTOP)
 	if(getAppWindow().getWebKitEngine())
 		oData.m_hBrowserWnd = getAppWindow().getWebKitEngine()->GetHTMLWND(oData.m_iTabIndex);
@@ -169,7 +173,9 @@ unsigned long CExtManager::parseJsonToRubyHash(const char* szJson)
 
 void CExtManager::navigate(const wchar_t* szUrl)
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho_webview_navigate( convertToStringA(szUrl).c_str(), -1 );
+#endif
 }
 
 bool CExtManager::existsJavascript(const wchar_t* szJSFunction)
@@ -240,6 +246,7 @@ bool CExtManager::DeRegisterForPrimaryBrowserMessage(unsigned int iMsgId)
 
 void CExtManager::executeJavascript(const wchar_t* szJSFunction)
 {
+#ifndef RHODES_VERSION_LIBRARY
     TNavigateData* nd = new TNavigateData();
     nd->index = rho_webview_active_tab();
 #ifndef RHODES_QT_PLATFORM
@@ -249,31 +256,46 @@ void CExtManager::executeJavascript(const wchar_t* szJSFunction)
     nd->url = wcsdup(szJSFunction);
     CMainWindow::getInstance()->executeJavaScriptCommand(nd);
 #endif
+#endif
 }
 
 StringW CExtManager::getCurrentUrl()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return convertToStringW(RHODESAPP().getCurrentUrl(rho_webview_active_tab()));
+#else
+    return convertToStringW(RHODESAPP().getCurrentUrl(-1));
+#endif
 }
 
 void CExtManager::historyForward()
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho_webview_navigate_forward();
+#endif
 }
 
 void CExtManager::historyBack()
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho_webview_navigate_back();
+#endif
 }
 
 int CExtManager::getCurrentTabID()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return rho_webview_active_tab();    
+#else
+    return -1;
+#endif
 }
 
 void CExtManager::refreshPage(bool bFromCache)
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho_webview_refresh(rho_webview_active_tab());
+#endif
 }
 
 void CExtManager::stopNavigate()
@@ -285,7 +307,9 @@ void CExtManager::stopNavigate()
 
 void CExtManager::quitApp()
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho_sys_app_exit();
+#endif
 }
 
 #ifndef RHODES_QT_PLATFORM
@@ -305,8 +329,10 @@ void CExtManager::minimizeApp()
     ::PostMessage( getMainWnd(), WM_WINDOW_MINIMIZE, 0, 0 );
 #endif
 #else
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->minimizeWindowCommand();
 #endif
+#endif
 }
 
 void CExtManager::restoreApp()
@@ -318,8 +344,10 @@ void CExtManager::restoreApp()
     rho_callInUIThread(__minimize_restoreApp, SW_SHOW);
 #endif
 #else
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->restoreWindowCommand();
 #endif
+#endif
 }
 
 void CExtManager::resizeBrowserWindow(RECT rc)
@@ -327,8 +355,10 @@ void CExtManager::resizeBrowserWindow(RECT rc)
 #ifndef RHODES_QT_PLATFORM
     //::MoveWindow( getMainWnd(), rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE );
 #else
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->setFrame(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top);
 #endif
+#endif
 }
 
 void CExtManager::zoomPage(float fZoom)

data/platform/wm/rhodes/rho/common/RhoClassFactory.h

@@ -29,6 +29,7 @@
 #include "common/IRhoClassFactory.h"
 #include "../net/NetRequestImpl.h"
 #include "RhoThreadImpl.h"
+#include "common/ISecurityTokenGenerator.h"
 
 namespace rho {
 namespace common {
@@ -52,6 +53,11 @@ public:
         return NULL;
     }
 
+    const rho::common::ISecurityTokenGenerator* createSecurityTokenGenerator()
+    {
+        return nullptr;
+    }
+
     virtual IRhoCrypt* createRhoCrypt();
 };
 

data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp

@@ -37,6 +37,8 @@
 #include "common/RhoDefs.h"
 #include "common/RhoStd.h"
 #undef null
+
+#ifndef RHODES_VERSION_LIBRARY
 #include <qglobal.h>
 #ifndef OS_SAILFISH
 #if QT_VERSION > QT_VERSION_CHECK(5,7,0)
@@ -48,6 +50,7 @@
 #endif
 #endif
 #include "../../qt/rhodes/impl/MainWindowImpl.h"
+#endif// RHODES_VERSION_LIBRARY
 
 #else // RHODES_QT_PLATFORM
 

data/platform/wm/rubylib/rubylib.vcxproj

@@ -273,6 +273,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_RubyCompiler|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\shared\ruby\ext\rho\rhoruby.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\io\wait\wait.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\io\nonblock\nonblock.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\date\date_core.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\date\date_parse.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\date\date_strftime.c" />
+    <ClCompile Include="..\..\shared\ruby\ext\date\date_strptime.c" />
     <ClCompile Include="..\..\shared\ruby\ext\rho\rhosupport.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_RubyCompiler|Win32'">false</ExcludedFromBuild>
     </ClCompile>

data/platform/wp8/rhoruntime/common/RhoClassFactory.h

@@ -29,6 +29,7 @@
 #include "common/IRhoClassFactory.h"
 #include "net/CURLNetRequest.h"
 #include "RhoThreadImpl.h"
+#include "common/ISecurityTokenGenerator.h"
 
 namespace rho {
 namespace common {
@@ -47,6 +48,11 @@ public:
         return new CRhoThreadImpl;
     }
 
+    const rho::common::ISecurityTokenGenerator* createSecurityTokenGenerator()
+    {
+        return nullptr;
+    }
+
     virtual net::ISSL* createSSLEngine();
     virtual IRhoCrypt* createRhoCrypt();
 };

data/rakefile.rb

@@ -138,7 +138,7 @@ end
 Jake.set_logger( $logger )
 
 
-def print_timestamp(msg = 'just for info')  
+def print_timestamp(msg = 'just for info')
   if $timestamp_start_milliseconds == 0
     $timestamp_start_milliseconds = (Time.now.to_f*1000.0).to_i
   end
@@ -198,7 +198,7 @@ namespace "framework" do
   end
 end
 
-$application_build_configs_keys = ['encrypt_files_key', 'nodejs_application', 'security_token', 'encrypt_database', 'use_deprecated_encryption','android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine", "iphone_enable_startup_logging"]
+$application_build_configs_keys = ['encrypt_files_key', 'nodejs_application', 'rubynodejs_application', 'security_token', 'encrypt_database', 'use_deprecated_encryption','android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine", "iphone_enable_startup_logging"]
 
 $winxpe_build = false
 
@@ -208,7 +208,7 @@ def make_application_build_config_header_file
   #f.puts "// Generated #{Time.now.to_s}"
   f.puts ""
   f.puts "#include <string.h>"
-  f.puts "#include <common/RhoConf.h>"
+  f.puts "#include \"common/RhoConf.h\""
   f.puts ""
   f.puts '//#include "app_build_configs.h"'
   if $rhosimulator_build
@@ -2255,9 +2255,11 @@ namespace "config" do
     $use_shared_runtime = Jake.getBuildBoolProp("use_shared_runtime")
     $js_application    = Jake.getBuildBoolProp("javascript_application")
     $nodejs_application    = Jake.getBuildBoolProp("nodejs_application")
+    $rubynodejs_application    = Jake.getBuildBoolProp("rubynodejs_application")
 
     $logger.debug '%%%_%%% $js_application = '+$js_application.to_s
     $logger.debug '%%%_%%% $nodejs_application = '+$nodejs_application.to_s
+    $logger.debug '%%%_%%% $rubynodejs_application = '+$rubynodejs_application.to_s
 
     if !$js_application && !$nodejs_application && !Dir.exists?(File.join($app_path, "app"))
       BuildOutput.error([
@@ -2564,14 +2566,14 @@ def init_extensions(dest, mode = "")
   rhoapi_js_folder = nil
   rhoapi_nodejs_folder = nil
   if !dest.nil?
-    if $nodejs_application
+    if $nodejs_application || $rubynodejs_application
         rhoapi_js_folder = File.join( File.dirname(dest), "apps/nodejs/server/public/api" )
     else
         rhoapi_js_folder = File.join( File.dirname(dest), "apps/public/api" )
     end
     rhoapi_nodejs_folder = File.join( File.dirname(dest), "apps/nodejs/rhoapi" )
   elsif mode == "update_rho_modules_js"
-      if $nodejs_application
+      if $nodejs_application || $rubynodejs_application
           rhoapi_js_folder = File.join( $app_path, "nodejs/server/public/api" )
       else
           rhoapi_js_folder = File.join( $app_path, "public/api" )
@@ -3416,7 +3418,7 @@ namespace "build" do
           end
         else
           puts `#{cmd_str}`
-        end        
+        end
         unless $? == 0
           puts "Error interpreting erb code"
           exit 1
@@ -3962,12 +3964,12 @@ namespace "build" do
     msbuild = "msbuild" if msbuild.nil?
 
     rho_ruby_project = File.join($startdir, "platform/win32/RubyWin/RubyWin.2015.sln")
-    argsClean = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32", 
-      '/p:VisualStudioVersion=14.0', '/t:Clean'] 
+    argsClean = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32",
+      '/p:VisualStudioVersion=14.0', '/t:Clean']
     Jake.run(msbuild, argsClean)
 
-    argsBuild = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32", 
-      '/p:VisualStudioVersion=14.0', '/t:Build'] 
+    argsBuild = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32",
+      '/p:VisualStudioVersion=14.0', '/t:Build']
     Jake.run(msbuild, argsBuild)
     puts "RhoRuby rebuilded"
   end
@@ -4044,6 +4046,8 @@ namespace "run" do
       sim_conf = "rhodes_path='#{$startdir}'\r\n"
       sim_conf += "app_version='#{$app_config["version"]}'\r\n"
       sim_conf += "app_name='#{$appname}'\r\n"
+      sim_conf += "rhodes_gem_version='#{ENV['rhodes_version']}'\r\n"
+
       if ( ENV['rho_reload_app_changes'] )
         sim_conf += "reload_app_changes=#{ENV['rho_reload_app_changes']}\r\n"
       else