rhodes 7.1.17 → 7.4.1

data/platform/android/build/android_studio_project_generator.rb

@@ -2,10 +2,12 @@ require 'erb'
 
 class AndroidStudioProjectGenerator
   attr_accessor :rhoRoot
+  attr_accessor :extdir
   attr_accessor :appincdir
   attr_accessor :buildMode
   attr_accessor :extLibs
   attr_accessor :externalDeps
+  attr_accessor :extensionsDeps
   attr_accessor :targetArch
   attr_accessor :compileSdkVersion
   attr_accessor :buildToolsVersion
@@ -14,6 +16,8 @@ class AndroidStudioProjectGenerator
   attr_accessor :targetSdkVersion
   attr_accessor :versionCode
   attr_accessor :versionName
+  attr_accessor :sourceList
+  attr_accessor :extName
 
   def render_app_gradle(erbPath)
     @versionCode = @versionName.to_i
@@ -23,4 +27,82 @@ class AndroidStudioProjectGenerator
     erb = ERB.new tpl
     erb.result binding
   end
+
+  def get_source_dir_for_java(source_path, root)
+    
+  end
+
+  def get_source_string_from_file(source_path, root)
+    f = File.open(source_path, "r")  
+    text = ''    
+    f.each_line do |line|
+      text = text + File.join(root, line)
+    end
+    f.close
+    return text
+  end
+
+  def render_app_gradle_ex(erbPath, source_path)
+    @versionCode = @versionName.to_i
+    @sourceList = get_source_string_from_file(source_path, @rhoRoot)
+
+    tpl = File.read erbPath
+    erb = ERB.new tpl
+    erb.result binding
+  end
+
+  def render_cmake_extension(erbPath, source_path)
+    @versionCode = @versionName.to_i
+    @sourceList = get_source_string_from_file(source_path, @extdir)
+
+    tpl = File.read erbPath
+    erb = ERB.new tpl
+    erb.result binding
+  end
+
+  def render_app_gradle_ex2(erbPath, source_path, source_path2)
+    @versionCode = @versionName.to_i
+    @sourceList = get_source_string_from_file(source_path, @rhoRoot) + "\n" + get_source_string_from_file(source_path2, @rhoRoot)
+
+    tpl = File.read erbPath
+    erb = ERB.new tpl
+    erb.result binding
+  end
+
+  def build(target)
+
+    #set intermediate dir
+    #set output dir
+
+    #collect app bundle
+    #collect rho core native sources and libs             #from existing config file
+    #collect rho core resources and assets
+    #collect core manifest ( or use app-overrided one )
+
+    #! generate rho native sources ( for compile-time prefs )
+    #! generate rho java sources ( for compile-time prefs )
+
+    #each do:
+    #collect extensions info ( make AARs from each ext? ):  # pass extensions info object from caller.
+    #  native sources
+    #  java sources
+    #  assets
+    #  resources
+    #  compiled c libs
+    #  compiled jars
+    #  maven dependencies
+    #  collect manifest changes                             #use standard toolchain ( aapt? )
+    #  collect java compile settings                        #pass from caller as object, refactor to move compiler settings to config file ( .yml or? )
+    #  collect c compile flags, includes, libs dir etc      #pass from caller as object, refactor to move compiler settings to config file ( .yml or? )
+
+    #  collect studio info: gradle version etc
+
+    #  generate cmakelists
+    #  combine resources
+    #  combine bundle and extra assets
+
+    #  use Android toolchain to generate manifest
+    #  generate gradle from template
+
+  end
 end

data/platform/android/build/android_tools.rb

@@ -29,8 +29,6 @@
 # uses following globals
 # $adb, $applog_path
 
-#USE_TRACES = Rake.application.options.trace
-
 require 'pp'
 require 'open3'
 
@@ -59,7 +57,7 @@ def fill_api_levels(sdkpath)
         end
       end
 
-      puts "+++ API LEVEL of #{platform}: #{apilevel}" if USE_TRACES
+      puts "+++ API LEVEL of #{platform}: #{apilevel}" if Rake.application.options.trace
 
       if apilevel != 0
         $api_levels[marketversion] = apilevel
