rhodes 3.2.1 → 3.2.2.beta

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -607,6 +607,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;

data/platform/iphone/curl/curl.xcodeproj/project.pbxproj

@@ -832,6 +832,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;

data/platform/iphone/rbuild/iphone.rake

@@ -195,12 +195,13 @@ def make_app_info
   File.open(fname,"w") { |f| f.write(buf) }
 end
 
-ICONS = ['icon', 'icon57', 'icon72', 'icon114']
+ICONS = [['icon', 'icon57'], ['icon57','icon57'], ['icon72','icon72'], ['icon114','icon114']]
 
 def restore_app_icon
   puts "restore icon"
   ipath = $config["build"]["iphonepath"]
-  ICONS.each do |name|
+  ICONS.each do |pair|
+    name = pair[0]
     ibak = File.join(ipath, name + '.bak')
     icon = File.join(ipath, name + '.png')
     next if !File.exists? ibak
@@ -214,10 +215,11 @@ def set_app_icon(make_bak)
   puts "set icon"
   ipath = $config["build"]["iphonepath"]
   begin
-    ICONS.each do |name|
+    ICONS.each do |pair|
+      name = pair[0]
       ibak = File.join(ipath, name + '.bak')
       icon = File.join(ipath, name + '.png')
-      appicon = File.join($app_path, 'icon', name + '.png')
+      appicon = File.join($app_path, 'icon', pair[1] + '.png')
       if make_bak 
          cp icon, ibak unless File.exists? ibak
       end

data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj

@@ -245,7 +245,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				DSTROOT = /tmp/rhoextlib.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -917,7 +917,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 1;

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -1146,6 +1146,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -388,6 +388,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				HEADER_SEARCH_PATHS = ../../shared;

data/res/generators/rhogen.rb

@@ -278,8 +278,199 @@ module Rhogen
   end
 
 
