rhodes 6.2.0 → 7.1.17

data/platform/android/build/ndkwrapper.rb

@@ -48,11 +48,39 @@ class NDKWrapper
   end
 
   def link_sysroot( api, abi )
-    File.join( @root_path, 'platforms', "android-#{api}", "arch-#{abi}" )
+    linkabi = abi == "aarch64" ? "arm64" : abi
+    #locate closest available NDK platform for target API
+    n_api = api.to_i
+    n_api.downto(1) { |i|
+      path = File.join( @root_path, 'platforms', "android-#{i.to_s}", "arch-#{linkabi}" )
+
+      return path if File.directory?(path)
+    }
+
+    raise "Unable to detect NDK link root for API: #{api}, ABI: #{abi}"      
+  end
+
+  def link_sysroot_level_ext( api, abi )
+
+    if @rev_major >= 18
+      triple = {
+        'arm'   => 'arm-linux-androideabi',
+        'aarch64' => 'aarch64-linux-android',
+        'mips'  => 'mipsel-linux-android',
+        'mips64'=> 'mips64el-linux-android',
+        'x86'   => 'i686-linux-android',
+        'x86_64'=> 'x86_64-linux-android'
+      }
+      File.join( sysroot_18, 'usr', 'lib', triple[abi], api.to_s)
+    else
+      nil
+    end
   end
 
   def sysroot( api, abi )
-    if @rev_major >= 16
+    if @rev_major >= 18
+      sysroot_18
+    elsif @rev_major >= 16
       sysroot_16 api,abi
     else
       sysroot_pre_16 api,abi
@@ -63,6 +91,21 @@ class NDKWrapper
     File.join( @root_path, 'sysroot' )
   end
 
+  def toolchain
+    $toolchain
+  end
+
+  def sysroot_18
+    ndkhostvariant = ''
+    if HostPlatform.windows?
+      ndkhostvariant = 'windows-x86_64' if $bufcheck64 and $bufcheck64.include?('64')
+    else
+      ndkhostvariant = `uname -s`.downcase!.chomp! + "-" + `uname -m`.chomp!
+    end
+
+    return File.join( @root_path, 'toolchains', 'llvm', 'prebuilt', ndkhostvariant, 'sysroot')
+  end
+
   def sysroot_pre_16( api, abi )
     variants = []
     variants << "platforms"
@@ -112,8 +155,8 @@ class NDKWrapper
     ndkabi = "unknown"
     ndkhostvariants = []
     if HostPlatform.windows?
-        bufcheck64 = `WMIC OS get OSArchitecture`.split[1]
-        ndkhostvariants << 'windows-x86_64' if bufcheck64 and bufcheck64.include?('64')
+        $bufcheck64 = `WMIC OS get OSArchitecture`.split[1]
+        ndkhostvariants << 'windows-x86_64' if $bufcheck64 and $bufcheck64.include?('64')
         ndkhostvariants << 'windows'
     else
         ndkhostvariants = [
@@ -122,17 +165,43 @@ class NDKWrapper
         ]
     end
 
-    toolchainversions = ['4.8','4.9']
+    if(@rev_major >= 18)
+      toolchainversions = ['8.0.0']
+    else
+      toolchainversions = ['4.8','4.9']
+    end
 
-    toolchain = 'unknown-toolchain'
+    $toolchain = 'unknown-toolchain'
     if abi == 'arm'
-      toolchain = 'arm-linux-androideabi'
+      if @rev_major >= 18
+        $toolchain = 'armv7a-linux-androideabi'
+      else
+        $toolchain = 'arm-linux-androideabi'
+      end
     elsif abi == 'x86'
-      toolchain = 'x86'
+      if @rev_major >= 18
+        $toolchain = 'i686-linux-android'
+      else
+        $toolchain = 'x86'
+      end
     elsif abi == 'x86_64'
-      toolchain = 'x86_64'
+      if @rev_major >= 18
+        $toolchain = 'x86_64-linux-android'
+      else
+        $toolchain = 'x86_64'
+      end
     elsif abi == 'mips'
