rhodes 6.2.0 → 7.1.17

data/platform/android/build/android_tools.rb

@@ -789,9 +789,9 @@ module_function :read_manifest_package
 
     args = []
     args << "-sigalg"
-    args << "MD5withRSA"
-    args << "-digestalg"
-    args << "SHA1"
+    args << "SHA256withRSA"
+    #args << "-digestalg"
+    #args << "SHA256"
     args << "-verbose"
     args << "-keystore"
     args << keystore
@@ -947,3 +947,36 @@ def stop_emulator
     Jake.run3_dont_fail('killall -9 emulator 2> /dev/null')
   end
 end
+
+def isWindows?
+  if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+      return true
+  else
+      return false
+  end
+end
+
+def PathToWindowsWay(path)
+  if isWindows?
+    return path.gsub("/", "\\")
+  else
+    return path
+  end
+end
+
+def FormatManifestToAapt2Compat(path)
+  f = File.open(path, "r")
+  text = ''
+  users_permissions = ''
+  f.each_line do |line|
+    if (line.include?('<uses-permission'))
+      users_permissions += line
+    else
+      text = text + line
+    end
+  end
+  f.close
+
+  text.gsub! '<!-- Permission declarations -->', users_permissions
+  f = File.open(path, "w") {|file| file << text }
+end

data/platform/android/build/androidcommon.rb

@@ -56,6 +56,7 @@ end
 
 def setup_ndk(ndkpath,apilevel,abi)
   puts "setup_ndk(#{ndkpath}, #{apilevel}, #{abi})" if USE_TRACES
+  apilevel = 21 if apilevel.to_i < 21 && abi == 'aarch64'
   $apilevel = apilevel
   ndk = NDKWrapper.new( ndkpath )
   
@@ -65,12 +66,22 @@ def setup_ndk(ndkpath,apilevel,abi)
   $ndksysroot = ndk.sysroot apilevel, abi 
 
   $ndkgccver = ndk.gccver
+  $ndk_rev_major = ndk.rev_major
+  $target_toolchain = ndk.toolchain
   $androidndkpath = ndkpath unless $androidndkpath
 
   $sysincludes = ndk.sysincludes apilevel, abi
   $link_sysroot = ndk.link_sysroot apilevel, abi
 
-  puts "NDK sysroot: #{$ndksysroot}, linker sysroot: #{$link_sysroot}, GCC v#{$ndkgccver}, sysincludes: #{$sysincludes}"
+  if ($ndk_rev_major >= 18)
+    $link_sysroot_ext = ndk.link_sysroot_level_ext apilevel, abi
+  end
+
+  if($ndk_rev_major >= 18)
+    puts "NDK sysroot: #{$ndksysroot}, linker sysroot: #{$link_sysroot}, CLANG v#{$ndkgccver}, sysincludes: #{$sysincludes}"
+  else
+    puts "NDK sysroot: #{$ndksysroot}, linker sysroot: #{$link_sysroot}, GCC v#{$ndkgccver}, sysincludes: #{$sysincludes}"
+  end
 
   # Detect rlim_t
   if $have_rlim_t.nil?
@@ -87,10 +98,19 @@ def setup_ndk(ndkpath,apilevel,abi)
       end
     end
   end
+
+  puts "setup success!" if USE_TRACES
 end
 
 def cc_def_args
     args = []
+    if($ndk_rev_major >= 18)
+      args << "--target=#{$target_toolchain}#{$apilevel}"
+      args << "-fno-addrsig"
+      if ($target_toolchain == 'i686-linux-android' && $apilevel.to_i <= 23)
+        args << '-mstackrealign'
+      end
+    end
     args << "--sysroot"
     args << $ndksysroot
     args << "-isystem #{$sysincludes}" if $sysincludes    
@@ -100,14 +120,16 @@ def cc_def_args
     args << "-Wno-sign-compare"
     args << "-Wno-unused"
     args << '-Wno-unused-parameter'
-    args << "-mandroid"
+    if($ndk_rev_major < 18)
+      args << "-mandroid"
+    end
     args << "-DANDROID"
     args << "-DOS_ANDROID"
     args << "-DRHO_DEBUG"
     args << "-D__ANDROID_API__=#{$apilevel}" if $apilevel
     args << "-DHAVE_RLIM_T" if $have_rlim_t
     unless $debug
-      args << "-O2"
+      args << "-O1"
       args << "-DNDEBUG"
     else
       args << "-O0"
@@ -128,7 +150,13 @@ def cpp_def_args
     args << "-fvisibility-inlines-hidden"
     args << "-fno-exceptions"
     args << "-fno-rtti"