@@ -105,7 +103,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
 
 #libnames
 
-    if USE_TRACES
+    if Rake.application.options.trace
       puts "Looking for name pattern: #{addon_pattern}"
       puts "Looking for API level: #{apilevel}" if apilevel
     end
@@ -136,7 +134,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
             line.strip!
             
             if namepattern =~ line
-              puts "Parsing add-on: #{$1}" if USE_TRACES
+              puts "Parsing add-on: #{$1}" if Rake.application.options.trace
               cur_name = $1
               break unless addonnamepattern =~ $1
               next
@@ -147,7 +145,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
             if line =~ /^api=([0-9]+)$/
               cur_apilevel = $1.to_i
 
-              puts "API level of #{dir}: #{cur_apilevel}" if USE_TRACES
+              puts "API level of #{dir}: #{cur_apilevel}" if Rake.application.options.trace
 
               break if apilevel and apilevel != cur_apilevel
               break if found_apilevel and found_apilevel > cur_apilevel
@@ -169,7 +167,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
                   found_libpatterns << Regexp.new("^(#{name})=(.+);.*$")
                 end
                 
-                puts "Library patterns: #{found_libpatterns.inspect}" if USE_TRACES
+                puts "Library patterns: #{found_libpatterns.inspect}" if Rake.application.options.trace
                 
               end
               next
@@ -201,7 +199,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
         next unless classpath
 
         found_classpath = classpath
-        puts "classpath: #{found_classpath}, API level: #{found_apilevel}" if USE_TRACES
+        puts "classpath: #{found_classpath}, API level: #{found_apilevel}" if Rake.application.options.trace
 
     end
 
@@ -212,7 +210,7 @@ def get_addon_classpath(addon_pattern, apilevel = nil)
       @@logger.warn msg
     end
 
-    if USE_TRACES
+    if Rake.application.options.trace
       puts "Add-on name: #{found_name}"
       puts "Add-on API level: #{found_apilevel}"
       puts "Add-on classpath: #{found_classpath}"
@@ -425,7 +423,7 @@ def run_emulator(options = {})
   system("\"#{$adb}\" start-server")
 
   unless is_emulator_running
-    puts "Need to start emulator" if USE_TRACES
+    puts "Need to start emulator" if Rake.application.options.trace
 
     avdname = prepare_avd( $appavdname, $emuversion, $abis, $use_google_addon_api )
 
@@ -439,7 +437,7 @@ def run_emulator(options = {})
     puts cmd
     start_emulator(cmd)
 
-    cmd_start_emu = "#{$adb} -e wait-for-device shell getprop sys.boot_completed"
+    cmd_start_emu = "#{$adb} -e wait-for-device"
     puts cmd_start_emu
     raise "Android emulator failed to start." unless system(cmd_start_emu)
 
@@ -449,16 +447,11 @@ def run_emulator(options = {})
     while (Time.now - startedWaiting < 600 )
         sleep 5
         now = Time.now
-        started = false
-        booted = true
-        Jake.run2 $adb, ["-e", "shell", "ps"], :system => false, :hideerrors => false do |line|
-            #puts line
-            booted = false if line =~ /bootanimation/
-            started = true if line =~ /android\.process\.acore/
-            true
-        end
-        #puts "started: #{started}, booted: #{booted}"
-        unless started and booted
+        booted = false
+
+        booted = `#{$adb} -e shell getprop sys.boot_completed` =~ /1/
+
+        unless booted
             printf("%.2fs: ",(now - startedWaiting))
             if (now - startedWaiting) > (180 * adbRestarts)
               # Restart the adb server every 60 seconds to prevent eternal waiting
@@ -784,10 +777,15 @@ module_function :read_manifest_package
     @@logger=v
   end
 
+  def self.apksigner= v
+    @@apksigner=v
+  end
+
   def signApk( inputApk, outputApk, keystore, keypass, storepass, storealias  )
     @@logger.info "Signing APK file"
 
     args = []
+=begin
     args << "-sigalg"
     args << "SHA256withRSA"
     #args << "-digestalg"
