rhodes 1.4.2 → 1.5.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 1.5.0
+* native screen resolution for iPad
+* native tab bar for android
+* support of SSL in AsyncHttp for iPhone and Android
+* fixed GPS updates on Android (back ported to 1-4-stable)
+* fixed MapView parameters validation for iPhone and Blackberry (back ported to 1-4-stable)
+* native geo mapping for android
+* support of splash screen for iPhone, Android, Blackberry and Windows Mobile
+
 == 1.4.2
 * Fix for BB push data
 * Fix issue #2547236 - BB map: incorrect drawing of world bounds (90N/90S, 180W/180E)
@@ -7,7 +16,7 @@
 * Fix issue #2561942 - BB Map: crash in case of wrong input parameters
 * Fix issue #2561958 - iPhone map: crash in case of wrong input parameters
 * Fix issue #2581678 - Android: GPS updates does not work
-
+ 
 == 1.4.1
 * fixed issue with empty cookie check failing
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'find'
 require 'erb'
 require 'rake/rdoctask'
+require 'digest/sha2'
+require 'rexml/document'
 
 #Look, another big fat hack. Make it so we can remove tasks from rake -T by setting comment to nil
 module Rake
@@ -20,6 +22,15 @@ load 'platform/iphone/rbuild/iphone.rake'
 load 'platform/wm/build/wm.rake'
 load 'platform/linux/tasks/linux.rake'
 
+def get_dir_hash(dir, init = nil)
+  hash = init
+  hash = Digest::SHA2.new if hash.nil?
+  Dir.glob(dir + "/**/*").each do |f|
+    hash << f
+    hash.file(f) if File.file? f
+  end
+  hash
+end
 
 namespace "framework" do
   task :spec do
@@ -43,7 +54,6 @@ end
 namespace "config" do
   task :common do
     $startdir = File.dirname(__FILE__)
-    $binextensions = []
     buildyml = 'rhobuild.yml'
 
     buildyml = ENV["RHOBUILD"] unless ENV["RHOBUILD"].nil?
@@ -61,7 +71,7 @@ namespace "config" do
         puts "Could not find rhodes application. Please verify your application setting in #{File.dirname(__FILE__)}/rhobuild.yml"
         exit 1
       end
-      $app_config = YAML::load_file($app_path + "/build.yml")
+      $app_config = Jake.config(File.open(File.join($app_path, "build.yml")))
 
     end
     Jake.set_bbver($app_config["bbver"].to_s)
@@ -79,26 +89,6 @@ def copy_assets(asset)
   
 end
 
-def check_extension_file
-  extfile = ""
-  File.open($startdir + "/platform/shared/ruby/ext/rho/extensions.c","r") do |f|
-    f.each_line do |line|
-      if line !~ /;/
-        extfile << line
-      else
-        loaded = false
-        $binextensions.each  { |loadedext| loaded = line.include? loadedext; break if loaded }
-        extfile << line if loaded
-
-      end
-
-    end
-  end
-  if extfile != ""
-    File.open($startdir + "/platform/shared/ruby/ext/rho/extensions.c","w") { |f| f.write extfile }
-  end
-end
-
 def clear_linker_settings
   if $config["platform"] == "iphone"
 #    outfile = ""
@@ -163,77 +153,7 @@ def add_extension(path,dest)
 
   Dir.glob("*").each { |f| cp_r f,dest unless f =~ /^ext(\/|(\.yml)?$)/ }
 