-    args << "-std=c++11"
+
+    if($ndk_rev_major < 18)
+      args << "-std=c++11"
+    else
+      args << "-stdlib=libc++"
+    end
+
     args << "-Wno-reorder"
     #args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','stlport','stlport')}\""
     args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include')}\""
@@ -200,8 +228,14 @@ def cc_run(command, args, chdir = nil, coloring = true, env = nil, verbose = tru
 
   isWinXP = false
   if RUBY_PLATFORM =~ /(win|w)32$/
-    winName = `WMIC OS get Name`
-    isWinXP = true if winName =~ /Windows XP/
+    begin
+      winName = `WMIC OS get Name`
+      #fix for invalid UTF
+      winName.encode('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '?')
+      isWinXP = true if winName =~ /Windows XP/
+    rescue ArgumentError
+      isWinXP = false
+    end
   end
 
   env = ENV unless env
@@ -332,12 +366,35 @@ def cc_link(outname, objects, additional = nil, deps = nil)
 
   args = []
 
+  if($ndk_rev_major >= 18)
+    args << "-v"  
+    args << "--target=#{$target_toolchain}#{$apilevel}"
+    args << "-fuse-ld=gold"
+  end
+
+  localabi = "unknown"
+  if $target_toolchain == "aarch64-linux-android"    
+    localabi = "arm64-v8a"
+  elsif ($target_toolchain == "arm-linux-androideabi" || $target_toolchain == "armv7a-linux-androideabi")
+    localabi = "armeabi"
+  elsif $target_toolchain == "i686-linux-android"
+    localabi = "x86"
+  else
+    localabi = "x86_64"
+  end
+
   if $ndkabi == "arm-eabi"
     args << "-nostdlib"
     args << "-Wl,-shared,-Bsymbolic"
+  elsif localabi == "arm64-v8a" or localabi == "armeabi"
+    args << "-shared"
+    args << "-Wl,-shared,-Bsymbolic"
   else
     args << "-shared"
   end
+
+  #args << "-Wl,-shared,-Bsymbolic" if localabi == "armeabi" or localabi == "arm64-v8a"
+
   #args << "-static-libstdc++"
   args << "-Wl,--no-whole-archive"
   args << "-Wl,--no-undefined"
@@ -350,51 +407,47 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "\"#{outname}\""
   args += objects.collect { |x| "\"#{x}\""}
   args += additional if additional.is_a? Array and not additional.empty?
-  args << "-L#{$link_sysroot}/usr/lib"
-  args << "-Wl,-rpath-link=#{$link_sysroot}/usr/lib"
-  args << "#{$link_sysroot}/usr/lib/libc.so"
-  args << "#{$link_sysroot}/usr/lib/libm.so"
-  #args << "#{$link_sysroot}/usr/lib/libstdc++.so"
-
-  localabi = "armeabi"
-  if $gccbin.include? "toolchains/x86"
-    localabi = "x86"
-  end
-  if $gccbin.include? "toolchains\\x86"
-    localabi = "x86"
-  end
-  
-  #libandroid_support = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", localabi)
-  #if File.exists? libandroid_support
-  #  args << "-L\"#{libandroid_support}\""
-  #  args << "-landroid_support"
-  #  puts "libandroid_support exists"
-  #else
-  #  localabi = "armeabi-v7a"
-  #  libandroid_support = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", localabi)
-  #  if File.exists? libandroid_support
-  #    args << "-L\"#{libandroid_support}\""
-  #    args << "-landroid_support"
-  #    puts "libandroid_support exists"
-  #  else
-  #    puts "libandroid_support does not exists"
-  #  end
-  #end
-
-  libgnustl_static = File.join($androidndkpath, "sources", "cxx-stl", "gnu-libstdc++", "4.9", "libs", localabi)
-  if File.exists? libgnustl_static
-    args << "-L\"#{libgnustl_static}\""
-    args << "-lgnustl_static"
-    puts "libgnustl_static exists"
+  if($ndk_rev_major >= 18)
+    args << "-L#{$link_sysroot}"
+    args << "-Wl,-rpath-link=#{$link_sysroot}"
+    args << "-L#{$link_sysroot_ext}"
+    args << "-Wl,-rpath-link=#{$link_sysroot_ext}"
+    args << "-L#{$link_sysroot_ext}/../"
+    args << "-Wl,-rpath-link=#{$link_sysroot_ext}/../"
   else
-    localabi = "armeabi-v7a"
+    args << "-L#{$link_sysroot}/usr/lib"
+    args << "-Wl,-rpath-link=#{$link_sysroot}/usr/lib"
+  end
+
+  args << "-lc"
+  args << "-lm"
+
+  if($ndk_rev_major < 18)
     libgnustl_static = File.join($androidndkpath, "sources", "cxx-stl", "gnu-libstdc++", "4.9", "libs", localabi)
     if File.exists? libgnustl_static
       args << "-L\"#{libgnustl_static}\""
       args << "-lgnustl_static"
       puts "libgnustl_static exists"
     else
-      puts "libgnustl_static does not exists"
+      localabi = "armeabi-v7a" if localabi == "armeabi"
+      libgnustl_static = File.join($androidndkpath, "sources", "cxx-stl", "gnu-libstdc++", "4.9", "libs", localabi)
+      if File.exists? libgnustl_static
+        args << "-L\"#{libgnustl_static}\""
+        args << "-lgnustl_static"
+        puts "libgnustl_static exists"
+      else
+        puts "libgnustl_static does not exists"
+      end
+    end
+  else
+    localabi = "armeabi-v7a" if localabi == "armeabi"
+    llvm_stl_shared = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", localabi)
+    if File.exists? llvm_stl_shared
+      args << "-L\"#{llvm_stl_shared}\""
+      args << "-lc++_shared"
+      puts "llvm stl shared library exists"
+    else
+      puts "llvm stl shared library does not exists"
     end
   end
 

data/platform/android/build/librhocommon_build.files

@@ -48,3 +48,14 @@ platform/shared/api_generator/js_helpers.cpp
 platform/shared/api_generator/MethodResult.cpp
 platform/shared/api_generator/StringifyHelper.cpp
 platform/shared/tinyxml2/tinyxml2.cpp
+platform/shared/rhoruby/impl/MutableArrayImpl.cpp
+platform/shared/rhoruby/impl/MutableBooleanImpl.cpp
+platform/shared/rhoruby/impl/MutableFloatImpl.cpp
+platform/shared/rhoruby/impl/MutableHashImpl.cpp
+platform/shared/rhoruby/impl/MutableIntegerImpl.cpp
+platform/shared/rhoruby/impl/MutableStringImpl.cpp
+platform/shared/rhoruby/impl/NilImpl.cpp
+platform/shared/rhoruby/impl/ObjectImpl.cpp
+platform/shared/rhoruby/impl/RefCountedObjectImpl.cpp
+platform/shared/rhoruby/impl/RhoRubyImpl.cpp
+platform/shared/rhoruby/impl/RhoRubySingletone.cpp

data/platform/android/build/librhodes_build.files

@@ -26,3 +26,5 @@ platform/android/Rhodes/jni/src/rhocryptimpl.cpp
 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

data/platform/android/build/manifest_generator.rb

@@ -19,6 +19,10 @@ class ManifestGenerator
   attr_accessor :rhodesActivityIntentFilters
   attr_accessor :hardwareAcceleration
   attr_accessor :apikey
+  attr_accessor :buildSdkVer
+  attr_accessor :buildToolsVer
+  attr_accessor :androidVerMaj
+  attr_accessor :androidVerMin
   
   attr_accessor :manifestManifestAdds
   attr_accessor :applicationManifestAdds
@@ -89,8 +93,11 @@ class ManifestGenerator
   end
   
   def render(erbPath)
-    puts "<<<<<<<<<<<<< render #{erbPath}"  
-  
+    puts "Rendering final AndroidManifest.xml: #{erbPath}"  
+
+    buildToolsVerMajor = self.buildToolsVer.split('.')[0].to_i
+    canRenderNetworkSecurityConfig = ((self.buildSdkVer.to_i >= 24) && (buildToolsVerMajor>=24))
+
     tpl = File.read erbPath
     erb = ERB.new tpl
     erb.result binding

data/platform/android/build/maven_deps_extractor.rb

@@ -7,11 +7,18 @@ class MavenDepsExtractor
   include Singleton
 
   @logger = nil
+  @api_level = nil
+
+  @repos_ = nil
 
   def set_logger( logger )
     @logger = logger
   end
 
+  def set_api_level( level )
+    @api_level = level
+  end
+
   def initialize
 
     @dependencies = {}
@@ -21,9 +28,17 @@ class MavenDepsExtractor
     @mvnbin = File.join( @m2home, 'bin', 'mvn' )
 
     if RUBY_PLATFORM =~ /(win|w)32$/
-      @mvnbin += '.bat'
+      @mvnbin += '.cmd'
     end
 
+    @repos_ = 
+    [
+      "file://#{File.join($androidsdkpath,'extras','google','m2repository')}",
+      "file://#{File.join($androidsdkpath,'extras','android','m2repository')}",
+      "https://jcenter.bintray.com",
+      "https://maven.google.com"
+    ]
+
     @jars = []
     @res_dirs = []
     @asset_dirs = []
@@ -111,18 +126,16 @@ class MavenDepsExtractor
   def extract_all
     @logger.info 'Extracting maven dependencies'
 
-    @logger.info 'Removing maven cache for android packages - just in case'
-    com_cache_dir = File.join(@m2home,'m2','com')
-    rm_r com_cache_dir if File.directory?(com_cache_dir)
+    #@logger.info 'Removing maven cache for android packages - just in case'
+    #com_cache_dir = File.join(@m2home,'m2','com')
+    #rm_rf com_cache_dir if File.directory?(com_cache_dir)
 
     copy_dir = File.join( @temp_dir, '.tmp')
     mkdir_p copy_dir    
+    get_art_poms(copy_dir)
     copy_dependencies copy_dir
-
-    @logger.info "Extracting dependencies"
     extract copy_dir, @temp_dir
-
-    rm_r copy_dir   
+    rm_r copy_dir
   end
 
   def extract( src, dst )
@@ -184,14 +197,56 @@ class MavenDepsExtractor
     argv.join(' ')
   end
 
+  def get_art_poms(path)
+    dependencies = @dependencies.values.flatten.map { |d| Hash[ ["grp_id","art_id","ver"].zip(split_dependency(d)) ] }
+    
+    remoteRepositories = ""
+
+    @repos_.each_with_index do |repo, i|
+      remoteRepositories += "repo#{i}::::#{repo},"
+    end
+
+    dependencies.each do |dep|
+      cmd = dep_get_cmd(dep["grp_id"], dep["art_id"], dep["ver"], remoteRepositories)
+      env = maven_env
+      pwd = path
+
+      @logger.info "Running Maven dependency get plugin"
+      puts cmd.to_s
+      Jake.run3( cmd, pwd, env )
+    end
+
+  end
+
+  def dep_get_cmd(grp_id, art_id, ver, repos)
+    argv = []
+    argv << @mvnbin
+    argv << 'dependency:get'
+    argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
+
+    argv << "-DgroupId=#{grp_id}"
+    argv << "-DartifactId=#{art_id}"
+    argv << "-Dversion=#{ver}"
+    argv << "-DremoteRepositories=#{repos}"
+    argv << "-Dpackaging=pom"
+    argv << "-Ddest=./"
+    argv << "-Dtransitive=false"
+
+    argv << '-e' if USE_TRACES
+    argv << '-X' if USE_TRACES
+
+    argv.join(' ')
+  end
+
   def copy_dependencies( path )    
     pom = File.join( path, 'pom.xml')
-    generate_pom(pom)
+    generate_pom(pom, path)
 
     cmd = dep_copy_cmd
     env = maven_env
     pwd = path
 
+    puts "current pwd: #{pwd}"
     @logger.info "Running Maven dependency copy plugin"
     Jake.run3( cmd, pwd, env )
     rm pom
@@ -205,17 +260,43 @@ class MavenDepsExtractor
     dep.split(':')
   end
 
-  def generate_pom(path)
+  def generate_pom(path, current_path)
     require 'erb'
 
     @logger.info "Generating pom.xml for dependencies at #{path}"
 
-    dependencies = @dependencies.values.flatten.map { |d| Hash[ ["grp_id","art_id","ver"].zip(split_dependency(d)) ] }
+    #dependencies = @dependencies.values.flatten.map { |d| Hash[ ["grp_id","art_id","ver"].zip(split_dependency(d)) ] }
+    dependencies = []
+
+    require 'nokogiri'
+    Dir.glob(File.join(current_path, "*.pom")).each do |pom|
+      doc = File.open(File.join(pom)) { |f| Nokogiri::XML(f) }
+      root = doc.search("project")
+      packaging = root.search("packaging")
+
+      artifactId = root.search("artifactId")[0].content
+      groupId = root.search("groupId")[0].content
+      version = root.search("version")[0].content
+      type = ''
+
+      if packaging[0] == nil
+        type = 'jar'
+      else
+        puts packaging.to_s
+        type = packaging[0].content
+      end
 
-    repos = [
-      File.join($androidsdkpath,'extras','google','m2repository'),
-      File.join($androidsdkpath,'extras','android','m2repository')
-    ]
+      hash = Hash.new
+      hash["grp_id"] = groupId
+      hash["art_id"] = artifactId
+      hash["ver"] = version
+      hash["packaging"] = type
+      dependencies << hash
+
+      rm_r pom
+    end
+
+    repos = @repos_
 
     tpl = File.read(File.join(@rhoroot,'platform','android','build','pom.erb'))
     erb = ERB.new tpl