-      toolchain = 'mipsel-linux-android'
+      if @rev_major >= 18
+        raise "Mips not supported!"
+      else
+        $toolchain = 'mipsel-linux-android'
+      end
+    elsif abi == 'aarch64'
+      if @rev_major >= 18
+        $toolchain = 'aarch64-linux-android'
+      else
+        raise "Aarch64 not supported for this ndk version!"
+      end
     else
       raise "Unknown ABI: {abi}";
     end
@@ -142,15 +211,21 @@ class NDKWrapper
 
       toolchainversions.each do |version|
         variants = []
-        variants << File.join(@root_path,'build','prebuilt',ndkhost,"#{toolchain}-#{version}")
-        variants << File.join(@root_path,'toolchains',"#{toolchain}-#{version}",'prebuilt',ndkhost)
+
+        if(@rev_major >= 18)
+          variants << File.join(@root_path,'toolchains','llvm','prebuilt',ndkhost)
+        else
+          variants << File.join(@root_path,'build','prebuilt',ndkhost,"#{$toolchain}-#{version}")
+          variants << File.join(@root_path,'toolchains',"#{$toolchain}-#{version}",'prebuilt',ndkhost)
+        end
+
 
         variants.each do |variant|
           puts "Check toolchain path: #{variant}" if USE_TRACES    
           next unless File.directory? variant
 
           ndktools = variant
-          ndkabi = toolchain
+          ndkabi = $toolchain
           @gccver = version
           
           ndkabi = 'i686-linux-android' if ndkabi == 'x86'
@@ -160,7 +235,7 @@ class NDKWrapper
 
           tools = {}
           
-          ['gcc', 'g++', 'ar', 'strip', 'objdump'].each do |tool|
+          [ 'gcc', 'g++', 'ar', 'strip', 'objdump'].each do |tool|
               name = tool.gsub('+', 'p')
               tools[name] = check_tool( tool, ndktools, ndkabi)
           end
@@ -179,8 +254,24 @@ class NDKWrapper
     @gccver
   end
 
+  def rev_major
+    @rev_major
+  end
+
   def check_tool( tool, ndktoolsdir, abi )
+    if(@rev_major >= 18)
+      abi = 'arm-linux-androideabi' if abi == 'armv7a-linux-androideabi'
+    end
+
     toolpath = File.join(ndktoolsdir,'bin',"#{abi}-#{tool}#{HostPlatform.exe_ext}")
+    if(@rev_major >= 18)
+      if (tool == 'gcc')
+        toolpath = File.join(ndktoolsdir,'bin',"clang#{HostPlatform.exe_ext}")
+      end
+      if (tool == 'g++')
+        toolpath = File.join(ndktoolsdir,'bin',"clang++#{HostPlatform.exe_ext}")
+      end
+    end
     puts "Checking tool path #{toolpath} for tool #{tool}" if USE_TRACES
     
     if File.file? toolpath
@@ -195,13 +286,17 @@ class NDKWrapper
       #https://android.googlesource.com/platform/ndk/+/ndk-release-r16/docs/UnifiedHeaders.md
       triple = {
         'arm'   => 'arm-linux-androideabi',
-        'arm64' => 'aarch64-linux-android',
+        'aarch64' => 'aarch64-linux-android',
         'mips'  => 'mipsel-linux-android',
         'mips64'=> 'mips64el-linux-android',
         'x86'   => 'i686-linux-android',
         'x86_64'=> 'x86_64-linux-android'
       }
-      File.join( sysroot_16(api,abi), 'usr', 'include', triple[abi])
+      if  @rev_major >= 18
+        File.join( sysroot_18, 'usr', 'include', triple[abi])
+      else
+        File.join( sysroot_16(api,abi), 'usr', 'include', triple[abi])
+      end
     else
       nil
     end

data/platform/android/build/pom.erb

@@ -13,7 +13,7 @@
       <groupId><%=dep['grp_id']%></groupId>
       <artifactId><%=dep['art_id']%></artifactId>
       <version><%=dep['ver']%></version>
-      <type>aar</type>
+      <type><%=dep['packaging']%></type>
     </dependency>
 <% end %>    
   </dependencies>