@@ -801,17 +799,41 @@ module_function :read_manifest_package
     args << outputApk
     args << inputApk
     args << storealias if storealias
+=end    
+    args << 'sign'
+    args << '--ks'
+    args << keystore
+
+    if storealias
+      args << '--ks-key-alias'
+      args << storealias
+    end
+
+    args << '--ks-pass'
+    args << "pass:#{storepass}"
+
+    args << '--key-pass'
+    args << "pass:#{keypass}"
+
+    args << '--v2-signing-enabled'
+    args << 'true'
+    args << '--verbose' if Rake.application.options.trace
+    args << '--out'
+    args << outputApk
+    args << inputApk
     
-    Jake.run2(@@jarsigner, args, :hide_output => !USE_TRACES )
+#    Jake.run2(@@jarsigner, args, :hide_output => !Rake.application.options.trace )
+    Jake.run2(@@apksigner, args, :hide_output => !Rake.application.options.trace )
+
     unless $?.success?
-      @@logger.error "Error running jarsigner"
+      @@logger.error "Error running apksigner"
       exit 1
     end
   end
   module_function :signApk
 
   def signApkDebug( inputApk, outputApk )
-    @@logger.info "Align Debug APK file"
+    @@logger.info "Sign Debug APK file"
 
     keystore = File.join(Dir.home,'/.android/debug.keystore')
     #Try to find debug keystore in another location
@@ -825,6 +847,49 @@ module_function :read_manifest_package
   end
   module_function :signApkDebug
 
+  def signAab( inputAab, outputAab, keystore, keypass, storepass, storealias  )
+    @@logger.info "Signing AAB file"
+
+    args = []
+
+    args << "-sigalg"
+    args << "SHA256withRSA"
+    #args << "-digestalg"
+    #args << "SHA256"
+    args << "-verbose"
+    args << "-keystore"
+    args << keystore
+    args << "-storepass"
+    args << storepass
+    args << "-signedjar"
+    args << outputAab
+    args << inputAab
+    args << storealias if storealias 
+    
+    Jake.run2(@@jarsigner, args, :hide_output => !Rake.application.options.trace )
+
+    unless $?.success?
+      @@logger.error "Error running jarsigner"
+      exit 1
+    end
+  end
+  module_function :signAab
+
+  def signAabDebug( inputAab, outputAab )
+    @@logger.info "Sign Debug AAB file"
+
+    keystore = File.join(Dir.home,'/.android/debug.keystore')
+    #Try to find debug keystore in another location
+    if ENV['USERPROFILE']
+      keystore = File.join(ENV['USERPROFILE'],'/.android/debug.keystore') unless File.file?(keystore)
+    end
+
+    raise "Can't find debug keystore in user's home folder" unless File.file?(keystore)
+
+    signAab( inputAab, outputAab, keystore, 'android', 'android', 'androiddebugkey' )
+  end
+  module_function :signAabDebug
+
   def alignApk( inputApk, outputApk )
     args = []
     args << "-f"
@@ -832,8 +897,8 @@ module_function :read_manifest_package
     args << "4"
     args << inputApk
     args << outputApk
-    out = Jake.run2(@@zipalign, args, :hide_output => !USE_TRACES )
-    puts out if USE_TRACES
+    out = Jake.run2(@@zipalign, args, :hide_output => !Rake.application.options.trace )
+    puts out if Rake.application.options.trace
     unless $?.success?
       @@logger.error "Error running zipalign"
       exit 1
@@ -906,6 +971,26 @@ module_function :read_manifest_package
   module_function :findSdkLibJar
 
 
+  def apk_build(sdk, apk_name, res_name, dex_name, debug)
+    puts "Building APK file..."
+    prev_dir = Dir.pwd
+    Dir.chdir File.join(sdk, "tools")
+
+    params = ['-Xmx1024m', '-classpath', findSdkLibJar(sdk), 'com.android.sdklib.build.ApkBuilderMain', apk_name]
+
+    params += ['-u', '-z', res_name, '-f', dex_name]
+
+    Jake.run File.join($java, "java#{HostPlatform.exe_ext}"), params
+    unless $?.success?
+        Dir.chdir prev_dir
+        raise 'Error building APK file'
+    end
+    Dir.chdir prev_dir
+  end
+  module_function :apk_build
+
+
+
 end #module AndroidTools
 
 def start_emulator(cmd)