-  if File.exist? "ext.yml"
-    extension_config = YAML::load_file("ext.yml")
-
-    if extension_config["entry"] and extension_config["entry"] != ""
-      extfile = ""
-      File.open($startdir + "/platform/shared/ruby/ext/rho/extensions.c","r") do |f|
-        externstart = false
-        externwritten = false
-        callstart = false
-        callwritten = false
-
-        f.each_line do |line|
-   #       puts line
-          #are we starting a replacement area?
-          externstart = true if line =~ /EXTERNS/
-          callstart = true if line =~ /CALLS/
-
-
-          #if we arent in our replacement area, just copy the line
-          unless externstart or callstart
-            extfile << line
-          else
-            #always write an end marker
-            extfile << line if line =~ /END/
-            #did we just start the extern replacement area?
-            if externstart and not externwritten
-              #write marker and our new extension
-              extfile << line
-              extfile << "extern void #{extension_config["entry"]}(void);\n"
-              externwritten = true
-            end
-
-            #same for calls
-            if callstart and not callwritten
-              extfile << line
-              extfile << "#{extension_config["entry"]}();\n"
-              callwritten = true
-            end
-
-            #did we leave a replacement area
-            externstart = false if externstart and line =~ /END/
-            callstart = false if callstart and line =~ /END/
-
-            #if we are in a replacement area, check for lines that are there
-            #that we have marked as loaded and copy those over
-            #this is to make sure we are only loading things we explicitly marked
-            #leaving out lines that came from a previous run
-            if externstart or callstart
-              loaded = false
-              $binextensions.each  { |loadedext| loaded = line.include? loadedext; break if loaded }
-              extfile << line if loaded
-            end
-          end
-
-        end
-        $binextensions << extension_config["entry"]
-      end
-
-      if extfile != ""
-        File.open($startdir + "/platform/shared/ruby/ext/rho/extensions.c","w") { |f| f.write extfile }
-      end
-      
-    end
-
-    if extension_config["libraries"] and extension_config["libraries"].is_a? Array
-      extension_config["libraries"].each { |lib| add_linker_library(lib) }
-    end
-  end
-
   chdir start
-
 end
 
 def common_bundle_start(startdir, dest)
@@ -266,7 +186,9 @@ def common_bundle_start(startdir, dest)
   extensions += $app_config[$config["platform"]["extensions"]] if $config["platform"] and
     $config["platform"]["extensions"] and $config["platform"]["extensions"].is_a? Array
   $app_config["extensions"] = extensions
-    
+
+  extentries = []
+  extlibs = [] 
   $app_config["extensions"].each do |extname|
     rhoextpath = "lib/extensions/" + extname
     appextpath = $app_path + "/extensions/" + extname
@@ -280,11 +202,43 @@ def common_bundle_start(startdir, dest)
 
     unless extpath.nil?
       add_extension(extpath, dest)
+
+      extyml = File.join(extpath, "ext.yml")
+      if File.file? extyml
+        extconf = Jake.config(File.open(extyml))
+        entry = extconf["entry"]
+        extentries << entry unless entry.nil?
+        libs = extconf["libraries"]
+        extlibs += libs if !libs.nil? and libs.is_a? Array
+      end
     end
 
   end
 
-  check_extension_file
+  exts = File.join($startdir, "platform", "shared", "ruby", "ext", "rho", "extensions.c")
+  exists = []
+  File.new(exts, "r").read.split("\n").each do |line|
+    next if line !~ /^\s*extern\s+void\s+([A-Za-z_][A-Za-z0-9_]*)/
+    exists << $1
+  end
+
+  if exists.sort! != extentries.sort!
+    File.open(exts, "w") do |f|
+      f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+      f.puts "// Generated #{Time.now.to_s}"
+      extentries.each do |entry|
+        f.puts "extern void #{entry}(void);"
+      end
+      f.puts "void Init_Extensions(void) {"
+      extentries.each do |entry|
+        f.puts "    #{entry}();"
+      end
+      f.puts "}"
+    end
+  end
+
+  extlibs.each { |lib| add_linker_library(lib) }
+
   set_linker_flags
 
   unless $app_config["constants"].nil?
@@ -318,6 +272,8 @@ def common_bundle_start(startdir, dest)
   Dir.glob("**/*.iphone.*").each { |f| rm f }
   Dir.glob("**/*.bb.*").each { |f| rm f }
   Dir.glob("**/*.android.*").each { |f| rm f }
+  Dir.glob("**/.svn").each { |f| rm_rf f }
+  Dir.glob("**/cvs").each { |f| rm_rf f }
 
 end
 
@@ -477,19 +433,19 @@ end
 #desc "Get versions"
 task :get_version do
 
-  genver = "unknown"
+  #genver = "unknown"
   iphonever = "unknown"
   #symver = "unknown"
   wmver = "unknown"
   androidver = "unknown"
   
 