@@ -22,7 +22,7 @@
     <repository>
       <id><%="repo#{i}"%></id>
       <name><%="android-maven-repo-#{i}"%></name>
-      <url><%="file://#{repo}"%></url>
+      <url><%="#{repo}"%></url>
     </repository>
 <% end %>
   </repositories>

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -179,7 +179,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
 
 + (NSString *) getApplicationsRosterUrl {
-	return @"http://tau-technologies.com/";
+	return @"https://tau-technologies.com/";
 }
 
 + (bool) installApplication:(NSString*)appName data:(NSData*)appData {
@@ -268,6 +268,11 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     
 	NSString *bundleRoot = [[NSBundle mainBundle] resourcePath];
+    
+#ifdef RHO_STANDALONE_LIB
+    bundleRoot = [bundleRoot stringByAppendingPathComponent:@"RhoBundle"];
+#endif
+    
 	NSString *rhoRoot = [NSString stringWithUTF8String:rho_native_rhopath()];
 	NSString *rhoUserRoot = [NSString stringWithUTF8String:rho_native_rhouserpath()];
     NSString *rhoDBRoot = [NSString stringWithUTF8String:rho_native_rhodbpath()]; 
@@ -1522,6 +1527,31 @@ void rho_startup_logging(const char* message) {
     [AppManager startupLogging:[NSString stringWithUTF8String:message]];
 }
 
+
+// return 0 if OK
+// return -1 if error
+// for Citrix support
+int rhodes_ios_delete_file_via_platform_api(const char* filePath) {
+    if (filePath == NULL) {
+        return -1;
+    }
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString* sPath = [NSString stringWithUTF8String:filePath];
+    if ([sPath length] <= 0) {
+        return -1;
+    }
+    NSError *error = nil;
+    if (![fileManager removeItemAtPath:sPath error:&error]) {
+        NSString *msg = [NSString stringWithFormat:@"$$$ rhodes_ios_delete_file_via_platform_api() error during delete file, ERROR = %@", [error localizedDescription]];
+        NSLog(msg);
+        RAWLOG_ERROR([msg UTF8String]);
+        return -1;
+    }
+    return 0;
+}
+
+
+
 /*
 #define MAX_ACTIONS 4
 const static struct {

data/platform/iphone/Classes/MapView/GoogleGeocoder.h

@@ -30,8 +30,8 @@
 #import <CoreLocation/CoreLocation.h>
 #import "MapAnnotation.h"
 
-//#define kGeoCodeURL @"http://maps.google.com/maps/geo?q="
-#define kGeoCodeURL @"http://maps.googleapis.com/maps/api/geocode/json?address="
+//#define kGeoCodeURL @"https://maps.google.com/maps/geo?q="
+#define kGeoCodeURL @"https://maps.googleapis.com/maps/api/geocode/json?address="
 
 @interface GoogleGeocoder : NSObject {
     NSMutableArray *annotations;
@@ -59,4 +59,4 @@
 @end
 
 
-#endif
+#endif

data/platform/iphone/Classes/RhoMainViewStubImpl.h

@@ -0,0 +1,38 @@
+#import "RhoMainView.h"
+
+
+@interface  RhoMainViewStubImpl : NSObject<RhoMainView> {}
+
+- (UIView*)view;
+
+- (id<RhoWebView,NSObject>)detachRhoWebView;
+
+- (void)loadHTMLString:(NSString*)data;
+
+- (void)back:(int)index;
+- (void)forward:(int)index;
+- (void)navigate:(NSString*)url tab:(int)index;
+- (void)navigateRedirect:(NSString*)url tab:(int)index;
+- (void)reload:(int)index;
+
+- (void)executeJs:(NSString*)js tab:(int)index;
+
+- (NSString*)currentLocation:(int)index;
+- (NSString*)get_current_url:(int)index;
+
+- (void)switchTab:(int)index;
+- (int)activeTab;
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
+- (void)removeNavBar;
+
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index;
+
+-(void)openNativeView:(UIView*)nv_view tab_index:(int)tab_index;
+-(void)closeNativeView:(int)tab_index;
+
+-(void)setTabBarBadge:(NSString*)badge_text tab_index:(int)tab_index;
+
+-(UIViewController*)getMainViewController;
+
+@end

data/platform/iphone/Classes/RhoMainViewStubImpl.m

@@ -0,0 +1,88 @@
+#import "RhoMainViewStubImpl.h"
+
+
+@implementation RhoMainViewStubImpl
+
+
+- (UIView*)view {
+    return nil;
+}
+
+- (id<RhoWebView,NSObject>)detachRhoWebView {
+    return nil;
+}
+
+- (void)loadHTMLString:(NSString*)data {
+
+}
+
+- (void)back:(int)index {
+
+}
+
+- (void)forward:(int)index {
+
+}
+
+- (void)navigate:(NSString*)url tab:(int)index {
+
+}
+
+- (void)navigateRedirect:(NSString*)url tab:(int)index {
+
+}
+
+- (void)reload:(int)index {
+
+}
+
+- (void)executeJs:(NSString*)js tab:(int)index {
+
+}
+
+- (NSString*)currentLocation:(int)index {
+    return nil;
+}
+
+- (NSString*)get_current_url:(int)index {
+    return nil;
+}
+
+- (void)switchTab:(int)index {
+    return;
+}
+
+- (int)activeTab {
+    return 0;
+}
+
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right{
+
+}
+
+- (void)removeNavBar {
+
+}
+
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index {
+    return nil;
+}
+
+-(void)openNativeView:(UIView*)nv_view tab_index:(int)tab_index {
+
+}
+
+-(void)closeNativeView:(int)tab_index {
+
+}
+
+-(void)setTabBarBadge:(NSString*)badge_text tab_index:(int)tab_index {
+
+}
+
+-(UIViewController*)getMainViewController {
+    return nil;
+}
+
+
+@end

data/platform/iphone/Classes/RhoUIWebView.h

@@ -23,6 +23,9 @@
  *
  * http://tau-technologies.com
  *------------------------------------------------------------------------*/
+#import "common/app_build_capabilities.h"
+
+#ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
 
 #import <UIKit/UIKit.h>
 #import "RhoWebView.h"
@@ -73,3 +76,5 @@
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error;
 
 @end
+
+#endif //APP_BUILD_CAPABILITY_IOS_UIWEBVIEW

data/platform/iphone/Classes/RhoUIWebView.m

@@ -24,6 +24,9 @@
  * http://tau-technologies.com
  *------------------------------------------------------------------------*/
 
+#import "common/app_build_capabilities.h"
+#ifdef APP_BUILD_CAPABILITY_IOS_UIWEBVIEW
+
 #import "RhoUIWebView.h"
 #import "RhoMainView.h"
 
@@ -35,6 +38,8 @@
 #define DEFAULT_LOGCATEGORY "RhoUIWebView"
 
 
+
+
 @implementation RhoUIWebView
 
 @synthesize webview, delegate;
@@ -53,7 +58,7 @@
         int v = rho_conf_getBool("WebView.keyboardDisplayRequiresUserAction");
         w.keyboardDisplayRequiresUserAction = (v != 0);
     }
-    
+
     if (rho_conf_is_property_exists("WebView.enableDragAndDrop")) {
         int v = rho_conf_getBool("WebView.enableDragAndDrop");
         if (!v) {
@@ -64,7 +69,7 @@
 #endif
         }
     }
-    
+
     w.userInteractionEnabled = YES;
     w.multipleTouchEnabled = YES;
     w.clipsToBounds = NO;
@@ -76,9 +81,9 @@
     w.tag = RHO_TAG_WEBVIEW;
     //assert([w retainCount] == 1);
     self.webview = w;
-    
-    
-    
+
+
+
     return self;
 }
 
@@ -141,7 +146,7 @@
 
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
     if (delegate != nil) {
-        return [delegate shouldStartLoadWithRequest:self request:request navigationType:navigationType];
+        return [delegate shouldStartLoadWithRequest:self request:request];
     }
     return YES;
 }
@@ -159,3 +164,6 @@
 }
 
 @end
+
+
+#endif //APP_BUILD_CAPABILITY_IOS_UIWEBVIEW