data/platform/android/build/androidcommon.rb

@@ -38,8 +38,6 @@ require_relative 'hostplatform'
 # $libname[]      list of paths to compiled library
 # $debug          set to true to enable debug binaries
 
-USE_TRACES = Rake.application.options.trace
-
 $output_lock = Mutex.new
 
 def num_cpus
@@ -55,7 +53,7 @@ def get_objects(sources, objdir)
 end
 
 def setup_ndk(ndkpath,apilevel,abi)
-  puts "setup_ndk(#{ndkpath}, #{apilevel}, #{abi})" if USE_TRACES
+  puts "setup_ndk(#{ndkpath}, #{apilevel}, #{abi})" if Rake.application.options.trace
   apilevel = 21 if apilevel.to_i < 21 && abi == 'aarch64'
   $apilevel = apilevel
   ndk = NDKWrapper.new( ndkpath )
@@ -99,7 +97,7 @@ def setup_ndk(ndkpath,apilevel,abi)
     end
   end
 
-  puts "setup success!" if USE_TRACES
+  puts "setup success!" if Rake.application.options.trace
 end
 
 def cc_def_args
@@ -275,7 +273,7 @@ def cc_run(command, args, chdir = nil, coloring = true, env = nil, verbose = tru
       puts '-' * 80
       puts "PWD: " + FileUtils.pwd
       puts cmdstr
-      puts out.string if verbose
+      puts out.string if verbose || ( ret && (!(ret.success?)) )
     }
     out.close
   end
@@ -527,7 +525,7 @@ def java_build(jarpath, buildpath, classpath, srclists)
 
     args = []
 
-    if USE_TRACES
+    if Rake.application.options.trace
       args << "cfv"
     else
       args << "cf"
@@ -544,20 +542,3 @@ def java_build(jarpath, buildpath, classpath, srclists)
     end
 
 end
-
-def apk_build(sdk, apk_name, res_name, dex_name, debug)
-    puts "Building APK file..."
-    prev_dir = Dir.pwd
-    Dir.chdir File.join(sdk, "tools")
-
-    params = ['-Xmx1024m', '-classpath', $sdklibjar, 'com.android.sdklib.build.ApkBuilderMain', apk_name]
-
-    params += ['-u', '-z', res_name, '-f', dex_name]
-
-    Jake.run File.join($java, "java#{HostPlatform.exe_ext}"), params
-    unless $?.success?
-        Dir.chdir prev_dir
-        raise 'Error building APK file'
-    end
-    Dir.chdir prev_dir
-end

data/platform/android/build/apk_builder.rb

@@ -0,0 +1,42 @@
+require_relative 'android_tools'
+require 'fileutils'
+
+class ApkBuilder
+    attr_accessor :sdk_path, :output_path, :res_pkg, :dex_path, :debug, :build_tools_path
+    attr_accessor :keystore, :storealias, :storepass, :keypass    
+
+    def build
+        validate
+
+        tmpdir = Dir.mktmpdir 'rhodes_apk_build'
+
+        begin
+
+            unaligned_apk = File.join tmpdir, 'unaligned.apk'
+            AndroidTools.apk_build @sdk_path, unaligned_apk, @res_pkg, @dex_path, @debug
+            
+            unsigned_apk = File.join tmpdir, 'unsigned.apk'
+            AndroidTools.alignApk unaligned_apk, unsigned_apk
+            
+            if @debug
+                AndroidTools.signApkDebug unsigned_apk, @output_path
+            else
+                AndroidTools.signApk unsigned_apk, @output_path, @keystore, @keypass, @storepass, @storealias
+            end
+
+        ensure
+
+            FileUtils.remove_entry(tmpdir)
+        end
+
+    end
+
+    private
+    def validate
+        raise 'APK Builder set up incorrectly' unless defined? @sdk_path and
+            defined? @output_path and
+            defined? @res_pkg and
+            defined? @dex_path and
+            defined? @debug
+    end
+end