-  File.open("res/generators/templates/application/build.yml","r") do |f|
-    file = f.read
-    if file.match(/version: (\d+\.\d+\.\d+)/)
-      genver = $1
-    end
-  end
+  # File.open("res/generators/templates/application/build.yml","r") do |f|
+  #     file = f.read
+  #     if file.match(/version: (\d+\.\d+\.\d+)/)
+  #       genver = $1
+  #     end
+  #   end
 
   File.open("platform/iphone/Info.plist","r") do |f|
     file = f.read
@@ -552,7 +508,7 @@ task :get_version do
   
 
   puts "Versions:"
-  puts "  Generator:        " + genver
+  #puts "  Generator:        " + genver
   puts "  iPhone:           " + iphonever
   #puts "  Symbian:          " + symver
   #puts "  WinMo:            " + wmver
@@ -575,15 +531,15 @@ task :set_version, [:version] do |t,args|
   verstring = major+"."+minor+"."+build
   origfile = ""
 
-  File.open("res/generators/templates/application/build.yml","r") { |f| origfile = f.read }
-  File.open("res/generators/templates/application/build.yml","w") do |f|
-    f.write origfile.gsub(/version: (\d+\.\d+\.\d+)/, "version: #{verstring}")
-  end
+  # File.open("res/generators/templates/application/build.yml","r") { |f| origfile = f.read }
+  #   File.open("res/generators/templates/application/build.yml","w") do |f|
+  #     f.write origfile.gsub(/version: (\d+\.\d+\.\d+)/, "version: #{verstring}")
+  #   end
   
 
   File.open("platform/iphone/Info.plist","r") { |f| origfile = f.read }
   File.open("platform/iphone/Info.plist","w") do |f| 
-    f.write origfile.gsub(/CFBundleVersion<\/key>(\s+)<string>(\d+\.\d+\.*\d*)<\/string>/, "CFBundleVersion</key>\n  <string>#{verstring}</string>")
+    f.write origfile.gsub(/CFBundleVersion<\/key>(\s+)<string>(\d+\.\d+\.*\d*)<\/string>/, "CFBundleVersion</key>\n\t<string>#{verstring}</string>")
   end
 
   # File.open("platform/symbian/build/release.properties","r") { |f| origfile = f.read }
@@ -626,7 +582,7 @@ namespace "buildall" do
         if k.to_s =~ /^4/
           puts "BUILDING VERSION: #{k}"
           $app_config["bbver"] = k
-          Jake.reconfig($config)
+#          Jake.reconfig($config)
  
           #reset all tasks used for building
           Rake::Task["config:bb"].reenable

data/bin/rhodes-setup

@@ -56,9 +56,27 @@ if ENV['ANDROID_HOME']
 end
 
 android = android.gsub(/\\/,"/")
-android = "" unless File.exists? android  + "/platforms/android-1.5"
+apilevel = -1
+android_platform_dir = "/platforms/android-1.5"
+Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
+  props = File.join(dir, 'source.properties')
+  next unless File.file? props
+  File.open(props, 'r') do |f|
+    while line = f.gets
+      next if line !~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
+      apilevel = $1.to_i
+      break
+    end
+  end
+
+  if apilevel == 3
+    android_platform_dir = dir[android.length..-1]
+    break
+  end
+end
+android = "" if apilevel == -1
 
-android = prompt_for("Android 1.5 SDK path", android, false, "/platforms/android-1.5")
+android = prompt_for("Android 1.5 SDK path", android, false, android_platform_dir)
 
 androidndk = prompt_for("Android NDK path", "",false)
 
@@ -108,6 +126,8 @@ config["env"]["paths"]["java"] = java
 config["env"]["paths"]["android"] = android
 config["env"]["paths"]["android-ndk"] = androidndk
 config["env"]["paths"]["cabwiz"] = cabwiz
+config["env"]["paths"][4.2] = {} if config["env"]["paths"][4.2].nil?
+config["env"]["paths"][4.6] = {} if config["env"]["paths"][4.6].nil?
 config["env"]["paths"][4.6]["jde"] = jde46
 config["env"]["paths"][4.6]["mds"] = jde46mds
 config["env"]["paths"][4.2]["jde"] = jde42

data/bin/set-rhodes-sdk

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'yaml'
 require 'fileutils'
 include FileUtils
 puts File.dirname(__FILE__)

