rhodes 5.5.2 → 5.5.15

data/platform/wm/rhodes/browser/stubs.cpp

@@ -0,0 +1,5 @@
+// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+#include "StdAfx.h"
+#include "common/RhoStd.h"
+#include "IBrowserEngine.h"
+rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}

data/platform/wm/rhodes/rho/net/NetRequestImpl.h

@@ -50,6 +50,7 @@ class CNetResponseImpl : public INetResponse
     String m_data;
     int    m_nRespCode;
     String m_cookies;
+    String m_errorMessage;
 public:
     CNetResponseImpl() : m_bValid(false),m_nRespCode(-1){}
 
@@ -75,6 +76,8 @@ public:
     }
     virtual int getRespCode(){ return m_nRespCode;}
 
+    virtual String getErrorMessage() { return m_errorMessage; }
+
     bool isValid()const{ return m_bValid; }
     void setValid(bool b){ m_bValid = b; }
 

data/platform/wm/rhodes/rhodes.vcproj

@@ -454,7 +454,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -1095,7 +1095,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -2031,6 +2031,31 @@
 		</Configuration>
 	</Configurations>
 	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
 	</References>
 	<Files>
 		<Filter
@@ -2999,6 +3024,10 @@
 				RelativePath=".\browser\IEBrowserEngine.h"
 				>
 			</File>
+			<File
+				RelativePath=".\browser\stubs.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

data/rakefile.rb

@@ -74,6 +74,7 @@ end
 #------------------------------------------------------------------------
 
 $app_basedir = pwd
+$is_webkit_engine = false
 $startdir = File.dirname(__FILE__)
 $startdir.gsub!('\\', '/')
 