data/platform/android/build/libcurl_build.files

@@ -91,4 +91,4 @@ platform/shared/curl/lib/ftplistparser.c
 platform/shared/curl/lib/vauth/cram.c
 platform/shared/curl/lib/hmac.c
 platform/shared/curl/lib/curl_fnmatch.c
-platform/shared/curl/lib/curl_gethostname.c
+platform/shared/curl/lib/curl_gethostname.c

data/platform/android/build/librhodes_build.files

@@ -27,4 +27,4 @@ platform/android/Rhodes/jni/src/extmanager.cpp
 platform/android/Rhodes/jni/src/MethodExecutorJni.cpp
 platform/android/Rhodes/jni/src/MethodResultJni.cpp
 platform/android/Rhodes/jni/src/SecurityTokenGenerator.cpp
-platform/android/Rhodes/jni/src/JNIRhoRubyCppWrapper.cpp
+platform/android/Rhodes/jni/src/JNIRhoRubyCppWrapper.cpp

data/platform/android/build/maven_deps_extractor.rb

@@ -22,6 +22,7 @@ class MavenDepsExtractor
   def initialize
 
     @dependencies = {}
+    @file_deps = []
 
     @rhoroot = File.join( File.dirname(__FILE__),'..','..','..')
     @m2home = File.join( @rhoroot, 'res', 'build-tools', 'maven' )
@@ -99,11 +100,17 @@ class MavenDepsExtractor
     @logger.info "Adding maven dependency for #{mod}: #{dep}"
     #return if remove_dependencies_with_lesser_versions(dep)
 
+    if dep.index("aar:") == 0
+      @file_deps << dep
+    else
+
     if !@dependencies[mod]
       @dependencies[mod] = [ dep ]
     else
       @dependencies[mod] << dep
     end
+
+    end
   end
 
   def get_dependencies
@@ -123,6 +130,14 @@ class MavenDepsExtractor
     @java_home = File.dirname(d) #no /bin part
   end
 
+  def extract_from_files(path)
+    @file_deps.each do |dep|
+      path_to_aar = dep
+      path_to_aar = path_to_aar[4..dep.length - 1]
+      cp_r path_to_aar, path
+    end
+  end
+
   def extract_all
     @logger.info 'Extracting maven dependencies'
 
@@ -134,6 +149,7 @@ class MavenDepsExtractor
     mkdir_p copy_dir    
     get_art_poms(copy_dir)
     copy_dependencies copy_dir
+    extract_from_files(copy_dir)
     extract copy_dir, @temp_dir
     rm_r copy_dir
   end
@@ -156,7 +172,7 @@ class MavenDepsExtractor
 
           assets = File.join(target,'assets')
           manifest = File.join(target,'AndroidManifest.xml')
-		  r_txt = File.join(target,'R.txt')
+		      r_txt = File.join(target,'R.txt')
           res = File.join(target,'res')
           libs = File.join(target,'libs')
           jni = File.join(target,'jni')
@@ -191,8 +207,8 @@ class MavenDepsExtractor
     argv << 'dependency:copy-dependencies'
 #    argv << '-o' #work offline
     argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
-    argv << '-e' if USE_TRACES
-    argv << '-X' if USE_TRACES
+    argv << '-e' if Rake.application.options.trace
+    argv << '-X' if Rake.application.options.trace
   
     argv.join(' ')
   end
@@ -232,8 +248,8 @@ class MavenDepsExtractor
     argv << "-Ddest=./"
     argv << "-Dtransitive=false"
 
-    argv << '-e' if USE_TRACES
-    argv << '-X' if USE_TRACES
+    argv << '-e' if Rake.application.options.trace
+    argv << '-X' if Rake.application.options.trace
 
     argv.join(' ')
   end
@@ -305,6 +321,20 @@ class MavenDepsExtractor
     f.close
   end
 
+  def aapt2_res_dirs
+    args = []
+    @res_dirs.each do |d|
+      args << d
+    end
+
+    return args
+  end
+
+  def res_dirs
+    aapt2_res_dirs
+  end
+
+
   def aapt_args
     args = []
 =begin    