+
+  class ExtensionGenerator < BaseGenerator
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'templates', 'extension')
+    end
+
+    desc <<-DESC
+      Adds native extension to Rhodes based application.
+    DESC
+
+    #option :testing_framework, :desc => 'Specify which testing framework to use (spec, test_unit)'
+
+    first_argument :name, :required => true, :desc => "extension name"
+
+    template :ext do |template|
+      template.source = 'extensions/montana/ext.yml'
+      template.destination = "extensions/#{name.downcase}/ext.yml"
+    end
+
+    template :extension_ruby do |template|
+      template.source = 'extensions/montana/montana.rb'
+      template.destination = "extensions/#{name.downcase}/#{name.downcase}.rb"
+    end
+
+    $build_script_full_path = ''
+
+    def callback_after_make_build(template)
+        # change atribbutes in build script file to executable
+        File.chmod(0755, $build_script_full_path) 
+    end    
+
+    template :build do |template|
+      template.source = 'extensions/montana/ext/build'
+      template.destination = "extensions/#{name.downcase}/ext/build"
+      $build_script_full_path = template.destination   
+      template.options = { :after => :callback_after_make_build}  
+    end
+
+    template :build_bat do |template|
+      template.source = 'extensions/montana/ext/build.bat'
+      template.destination = "extensions/#{name.downcase}/ext/build.bat"
+    end
+
+    template :extension_i do |template|
+      template.source = 'extensions/montana/ext/montana/shared/ruby/montana.i'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/ruby/#{name.downcase}.i"
+    end
+
+    template :extension_wrap do |template|
+      template.source = 'extensions/montana/ext/montana/shared/ruby/montana_wrap.c'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/ruby/#{name.downcase}_wrap.c"
+    end
+
+    template :extension_c do |template|
+      template.source = 'extensions/montana/ext/montana/shared/src/montana.c'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/src/#{name.downcase}.c"
+    end
+
+    template :extension_iphone_rakefile do |template|
+      template.source = 'extensions/montana/ext/montana/platform/iphone/Rakefile'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Rakefile"
+    end
+
+    file :extension_iphone_pch do |file|
+      file.source = 'extensions/montana/ext/montana/platform/iphone/Montana_Prefix.pch'
+      file.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/#{name.camel_case}_Prefix.pch"
+    end
+
+    template :extension_iphone_project do |template|
+      template.source = 'extensions/montana/ext/montana/platform/iphone/Montana.xcodeproj/project.pbxproj'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/#{name.camel_case}.xcodeproj/project.pbxproj"
+    end
+
+    template :extension_iphone_src_h do |template|
+      template.source = 'extensions/montana/ext/montana/platform/iphone/Classes/Montana.h'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Classes/#{name.camel_case}.h"
+    end
+
+    template :extension_iphone_src_m do |template|
+      template.source = 'extensions/montana/ext/montana/platform/iphone/Classes/Montana.m'
+      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Classes/#{name.camel_case}.m"
+    end
+
+    template :extension_android_ext_build do |template|
+        template.source = 'extensions/montana/ext/montana/platform/android/ext_build.files'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/ext_build.files"
+    end
+
+    template :extension_android_rakefile do |template|
+        template.source = 'extensions/montana/ext/montana/platform/android/Rakefile'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/Rakefile"
+    end
+
+    template :extension_android_cpp do |template|
+        template.source = 'extensions/montana/ext/montana/platform/android/jni/src/montana.cpp'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/jni/src/#{name.downcase}.cpp"
+    end
+
+    template :extension_android_java do |template|
+        template.source = 'extensions/montana/ext/montana/platform/android/src/com/montana/Montana.java'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/src/com/#{name.downcase}/#{name.camel_case}.java"
+    end
+
+
+    template :extension_wm_rakefile do |template|
+        template.source = 'extensions/montana/ext/montana/platform/wm/Rakefile'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/Rakefile"
+    end
+
+    template :extension_wm_vcproject do |template|
+        template.source = 'extensions/montana/ext/montana/platform/wm/Montana.vcproj'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.vcproj"
+    end
+
+    template :extension_wm_h do |template|
+        template.source = 'extensions/montana/ext/montana/platform/wm/src/montana_wm.h'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/src/#{name.downcase}_wm.h"
+    end
+
+    template :extension_wm_cpp do |template|
+        template.source = 'extensions/montana/ext/montana/platform/wm/src/montana_wm.cpp'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/src/#{name.downcase}_wm.cpp"
+    end
+
+
+    template :extension_bb_files do |template|
+        template.source = 'extensions/montana/ext/montana/platform/bb/Montana.files'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/#{name.camel_case}.files"
+    end
+
+    template :extension_bb_jgp do |template|
+        template.source = 'extensions/montana/ext/montana/platform/bb/montana.jdp'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/#{name.downcase}.jdp"
+    end
+
+    template :extension_bb_Rakefile do |template|
+        template.source = 'extensions/montana/ext/montana/platform/bb/Rakefile'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/Rakefile"
+    end
+
+    template :extension_bb_java do |template|
+        template.source = 'extensions/montana/ext/montana/platform/bb/src/com/montana/Montana.java'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/src/com/#{name.downcase}/#{name.camel_case}.java"
+    end
+
+
+
+    template :extension_test_controller do |template|
+      template.source = 'app/MontanaTest/controller.rb'
+      template.destination = "app/#{name.camel_case}Test/controller.rb"
+    end
+
+    template :extension_test_index do |template|
+      template.source = 'app/MontanaTest/index.erb'
+      template.destination = "app/#{name.camel_case}Test/index.erb"
+    end
+
+
+
+
+    #<%= name.downcase %>
+    #<%= name.camel_case %>
+
+    #template :spec do |template|
+    #  underscore_name = name.camel_case.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
+    #  template.source = 'spec.rb'
+    #  template.destination = "app/test/#{underscore_name}_spec.rb"
+    #end
+
+    #file :loadingpng do |file|
+    #  file.source = 'app/loading.png'
+    #  file.destination = "#{name}/app/loading.png"
+    #end
+    
+    #directory :helpers do |directory|
+    #  directory.source = 'app/helpers'
+    #  directory.destination = "#{name}/app/helpers"
+    #end
+
+
+    def attributes?
+      self.attributes && !self.attributes.empty?
+    end
+
+  end
+
+
+
+
   add :app, AppGenerator
   add :model, ModelGenerator
   add :spec, SpecGenerator
+  add :extension, ExtensionGenerator
 
 end

data/res/generators/templates/extension/app/MontanaTest/controller.rb

@@ -0,0 +1,20 @@
+require 'rho/rhocontroller'
+require 'helpers/application_helper'
+require 'helpers/browser_helper'
+require '<%= name.downcase %>'
+
+class <%= name.camel_case %>TestController < Rho::RhoController
+  include BrowserHelper
+  include ApplicationHelper
+  
+  def index
+    render :back => '/app'
+  end
+
+  def run_test
+    sum = <%= name.camel_case %>.calc_summ(3,7) 
+    Alert.show_popup <%= name.camel_case %>::<%= name.camel_case %>StringHelper::process_string('test')+sum.to_s
+    render :action => :index, :back => '/app'
+  end
+  
+end

data/res/generators/templates/extension/app/MontanaTest/index.erb

@@ -0,0 +1,17 @@
+<div data-role="page">
+
+  <div data-role="header" data-position="inline">
+    <h1><%= name.camel_case %> Extension Test</h1>
+    <a href="<%%= Rho::RhoConfig.start_path %>" class="ui-btn-left" data-icon="home" data-direction="reverse"
+       <%%= "data-ajax='false'" if is_bb6 %>>Home</a>
+      
+  </div>
+
+  <div data-role="content">
+    <ul data-role="listview">
+        <%%= link_to 'Run <%= name.camel_case %> test', { :action => :run_test }%>
+    </ul>
+  </div>
+
+</div>
+