data/lib/build/jake.rb

@@ -26,16 +26,13 @@ class Jake
 
 
   def self.config(configfile)
-    @@config = YAML::load(configfile)
-    @@config = self.config_parse(@@config)
-    @@config
+    conf = YAML::load(configfile)
+    res = self.config_parse(conf)
+    res
   end
   def self.set_bbver(bbver)
     @@bbver = bbver
   end
-  def self.reconfig(config)
-    @@config = config
-  end
 
   def self.get_absolute(path)
     return File.expand_path(path) if File.exists?(path)
@@ -66,7 +63,7 @@ class Jake
           x
         else
           if x =~ /%(.*?)%/
-            x.gsub!(/%.*?%/, @@config.fetch_r($1).to_s)
+            x.gsub!(/%.*?%/, conf.fetch_r($1).to_s)
           end
           s = x.to_s
           if File.exists? s
@@ -98,45 +95,43 @@ class Jake
   end
   
   def self.run(command, args, wd=nil,system = false, hideerrors = false)
-    argstr = " "
+    argv = []
     currentdir = ""
     retval = ""
-    args.each do |x|
-      x = x.to_s
-      #x.gsub!(/^"/,"")
-      #x.gsub!(/"$/,"")
-      argstr +=  x + " "
-      #argstr += '"' + x + '" '
-    end
+    argv << command
+    argv += args
+    argv.map! { |x| x.to_s }.map! { |x| x =~ /^".*"$/ ? x[1..-2] : x }
 
     if not wd.nil?
       currentdir = pwd()
       chdir wd  
     end
     
+    cmdstr = argv.map { |x| x =~ / |\|/ ? '"' + x + '"' : x }.join(' ')
+
     puts "PWD: " + pwd
-    puts "CMD: " + command
-    puts "ARGS: " + argstr
+    puts "CMD: " + cmdstr
+    $stdout.flush
     
-    command = command + " " + argstr
     if hideerrors
       if RUBY_PLATFORM =~ /(win|w)32$/
         nul = "nul"
       else
         nul = "/dev/null"
       end
-      command = command + " 2>" + nul
+      argv << "2>" + nul
     end
     #retval =  `#{command} #{argstr}`
     #retval = %x[#{command}]
     if system
-      system(command)
+      system(cmdstr)
       retval = ""
     else