@@ -327,6 +357,10 @@ class MavenDepsExtractor
   def jars
     @jars
   end
+
+  def jni_libs
+    @jni_libs
+  end
   
   def extract_packages
      require 'nokogiri'

data/platform/android/build/ndkwrapper.rb

@@ -1,7 +1,5 @@
 require_relative 'hostplatform'
 
-USE_TRACES = Rake.application.options.trace
-
 class NDKWrapper
 
   @root_path = nil
@@ -116,15 +114,15 @@ class NDKWrapper
     max_ndk_api_level = 19 #we use some functions missing from API 20 and forth
 
     variants.each do |variant|
-      puts "Check NDK folder: #{variant}" if USE_TRACES
+      puts "Check NDK folder: #{variant}" if Rake.application.options.trace
       Dir.glob(File.join(@root_path, variant, "*")).each do |platform|
         sys_root = File.join platform, "arch-arm"
-        puts "Checking #{sys_root} for NDK nsysroot"  if USE_TRACES
+        puts "Checking #{sys_root} for NDK nsysroot"  if Rake.application.options.trace
         next unless File.directory? sys_root
         next unless platform =~ /android-([0-9]+)$/
         api_level = $1.to_i 
         api_levels.push api_level if (api_level<=max_ndk_api_level)
-        puts "NDK API level: #{api_level}" if USE_TRACES
+        puts "NDK API level: #{api_level}" if Rake.application.options.trace
       end
     end
     
@@ -132,7 +130,7 @@ class NDKWrapper
 
     last_api_level = 0
     api_levels.each do |cur_api_level|
-      puts "Checking is API level enough: #{cur_api_level}"  if USE_TRACES
+      puts "Checking is API level enough: #{cur_api_level}"  if Rake.application.options.trace
       break if cur_api_level > max_ndk_api_level
       last_api_level = cur_api_level
     end
@@ -155,7 +153,7 @@ class NDKWrapper
     ndkabi = "unknown"
     ndkhostvariants = []
     if HostPlatform.windows?
-        $bufcheck64 = `WMIC OS get OSArchitecture`.split[1]
+        $bufcheck64 = `WMIC OS get OSArchitecture`.encode('UTF-8', invalid: :replace, replace: "").split[1]
         ndkhostvariants << 'windows-x86_64' if $bufcheck64 and $bufcheck64.include?('64')
         ndkhostvariants << 'windows'
     else
@@ -207,7 +205,7 @@ class NDKWrapper
     end
 
     ndkhostvariants.each do |ndkhost|
-      puts "Checking toolchain for host: #{ndkhost}" if USE_TRACES
+      puts "Checking toolchain for host: #{ndkhost}" if Rake.application.options.trace
 
       toolchainversions.each do |version|
         variants = []
@@ -221,7 +219,7 @@ class NDKWrapper
 
 
         variants.each do |variant|
-          puts "Check toolchain path: #{variant}" if USE_TRACES    
+          puts "Check toolchain path: #{variant}" if Rake.application.options.trace    
           next unless File.directory? variant
 
           ndktools = variant
@@ -231,7 +229,7 @@ class NDKWrapper
           ndkabi = 'i686-linux-android' if ndkabi == 'x86'
           ndkabi = 'x86_64-linux-android' if ndkabi == 'x86_64'
 
-          puts "Toolchain is detected: #{ndktools}, abi: #{ndkabi}, version: #{@gccver}" if USE_TRACES
+          puts "Toolchain is detected: #{ndktools}, abi: #{ndkabi}, version: #{@gccver}" if Rake.application.options.trace
 
           tools = {}
           
@@ -272,7 +270,7 @@ class NDKWrapper
         toolpath = File.join(ndktoolsdir,'bin',"clang++#{HostPlatform.exe_ext}")
       end
     end
-    puts "Checking tool path #{toolpath} for tool #{tool}" if USE_TRACES
+    puts "Checking tool path #{toolpath} for tool #{tool}" if Rake.application.options.trace
     
     if File.file? toolpath
       return toolpath