@@ -156,7 +157,7 @@ namespace "framework" do
   end
 end
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', '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"]
+$application_build_configs_keys = ['security_token', 'encrypt_database', '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
 
@@ -832,7 +833,7 @@ def cloud_url_git_match(str)
   # else
     server = res[1]; user = res[2]; app = res[3]
   end
- 
+
   (server.nil? || app.nil?) ? {} : { :str => "#{server}:#{user}/#{app}", :server => server,  :user => user, :app => app }
 end
 
@@ -2019,9 +2020,9 @@ namespace "config" do
 
           $app_config["capabilities"] += ["symbol"] unless $app_config["capabilities"].index("symbol")
           if $current_platform == "wm"
-			$app_config["extensions"] += ["webkit"] 
+			$app_config["extensions"] += ["webkit"]
           else
-			$app_config["extensions"] += ["rhoelementsext"] 
+			$app_config["extensions"] += ["rhoelementsext"]
 			$app_config["extensions"] += ["symbolapi"] #extension with plug-ins
 
 			#check for RE2 plugins
@@ -2038,7 +2039,7 @@ namespace "config" do
 			end
 
 			application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
-		end	
+		end
 
 
         if !$app_config["capabilities"].index('native_browser') && $current_platform != "android"
@@ -2099,7 +2100,7 @@ namespace "config" do
         $app_config['extensions'] = $app_config['extensions'] | ['hardwarekeys']
         $app_config['extensions'] = $app_config['extensions'] | ['sensor']
       end
-      
+
       if $current_platform == "wp8"
         $app_config['extensions'] = $app_config['extensions'] | ['barcode']
       end
@@ -2294,6 +2295,10 @@ def add_linker_library(libraryname)
   $ldflags << "#{tmpdir}/#{libraryname}\n" unless $ldflags.nil?
 end
 
+def add_inker_library_absolute(fulllibraryfilepath)
+    $ldflags << fulllibraryfilepath + "\n" unless $ldflags.nil?
+end
+
 def set_linker_flags
   if $config["platform"] == "iphone"
     simulator = $sdk =~ /iphonesimulator/
@@ -2486,6 +2491,10 @@ def init_extensions(dest, mode = "")
 
   $app_config["extensions"].each do |extname|
     puts 'ext - ' + extname
+    
+    if extname == "webkit"
+		$is_webkit_engine = true
+    end
 
     extpath = nil
     extpaths.each do |p|
@@ -2539,6 +2548,19 @@ def init_extensions(dest, mode = "")
             end
           end
 
+          # add additional libraries
+          link_libraries = []
+          if (!extconf["link_libraries"].nil?) && (extconf["link_libraries"].is_a? Array)
+              link_libraries += extconf["link_libraries"]
+          end
+          if (!extconf[$config["platform"]].nil?) && (!extconf[$config["platform"]]["link_libraries"].nil?) && (extconf[$config["platform"]]["link_libraries"].is_a? Array)
+              link_libraries += extconf[$config["platform"]]["link_libraries"]
+          end
+          link_libraries.each do |linklib|
+              fulllibpath = File.join(extpath, linklib)
+              add_inker_library_absolute(fulllibpath)
+          end
+
           if entry && entry.length() > 0
             if xml_api_paths.nil? #&& !(("rhoelementsext" == extname || "dominjector" == extname ) && ($config["platform"] == "wm"||$config["platform"] == "android"))
 
@@ -2547,7 +2569,7 @@ def init_extensions(dest, mode = "")
 
               if (("rhoelementsext" == extname || "dominjector" == extname) && ($config["platform"] == "wm"||$config["platform"] == "android"))
                 extentries << entry
-                extentries_init << entry             
+                extentries_init << entry
               elsif !$js_application
                 extentries << entry
                 entry =  "if (rho_ruby_is_started()) #{entry}"
@@ -2670,6 +2692,23 @@ def init_extensions(dest, mode = "")
 
   end
 
+  stubs = File.join($startdir, "platform", "wm", "rhodes", "browser", "stubs.cpp")
+  if $is_webkit_engine == false
+	File.open(stubs, "w+") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "#include \"StdAfx.h\""
+        f.puts "#include \"common/RhoStd.h\""
+        f.puts "#include \"IBrowserEngine.h\""
+        f.puts "rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}"
+        Jake.modify_file_if_content_changed( stubs, f )
+    end
+  else
+	File.open(stubs, "w+") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "#include \"StdAfx.h\""
+        Jake.modify_file_if_content_changed( stubs, f )
+    end
+  end
 
   if ($ruby_only_extensions_list)
     BuildOutput.warning([
@@ -4151,7 +4190,7 @@ namespace "wm_gem" do
       $neon_root = $config["env"]["paths"]["neon"] unless $config["env"]["paths"]["neon"].nil?
       $rhoelementsext_main_dir = File.join($startdir, 'extensions/rhoelementsext/ext')
       $rhoelementsext_wm_dir = File.join($rhoelementsext_main_dir, "rhoelementsext/platform/wm")
-      
+
       $re_version = $config['version']
     end
 
@@ -4161,23 +4200,23 @@ namespace "wm_gem" do
 
 				dest_dir = "./libs/data"
 				mkdir_p dest_dir
-			
+
 				src_dir = File.join($startdir, "neon/R2D1/Build" )
-			
+
 				cp_r File.join(src_dir, "Config"), dest_dir, :preserve => true
 				cp_r File.join(src_dir, "Windows/NPAPI"), dest_dir, :preserve => true
 				cp_r File.join(src_dir, "Windows/Plugins"), File.join(dest_dir, 'Plugin'), :preserve => true
 
 				Dir.glob(File.join(src_dir, "Windows/Binaries/*.*")).each { |f| cp_r f, dest_dir }
 				Dir.glob(File.join(src_dir, "Windows/WebKit/*.*")).each { |f| cp_r f, dest_dir }
-				
+
 				chdir File.dirname(__FILE__)
 				chmod_R 0777, "./libs/data"
 			  end
 			end
-		end	
+		end
 end
-namespace "build" do  
+namespace "build" do
   task :set_neon, :neon_dir do |t, args|
     Jake.edit_yml(File.join(File.dirname(__FILE__), 'rhoelements.yml')) do |yml|
       yml['env']['paths']['neon'] = args[:neon_dir]
@@ -4209,7 +4248,7 @@ namespace :run do
   desc "start rholog(webrick) server"
   task :webrickrhologserver, :app_path  do |t, args|
     require 'webrick'
-    
+
     puts "Args were: #{args}"
     $app_path = args[:app_path]
 

data/res/build-tools/iphonesim/build/Release/iphonesim_8

@@ -34,8 +34,8 @@ device = SimCtl.device(udid: device_uid)
 
 if device == nil
 
-    devicetype = SimCtl.devicetype(name: 'iPhone 6s')
-    devicename = 'Rhomobile iPhone6s '+sdk_ver
+    devicetype = SimCtl.devicetype(name: 'iPhone 7')
+    devicename = 'Rhomobile iPhone7 '+sdk_ver
 
     if ARGV[3] == 'ipad'
         devicetype = SimCtl.devicetype(name: 'iPad Air 2')

data/res/generators/rhogen.rb

@@ -149,77 +149,6 @@ module Rhogen
       file.destination = "#{name}/app/loading.png"
     end
 
-    file :loadingpng5 do |file|
-      file.source = 'app/loading-568h@2x.png'
-      file.destination = "#{name}/app/loading-568h@2x.png"
-    end
-
-    file :loadingpng51 do |file|
-      file.source = 'app/loading-667h@2x.png'
-      file.destination = "#{name}/app/loading-667h@2x.png"
-    end
-
-    file :loadingpng52 do |file|
-      file.source = 'app/loading-736h@3x.png'
-      file.destination = "#{name}/app/loading-736h@3x.png"
-    end
-
-    file :loadingpngl do |file|
-      file.source = 'app/loading-Landscape.png'
-      file.destination = "#{name}/app/loading-Landscape.png"
-    end
-
-    file :loadingpngll do |file|
-      file.source = 'app/loading-LandscapeLeft.png'
-      file.destination = "#{name}/app/loading-LandscapeLeft.png"
-    end
-
-    file :loadingpnglr do |file|
-      file.source = 'app/loading-LandscapeRight.png'
-      file.destination = "#{name}/app/loading-LandscapeRight.png"
-    end
-
-    file :loadingpngp do |file|
-      file.source = 'app/loading-Portrait.png'
-      file.destination = "#{name}/app/loading-Portrait.png"
-    end
-
-    file :loadingpngpud do |file|
-      file.source = 'app/loading-PortraitUpsideDown.png'
-      file.destination = "#{name}/app/loading-PortraitUpsideDown.png"
-    end
-
-    file :loadingpngl2 do |file|
-      file.source = 'app/loading-Landscape@2x.png'
-      file.destination = "#{name}/app/loading-Landscape@2x.png"
-    end
-
-    file :loadingpngll2 do |file|
-      file.source = 'app/loading-LandscapeLeft@2x.png'
-      file.destination = "#{name}/app/loading-LandscapeLeft@2x.png"
-    end
-
-    file :loadingpnglr2 do |file|
-      file.source = 'app/loading-LandscapeRight@2x.png'
-      file.destination = "#{name}/app/loading-LandscapeRight@2x.png"
-    end
-
-    file :loadingpngp2 do |file|
-      file.source = 'app/loading-Portrait@2x.png'
-      file.destination = "#{name}/app/loading-Portrait@2x.png"
-    end
-
-    file :loadingpngpud2 do |file|
-      file.source = 'app/loading-PortraitUpsideDown@2x.png'
-      file.destination = "#{name}/app/loading-PortraitUpsideDown@2x.png"
-    end
-
-    file :loadingpngx do |file|
-      file.source = 'app/loading@2x.png'
-      file.destination = "#{name}/app/loading@2x.png"
-    end
-
-
     directory :helpers do |directory|
       directory.source = 'app/helpers'
       directory.destination = "#{name}/app/helpers"
@@ -230,9 +159,9 @@ module Rhogen
       directory.destination = "#{name}/icon"
     end
 
-    directory :production do |directory|
-      directory.source = 'production'
-      directory.destination = "#{name}/production"
+    directory :resources do |directory|
+      directory.source = 'resources'
+      directory.destination = "#{name}/resources"
     end
 
     template :settings1 do |template|
@@ -382,84 +311,14 @@ module Rhogen
       file.destination = "#{name}/app/loading.png"
     end
 
-    file :loadingpng5 do |file|
-      file.source = 'app/loading-568h@2x.png'
-      file.destination = "#{name}/app/loading-568h@2x.png"
-    end
-
-    file :loadingpng51 do |file|
-      file.source = 'app/loading-667h@2x.png'
-      file.destination = "#{name}/app/loading-667h@2x.png"
-    end
-
-    file :loadingpng52 do |file|
-      file.source = 'app/loading-736h@3x.png'
-      file.destination = "#{name}/app/loading-736h@3x.png"
-    end
-
-    file :loadingpngl do |file|
-      file.source = 'app/loading-Landscape.png'
-      file.destination = "#{name}/app/loading-Landscape.png"
-    end
-
-    file :loadingpngll do |file|
-      file.source = 'app/loading-LandscapeLeft.png'
-      file.destination = "#{name}/app/loading-LandscapeLeft.png"
-    end
-
-    file :loadingpnglr do |file|
-      file.source = 'app/loading-LandscapeRight.png'
-      file.destination = "#{name}/app/loading-LandscapeRight.png"
-    end
-
-    file :loadingpngp do |file|
-      file.source = 'app/loading-Portrait.png'
-      file.destination = "#{name}/app/loading-Portrait.png"
-    end
-
-    file :loadingpngpud do |file|
-      file.source = 'app/loading-PortraitUpsideDown.png'
-      file.destination = "#{name}/app/loading-PortraitUpsideDown.png"
-    end
-
-    file :loadingpngl2 do |file|
-      file.source = 'app/loading-Landscape@2x.png'
-      file.destination = "#{name}/app/loading-Landscape@2x.png"
-    end
-
-    file :loadingpngll2 do |file|
-      file.source = 'app/loading-LandscapeLeft@2x.png'
-      file.destination = "#{name}/app/loading-LandscapeLeft@2x.png"
-    end
-
-    file :loadingpnglr2 do |file|
-      file.source = 'app/loading-LandscapeRight@2x.png'
-      file.destination = "#{name}/app/loading-LandscapeRight@2x.png"
-    end
-
-    file :loadingpngp2 do |file|
-      file.source = 'app/loading-Portrait@2x.png'
-      file.destination = "#{name}/app/loading-Portrait@2x.png"
-    end
-
-    file :loadingpngpud2 do |file|
-      file.source = 'app/loading-PortraitUpsideDown@2x.png'
-      file.destination = "#{name}/app/loading-PortraitUpsideDown@2x.png"
-    end
-
-    file :loadingpngx do |file|
-      file.source = 'app/loading@2x.png'
-      file.destination = "#{name}/app/loading@2x.png"
-    end
-
     directory :icon do |directory|
       directory.source = 'icon'
       directory.destination = "#{name}/icon"
     end
 
-    directory :production do |directory|
-      directory.source = 'production'
-      directory.destination = "#{name}/production"
+    directory :resources do |directory|
+      directory.source = 'resources'
+      directory.destination = "#{name}/resources"
     end
 
     file :androidmanifesterb do |file|

data/res/generators/templates/api/platform/iphone/generated/base_impl/MontanaBase.m

@@ -14,8 +14,8 @@ static NSDictionary* ourPropertyAliases= nil;
 @implementation <%= $cur_module.name %>Base
 
 - (void) resetAllPropertiesToDefault {
-<% if $cur_module.is_template_propertybag 
-%>    mDeclaredProperties = [[NSSet setWithObjects:<% 
+<% if $cur_module.is_template_propertybag
+%>    mDeclaredProperties = [[NSSet setWithObjects:<%
         $cur_module.properties.each do |prop|
           line = '@"'+prop.native_name+'", ' %><%= line %><%
         end
@@ -98,7 +98,7 @@ static NSDictionary* ourPropertyAliases= nil;
     NSObject* value = propertyValue;
     NSString* strValue = propertyValue;
     if ([propertyName isEqualToString:@"ID"] && [value isKindOfClass:[NSString class]] && [strValue isEqualToString:@""]) {
-        NSLog(@"Clearing ID!");
+        //NSLog(@"Clearing ID!");
     }
     if ([value isKindOfClass:[NSNumber class]]) {
         NSNumber* numValue = (NSNumber*)value;
@@ -137,13 +137,13 @@ static NSDictionary* ourPropertyAliases= nil;
 -(void) getProperties:(NSArray*)arrayofNames methodResult:(id<IMethodResult>)methodResult {
     NSMutableDictionary* dict = [[NSMutableDictionary dictionaryWithCapacity:[arrayofNames count]] autorelease];
     CMethodResult_SimpleHolder* resultHolder = [CMethodResult_SimpleHolder makeEmptyHolder];
-    for (NSString* key in arrayofNames) {        
+    for (NSString* key in arrayofNames) {
       [resultHolder setResult:nil];
       [self getProperty:key methodResult:resultHolder];
       if ([resultHolder getResult] != nil) {
           NSString* value = (NSString*)[resultHolder getResult];
           [dict setObject:value forKey:key];
-      } <% 
+      } <%
 if !$cur_module.is_property_bag_limit_to_only_declared_properties && $cur_module.is_template_propertybag %>
       else {
         [dict setObject:@"" forKey:key];
@@ -159,7 +159,7 @@ if !$cur_module.is_property_bag_limit_to_only_declared_properties && $cur_module
 
 
 -(void) setProperties:(NSDictionary*)propertyMap methodResult:(id<IMethodResult>)methodResult {
-    for (NSString* key in propertyMap) {    
+    for (NSString* key in propertyMap) {
         NSString* value = (NSString*)[propertyMap objectForKey:key];
         [self setProperty:key propertyValue:value methodResult:methodResult];
     }
@@ -242,4 +242,4 @@ end %>
     [super dealloc];
 }
 
-@end
+@end