-      bb = IO.popen(command) { |bb|
-        b = bb.readlines
-        retval = b.join
-        #puts "exitstatus is #{Process.waitpid(bb.pid)}"
+      argv = cmdstr if RUBY_VERSION =~ /^1\.8/
+      IO.popen(argv) { |f|
+        while line = f.gets
+          puts line
+        end
       }
     end
     if not wd.nil?
@@ -149,9 +144,9 @@ class Jake
   
   def self.unjar(src,targetdir)
     if RUBY_PLATFORM =~ /(win|w)32$/
-      cmd =  @@config["env"]["paths"]["java"] + "/jar.exe"
+      cmd =  $config["env"]["paths"]["java"] + "/jar.exe"
     else
-      cmd =  @@config["env"]["paths"]["java"] + "/jar"
+      cmd =  $config["env"]["paths"]["java"] + "/jar"
     end
 
       p = Pathname.new(src)
@@ -162,7 +157,7 @@ class Jake
     args = Array.new
   
     args << "xf"
-    args << '"' + src.to_s + '"'
+    args << src.to_s
   
     chdir targetdir
     puts run(cmd,args)
@@ -170,15 +165,15 @@ class Jake
   end
   def self.jarfilelist(target)
     if RUBY_PLATFORM =~ /(win|w)32$/
-      cmd =  @@config["env"]["paths"]["java"] + "/jar.exe"
+      cmd =  $config["env"]["paths"]["java"] + "/jar.exe"
     else
-      cmd =  @@config["env"]["paths"]["java"] + "/jar"
+      cmd =  $config["env"]["paths"]["java"] + "/jar"
     end
     target.gsub!(/"/,"")
 
     args = []
     args << "tf"
-    args << '"' + target +'"'
+    args << target
 
     filelist = []
     run(cmd,args).each { |file| filelist << file if not file =~ /\/$/ }
@@ -187,20 +182,20 @@ class Jake
   end
 
   def self.jar(target,manifest,files,isfolder=false)
-     if RUBY_PLATFORM =~ /(win|w)32$/
-      cmd =  @@config["env"]["paths"]["java"] + "/jar.exe"
+    if RUBY_PLATFORM =~ /(win|w)32$/
+      cmd =  $config["env"]["paths"]["java"] + "/jar.exe"
     else
-      cmd =  @@config["env"]["paths"]["java"] + "/jar"
+      cmd =  $config["env"]["paths"]["java"] + "/jar"
     end
     target.gsub!(/"/,"")
     
     args = []
     args << "cfm"
-    args << '"' + target +'"'
+    args << target
     args << manifest
     if isfolder
       args << "-C"
-      args << '"' + files +'"'
+      args << files
       args << "."
     else
       args << files
@@ -212,11 +207,11 @@ class Jake
   end
   
   def self.rapc(output,destdir,imports,files,title=nil,vendor=nil,version=nil,icon=nil,library=true,cldc=false,quiet=true, nowarn=true)
-    #cmd = @@config["env"]["paths"][@@config["env"]["bbver"]]["java"] + "/java.exe"
+    #cmd = $config["env"]["paths"][$config["env"]["bbver"]]["java"] + "/java.exe"
 #   cmd = "java.exe"
     
-    jdehome = @@config["env"]["paths"][@@bbver]["jde"]
-    javabin = @@config["env"]["paths"]["java"]
+    jdehome = $config["env"]["paths"][@@bbver]["jde"]
+    javabin = $config["env"]["paths"]["java"]
     cmd = jdehome + "/bin/rapc.exe"
     
     currentdir = pwd()
@@ -247,21 +242,20 @@ class Jake
     args = []
     #args << "-classpath"
   #  args << "-jar"
-    #args << '"' + jdehome + "/bin/rapc.jar\""
+    #args << jdehome + "/bin/rapc.jar"
     #args << "net.rim.tools.compiler.Compiler"
     
-    args << "\"-javacompiler=" + javabin + "/javac.exe\""
+    args << "-javacompiler=" + javabin + "/javac.exe"
     args << "-quiet" if quiet
     args << "-nowarn" if nowarn
-    args << '"import=' + imports + '"'
+    args << 'import=' + imports
     args << 'codename=' + output
     args << 'library=' + output if library
     args << output + '.rapc'
     args << files
-    args << "2>&1"
   
     cmd.gsub!(/\//,"\\")
-    outputstring = run( '"' + cmd + '"',args)
+    outputstring = run(cmd, args)
     puts outputstring unless $? == 0
     chdir currentdir
   
@@ -269,22 +263,22 @@ class Jake
   
   def self.ant(dir,target)
   
-    srcdir = @@config["build"]["srcdir"]
-    rubypath = @@config["build"]["rubypath"]
-    excludelib = @@config["build"]["excludelib"]
-    excludeapps = @@config["build"]["excludeapps"]
-    compileERB = @@config["build"]["compileERB"]
+    srcdir = $config["build"]["srcdir"]
+    rubypath = $config["build"]["rubypath"]
+    excludelib = $config["build"]["excludelib"]
+    excludeapps = $config["build"]["excludeapps"]
+    compileERB = $config["build"]["compileERB"]
     
   
     args = []
     args << "-buildfile"
     args << dir + "/build.xml"
-    args << '"-Dsrc.dir=' + get_absolute(srcdir) + '"'
-#    args << '"-Druby.path=' + get_absolute(rubypath) + '"'
-    args << '"-Dexclude.lib=' + excludelib + '"'
-    args << '"-Dexclude.apps=' + excludeapps + '"'
-    args << '"-DcompileERB.path=' + get_absolute(compileERB) + '"'
-    args << '"-Dsrclib.dir=' + get_absolute(srcdir) + '"'
+    args << '-Dsrc.dir=' + get_absolute(srcdir)
+#    args << '-Druby.path=' + get_absolute(rubypath)
+    args << '-Dexclude.lib=' + excludelib
+    args << '-Dexclude.apps=' + excludeapps
+    args << '-DcompileERB.path=' + get_absolute(compileERB)
+    args << '-Dsrclib.dir=' + get_absolute(srcdir)
   
   
     args << target