data/res/generators/templates/extension/extensions/montana/ext.yml

@@ -0,0 +1,4 @@
+entry: Init_<%= name.camel_case %>_extension	
+javaentry: com.<%= name.downcase %>.<%= name.camel_case %>
+android_additional_sources_list: ext/<%= name.downcase %>/platform/android/ext_build.files
+libraries: ["<%= name.camel_case %>"]

data/res/generators/templates/extension/extensions/montana/ext/build

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+
+if [ "$RHO_PLATFORM" = "android" ]; then
+
+cd <%= name.downcase %>/platform/android
+rake --trace
+
+elif [ "$RHO_PLATFORM" = "iphone" ]; then
+
+cd <%= name.downcase %>/platform/iphone
+rake --trace
+
+fi
+
+
+

data/res/generators/templates/extension/extensions/montana/ext/build.bat

@@ -0,0 +1,36 @@
+
+if "%RHO_PLATFORM%" == "android" (
+
+cd <%= name.downcase %>\platform\android
+rake --trace
+
+)
+
+if "%RHO_PLATFORM%" == "iphone" (
+
+cd <%= name.downcase %>\platform\phone
+rake --trace
+
+)
+
+if "%RHO_PLATFORM%" == "wm" (
+
+cd <%= name.downcase %>\platform\wm
+rake --trace
+
+)
+
+if "%RHO_PLATFORM%" == "win32" (
+
+cd <%= name.downcase %>\platform\wm
+rake --trace
+
+)
+
+if "%RHO_PLATFORM%" == "bb" (
+
+cd <%= name.downcase %>\platform\bb
+rake --trace
+
+)
+

data/res/generators/templates/extension/extensions/montana/ext/montana/platform/android/Rakefile

@@ -0,0 +1,77 @@
+require 'fileutils'
+
+
+def build_extension(name, arch, src_files)
+  objects = []
+  mkdir_p $tempdir unless File.exists? $tempdir
+
+  use_own_stlport = false
+  $std_includes = File.join ENV['ANDROID_NDK'], "sources", "cxx-stl", "stlport", "stlport"
+  unless File.directory? $std_includes
+      $stlport_includes = "#{$rootdir}/platform/shared/stlport/stlport"
+      use_own_stlport = true
+  end
+
+  #Dir.glob("*.c").each do |f|
+  src_files.each do |f|
+    objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
+    objects << objname
+
+    args = []
+    args << "-I."
+    args << "-I#{$rootdir}/platform/android/Rhodes/jni/include"
+    args << "-I#{$rootdir}/platform/shared/ruby/include"
+    args << "-I#{$rootdir}/platform/shared"
+    args << "-I#{$rootdir}/platform/shared/common"
+
+    args << "-I#{$std_includes}" unless $std_includes.nil?
+    args << "-D__NEW__" if use_own_stlport
+    args << "-I#{$stlport_includes}" if use_own_stlport
+
+    args << "-I#{$rootdir}/platform/shared/ruby/android"
+    args << "-I#{$rootdir}/platform/shared/ruby/generated"
+
+    cc_compile f, $tempdir, args or exit 1
+
+  end
+
+  mkdir_p $targetdir unless File.exist? $targetdir
+
+  cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+
+end
+
+namespace "build" do
+  task :config do
+    curdir = pwd
+    $<%= name.downcase %>dir = curdir.gsub('/ext/<%= name.downcase %>/platform/android','');
+    $targetdir = ENV['TARGET_TEMP_DIR']
+    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
+    $tempdir = ENV['TEMP_FILES_DIR']
+    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
+    $rootdir = ENV['RHO_ROOT']
+    raise "RHO_ROOT is not set" if $rootdir.nil?
+
+    require File.join($rootdir, 'platform/android/build/androidcommon.rb')
+
+    setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'])
+
+  end
+
+  task :all => :config do
+
+    src_files = []
+
+    src_files << $<%= name.downcase %>dir + '/ext/<%= name.downcase %>/platform/android/jni/src/<%= name.downcase %>.cpp'
+    src_files << $<%= name.downcase %>dir + '/ext/<%= name.downcase %>/shared/ruby/<%= name.downcase %>_wrap.c'
+    src_files << $<%= name.downcase %>dir + '/ext/<%= name.downcase %>/shared/src/<%= name.downcase %>.c'
+
+    # build native part
+    build_extension('<%= name.camel_case %>', $arch, src_files)
+
+    # java part will be builded automatically (java files should be listed in ext_build.files ans ext. yml should be configured)
+
+  end
+end
+
+task :default => "build:all"