bin/rhodes-setup bin/rhodes-setup.bat bin/rhogen bin/rhogen.bat bin/set-rhodes-sdk bin/set-rhodes-sdk.bat bin/upgrade-rhodes-app bin/upgrade-rhodes-app.bat ext/extconf.rb lib/build/compileERB/bb.rb lib/build/compileERB/default.rb lib/build/compileRB/compileRB.rb lib/build/jake.rb lib/build/manifest/createAppManifest.rb lib/build/rhodes-build.rb lib/build/tasks/android.rake lib/build/tasks/blackberry.rake lib/build/tasks/common.rake lib/build/tasks/iphone.rake lib/build/tasks/linux.rake lib/build/tasks/rhodes-build.rb lib/build/tasks/rspec.rake lib/build/tasks/symbian.rake lib/build/tasks/wm.rake lib/build/version.rb lib/framework/ServeME.rb lib/framework/bsearch.rb lib/framework/builtinME.rb lib/framework/date.rb lib/framework/date/format.rb lib/framework/dateME.rb lib/framework/erb.rb lib/framework/find.rb lib/framework/indifferent_access.rb lib/framework/rational.rb lib/framework/rationalME.rb lib/framework/rho.rb lib/framework/rho/render.rb lib/framework/rho/rho.rb lib/framework/rho/rhoapplication.rb lib/framework/rho/rhocontact.rb lib/framework/rho/rhocontroller.rb lib/framework/rho/rhoerror.rb lib/framework/rho/rhofsconnector.rb lib/framework/rho/rhosupport.rb lib/framework/rho/rhoutils.rb lib/framework/rho/rhoviewhelpers.rb lib/framework/rhodes-framework.rb lib/framework/rhodes.rb lib/framework/rhoframework.rb lib/framework/rhofsconnector.rb lib/framework/rhom.rb lib/framework/rhom/rhom.rb lib/framework/rhom/rhom_db_adapter.rb lib/framework/rhom/rhom_object.rb lib/framework/rhom/rhom_object_factory.rb lib/framework/rhom/rhom_source.rb lib/framework/singleton.rb lib/framework/time.rb lib/framework/version.rb lib/rhodes.rb platform/android/Rhodes/src/com/rhomobile/rhodes/FileAccess.java platform/android/Rhodes/src/com/rhomobile/rhodes/RAFile.java platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java platform/bb/Hsqldb/src/com/rho/file/Jsr75RAFileImpl.java platform/bb/Hsqldb/src/com/rho/file/PersistRAFileImpl.java platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java platform/bb/rhodes/src/com/rho/RhoMainScreen.java platform/iphone/Classes/JSString.h platform/iphone/Classes/JSString.m platform/iphone/Classes/MapView/GoogleGeocoder.h platform/iphone/Classes/MapView/GoogleGeocoder.m platform/iphone/Classes/MapView/MapAnnotation.h platform/iphone/Classes/MapView/MapAnnotation.m platform/iphone/Classes/MapView/MapViewController.h platform/iphone/Classes/MapView/MapViewController.m platform/iphone/Classes/RhoFileImpl.m platform/iphone/Classes/Server/WebViewUrl.h platform/iphone/Classes/Server/WebViewUrl.m platform/linux/tasks/linux.rake platform/osx/Rhodes Launcher/English.lproj/InfoPlist.strings platform/osx/Rhodes Launcher/English.lproj/MainMenu.xib platform/osx/Rhodes Launcher/Info.plist platform/osx/Rhodes Launcher/Rhodes Launcher.xcodeproj/TemplateIcon.icns platform/osx/Rhodes Launcher/Rhodes Launcher.xcodeproj/project.pbxproj platform/osx/Rhodes Launcher/Rhodes Launcher_Prefix.pch platform/osx/Rhodes Launcher/RhodesController.h platform/osx/Rhodes Launcher/RhodesController.m platform/osx/Rhodes Launcher/icon.icns platform/osx/Rhodes Launcher/launch.rb platform/osx/Rhodes Launcher/main.m platform/osx/Rhodes Launcher/rhorunner.app/Info.plist platform/osx/Rhodes Launcher/rhorunner.app/MainWindow.nib platform/osx/Rhodes Launcher/rhorunner.app/PkgInfo platform/osx/Rhodes Launcher/rhorunner.app/Settings.bundle/Root.plist platform/osx/Rhodes Launcher/rhorunner.app/Settings.bundle/en.lproj/Root.strings platform/osx/Rhodes Launcher/rhorunner.app/apps/app/loading.html platform/osx/Rhodes Launcher/rhorunner.app/apps/app_manifest.txt platform/osx/Rhodes Launcher/rhorunner.app/apps/public/css/base.css platform/osx/Rhodes Launcher/rhorunner.app/apps/public/css/blackberry.css platform/osx/Rhodes Launcher/rhorunner.app/apps/public/css/iphone.css platform/osx/Rhodes Launcher/rhorunner.app/apps/public/css/rho.css platform/osx/Rhodes Launcher/rhorunner.app/apps/public/css/xhtml.css platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/IUI_LICENSE.txt platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/backButton.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/blueButton.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/cancel.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/grayButton.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/iui-logo-touch-icon.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/listArrow.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/listArrowSel.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/listGroup.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/loading.gif platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/pinstripes.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/right_button.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/selection.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/thumb.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/toggle.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/toggleOn.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/toolButton.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/toolButton_new.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/toolbar.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/images/whiteButton.png platform/osx/Rhodes Launcher/rhorunner.app/apps/public/js/application.js platform/osx/Rhodes Launcher/rhorunner.app/apps/public/js/jquery-1.2.6.min.js platform/osx/Rhodes Launcher/rhorunner.app/apps/public/js/rho.js platform/osx/Rhodes Launcher/rhorunner.app/apps/public/js/rhogeolocation-wm.js platform/osx/Rhodes Launcher/rhorunner.app/apps/public/js/rhogeolocation.js platform/osx/Rhodes Launcher/rhorunner.app/apps/rhoconfig.txt platform/osx/Rhodes Launcher/rhorunner.app/back_btn.png platform/osx/Rhodes Launcher/rhorunner.app/db/syncdb.sqlite platform/osx/Rhodes Launcher/rhorunner.app/forward_btn.png platform/osx/Rhodes Launcher/rhorunner.app/gears.png platform/osx/Rhodes Launcher/rhorunner.app/home_btn.png platform/osx/Rhodes Launcher/rhorunner.app/icon.png platform/osx/Rhodes Launcher/rhorunner.app/rhorunner platform/osx/Rhodes Launcher/unzipbundle.rb platform/osx/Rhodes Launcher/version.plist platform/shared/common/Tokenizer.cpp platform/shared/common/Tokenizer.h platform/shared/db/DBAttrManager.cpp platform/shared/db/DBAttrManager.h platform/shared/net/URI.cpp platform/shared/net/URI.h platform/shared/ruby/ext/mapview/mapview.i platform/shared/ruby/ext/mapview/mapview_wrap.c platform/shared/rubyJVM/src/com/rho/IFileAccess.java platform/shared/rubyJVM/src/com/rho/IRAFile.java platform/shared/rubyJVM/src/com/rho/db/DBAttrManager.java platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java platform/shared/sync/SyncNotify.cpp platform/shared/sync/SyncNotify.h rakefile.rb res/build-tools/RhoRuby.exe res/build-tools/RubyMac res/build-tools/build_inf.js res/build-tools/db/syncdb.schema res/build-tools/insertRhoBundle2pkg.rb res/build-tools/rhodes_pid.key res/build-tools/xruby-0.3.3.jar res/generators/rhogen.rb res/generators/templates/application/Rakefile res/generators/templates/application/app/Settings/controller.rb res/generators/templates/application/app/Settings/index.erb res/generators/templates/application/app/Settings/login.erb res/generators/templates/application/app/Settings/reset.erb res/generators/templates/application/app/Settings/wait.erb res/generators/templates/application/app/application.rb res/generators/templates/application/app/helpers/application_helper.rb res/generators/templates/application/app/index.erb res/generators/templates/application/app/layout.erb res/generators/templates/application/app/loading.html res/generators/templates/application/build.yml res/generators/templates/application/icon/icon.ico res/generators/templates/application/icon/icon.png res/generators/templates/application/public/css/base.css res/generators/templates/application/public/css/blackberry.css res/generators/templates/application/public/css/iphone.css res/generators/templates/application/public/css/rho.css res/generators/templates/application/public/css/xhtml.css res/generators/templates/application/public/images/IUI_LICENSE.txt res/generators/templates/application/public/images/backButton.png res/generators/templates/application/public/images/blueButton.png res/generators/templates/application/public/images/cancel.png res/generators/templates/application/public/images/grayButton.png res/generators/templates/application/public/images/iui-logo-touch-icon.png res/generators/templates/application/public/images/listArrow.png res/generators/templates/application/public/images/listArrowSel.png res/generators/templates/application/public/images/listGroup.png res/generators/templates/application/public/images/loading.gif res/generators/templates/application/public/images/pinstripes.png res/generators/templates/application/public/images/right_button.png res/generators/templates/application/public/images/selection.png res/generators/templates/application/public/images/thumb.png res/generators/templates/application/public/images/toggle.png res/generators/templates/application/public/images/toggleOn.png res/generators/templates/application/public/images/toolButton.png res/generators/templates/application/public/images/toolButton_new.png res/generators/templates/application/public/images/toolbar.png res/generators/templates/application/public/images/whiteButton.png res/generators/templates/application/public/js/application.js res/generators/templates/application/public/js/jquery-1.2.6.min.js res/generators/templates/application/public/js/rho.js res/generators/templates/application/public/js/rhogeolocation-wm.js res/generators/templates/application/public/js/rhogeolocation.js res/generators/templates/application/rhoconfig.txt res/generators/templates/bundle/db/syncdb.sqlite res/generators/templates/model/config.rb res/generators/templates/model/controller.rb res/generators/templates/model/edit.erb res/generators/templates/model/index.erb res/generators/templates/model/new.erb res/generators/templates/model/show.erb res/generators/templates/source/source_adapter.rb rhodes.gemspec spec/README spec/Rakefile spec/app/Account/config.rb spec/app/Case/config.rb spec/app/Question/config.rb spec/app/Settings/controller.rb spec/app/Settings/index.erb spec/app/SpecRunner/controller.rb spec/app/SpecRunner/index.erb spec/app/application.rb spec/app/index.erb spec/app/layout.erb spec/app/loading.html spec/app/mspec.rb spec/app/mspec/expectations.rb spec/app/mspec/expectations/expectations.rb spec/app/mspec/expectations/should.rb spec/app/mspec/fileutils.rb spec/app/mspec/guards.rb spec/app/mspec/guards/background.rb spec/app/mspec/guards/bug.rb spec/app/mspec/guards/compliance.rb spec/app/mspec/guards/conflict.rb spec/app/mspec/guards/endian.rb spec/app/mspec/guards/extensions.rb spec/app/mspec/guards/guard.rb spec/app/mspec/guards/noncompliance.rb spec/app/mspec/guards/platform.rb spec/app/mspec/guards/quarantine.rb spec/app/mspec/guards/runner.rb spec/app/mspec/guards/superuser.rb spec/app/mspec/guards/support.rb spec/app/mspec/guards/tty.rb spec/app/mspec/guards/version.rb spec/app/mspec/helpers.rb spec/app/mspec/helpers/argv.rb spec/app/mspec/helpers/bignum.rb spec/app/mspec/helpers/const_lookup.rb spec/app/mspec/helpers/environment.rb spec/app/mspec/helpers/fixture.rb spec/app/mspec/helpers/flunk.rb spec/app/mspec/helpers/io.rb spec/app/mspec/helpers/language_version.rb spec/app/mspec/helpers/ruby_exe.rb spec/app/mspec/helpers/scratch.rb spec/app/mspec/helpers/tmp.rb spec/app/mspec/matchers.rb spec/app/mspec/matchers/base.rb spec/app/mspec/matchers/be_an_instance_of.rb spec/app/mspec/matchers/be_ancestor_of.rb spec/app/mspec/matchers/be_close.rb spec/app/mspec/matchers/be_empty.rb spec/app/mspec/matchers/be_false.rb spec/app/mspec/matchers/be_kind_of.rb spec/app/mspec/matchers/be_nil.rb spec/app/mspec/matchers/be_true.rb spec/app/mspec/matchers/complain.rb spec/app/mspec/matchers/eql.rb spec/app/mspec/matchers/equal.rb spec/app/mspec/matchers/equal_element.rb spec/app/mspec/matchers/equal_utf16.rb spec/app/mspec/matchers/have_constant.rb spec/app/mspec/matchers/have_instance_method.rb spec/app/mspec/matchers/have_method.rb spec/app/mspec/matchers/have_private_instance_method.rb spec/app/mspec/matchers/include.rb spec/app/mspec/matchers/match_yaml.rb spec/app/mspec/matchers/method.rb spec/app/mspec/matchers/output.rb spec/app/mspec/matchers/output_to_fd.rb spec/app/mspec/matchers/raise_error.rb spec/app/mspec/matchers/respond_to.rb spec/app/mspec/matchers/stringsymboladapter.rb spec/app/mspec/mocks.rb spec/app/mspec/mocks/mock.rb spec/app/mspec/mocks/object.rb spec/app/mspec/mocks/proxy.rb spec/app/mspec/pp.rb spec/app/mspec/runner.rb spec/app/mspec/runner/actions.rb spec/app/mspec/runner/actions/debug.rb spec/app/mspec/runner/actions/filter.rb spec/app/mspec/runner/actions/gdb.rb spec/app/mspec/runner/actions/tag.rb spec/app/mspec/runner/actions/taglist.rb spec/app/mspec/runner/actions/tagpurge.rb spec/app/mspec/runner/actions/tally.rb spec/app/mspec/runner/actions/timer.rb spec/app/mspec/runner/context.rb spec/app/mspec/runner/example.rb spec/app/mspec/runner/exception.rb spec/app/mspec/runner/filters.rb spec/app/mspec/runner/filters/match.rb spec/app/mspec/runner/filters/profile.rb spec/app/mspec/runner/filters/regexp.rb spec/app/mspec/runner/filters/tag.rb spec/app/mspec/runner/formatters.rb spec/app/mspec/runner/formatters/describe.rb spec/app/mspec/runner/formatters/dotted.rb spec/app/mspec/runner/formatters/file.rb spec/app/mspec/runner/formatters/html.rb spec/app/mspec/runner/formatters/method.rb spec/app/mspec/runner/formatters/specdoc.rb spec/app/mspec/runner/formatters/spinner.rb spec/app/mspec/runner/formatters/summary.rb spec/app/mspec/runner/formatters/unit.rb spec/app/mspec/runner/formatters/yaml.rb spec/app/mspec/runner/mspec.rb spec/app/mspec/runner/object.rb spec/app/mspec/runner/shared.rb spec/app/mspec/runner/tag.rb spec/app/mspec/utils/name_map.rb spec/app/mspec/utils/options.rb spec/app/mspec/utils/ruby_name.rb spec/app/mspec/utils/script.rb spec/app/mspec/utils/version.rb spec/app/mspec/version.rb spec/app/spec/fixtures/client_info.txt spec/app/spec/fixtures/object_values.txt spec/app/spec/pagination/fixtures/object_values.txt spec/app/spec/rho_controller_spec.rb spec/app/spec/rho_spec.rb spec/app/spec/rhom_db_adapter_spec.rb spec/app/spec/rhom_object_spec.rb spec/app/spec/rhom_spec.rb spec/app/spec/rhoruby_spec.rb spec/app/spec/spec_helper.rb spec/app/spec/syncengine_spec.rb spec/app/spec/webview_spec.rb spec/app/spec_runner.rb spec/app_generator_spec.rb spec/build.yml spec/generator_spec_helper.rb spec/model_generator_spec.rb spec/public/css/base.css spec/public/css/blackberry.css spec/public/css/iphone.css spec/public/css/rho.css spec/public/css/xhtml.css spec/public/images/IUI_LICENSE.txt spec/public/images/backButton.png spec/public/images/blueButton.png spec/public/images/cancel.png spec/public/images/grayButton.png spec/public/images/iui-logo-touch-icon.png spec/public/images/listArrow.png spec/public/images/listArrowSel.png spec/public/images/listGroup.png spec/public/images/loading.gif spec/public/images/pinstripes.png spec/public/images/right_button.png spec/public/images/selection.png spec/public/images/thumb.png spec/public/images/toggle.png spec/public/images/toggleOn.png spec/public/images/toolButton.png spec/public/images/toolButton_new.png spec/public/images/toolbar.png spec/public/images/whiteButton.png spec/public/js/application.js spec/public/js/jquery-1.2.6.min.js spec/public/js/rho.js spec/public/js/rhogeolocation-wm.js spec/public/js/rhogeolocation.js spec/rhoconfig.txt spec/source_generator_spec.rb spec/spec.opts spec/spec_helper.rb @@ -1,11 +1,15 @@ require 'find' require 'erb' -require 'rhodes/rhodes-build/lib/jake.rb' + +chdir File.dirname(__FILE__) + +require 'lib/build/jake.rb' load 'platform/bb/build/bb.rake' load 'platform/android/build/android.rake' load 'platform/iphone/rbuild/iphone.rake' load 'platform/wm/build/wm.rake' +load 'platform/linux/tasks/linux.rake' namespace "config" do task :common do @@ -19,13 +23,30 @@ namespace "config" do else $all_files_mask = "*" end + if $app_path.nil? #if we are called from the rakefile directly, this wont be set + #load the apps path and config + $app_path = $config["env"]["app"] + $app_config = YAML::load_file($app_path + "/build.yml") + + end + Jake.set_bbver($app_config["bbver"].to_s) end end +def copy_assets(asset) + + dest = File.join($srcdir,'apps/public') + + cp_r asset + "/.", dest, :remove_destination => true + +end + + + def common_bundle_start(startdir, dest) - app = $config["env"]["app"] - rhodeslib = "rhodes/rhodes-framework/lib" + app = $app_path + rhodeslib = "lib/framework" rm_rf $srcdir mkdir_p $srcdir @@ -50,6 +71,8 @@ def common_bundle_start(startdir, dest) cp_r app + '/app',File.join($srcdir,'apps') cp_r app + '/public', File.join($srcdir,'apps') cp app + '/rhoconfig.txt', File.join($srcdir,'apps') + + copy_assets($assetfolder) if ($assetfolder and File.exists? $assetfolder) end def create_manifest @@ -75,17 +98,23 @@ namespace "build" do namespace "bundle" do task :xruby do #needs $config, $srcdir, $excludelib, $bindir - app = $config["env"]["app"] + app = $app_path startdir = pwd - dest = startdir + "/" + $srcdir - xruby = File.dirname(__FILE__) + '/rhodes/rhodes-build/res/xruby-0.3.3.jar' + dest = $srcdir + xruby = File.dirname(__FILE__) + '/res/build-tools/xruby-0.3.3.jar' common_bundle_start(startdir,dest) - chdir File.join($srcdir,'apps/public') - rm_rf 'js/iui' - Dir.glob("js/jquery*").each {|f| rm_rf f} - Dir.glob("js/prototype*").each {|f| rm f} + if not $config["excludedirs"].nil? + if $config["excludedirs"].has_key?($config["platform"]) + chdir File.join($srcdir, 'apps') + + excl = $config["excludedirs"][$config["platform"]] + excl.each do |mask| + Dir.glob(mask).each {|f| rm_rf f} + end + end + end chdir startdir #create manifest @@ -126,24 +155,35 @@ namespace "build" do end task :noxruby do - app = $config["env"]["app"] - rhodeslib = "rhodes/rhodes-framework/lib" - compileERB = "rhodes/rhodes-build/lib/compileERB/default.rb" - compileRB = "rhodes/rhodes-build/lib/compileRB/compileRB.rb" + app = $app_path + rhodeslib = File.dirname(__FILE__) + "/lib/framework" + compileERB = "lib/build/compileERB/default.rb" + compileRB = "lib/build/compileRB/compileRB.rb" startdir = pwd - dest = startdir + "/" + $srcdir + "/lib" + dest = $srcdir + "/lib" common_bundle_start(startdir,dest) create_manifest cp compileERB, $srcdir - puts `#{$rubypath} -R#{rhodeslib} #{$srcdir}/default.rb` + puts "Running default.rb" + + puts `#{$rubypath} -I#{rhodeslib} #{$srcdir}/default.rb` + unless $? == 0 + puts "Error interpreting erb code" + exit 1 + end rm "#{$srcdir}/default.rb" cp compileRB, $srcdir - puts `#{$rubypath} -R#{rhodeslib} #{$srcdir}/compileRB.rb` + puts "Running compileRB" + puts `#{$rubypath} -I#{rhodeslib} #{$srcdir}/compileRB.rb` + unless $? == 0 + puts "Error interpreting ruby code" + exit 1 + end chdir $srcdir Dir.glob("**/*.rb") { |f| rm f } @@ -151,7 +191,7 @@ namespace "build" do chdir startdir - cp_r "rhodes/rhodes-build/res/prebuilt/common/db", $srcdir + cp_r "res/build-tools/db", $srcdir end end end @@ -160,7 +200,7 @@ end # Simple rakefile that loads subdirectory 'rhodes' Rakefile # run "rake -T" to see list of available tasks -desc "Get versions" +#desc "Get versions" task :get_version do bbver = "unknown" iphonever = "unknown" @@ -221,14 +261,14 @@ task :get_version do end end - File.open("rhodes/rhodes-build/lib/version.rb","r") do |f| + File.open("lib/build/version.rb","r") do |f| file = f.read if file.match(/VERSION = '(\d+\.\d+\.*\d*)'/) rbuildver = $1 end end - File.open("rhodes/rhodes-framework/lib/version.rb","r") do |f| + File.open("lib/framework/version.rb","r") do |f| file = f.read if file.match(/VERSION = '(\d+\.\d+\.*\d*)'/) rframever = $1 @@ -255,7 +295,7 @@ task :get_version do puts " Rhodes Generator: " + rgenver end -desc "Set version" +#desc "Set version" task :set_version, [:version] do |t,args| throw "You must pass in version" if args.version.nil? ver = args.version.split(/\./) @@ -302,9 +342,9 @@ task :set_version, [:version] do |t,args| end ["rhodes/rhodes/lib/rhodes.rb", - "rhodes/rhodes-build/lib/version.rb", - "rhodes/rhodes-framework/lib/version.rb", - "rhodes/rhodes-framework/lib/rhodes.rb", + "lib/build/version.rb", + "lib/framework/version.rb", + "lib/framework/rhodes.rb", "rhodes/rhodes-generator/lib/version.rb"].each do |versionfile| File.open(versionfile,"r") { |f| origfile = f.read } @@ -317,145 +357,16 @@ task :set_version, [:version] do |t,args| Rake::Task[:get_version].invoke end -namespace "prebuild" do - desc "Prebuild binaries for WM gems" - task :wm do - basedir = pwd - if RUBY_PLATFORM =~ /(win|w)32$/ - rake = "cmd.exe /c rake" - ant = "ant.bat" - else - rake = "rake" - ant = "ant" - end - - chdir 'platform/wm/build' - - zip = File.join(basedir,'rhodes/rhodes-build/res/7z.exe') - - puts `#{rake} compile` - unless $? == 0 - puts "Error compiling WM code" - exit 1 - end - chdir '../bin' - throw "windows build missing" if not File.exists? 'Windows Mobile 6 Professional SDK (ARMV4I)' - - puts `#{zip} a -mx=9 -r wm6.7z "Windows Mobile 6 Professional SDK (ARMV4I)"` - throw "windows zip missing" if not File.exists? 'wm6.7z' - - cp "wm6.7z", "../../../rhodes/rhodes-build/res/prebuilt/wm" - - chdir basedir - - # chdir "platform/symbian/build" - # filecontents = "" - # File.open("build.properties","r") { |f| filecontents = f.read } - # File.open("build.properties","w") do |f| - # filecontents.gsub!(/build\.target=[A-Z ]+/,"build.target=GCCE UREL") - # f.write filecontents - # end - # if filecontents.match(/S60_3rd_FP1=(.+)/) - # epoc32 = $1 - # else - # epoc32 = "\\Symbian\\9.2\\S60_3rd_FP1\\" - # end - # - # epoc32.gsub!(/\\\\/,"\\") - # - # puts `#{ant} build-prebuilt -DSDK=S60_3rd_FP1` - # puts "Looking for: " + File.join(epoc32,"Epoc32\\release\\gcce\\urel\\rhodes.exe") - # throw "symbian rhodes.exe missing" if not File.exists?(File.join(epoc32,"Epoc32\\release\\gcce\\urel\\rhodes.exe")) - # - # prebuilt = "../../../rhodes/rhodes-build/res/prebuilt/symbian/" - # - # rm_rf prebuilt + "Epoc32" - # - # mkdir_p prebuilt + "Epoc32/data/z/private/10003a3f" - # mkdir_p prebuilt + "Epoc32/data/z/resource" - # mkdir_p prebuilt + "Epoc32/data/z/system" - # mkdir_p prebuilt + "Epoc32/release/gcce/urel" - # - # cp_r epoc32 + "Epoc32\\data\\z\\private\\10003a3f\\apps\\", prebuilt + "Epoc32/data/z/private/10003a3f/", :verbose => true - # cp_r epoc32 + "Epoc32\\data\\z\\resource\\apps\\", prebuilt + "Epoc32/data/z/resource/" - # cp_r epoc32 + "Epoc32\\data\\z\\system\\data\\", prebuilt + "Epoc32/data/z/system/" - # cp_r epoc32 + "Epoc32\\release\\gcce\\urel\\rhodes.exe", prebuilt + "Epoc32/release/gcce/urel/" - # - # - # - # File.open("build.properties","w") do |f| - # filecontents.gsub!(/build\.target=[A-Z ]+/,"build.target=WINSCW UDEB") - # f.write filecontents - # end - # - # - # - # puts `#{ant} build-prebuilt -DSDK=S60_3rd_FP1` - # puts "Looking for: " + File.join(epoc32,"Epoc32\\release\\winscw\\deb\\rhodes.exe") - # throw "symbian rhodes.exe missing" if not File.exists?(File.join(epoc32,"Epoc32\\release\\winscw\\udeb\\rhodes.exe")) - # - # mkdir_p prebuilt + "Epoc32/winscw/c/Data/Rho" - # mkdir_p prebuilt + "Epoc32/release/winscw/udeb" - # - # cp_r epoc32 + "Epoc32\\winscw\\c\\Data\\Rho\\rhologpath.txt", prebuilt + "Epoc32/winscw/c/data/Rho" - # cp_r epoc32 + "Epoc32\\release\\winscw\\udeb\\rhodes.exe", prebuilt + "Epoc32/release/winscw/udeb/" - - - end - - desc "Prebuild iPhone binaries for gems" - task :iphone do - basedir = pwd - rake = "rake" - ant = "ant" - prebuilt = "../../../rhodes/rhodes-build/res/prebuilt/iphone/" - - chdir 'platform/iphone/rbuild' - # Simulator - puts `#{ant} clean -Diphone.sdk=iphonesimulator3.0 -Diphone.config=Debug` - unless $? == 0 - puts "Error cleaning iphone" - exit 1 - end - puts `#{ant} buildapp -Diphone.sdk=iphonesimulator3.0 -Diphone.config=Debug` - - throw "cant find rhorunner.app!" if not File.exists? "../build/Debug-iphonesimulator/rhorunner.app" - - mkdir_p prebuilt + "sim" - rm_rf prebuilt + "sim/rhorunner.app" - cp_r "../build/Debug-iphonesimulator/rhorunner.app", prebuilt + "sim/" - - rm_rf prebuilt + "sim/rhorunner.app/apps" - rm_rf prebuilt + "sim/rhorunner.app/lib" - chdir basedir - - # Device - #chdir 'platform/iphone/rbuild' - #puts `#{ant} clean -Diphone.sdk=iphoneos2.2.1 -Diphone.config=Release` - #puts `#{ant} buildapp -Diphone.sdk=iphoneos2.2.1 -Diphone.config=Release` - - #throw "cant find rhorunner.app!" if not File.exists? "../build/Release-iphoneos/rhorunner.app" - - #mkdir_p prebuilt + "device" - #rm_rf prebuilt + "device/rhorunner.app" - #cp_r "../build/Release-iphoneos/rhorunner.app", prebuilt + "device/" - #rm_rf prebuilt + "device/rhorunner.app/apps" - #rm_rf prebuilt + "device/rhorunner.app/lib" - - #chdir basedir - end - -end namespace "buildall" do namespace "bb" do - desc "Build all jdk versions for blackberry" +# desc "Build all jdk versions for blackberry" task :production => "config:common" do $config["env"]["paths"].each do |k,v| if k.to_s =~ /^4/ puts "BUILDING VERSION: #{k}" - $config["env"]["bbver"] = k + $app_config["bbver"] = k Jake.reconfig($config) #reset all tasks used for building @@ -483,3 +394,38 @@ namespace "buildall" do end end +task :gem do + puts "Removing old gem" + rm_rf Dir.glob("*.gem") + puts "Copying Rakefile" + cp "Rakefile", "rakefile.rb" + + puts "Building manifest" + out = "" + Dir.glob("**/*") {|fname| out << fname + "\n" if File.file? fname} + File.open("Manifest.txt",'w') {|f| f.write(out)} + + puts "Loading gemspec" + spec = Gem::Specification.load('rhodes.gemspec') + + puts "Building gem" + gemfile = Gem::Builder.new(spec).build +end + +task :tasks do + Rake::Task.tasks.each {|t| puts t.to_s} +end + +task :switch_app => "config:common" do + rhobuildyml = File.dirname(__FILE__) + "/rhobuild.yml" + if File.exists? rhobuildyml + config = YAML::load_file(rhobuildyml) + else + puts "Cant find rhobuild.yml" + exit 1 + end + config["env"]["app"] = $app_path.gsub(/\\/,"/") + File.open( rhobuildyml, 'w' ) do |out| + YAML.dump( config, out ) + end +end Rakefile @@ -76,17 +76,18 @@ public final class R { public static final int about_rhodes=0x7f04000e; public static final int app_name=0x7f040000; public static final int back=0x7f040004; - public static final int cancel=0x7f040012; + public static final int cancel=0x7f040013; public static final int db_schema=0x7f04000f; public static final int deleteTrigger=0x7f040010; public static final int exit=0x7f040007; public static final int forward=0x7f040003; public static final int home=0x7f040001; + public static final int insertTrigger=0x7f040011; public static final int logoptions=0x7f04000b; public static final int logview=0x7f04000a; public static final int navigation=0x7f040005; public static final int no_files=0x7f04000c; - public static final int ok=0x7f040011; + public static final int ok=0x7f040012; public static final int options=0x7f040009; public static final int refresh=0x7f040002; public static final int sync=0x7f040008; platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java @@ -19,17 +19,31 @@ Drop Table If Exists [object_values_to_delete]; CREATE TABLE 'object_values_to_delete' ( 'id' INTEGER PRIMARY KEY NOT NULL, - 'value' text default NULL, - 'update_type' varchar(255) default NULL, + 'source_id' INTEGER default NULL, + 'attrib' varchar(255) default NULL, + 'object' varchar(255) default NULL, + 'value' varchar(255) default NULL, 'attrib_type' varchar(255) default NULL); + DROP TABLE IF EXISTS [object_attribs_to_load]; + CREATE TABLE 'object_attribs_to_load' ( + 'id' INTEGER PRIMARY KEY NOT NULL, + 'source_id' INTEGER NOT NULL, + 'name' varchar(255) default NULL); </string> <string name="deleteTrigger"> CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW BEGIN - INSERT INTO object_values_to_delete VALUES (OLD.id, OLD.value,OLD.attrib_type,OLD.update_type); + INSERT INTO object_values_to_delete VALUES (OLD.id, OLD.source_id, OLD.attrib, OLD.object, OLD.value, OLD.attrib_type); END; </string> + <string name="insertTrigger"> + CREATE TRIGGER rhoinsertTrigger BEFORE INSERT ON object_values + FOR EACH ROW + BEGIN + INSERT INTO object_attribs_to_load VALUES (NEW.id, NEW.source_id, NEW.attrib); + END; + </string> <string name="ok"> Ok </string> <string name="cancel">Cancel</string> </resources> platform/android/Rhodes/res/values/strings.xml @@ -71,6 +71,7 @@ public final class AndroidR { public static final int back=R.string.back; public static final int db_schema=R.string.db_schema; public static final int deleteTrigger=R.string.deleteTrigger; + public static final int insertTrigger=R.string.insertTrigger; public static final int exit=R.string.exit; public static final int forward=R.string.forward; public static final int home=R.string.home; platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java @@ -6,6 +6,8 @@ import java.net.URL; import com.rho.net.IHttpConnection; import com.rho.net.INetworkAccess; +import com.rho.net.RhoConnection; +import com.rho.net.URI; import com.rhomobile.rhodes.http.HttpHeader; public class NetworkAccessImpl implements INetworkAccess { @@ -21,6 +23,7 @@ public class NetworkAccessImpl implements INetworkAccess { return RhodesInstance.getInstance().getHomeUrl(); } + /* public boolean doLocalRequest(String strUrl, String strBody) { HttpHeader headers = new HttpHeader(); @@ -30,6 +33,7 @@ public class NetworkAccessImpl implements INetworkAccess { return true; } + */ public IHttpConnection connect(String server) throws IOException { @@ -38,6 +42,11 @@ public class NetworkAccessImpl implements INetworkAccess { server = server.substring(0, fragment); } + if (URI.isLocalHost(server)) { + URI uri = new URI(server); + return new RhoConnection(uri); + } + URL url = new URL(server); HttpURLConnection urlc = (HttpURLConnection)url.openConnection(); platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkAccessImpl.java @@ -424,6 +424,9 @@ public class Platform extends Activity { thread.start(); } + public void executeJs(String js) { + this.webView.loadUrl("javascript:" + js); + } public String getStartPage() { return startPage; platform/android/Rhodes/src/com/rhomobile/rhodes/Platform.java @@ -3,7 +3,10 @@ package com.rhomobile.rhodes; import android.content.Context; import android.telephony.*; +import com.rho.IFileAccess; +import com.rho.IRAFile; import com.rho.IRhoRubyHelper; +import com.rho.RhoConf; import com.rho.db.IDBStorage; import com.rhomobile.rhodes.camera.Camera; import com.rhomobile.rhodes.datetime.DateTimePicker; @@ -30,6 +33,7 @@ public class RhoRubyHelper implements IRhoRubyHelper { RhoPhonebook.initMethods(RubyRuntime.PhonebookClass); Camera.initMethods(RubyRuntime.CameraClass); WebView.initMethods(RubyRuntime.WebViewClass); + RhoConf.initMethods(RubyRuntime.RhoConfClass); DateTimePicker.initMethods(RubyRuntime.DateTimePickerClass); RingtoneManager.initMethods(RubyRuntime.RingtoneManagerClass); NativeBar.initMethods(RubyRuntime.NativeBarClass); @@ -109,4 +113,12 @@ public class RhoRubyHelper implements IRhoRubyHelper { return new DBStorage(); } + public IFileAccess createFileAccess() { + return new FileAccess(); + } + + public IRAFile createRAFile() { + return new RAFile(); + } + } platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubyHelper.java @@ -39,6 +39,12 @@ public class WebView extends RubyBasic { return RubyConstant.QTRUE; } + public static RubyValue execute_js(RubyValue arg0) { + String js = arg0.toString(); + RhodesInstance.getInstance().executeJs(js); + return RubyConstant.QNIL; + } + public static RubyValue current_location() { String url = RhodesInstance.getInstance().getCurrentUrl(); @@ -66,6 +72,11 @@ public class WebView extends RubyBasic { return WebView.set_menu_items(arg0); } }); + klass.getSingletonClass().defineMethod("execute_js", new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) { + return WebView.execute_js(arg0); + } + }); } platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java @@ -33,6 +33,12 @@ public class DBStorage implements IDBStorage { rhoDB.endTransaction(); } + synchronized public void rollback() throws DBException + { + if (rhoDB != null && rhoDB.isOpen()) + rhoDB.rollbackTransaction(); + } + synchronized public IDBResult createResult() { return new SqliteDBResult(); } @@ -42,31 +48,56 @@ public class DBStorage implements IDBStorage { andFile.delete(strPath); } - synchronized public IDBResult executeSQL(String strStatement, Object[] values) + synchronized public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique) throws DBException { if (rhoDB != null && rhoDB.isOpen()) { - IDBResult result = rhoDB.executeSQL(strStatement, values); + IDBResult result = executeSQLNoCallbacks(strStatement, values, bReportNonUnique); + onInsertRecords(strStatement); onDeleteRecords(strStatement); return result; } return null; } + + synchronized private IDBResult executeSQLNoCallbacks(String strStatement, Object[] values, + boolean bReportNonUnique) throws DBException + { + return rhoDB.executeSQL(strStatement, values, bReportNonUnique); + } + + void onInsertRecords(String strStatement) { + IDBResult rows2Insert = null; + try { + if (this.callback == null) + return; + + if (!strStatement.toLowerCase().startsWith("insert ")) + return; + + rows2Insert = executeSQLNoCallbacks("SELECT * FROM object_attribs_to_load", null, false); + this.callback.OnInsertIntoTable("object_values", rows2Insert); + executeSQLNoCallbacks("DELETE FROM object_attribs_to_load", null, false); + } + catch (Exception e) { + LOG.ERROR(e.getMessage()); + } + } void onDeleteRecords(String strStatement){ IDBResult rows2Delete = null; try { - if ( strStatement.toLowerCase().indexOf(" delete ") == -1 ) - return; - - if ( this.callback == null ) + if (this.callback == null) return; - rows2Delete = executeSQL("SELECT attrib_type, update_type, value FROM object_values_to_delete", null); - + if (!strStatement.toLowerCase().startsWith("delete ")) + return; + + rows2Delete = executeSQLNoCallbacks("SELECT * FROM object_values_to_delete", null,false); this.callback.OnDeleteFromTable("object_values", rows2Delete); + executeSQLNoCallbacks("DELETE FROM object_values_to_delete", null, false); } catch( Exception e ){ LOG.ERROR(e.getMessage()); platform/android/Rhodes/src/com/rhomobile/rhodes/db/DBStorage.java @@ -6,8 +6,10 @@ import com.rho.db.DBException; import com.rho.db.IDBResult; import com.rhomobile.rhodes.AndroidR; import android.content.Context; +import android.database.Cursor; import android.database.DatabaseUtils; import android.database.SQLException; +import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteStatement; @@ -82,6 +84,10 @@ public class RhoDB extends SQLiteOpenHelper { SQLiteStatement stTrigger = db.compileStatement(ctx .getString(AndroidR.string.deleteTrigger)); stTrigger.execute(); + + stTrigger = db.compileStatement(ctx. + getString(AndroidR.string.insertTrigger)); + stTrigger.execute(); db.setVersion(dbVersion); @@ -145,12 +151,24 @@ public class RhoDB extends SQLiteOpenHelper { db.endTransaction(); } } + + public void rollbackTransaction() { + if (db == null) + throw new SQLException( + "Database must be opened before rollback transaction"); + + if (db.inTransaction()) { + db.endTransaction(); + } + } + + public IDBResult executeSQL(String strStatement, Object[] values) throws DBException { + return executeSQL(strStatement, values, false); + } - public IDBResult executeSQL(String strStatement, Object[] values) + public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique) throws DBException { - SqliteDBResult result = new SqliteDBResult(); - if (db == null) throw new DBException(new SQLException( "Database must be opened before insert new data!")); @@ -164,9 +182,27 @@ public class RhoDB extends SQLiteOpenHelper { } } - result.copy(db.rawQuery(strStatement, params)); - - return result; + Cursor cursor = null; + try { + cursor = db.rawQuery(strStatement, params); + SqliteDBResult result = new SqliteDBResult(); + result.copy(cursor); + return result; + } + catch (SQLiteConstraintException e) { + if (bReportNonUnique) + return new SqliteDBResult(true); + Log.e(LOG_TAG, "SQL error", e); + return null; + } + catch (Exception e) { + Log.e(LOG_TAG, "SQL error", e); + return null; + } + finally { + if (cursor != null) + cursor.close(); + } } public void bindParams(String[] params, int i, Object value) { platform/android/Rhodes/src/com/rhomobile/rhodes/db/RhoDB.java @@ -17,10 +17,20 @@ public class SqliteDBResult implements IDBResult { private boolean useLocalCursor = false; private List< List<String> > localDataCopy = new ArrayList< List<String> >(); private List<String> cashedColumnsNames = new ArrayList< String > (); + private boolean nonUnique = false; public SqliteDBResult() { //lock.getWriteLock(); } + + public SqliteDBResult(boolean bNonUnique) { + nonUnique = bNonUnique; + } + + public boolean isNonUnique() + { + return nonUnique; + } public void assign(Cursor cursor) { this.cursor = cursor; platform/android/Rhodes/src/com/rhomobile/rhodes/db/SqliteDBResult.java @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="shared"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> platform/android/RubyJVM/.classpath @@ -16,7 +16,7 @@ </natures> <linkedResources> <link> - <name>shared</name> + <name>src</name> <type>2</type> <locationURI>RHO_SHARED/rubyJVM/src</locationURI> </link> platform/android/RubyJVM/.project @@ -11,6 +11,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/db/DBStorage.java platform/android/Rhodes/src/com/rhomobile/rhodes/db/RhoDB.java platform/android/Rhodes/src/com/rhomobile/rhodes/db/RWLock.java platform/android/Rhodes/src/com/rhomobile/rhodes/db/SqliteDBResult.java +platform/android/Rhodes/src/com/rhomobile/rhodes/FileAccess.java platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java @@ -36,6 +37,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactList.java platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/RhoPhonebook.java platform/android/Rhodes/src/com/rhomobile/rhodes/Platform.java +platform/android/Rhodes/src/com/rhomobile/rhodes/RAFile.java platform/android/Rhodes/src/com/rhomobile/rhodes/ResourceFetchThread.java platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java platform/android/build/RhodesSRC_build.files @@ -1,11 +1,14 @@ platform/shared/rubyJVM/src/com/rho/DateTimeTokenizer.java platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java +platform/shared/rubyJVM/src/com/rho/db/DBAttrManager.java platform/shared/rubyJVM/src/com/rho/db/DBException.java platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java platform/shared/rubyJVM/src/com/rho/db/IDBResult.java platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java platform/shared/rubyJVM/src/com/rho/FilePath.java platform/shared/rubyJVM/src/com/rho/IFile.java +platform/shared/rubyJVM/src/com/rho/IFileAccess.java +platform/shared/rubyJVM/src/com/rho/IRAFile.java platform/shared/rubyJVM/src/com/rho/IRhoLogSink.java platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java platform/shared/rubyJVM/src/com/rho/location/GeoLocation.java @@ -36,6 +39,7 @@ platform/shared/rubyJVM/src/com/rho/sync/JSONEntry.java platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java +platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java platform/shared/rubyJVM/src/com/rho/sync/ISyncStatusListener.java platform/shared/rubyJVM/src/com/rho/TestProfiler.java platform/android/build/RubyVM_build.files @@ -1,48 +1,67 @@ # -def set_app_name(newname) - fname = Jake.get_absolute $androidpath + "/Rhodes/res/values/strings.xml" +def set_app_name_android(newname) + puts "set_app_name" + $stdout.flush + + fname = Jake.get_absolute File.join($androidpath, "Rhodes", "res", "values", "strings.xml") buf = File.new(fname,"r").read.gsub(/"app_name">.*<\/string>/,"\"app_name\">#{newname}</string>") File.open(fname,"w") { |f| f.write(buf) } + lowname = newname.downcase.gsub(/[^A-Za-z_0-9]/, '') + + fname = Jake.get_absolute File.join($androidpath, "Rhodes", "AndroidManifest.xml") + buf = File.new(fname,"r").read.gsub(/package=".*"/,"package=\"com.rhomobile.#{lowname}\"") + File.open(fname,"w") { |f| f.write(buf) } + + fname = Jake.get_absolute File.join($androidpath, "Rhodes", "src", "com", "rhomobile", "rhodes", "AndroidR.java") + buf = File.new(fname,"r").read.gsub(/^\s*import com\.rhomobile\..*\.R;\s*$/,"\nimport com.rhomobile.#{lowname}.R;\n") + File.open(fname,"w") { |f| f.write(buf) } +end + +def generate_rjava + Rake::Task["build:android:rjava"].execute end namespace "config" do task :android => ["config:common"] do + $config["platform"] = "android" + $java = $config["env"]["paths"]["java"] $androidsdkpath = $config["env"]["paths"]["android"] - $androidplatform = "android-1.1" - $androidpath = $config["build"]["androidpath"] - $bindir = $androidpath + "/bin" - $builddir = $androidpath + "/build" - $srcdir = $bindir + "/RhoBundle" - $targetdir = $androidpath + "/target" + $androidplatform = "android-1.5" + $avdname = "rhoAndroid15" + $androidpath = Jake.get_absolute $config["build"]["androidpath"] + $bindir = File.join($app_path, "bin") + $builddir = File.join($androidpath, "build") + $srcdir = File.join($bindir, "RhoBundle") + $targetdir = File.join($bindir, "target") $excludelib = ['**/singleton.rb','**/rational.rb','**/rhoframework.rb','**/date.rb'] - $tmpdir = $bindir +"/tmp" - $resourcedir = $tmpdir + "/resource" + $tmpdir = File.join($bindir, "tmp") + $resourcedir = File.join($tmpdir, "resource") $excludeapps = "public/js/iui/**,**/jquery*" - $libs = $androidpath + "/Rhodes/libs" + $libs = File.join($androidpath, "Rhodes", "libs") + $appname = $app_config["name"] + $appname = "Rhodes" if $appname.nil? if RUBY_PLATFORM =~ /(win|w)32$/ - $dx = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "dx.bat" ) - $aapt = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "aapt.exe" ) - $apkbuilder = File.join( $androidsdkpath, "tools", "apkbuilder.bat" ) - $androidbin = File.join( $androidsdkpath, "tools", "android.bat" ) $emulator = "cmd /c " + File.join( $androidsdkpath, "tools", "emulator.exe" ) - $adb = File.join( $androidsdkpath, "tools", "adb.exe" ) + $bat_ext = ".bat" $exe_ext = ".exe" $path_separator = ";" else #XXX make these absolute - $dx = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "dx" ) - $aapt = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "aapt" ) - $apkbuilder = File.join( $androidsdkpath, "tools", "apkbuilder" ) - $androidbin = File.join( $androidsdkpath, "tools", "android" ) $emulator = File.join( $androidsdkpath, "tools", "emulator" ) - $adb = File.join( $androidsdkpath, "tools", "adb" ) + $bat_ext = "" $exe_ext = "" $path_separator = ":" end + $dx = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "dx" + $bat_ext ) + $aapt = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "aapt" + $exe_ext ) + $apkbuilder = File.join( $androidsdkpath, "tools", "apkbuilder" + $bat_ext ) + $androidbin = File.join( $androidsdkpath, "tools", "android" + $bat_ext ) + $adb = File.join( $androidsdkpath, "tools", "adb" + $exe_ext ) + $keytool = File.join( $java, "keytool" + $exe_ext ) $jarsigner = File.join( $java, "jarsigner" + $exe_ext ) $keystoredir = ENV['HOME'] + "/.rhomobile" @@ -62,42 +81,43 @@ end namespace "build" do namespace "android" do - desc "Generate R.java file" + # desc "Generate R.java file" task :rjava => "config:android" do - manifest = Jake.get_absolute $androidpath + "/Rhodes/AndroidManifest.xml" - resource = Jake.get_absolute $androidpath + "/Rhodes/res" - assets = Jake.get_absolute $androidpath + "/Rhodes/assets" - rjava = Jake.get_absolute $androidpath + "/Rhodes/gen/com/rhomobile/rhodes" - androidjar = $androidsdkpath + "/platforms/" + $androidplatform + "/android.jar" + manifest = File.join($androidpath, "Rhodes", "AndroidManifest.xml") + resource = Jake.get_absolute File.join($androidpath, "Rhodes", "res") + assets = Jake.get_absolute File.join($androidpath, "Rhodes", "assets") + rjava = Jake.get_absolute File.join($androidpath, "Rhodes", "gen", "com", "rhomobile", "rhodes") + androidjar = File.join($androidsdkpath, "platforms", $androidplatform, "android.jar") - cp resource + "/drawable/icon.png",$tmpdir + "/icon.png.bak" - cp $config["env"]["app"] + "/icon/icon.png", resource + "/drawable" - set_app_name($config["env"]["appname"]) unless $config["env"]["appname"].nil? + mkdir_p $tmpdir + iconbakname = $tmpdir + "/icon.png.bak" + iconappname = $app_path + "/icon/icon.png" + cp resource + "/drawable/icon.png",iconbakname + cp iconappname, resource + "/drawable" if File.exists?(iconappname) args = ["package","-f","-M",manifest,"-S", resource,"-A", assets,"-I",androidjar,"-J", rjava ] puts Jake.run($aapt,args) - set_app_name("Rhodes") unless $config["env"]["appname"].nil? - mv $tmpdir + "/icon.png.bak",resource + "/drawable/icon.png" + exitstatus = $? - unless $? == 0 + mv iconbakname,resource + "/drawable/icon.png" if File.exists?(iconbakname) + + unless exitstatus == 0 puts "Error in AAPT" exit 1 end end - desc "Build RhoBundle for android" +# desc "Build RhoBundle for android" task :rhobundle => "config:android" do Rake::Task["build:bundle:xruby"].execute - cp_r $srcdir + "/apps", $androidpath + "/Rhodes/assets" + cp_r $srcdir + "/apps", Jake.get_absolute($androidpath) + "/Rhodes/assets" cp_r $bindir + "/RhoBundle.jar", $libs - - Rake::Task["build:android:rjava"].execute end - desc "Build RubyVM for android" +# desc "Build RubyVM for android" task :rubyvm => "config:android" do javac = $config["env"]["paths"]["java"] + "/javac" + $exe_ext cp_r "platform/shared/rubyJVM", $bindir @@ -133,13 +153,16 @@ namespace "build" do cp_r $bindir + "/RubyVM.jar", $libs end - desc "Build Rhodes for android" + # desc "Build Rhodes for android" task :rhodes => [:rubyvm, :rhobundle] do javac = $config["env"]["paths"]["java"] + "/javac" + $exe_ext rm_rf $tmpdir + "/Rhodes" mkdir_p $tmpdir + "/Rhodes" + set_app_name_android($appname) + generate_rjava + args = [] args << "-g" args << "-d" @@ -154,6 +177,8 @@ namespace "build" do args << "@#{$builddir}/RhodesGEN_build.files" puts Jake.run(javac,args) unless $? == 0 + set_app_name_android("Rhodes") + generate_rjava puts "Error compiling java code" exit 1 end @@ -172,12 +197,14 @@ namespace "build" do args << "@#{$builddir}/RhodesSRC_build.files" puts Jake.run(javac,args) unless $? == 0 + set_app_name_android("Rhodes") + generate_rjava puts "Error compiling java code" exit 1 end - - + set_app_name_android("Rhodes") + generate_rjava args = ["cf","../../Rhodes.jar", "#{$all_files_mask}"] puts Jake.run($config["env"]["paths"]["java"] + "/jar" + $exe_ext, args, "#{$tmpdir}/Rhodes/") @@ -187,7 +214,7 @@ namespace "build" do end end - desc "build all" + #desc "build all" task :all => [:rubyvm, :rhobundle, :rhodes] end end @@ -197,11 +224,11 @@ namespace "package" do puts "Running dx utility" args = [] args << "--dex" - outfile = Jake.get_absolute("#{$bindir}/classes.dex") + outfile = "#{$bindir}/classes.dex" args << "--output=#{outfile}" - args << Jake.get_absolute("#{$bindir}/Rhodes.jar") - args << Jake.get_absolute("#{$bindir}/RubyVM.jar") - args << Jake.get_absolute("#{$bindir}/RhoBundle.jar") + args << "#{$bindir}/Rhodes.jar" + args << "#{$bindir}/RubyVM.jar" + args << "#{$bindir}/RhoBundle.jar" puts Jake.run($dx,args) unless $? == 0 puts "Error running DX utility" @@ -212,19 +239,21 @@ namespace "package" do resource = Jake.get_absolute $androidpath + "/Rhodes/res" assets = Jake.get_absolute $androidpath + "/Rhodes/assets" androidjar = "#{$androidsdkpath}/platforms/#{$androidplatform}/android.jar" - resourcepkg = Jake.get_absolute $bindir + "/rhodes.ap_" + resourcepkg = $bindir + "/rhodes.ap_" puts "Packaging Assets and Jars" - cp resource + "/drawable/icon.png",$tmpdir + "/icon.png.bak" - cp $config["env"]["app"] + "/icon/icon.png", resource + "/drawable" - set_app_name($config["env"]["appname"]) unless $config["env"]["appname"].nil? + iconbakname = $tmpdir + "/icon.png.bak" + iconappname = $app_path + "/icon/icon.png" + cp resource + "/drawable/icon.png",iconbakname + cp iconappname, resource + "/drawable" if File.exists?(iconappname) + set_app_name_android($appname) puts `#{$aapt} package -f -M "#{manifest}" -S "#{resource}" -A "#{assets}" -I "#{androidjar}" -F "#{resourcepkg}"` returnval = $? - set_app_name("Rhodes") unless $config["env"]["appname"].nil? - mv $tmpdir + "/icon.png.bak",resource + "/drawable/icon.png" + set_app_name_android("Rhodes") + mv iconbakname,resource + "/drawable/icon.png" if File.exists?(iconbakname) unless returnval == 0 puts "Error running AAPT" @@ -236,11 +265,11 @@ end namespace "device" do namespace "android" do - desc "build self signed for debug" + desc "Build debug self signed for device" task :debug => "package:android" do - dexfile = Jake.get_absolute $bindir + "/classes.dex" - apkfile = Jake.get_absolute $targetdir + "/Rhodes-debug.apk" - resourcepkg = Jake.get_absolute $bindir + "/rhodes.ap_" + dexfile = $bindir + "/classes.dex" + apkfile = $targetdir + "/" + $appname + "-debug.apk" + resourcepkg = $bindir + "/rhodes.ap_" puts "Building APK file" puts `#{$apkbuilder} "#{apkfile}" -z "#{resourcepkg}" -f "#{dexfile}"` @@ -250,12 +279,12 @@ namespace "device" do end end - desc "build signed for production" + desc "Build production signed for device" task :production => "package:android" do - dexfile = Jake.get_absolute $bindir + "/classes.dex" - apkfile = Jake.get_absolute $targetdir + "/Rhodes.apk" - signedapkfile = Jake.get_absolute $targetdir + "/Rhodes_signed.apk" - resourcepkg = Jake.get_absolute $bindir + "/rhodes.ap_" + dexfile = $bindir + "/classes.dex" + apkfile = $targetdir + "/" + $appname + ".apk" + signedapkfile = $targetdir + "/" + $appname + "_signed.apk" + resourcepkg = $bindir + "/rhodes.ap_" puts "Building APK file" puts `#{$apkbuilder} "#{apkfile}" -u -z "#{resourcepkg}" -f "#{dexfile}"` @@ -312,13 +341,13 @@ end namespace "run" do desc "build and launch emulator" task :android => "device:android:debug" do - apkfile = Jake.get_absolute $targetdir + "/Rhodes-debug.apk" + apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk" puts `#{$adb} start-server` sleep 5 - system("#{$androidbin} create avd --name rhoAndroid11 --target 1 --sdcard 32M --skin HVGA") + system("#{$androidbin} create avd --name #{$avdname} --target 2 --sdcard 32M --skin HVGA") - Thread.new { system("#{$emulator} -avd rhoAndroid11") } + Thread.new { system("#{$emulator} -avd #{$avdname}") } sleep 10 @@ -330,7 +359,7 @@ namespace "run" do puts "Loading package into emulator" theoutput = `#{$adb} install -r "#{apkfile}"` count = 0 - while (theoutput.to_s.match(/Error Type/) or theoutput.to_s.match(/Fail/)) and count < 15 do + while (not theoutput.to_s.match(/Success/)) and count < 15 do puts "Failed to load (possibly because emulator not done launching)- retrying" $stdout.flush sleep 5 @@ -342,6 +371,8 @@ namespace "run" do end namespace "clean" do + desc "Clean Android" + task :android => "clean:android:all" namespace "android" do task :assets => "config:android" do Dir.glob($androidpath + "/Rhodes/assets/apps/**/*") do |f| @@ -352,35 +383,10 @@ namespace "clean" do rm_rf $targetdir rm_rf $bindir rm_rf $srcdir + rm_rf $libs end - desc "clean android" +# desc "clean android" task :all => [:assets,:files] end end -namespace "prebuild" do - desc "Build binaries for anroid to be inserted into gem" - task :android => "build:android:all" do - prebuilt = "rhodes/rhodes-build/res/prebuilt/android" - - if File.exists? $bindir + "/RubyVM.jar" and File.exists? $bindir + "/Rhodes.jar" - rm_rf prebuilt if File.exists? prebuilt - mkdir_p prebuilt - - cp $androidpath + "/Rhodes/assets/apps/loading.html", prebuilt - cp $androidpath + "/Rhodes/AndroidManifest.xml", prebuilt - - cp_r $androidpath + "/Rhodes/res", prebuilt - - mkdir_p prebuilt + "/src/com/rhomobile/rhodes" - - cp_r $androidpath + "/Rhodes/src/com/rhomobile/rhodes/AndroidR.java", prebuilt + "/src/com/rhomobile/rhodes" - - mkdir_p prebuilt + "/classes" - - Jake.unjar($bindir + "/RubyVM.jar", prebuilt + "/classes") - Jake.unjar($bindir + "/Rhodes.jar", prebuilt + "/classes") - rm_rf prebuilt + "/classes/META-INF" - end - end -end platform/android/build/android.rake @@ -22,15 +22,15 @@ RubyVM ] ExcludeFromBuildAll=0 [Files -src\com\rho\db\file\Jsr75RAFileImpl.java -src\com\rho\db\file\PersistRAFileImpl.java -src\com\rho\db\file\RAFileImpl.java src\com\rho\db\FileUtilBB.java src\com\rho\db\HsqlDBResult.java src\com\rho\db\HsqlDBRowResult.java src\com\rho\db\HsqlDBStorage.java src\com\rho\db\Journal.java src\com\rho\db\RandomAccessFile.java +src\com\rho\file\FileAccessBB.java +src\com\rho\file\Jsr75RAFileImpl.java +src\com\rho\file\PersistRAFileImpl.java src\j2me\io\BufferedOutputStream.java src\j2me\io\FilterOutputStream.java src\j2me\math\BigDecimal.java platform/bb/Hsqldb/Hsqldb.jdp @@ -1,17 +1,14 @@ package com.rho.db; import j2me.io.File; -//import j2me.io.FileDescriptor; -//import j2me.io.FileInputStream; -//import j2me.io.FileOutputStream; import java.io.IOException; import java.util.Random; -import javax.microedition.io.file.FileConnection; -import javax.microedition.io.Connector; - import org.hsqldb.lib.FileAccess; +import com.rho.RhoClassFactory; +import com.rho.IRAFile; + /** * A collection of static file management methods.<p> * Also implements the default FileAccess method @@ -19,8 +16,19 @@ import org.hsqldb.lib.FileAccess; public class FileUtilBB implements FileAccess { private static FileUtilBB fileUtil = new FileUtilBB(); - - FileUtilBB() {} + + private static IRAFile impl = null; + + private void InitImpl() { + if (impl == null) { + try { + impl = RhoClassFactory.createRAFile(); + } + catch (Exception e) { + System.out.println("FileUtilBB:InitImpl Exception: " + e.getMessage()); + } + } + } public static FileUtilBB getDefaultInstance() { return fileUtil; @@ -30,22 +38,25 @@ public class FileUtilBB implements FileAccess { return exists(elementName); } - public long getFileLength(java.lang.String filename){ + public long getFileLength(java.lang.String filename) { - FileConnection fconn = null; - try{ - fconn = (FileConnection)Connector.open(filename,Connector.READ); - return fconn.fileSize(); - }catch(IOException exc){ - System.out.println("FileUtilBB:getFileLength Exception: " + exc.getMessage() + ";File: " + filename); - }finally{ - if ( fconn != null ) - try{ - fconn.close(); - }catch(IOException exc){ - System.out.println("FileUtilBB:getFileLength Close Exception: " + exc.getMessage() + ";File: " + filename); - } - } + InitImpl(); + synchronized (impl) { + try { + impl.open(filename); + return impl.size(); + } + catch(Exception exc) { + System.out.println("FileUtilBB:getFileLength Exception: " + exc.getMessage() + ";File: " + filename); + } + finally { + try { + impl.close(); + } catch (IOException e) { + System.out.println("FileUtilBB:getFileLenght Exception on close: " + e.getMessage() + ";File: " + filename); + } + } + } return 0; } @@ -112,26 +123,23 @@ public class FileUtilBB implements FileAccess { /** * Delete the named file */ - public void delete(String filename) + public void delete(String filename) { - FileConnection fconn = null; - - try{ - fconn = (FileConnection)Connector.open(filename,Connector.READ_WRITE); - //if ( fc.isDirectory() ) - // deleteFilesInFolder(fc); - - if ( fconn != null && fconn.exists() ) - fconn.delete(); - }catch(IOException exc){ - System.out.println("FileUtilBB:delete '" + filename + "' Exception: " + exc.getMessage()); - }finally{ - if ( fconn != null ) - try{fconn.close();}catch(IOException exc){ - System.out.println("FileUtilBB:delete close '" + filename + "' Exception: " + exc.getMessage()); - } + InitImpl(); + synchronized (impl) { + try { + impl.open(filename, "rw"); + impl.delete(); + }catch(Exception exc){ + System.out.println("FileUtilBB:delete '" + filename + "' Exception: " + exc.getMessage()); + }finally{ + try { + impl.close(); + } catch (IOException e) { + System.out.println("FileUtilBB:delete Exception on close: " + e.getMessage() + ";File: " + filename); + } + } } - } /** @@ -152,27 +160,50 @@ public class FileUtilBB implements FileAccess { public void deleteOnExit(File f) { //JavaSystem.deleteOnExit(f); } + + public long size(String filename) { + InitImpl(); + synchronized (impl) { + try { + impl.open(filename); + return impl.size(); + } + catch (Exception exc) { + return 0; + } + finally { + try { + impl.close(); + } + catch (Exception e) { + System.out.println("FileUtilBB:size Exception on close: " + e.getMessage() + ";File: " + filename); + } + } + } + } /** * Return true or false based on whether the named file exists. */ public boolean exists(String filename) { - FileConnection fconn = null; - - try{ - fconn = (FileConnection)Connector.open(filename); - return fconn.exists(); - }catch(IOException exc){ - System.out.println("FileUtilBB:exists '" + filename + "' Exception: " + exc.getMessage()); - }finally{ - if ( fconn != null ) - try{fconn.close();}catch(IOException exc){ - System.out.println("FileUtilBB:exists close '" + filename + "' Exception: " + exc.getMessage()); - } + InitImpl(); + synchronized (impl) { + try{ + impl.open(filename); + return impl.exists(); + } + catch (Exception exc) { + return false; + } + finally { + try { + impl.close(); + } catch (Exception e) { + System.out.println("FileUtilBB:exists Exception on close: " + e.getMessage() + ";File: " + filename); + } + } } - - return false; } public boolean exists(String fileName, boolean resource, Class cla) { @@ -193,27 +224,27 @@ public class FileUtilBB implements FileAccess { */ private void renameOverwrite(String oldname, String newname) { - delete(newname); - - FileConnection fconn = null; - try{ - fconn = (FileConnection)Connector.open(oldname, Connector.READ_WRITE); - - String name = newname; - int nSlash = newname.lastIndexOf('/'); - if ( nSlash >= 0 ) - name = newname.substring(nSlash+1); - - if ( fconn.exists() ){ - fconn.rename(name); - } - }catch(IOException exc){ - System.out.println("FileUtilBB:renameOverwrite from '" + oldname + "' to '" + newname + "' Exception: " + exc.getMessage()); - }finally{ - if ( fconn != null ) - try{fconn.close();}catch(IOException exc){ - System.out.println("FileUtilBB:renameOverwrite close Exception: " + exc.getMessage()); - } + InitImpl(); + synchronized (impl) { + delete(newname); + try{ + String name = newname; + int nSlash = newname.lastIndexOf('/'); + if ( nSlash >= 0 ) + name = newname.substring(nSlash+1); + + InitImpl(); + impl.open(oldname, "rw"); + impl.rename(name); + }catch(IOException exc){ + System.out.println("FileUtilBB:renameOverwrite from '" + oldname + "' to '" + newname + "' Exception: " + exc.getMessage()); + }finally{ + try { + impl.close(); + } catch (Exception e) { + System.out.println("FileUtilBB:rename Exception on close: " + e.getMessage() + ";From '" + oldname + "' to '" + newname + "'"); + } + } } } platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java @@ -2,7 +2,9 @@ package com.rho.db; import org.hsqldb.Record; import org.hsqldb.Result; +import org.hsqldb.Trace; import org.hsqldb.Types; +import org.hsqldb.HsqlException; import com.xruby.runtime.builtin.ObjectFactory; import com.xruby.runtime.lang.*; @@ -25,6 +27,17 @@ public class HsqlDBResult implements IDBResult public int getCount(){ return m_result != null ? m_result.getSize() : 0; }*/ + + public boolean isNonUnique() { + if ( m_result != null && m_result.getException() != null && + m_result.getException() instanceof HsqlException ) + { + HsqlException e = (HsqlException)m_result.getException(); + return e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX; + } + + return false; + } public int getColCount(){ return m_result != null ? m_result.getColumnCount() : 0; @@ -176,6 +189,12 @@ public class HsqlDBResult implements IDBResult { return m_current.data; } + + public boolean isNullByIdx(int nCol) + { + Object val = getCurValue(nCol); + return val == null; + } public String getStringByIdx(int nCol) { platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java @@ -6,7 +6,7 @@ import com.rho.db.IDBStorage; import org.hsqldb.*; import org.hsqldb.persist.*; -public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ +public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{ private Session m_dbSess; private FileUtilBB m_fs; @@ -47,9 +47,12 @@ public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ HsqlProperties props = new HsqlProperties(); props.setProperty(HsqlDatabaseProperties.hsqldb_default_table_type, "cached"); - + + if ( !m_fs.exists(strDbName + ".script") && m_fs.exists(strDbName + ".script.new") ) + m_fs.renameElement(strDbName + ".script.new", strDbName + ".script"); + m_dbSess = DatabaseManager.newSession(DatabaseURL.S_FILE, strDbName, "SA", "", props); - m_dbSess.setDeleteCallback(this); + m_dbSess.setDBCallback(this); if ( !m_fs.exists(strDbName + ".data") ) { @@ -73,7 +76,7 @@ public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ } } */ - + //IDBCallback public void onDeleteRow(Table table, Row row) { if ( m_dbCallback == null ) return; @@ -82,11 +85,20 @@ public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ m_dbCallback.OnDeleteFromTable(table.getName().name, m_rowResult ); } + public void onInsertRow(Table table, Row row) { + if ( m_dbCallback == null ) + return; + + m_rowResult.init(table, row); + m_dbCallback.OnInsertIntoTable(table.getName().name, m_rowResult ); + } + //IDBCallback + public void setDbCallback(IDBCallback callback) { m_dbCallback = callback; if ( m_dbSess != null ) - m_dbSess.setDeleteCallback(this); + m_dbSess.setDBCallback(this); // m_dbSess.sqlExecuteDirectNoPreChecks( // "CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW QUEUE 0 CALL \"com.rho.HsqlDBStorage.HsqlDeleteTrigger\""); @@ -106,22 +118,15 @@ public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ return new HsqlDBResult(); } - public IDBResult executeSQL(String strStatement, Object[] values) + public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique) throws DBException { try { if ( m_dbSess == null ) throw new RuntimeException("executeSQL: m_dbSess == null"); - /*if ( strStatement.startsWith("destroy ") ) - { - destroy_table(strStatement.substring(8)); - return new HsqlDBResult(); - }*/ - CompiledStatement st = m_dbSess.compiledStatementManager.compile(m_dbSess, strStatement); - Result res = m_dbSess.sqlExecuteCompiledNoPreChecksSafe(st, values); - + Result res = m_dbSess.sqlExecuteCompiledNoPreChecksSafe(st, values, bReportNonUnique); if ( m_dbSess.isAutoCommit() ) m_dbSess.commit(); @@ -154,6 +159,12 @@ public class HsqlDBStorage implements IDBStorage, Session.IDeleteCallback{ } + public void rollback()throws DBException + { + if ( m_dbSess!= null ) + m_dbSess.rollback(); + } + public String[] getAllTableNames()throws DBException { org.hsqldb.lib.HsqlArrayList arTables = m_dbSess.getDatabase().schemaManager.getAllTables(); platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java @@ -39,6 +39,7 @@ public class Journal public void close()throws IOException{ if ( m_journalFile != null ){ + m_journalFile.stopListenForSync(m_dataName); m_journalFile.close(); m_journalFile = null; } @@ -65,6 +66,7 @@ public class Journal if ( m_journalFile == null ){ m_journalFile = new RandomAccessFile(m_journalName,"rw"); + m_journalFile.listenForSync(m_dataName); m_journalFile.writeLong(m_dataFile.length()); m_journalFile.write(BLOCK_CONFIRM); m_journalFile.sync(); @@ -128,8 +130,8 @@ public class Journal bSuccess = true; }catch(IOException exc) { - LOG.ERROR("Rollback failed.", exc); - throw exc; + LOG.ERROR("Rollback failed.Journal is empty or corrupted", exc); + //throw exc; }finally{ if ( df != null ) { @@ -163,8 +165,8 @@ public class Journal if ( nReaded <= 0 ) return; - if ( nReaded != nLen ) - throw new IOException("Cannot read '" + nLen + "' bytes from data file: only '" + nReaded +"' is available"); +// if ( nReaded != nLen ) +// throw new IOException("Cannot read '" + nLen + "' bytes from data file: only '" + nReaded +"' is available"); m_journalFile.writeLong(nPos); m_journalFile.writeLong(nReaded); platform/bb/Hsqldb/src/com/rho/db/Journal.java @@ -5,14 +5,11 @@ import java.io.*; import j2me.io.FileNotFoundException; import javax.microedition.io.Connector; -import javax.microedition.io.file.FileConnection; -import com.rho.RhoConf; -import com.rho.RhoEmptyLogger; -import com.rho.RhoLogger; -import com.rho.db.file.Jsr75RAFileImpl; -import com.rho.db.file.PersistRAFileImpl; -import com.rho.db.file.RAFileImpl; +import com.rho.RhoClassFactory; +//import com.rho.RhoEmptyLogger; +//import com.rho.RhoLogger; +import com.rho.IRAFile; import j2me.nio.channels.*; @@ -20,16 +17,10 @@ import j2me.io.File; public class RandomAccessFile { - private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : - new RhoLogger("RAFile"); + //private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : + // new RhoLogger("RAFile"); - public static final int READ = Connector.READ; - public static final int WRITE = Connector.WRITE; - public static final int READ_WRITE = Connector.READ_WRITE; - - public static final String USE_PERSISTENT = "use_persistent_storage"; - - private RAFileImpl m_impl = null; + private IRAFile m_impl = null; private boolean m_bWriteAccess; @@ -45,9 +36,9 @@ public class RandomAccessFile String name = (file != null ? file.getPath() : null); int imode = -1; if (mode.equals("r")) - imode = READ; + imode = Connector.READ; else if (mode.startsWith("rw")) { - imode = READ_WRITE; + imode = Connector.READ_WRITE; m_bWriteAccess = true; } @@ -59,15 +50,12 @@ public class RandomAccessFile throw new NullPointerException(); } - if (RhoConf.getInstance().getBool(USE_PERSISTENT)) { - LOG.TRACE("Use persistent storage implementation"); - m_impl = new PersistRAFileImpl(); - } - else { - LOG.TRACE("Use Jsr75 implementation"); - m_impl = new Jsr75RAFileImpl(); - } - m_impl.open(name, imode); + try { + m_impl = RhoClassFactory.createRAFile(); + } catch (Exception e) { + throw new FileNotFoundException(e.getMessage()); + } + m_impl.open(name, mode); } public long length() throws IOException @@ -226,4 +214,12 @@ public class RandomAccessFile } return input.toString(); } + + public void listenForSync(String name) throws IOException { + m_impl.listenForSync(name); + } + + public void stopListenForSync(String name) throws IOException { + m_impl.stopListenForSync(name); + } } platform/bb/Hsqldb/src/com/rho/db/RandomAccessFile.java @@ -70,6 +70,7 @@ import java.io.IOException; import org.hsqldb.lib.IntLookup; //import org.hsqldb.lib.java.JavaSystem; +import org.hsqldb.rowio.RowInputBinary; import org.hsqldb.rowio.RowInputInterface; import org.hsqldb.rowio.RowOutputInterface; @@ -163,7 +164,7 @@ public class CachedRow extends Row { * @throws HsqlException */ public CachedRow(Table t, - RowInputInterface in) throws IOException, HsqlException { + RowInputBinary in) throws IOException, HsqlException { tTable = t; iPos = in.getPos(); platform/bb/Hsqldb/src/org/hsqldb/CachedRow.java @@ -88,7 +88,7 @@ final class CompiledStatementExecutor { * @return the result of executing the statement * @param cs any valid CompiledStatement */ - Result execute(CompiledStatement cs, Object[] paramValues) { + Result execute(CompiledStatement cs, Object[] paramValues, boolean bReportNonUnique) { Result result = null; @@ -102,6 +102,17 @@ final class CompiledStatementExecutor { cs.materializeSubQueries(session); result = executeImpl(cs); + } catch (HsqlException e) { + if ( e.getErrorCode() == -Trace.VIOLATION_OF_UNIQUE_INDEX && + bReportNonUnique ) + {} + else + LOG.ERROR("execute statement failed.", e); + + result = new Result(e, cs.sql); + } catch (Exception e) { + LOG.ERROR("execute statement failed.", e); + result = new Result(e, cs.sql); } catch (Throwable t) { LOG.ERROR("execute statement failed.", t); result = new Result(t, cs.sql); platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java @@ -869,7 +869,8 @@ class Select { boolean notempty = !(queryCondition != null && queryCondition.isFixedConditional() &&!queryCondition.testCondition(session)); - + //int nCounter = 0; + //int arrLoaded[] = new int[1000]; while (notempty && level >= 0) { // perform a join @@ -897,6 +898,8 @@ class Select { first[level] = found; } +// arrLoaded[nCounter++] = session.getDatabase().logger.getCache().getCachedObjectCount(); + if (!found &&!outerfound) { level--; @@ -949,6 +952,9 @@ class Select { if (gResult.size() >= limitcount) { break; } + + if ( t != null && t.filterIndex != null && t.isMultiFindFirst && t.filterIndex.isUnique() ) + break; } catch (HsqlInternalException e) { continue; } platform/bb/Hsqldb/src/org/hsqldb/Select.java @@ -161,13 +161,14 @@ public class Session implements SessionInterface { } //RHO - private IDeleteCallback m_deleteCallback; - public interface IDeleteCallback { + private IDBCallback m_dbCallback; + public interface IDBCallback { public void onDeleteRow(Table table, Row row); + public void onInsertRow(Table table, Row row); }; - public void setDeleteCallback(IDeleteCallback callback){ - m_deleteCallback = callback; + public void setDBCallback(IDBCallback callback){ + m_dbCallback = callback; } //RHO /** @@ -418,8 +419,8 @@ public class Session implements SessionInterface { */ public boolean addDeleteAction(Table table, Row row) throws HsqlException { m_bNeedCommit = true;//!isNestedTransaction; - if ( m_deleteCallback != null ) - m_deleteCallback.onDeleteRow(table, row); + if ( m_dbCallback != null ) + m_dbCallback.onDeleteRow(table, row); if (!isAutoCommit || isNestedTransaction) { Transaction t = new Transaction(true, table, row, actionTimestamp); @@ -455,12 +456,20 @@ public class Session implements SessionInterface { rowActionList.add(t); database.txManager.addTransaction(this, t); } + + if ( m_dbCallback != null ) + m_dbCallback.onInsertRow(table, row); return true; } else { table.commitRowToStore(row); + + if ( m_dbCallback != null ) + m_dbCallback.onInsertRow(table, row); + } + return false; } @@ -1088,13 +1097,13 @@ public class Session implements SessionInterface { Result sqlExecuteCompiledNoPreChecks(CompiledStatement cs, Object[] pvals) { - return compiledStatementExecutor.execute(cs, pvals); + return compiledStatementExecutor.execute(cs, pvals, false); } public Result sqlExecuteCompiledNoPreChecksSafe(CompiledStatement cs, - Object[] pvals) { + Object[] pvals, boolean bReportNonUnique) { synchronized (database) { - return compiledStatementExecutor.execute(cs, pvals); + return compiledStatementExecutor.execute(cs, pvals, bReportNonUnique); } } platform/bb/Hsqldb/src/org/hsqldb/Session.java @@ -79,6 +79,7 @@ import org.hsqldb.lib.StringUtil; import org.hsqldb.persist.CachedObject; import org.hsqldb.persist.DataFileCache; import org.hsqldb.persist.PersistentStore; +import org.hsqldb.rowio.RowInputBinary; import org.hsqldb.rowio.RowInputInterface; import org.hsqldb.store.ValuePool; @@ -3478,7 +3479,7 @@ public class Table extends BaseTable { cache.restore(row); } - public CachedObject get(RowInputInterface in) { + public CachedObject get(RowInputBinary in) { try { if (Table.this.isText) { platform/bb/Hsqldb/src/org/hsqldb/Table.java @@ -100,7 +100,7 @@ public class DataFileCache { protected boolean hasRowInfo = false; // reusable input / output streams - protected RowInputInterface rowIn; + protected RowInputBinary rowIn; protected RowOutputInterface rowOut; // @@ -613,7 +613,7 @@ public class DataFileCache { CachedObject object = cache.get(i); if (object == null) { - RowInputInterface rowInput = readObject(i); + RowInputBinary rowInput = readObject(i); if (rowInput == null) { return null; @@ -658,7 +658,7 @@ public class DataFileCache { return dataFile.readInt(); } - protected synchronized RowInputInterface readObject(int pos) + protected synchronized RowInputBinary readObject(int pos) throws IOException { dataFile.seek((long) pos * cacheFileScale); platform/bb/Hsqldb/src/org/hsqldb/persist/DataFileCache.java @@ -392,7 +392,7 @@ public class HsqlDatabaseProperties extends HsqlProperties { // reduce the default 14 (3*16K rows) if memory is limited and rows // are large. // values between 8-16 are allowed - setProperty(hsqldb_cache_scale, 10); + setProperty(hsqldb_cache_scale, 14); // maximum size of .log file in megabytes setProperty(hsqldb_log_size, 200); platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java @@ -33,6 +33,7 @@ package org.hsqldb.persist; import java.io.IOException; +import org.hsqldb.rowio.RowInputBinary; import org.hsqldb.rowio.RowInputInterface; /** @@ -61,7 +62,7 @@ public interface PersistentStore { /** add object previously removed from persistnce */ void restore(CachedObject object) throws IOException; - CachedObject get(RowInputInterface in) throws IOException; + CachedObject get(RowInputBinary in) throws IOException; CachedObject getNewInstance(int size) throws IOException; platform/bb/Hsqldb/src/org/hsqldb/persist/PersistentStore.java @@ -34,6 +34,9 @@ package org.hsqldb.persist; import java.io.EOFException; import j2me.io.FileNotFoundException; import java.io.IOException; + +import com.rho.RhoEmptyProfiler; +import com.rho.RhoProfiler; import com.rho.db.RandomAccessFile; //import java.lang.reflect.Constructor; @@ -61,6 +64,9 @@ class ScaledRAFile implements ScaledRAInterface { static final int DATA_FILE_NIO = 1; static final int DATA_FILE_JAR = 2; static final long MAX_NIO_LENGTH = (1L << 28); + + private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : + new RhoProfiler(); // final SimpleLog appLog; @@ -454,6 +460,7 @@ class ScaledRAFile implements ScaledRAInterface { public void write(byte[] b, int off, int len) throws IOException { + //PROF.START("ScaledRAFile1"); try { createFiles(); @@ -480,10 +487,14 @@ class ScaledRAFile implements ScaledRAInterface { throw e; } + //finally { + // PROF.STOP("ScaledRAFile1"); + //} } public void writeInt(int i) throws IOException { + //PROF.START("ScaledRAFile2"); try { createFiles(); @@ -511,10 +522,14 @@ class ScaledRAFile implements ScaledRAInterface { throw e; } + //finally { + // PROF.STOP("ScaledRAFile2"); + //} } public void writeLong(long i) throws IOException { + //PROF.START("ScaledRAFile3"); try { createFiles(); @@ -542,6 +557,9 @@ class ScaledRAFile implements ScaledRAInterface { throw e; } + //finally { + // PROF.STOP("ScaledRAFile3"); + //} } public void close() throws IOException { platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFile.java @@ -163,20 +163,24 @@ public abstract class RowInputBase extends HsqlByteArrayInputStream { case Types.VARCHAR : case Types.VARCHAR_IGNORECASE : case Types.LONGVARCHAR : - o = readChar(type); + //o = readChar(type); + o = readString(); break; case Types.TINYINT : case Types.SMALLINT : - o = readSmallint(); + //o = readSmallint(); + o = new Integer(readShort()); break; case Types.INTEGER : - o = readInteger(); + //o = readInteger(); + o = new Integer(readInt()); break; case Types.BIGINT : - o = readBigint(); + //o = readBigint(); + o = new Long(readLong()); break; //fredt although REAL is now Double, it is read / written in platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputBase.java @@ -107,9 +107,10 @@ implements org.hsqldb.rowio.RowInputInterface { public String readString() throws IOException { int length = readInt(); - String s = StringConverter.readUTF(buf, pos, length); + //String s = StringConverter.readUTF(buf, pos, length); + String s = new String(buf, pos, length, "UTF-8"); - s = ValuePool.getString(s); + //s = ValuePool.getString(s); pos += length; return s; platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputBinary.java @@ -31,6 +31,8 @@ package org.hsqldb.rowio; +import java.io.UnsupportedEncodingException; + import j2me.math.BigDecimal; import j2me.math.BigInteger; import j2me.math.Number; @@ -125,13 +127,18 @@ public class RowOutputBinary extends RowOutputBase { public void writeType(int type) { writeShort(type); } - + public void writeString(String s) { int temp = count; writeInt(0); - StringConverter.writeUTF(s, this); + //StringConverter.writeUTF(s, this); + try { + this.write(s.getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e.getMessage()); + } writeIntData(count - temp - 4, temp); } platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBinary.java @@ -112,7 +112,7 @@ public abstract class ScriptWriterBase implements Runnable { /** the last schema for last sessionId */ Session currentSession; public static final String[] LIST_SCRIPT_FORMATS = new String[] { - Token.T_TEXT, Token.T_BINARY, null, Token.T_COMPRESSED + //Token.T_TEXT, Token.T_BINARY, null, Token.T_COMPRESSED }; public static final int SCRIPT_TEXT_170 = 0; public static final int SCRIPT_BINARY_172 = 1; platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterBase.java @@ -74,7 +74,7 @@ public class ValuePool { // static { - initPool(); + //initPool(); } private static void initPool() { @@ -104,78 +104,79 @@ public class ValuePool { public static void resetPool(int[] sizeArray, int sizeFactor) { - synchronized (ValuePool.class) { + /*synchronized (ValuePool.class) { for (int i = 0; i < POOLS_COUNT; i++) { poolList[i].resetCapacity(sizeArray[i] * sizeFactor, BaseHashMap.PURGE_HALF); } - } + }*/ } public static void resetPool() { - synchronized (ValuePool.class) { - resetPool(defaultPoolLookupSize, defaultSizeFactor); - } +// synchronized (ValuePool.class) { +// resetPool(defaultPoolLookupSize, defaultSizeFactor); +// } } public static void clearPool() { - synchronized (ValuePool.class) { - for (int i = 0; i < POOLS_COUNT; i++) { - poolList[i].clear(); - } - } +// synchronized (ValuePool.class) { +// for (int i = 0; i < POOLS_COUNT; i++) { +// poolList[i].clear(); +// } +// } } public static Integer getInt(int val) { - - synchronized (intPool) { + return new Integer(val); + /*synchronized (intPool) { return intPool.getOrAddInteger(val); - } + }*/ } public static Long getLong(long val) { - - synchronized (longPool) { + return new Long(val); + /*synchronized (longPool) { return longPool.getOrAddLong(val); - } + }*/ } public static Double getDouble(long val) { - - synchronized (doublePool) { + return new Double(val); + /*synchronized (doublePool) { return doublePool.getOrAddDouble(val); - } + }*/ } public static String getString(String val) { - if (val == null || val.length() > maxStringLength) { + //if (val == null || val.length() > maxStringLength) { return val; - } - + //} + /* synchronized (stringPool) { return stringPool.getOrAddString(val); - } + }*/ } public static Date getDate(long val) { - - synchronized (datePool) { - return datePool.getOrAddDate(val); - } + + return new Date(val); + //synchronized (datePool) { + // return datePool.getOrAddDate(val); + //} } public static BigDecimal getBigDecimal(BigDecimal val) { - if (val == null) { + //if (val == null) { return val; - } + //} - synchronized (bigdecimalPool) { - return (BigDecimal) bigdecimalPool.getOrAddObject(val); - } + //synchronized (bigdecimalPool) { + // return (BigDecimal) bigdecimalPool.getOrAddObject(val); + //} } public static Boolean getBoolean(boolean b) { platform/bb/Hsqldb/src/org/hsqldb/store/ValuePool.java @@ -1,5 +1,9 @@ ## RIM Java Development Environment # RIM Project file +# +# This file is generated and managed by BlackBerry developer tools. +# It SHOULD NOT BE modified manually. +# AddOn=0 AlwaysBuild=0 [AlxImports @@ -19,12 +23,15 @@ ExcludeFromBuildAll=0 [Files ..\..\shared\rubyJVM\src\com\rho\DateTimeTokenizer.java ..\..\shared\rubyJVM\src\com\rho\db\DBAdapter.java +..\..\shared\rubyJVM\src\com\rho\db\DBAttrManager.java ..\..\shared\rubyJVM\src\com\rho\db\DBException.java ..\..\shared\rubyJVM\src\com\rho\db\IDBCallback.java ..\..\shared\rubyJVM\src\com\rho\db\IDBResult.java ..\..\shared\rubyJVM\src\com\rho\db\IDBStorage.java ..\..\shared\rubyJVM\src\com\rho\FilePath.java ..\..\shared\rubyJVM\src\com\rho\IFile.java +..\..\shared\rubyJVM\src\com\rho\IFileAccess.java +..\..\shared\rubyJVM\src\com\rho\IRAFile.java ..\..\shared\rubyJVM\src\com\rho\IRhoLogSink.java ..\..\shared\rubyJVM\src\com\rho\IRhoRubyHelper.java ..\..\shared\rubyJVM\src\com\rho\location\GeoLocation.java @@ -57,6 +64,7 @@ ExcludeFromBuildAll=0 ..\..\shared\rubyJVM\src\com\rho\sync\SyncEngine.java ..\..\shared\rubyJVM\src\com\rho\sync\SyncSource.java ..\..\shared\rubyJVM\src\com\rho\sync\SyncThread.java +..\..\shared\rubyJVM\src\com\rho\sync\SyncNotify.java ..\..\shared\rubyJVM\src\com\rho\TestProfiler.java ..\..\shared\rubyJVM\src\com\rho\TestRhoLog.java ..\..\shared\rubyJVM\src\com\rho\TimeInterval.java @@ -440,8 +448,11 @@ OutputFileName=RubyVM [PackageProtection ] RibbonPosition=0 +[RolloverIcons +] RunOnStartup=0 StartupTier=7 SystemModule=0 Type=2 +UserData=|src Version=1.45 platform/bb/RubyVM/RubyVM.jdp @@ -1,9 +1,12 @@ platform\shared\rubyJVM\src\com\rho\DateTimeTokenizer.java +platform\shared\rubyJVM\src\com\rho\db\DBAttrManager.java platform\shared\rubyJVM\src\com\rho\db\DBAdapter.java platform\shared\rubyJVM\src\com\rho\db\DBException.java platform\shared\rubyJVM\src\com\rho\db\IDBCallback.java platform\shared\rubyJVM\src\com\rho\db\IDBResult.java platform\shared\rubyJVM\src\com\rho\db\IDBStorage.java +platform\shared\rubyJVM\src\com\rho\IFileAccess.java +platform\shared\rubyJVM\src\com\rho\IRAFile.java platform\shared\rubyJVM\src\com\rho\FilePath.java platform\shared\rubyJVM\src\com\rho\IFile.java platform\shared\rubyJVM\src\com\rho\IRhoLogSink.java @@ -38,6 +41,7 @@ platform\shared\rubyJVM\src\com\rho\sync\ClientRegister.java platform\shared\rubyJVM\src\com\rho\sync\ISyncStatusListener.java platform\shared\rubyJVM\src\com\rho\sync\SyncSource.java platform\shared\rubyJVM\src\com\rho\sync\SyncThread.java +platform\shared\rubyJVM\src\com\rho\sync\SyncNotify.java platform\shared\rubyJVM\src\com\rho\TestProfiler.java platform\shared\rubyJVM\src\com\rho\TestRhoLog.java platform\shared\rubyJVM\src\com\rho\TimeInterval.java platform/bb/build/RubyVM_build.files @@ -1,6 +1,19 @@ # + +def freplace( fname, pattern, str ) + f = File.open( fname ) + strings = f.read + f.close + + strings.gsub!( pattern, str ) + + f = File.new( fname, "w" ) + f.print strings + f.close +end + def startmds - mdshome = $config["env"]["paths"][$config["env"]["bbver"]]["mds"] + mdshome = $config["env"]["paths"][$bbver]["mds"] args = [] args << "/c" args << "run.bat" @@ -9,7 +22,7 @@ def startmds end def stopmds - mdshome = $config["env"]["paths"][$config["env"]["bbver"]]["mds"] + mdshome = $config["env"]["paths"][$bbver]["mds"] args = [] args << "/c" args << "shutdown.bat" @@ -18,9 +31,8 @@ def stopmds end def startsim - bbver = $config["env"]["bbver"] - sim = $config["env"]["paths"][bbver]["sim"] - jde = $config["env"]["paths"][bbver]["jde"] + sim = $config["env"]["paths"][$bbver]["sim"] + jde = $config["env"]["paths"][$bbver]["jde"] command = '"' + jde + "/simulator/fledge.exe\"" args = [] @@ -34,30 +46,31 @@ def startsim args << "/pin=0x2100000A" args << "/no-compact-filesystem" - if bbver !~ /^4\.[012](\..*)?$/ + if $bbver !~ /^4\.[012](\..*)?$/ args << "/fs-sdcard=true" end - args << "\"/app-param=JvmDebugFile:"+Jake.get_absolute($config["env"]["applog"]) +'"' + args << "\"/app-param=JvmDebugFile:"+Jake.get_absolute($app_config["applog"]) +'"' Thread.new { Jake.run(command,args,jde + "/simulator",true) } $stdout.flush end def stopsim - sim = $config["env"]["paths"][$config["env"]["bbver"]]["sim"] - jde = $config["env"]["paths"][$config["env"]["bbver"]]["jde"] + sim = $config["env"]["paths"][$bbver]["sim"] + jde = $config["env"]["paths"][$bbver]["jde"] command = '"' + jde + "/simulator/fledgecontroller.exe\"" args = [] args << "/session="+sim args << "/execute=Exit(true)" - Jake.run(command,args, jde + "/simulator") + #Jake.run(command,args, jde + "/simulator") + Thread.new { Jake.run(command,args, nil, true,true) } end def manualsign java = $config["env"]["paths"]["java"] + "/java.exe" - jde = $config["env"]["paths"][$config["env"]["bbver"]]["jde"] + jde = $config["env"]["paths"][$bbver]["jde"] args = [] args << "-jar" @@ -72,7 +85,7 @@ end def autosign java = $config["env"]["paths"]["java"] + "/java.exe" - jde = $config["env"]["paths"][$config["env"]["bbver"]]["jde"] + jde = $config["env"]["paths"][$bbver]["jde"] args = [] args << "-jar" @@ -92,29 +105,35 @@ end namespace "config" do task :bb => ["config:common"] do - bbpath = $config["build"]["bbpath"] - $bbver = $config["env"]["bbver"] - $builddir = bbpath + "/build" - $bindir = bbpath + "/bin" - $rhobundledir = bbpath + "/RhoBundle" + $config["platform"] = "bb" + + $bbver = $app_config["bbver"].to_s + $builddir = $config["build"]["bbpath"] + "/build" + $bindir = $app_path + "/bin" + $rhobundledir = $app_path + "/RhoBundle" $srcdir = $bindir + "/RhoBundle" - $preverified = bbpath + "/preverified" - $targetdir = bbpath + "/target/" + $bbver - $rubyVMdir = bbpath + "/RubyVM" + $preverified = $app_path + "/preverified" + $targetdir = $bindir + "/target/" + $bbver + $rubyVMdir = $app_path + "/RubyVM" $excludelib = ['**/singleton.rb','**/rational.rb','**/rhoframework.rb','**/date.rb'] - $compileERB = bbpath + "/build/compileERB.rb" + $compileERB = $app_path + "/build/compileERB.rb" $tmpdir = $bindir +"/tmp" $excludeapps = "public/js/iui/**,**/jquery*" + $assetfolder = $app_path + "/public-" + "bb-" + $bbver + + $outfilebase = $app_config["name"].nil? ? "rhodesApp" : $app_config["name"] + $outfilebase.gsub!(/[^A-Za-z_0-9]/, '_') + $rhobundleimplib = $config["env"]["paths"][$bbver]["jde"] + "/lib/net_rim_api.jar;" + - Jake.get_absolute($preverified+"/RubyVM.jar") - $rhodesimplib = $rhobundleimplib + ";"+ Jake.get_absolute($preverified+"/RhoBundle.jar") + $preverified+"/RubyVM.jar" + $rhodesimplib = $rhobundleimplib + ";"+ $preverified+"/RhoBundle.jar" end end namespace "build" do namespace "bb" do - desc "Build rhoBundle" +# desc "Build rhoBundle" #XXX change to ns build, rhobundle task :rhobundle => :rubyvm do java = $config["env"]["paths"]["java"] + "/java.exe" @@ -140,11 +159,16 @@ namespace "build" do end $stdout.flush + mkdir_p $rhobundledir unless File.exists? $rhobundledir cp $preverified + "/RhoBundle.jar", $rhobundledir + "/RhoBundle.jar" end - desc "Build RubyVM" + task :devrhobundle => :rhobundle do + cp $preverified + "/RhoBundle.jar", "platform/bb/RhoBundle/RhoBundle.jar" + end + +# desc "Build RubyVM" task :rubyvm => ["config:bb"] do javac = $config["env"]["paths"]["java"] + "/javac.exe" jdehome = $config["env"]["paths"][$bbver]["jde"] @@ -202,7 +226,7 @@ namespace "build" do mkdir_p $tmpdir end - desc "Build rhodes" +# desc "Build rhodes" task :rhodes => [ :rubyvm, :rhobundle ] do javac = $config["env"]["paths"]["java"] + "/javac.exe" jde = $config["env"]["paths"][$bbver]["jde"] @@ -216,12 +240,27 @@ namespace "build" do if not FileUtils.uptodate?($preverified + "/rhodes.jar",sources) - vsrcdir = $builddir + "/../rhodes/platform/" + $bbver - if !File.exist?( vsrcdir ) || !File.directory?( vsrcdir ) - vsrcdir = $builddir + "/../rhodes/platform/common" + $tmpdir.gsub!(/\\/, '/') + vsrclist = $tmpdir + "/vsrc_build.files" + +# vsrclist = $builddir + "/../bin/vsrc_build.files" +# mkdir_p $builddir + "/../bin" unless File.exists? $builddir + "/../bin" + + vsrcdir = $tmpdir + "/vsrc" + mkdir_p vsrcdir + cp_r $builddir + "/../rhodes/platform/common/.", vsrcdir + if File.exist?( $builddir + "/../rhodes/platform/" + $bbver ) + cp_r $builddir + "/../rhodes/platform/" + $bbver + "/.", vsrcdir, :remove_destination => true end - vsrclist = $builddir + "/../bin/vsrc_build.files" + # Modify sources to get different class names due to BB limitation - + # there can not be two or more applications installed which contains the same + # class names which implements Persistable interface. See details here - + # http://supportforums.blackberry.com/rim/board/message?board.id=java_dev&thread.id=11152 + mkdir_p vsrcdir + "/com/rho/file" + cp_r $builddir + "/../hsqldb/src/com/rho/file/PersistRAFileImpl.java", vsrcdir + "/com/rho/file" + freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /FileInfoWrapper/, $outfilebase + "_FileInfoWrapper" ) + freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /PageWrapper/, $outfilebase + "_PageWrapper" ) fvsrc = File.new( vsrclist, "w" ) Dir.glob( vsrcdir + "/**/*.java" ).each do |line| @@ -254,8 +293,10 @@ namespace "build" do end $stdout.flush + rm_rf vsrcdir + cp_r $builddir + "/../rhodes/resources", $tmpdir + "/resources" - cp $config["env"]["app"] + "/icon/icon.png", $tmpdir +"/resources" + cp $app_path + "/icon/icon.png", $tmpdir +"/resources" Jake.jar($bindir + "/rhodes.jar", $builddir + "/manifest.mf", $tmpdir,true) $stdout.flush @@ -282,15 +323,15 @@ end namespace "package" do namespace "bb" do - desc "Package rhoBundle" +# desc "Package rhoBundle" task :rhobundle => ["build:bb:rhobundle"] do Jake.rapc("RhoBundle", $targetdir, $rhobundleimplib , - '"' + Jake.get_absolute($preverified + "/RhoBundle.jar") + '"', + '"' + $preverified + "/RhoBundle.jar" + '"', "RhoBundle", - $config["env"]["vendor"], - $config["env"]["version"] + $app_config["vendor"], + $app_config["version"] ) unless $? == 0 puts "Error in RAPC" @@ -300,7 +341,7 @@ namespace "package" do end - desc "Package rubyVM" +# desc "Package rubyVM" task :rubyvm => "build:bb:rubyvm" do jdehome = $config["env"]["paths"][$bbver]["jde"] @@ -308,10 +349,10 @@ namespace "package" do Jake.rapc("RubyVM", $targetdir, jdehome + "/lib/net_rim_api.jar", - '"' + Jake.get_absolute($preverified + "/RubyVM.jar") +'"', + '"' + $preverified + "/RubyVM.jar" +'"', "RubyVM", - $config["env"]["vendor"], - $config["env"]["version"] + $app_config["vendor"], + $app_config["version"] ) unless $? == 0 puts "Error in RAPC" @@ -325,18 +366,18 @@ namespace "package" do end - desc "Package rhodesApp" +# desc "Package rhodesApp" task :rhodes => ["build:bb:rhodes"] do - appname = $config["env"]["appname"].nil? ? "rhodesApp" : $config["env"]["appname"] + appname = $app_config["name"].nil? ? "rhodesApp" : $app_config["name"] - if not FileUtils.uptodate?($targetdir + '/rhodesApp.cod',$preverified + "/rhodes.jar") - Jake.rapc("rhodesApp", + if not FileUtils.uptodate?($targetdir + '/' + $outfilebase + '.cod',$preverified + "/rhodes.jar") + Jake.rapc($outfilebase, $targetdir, $rhodesimplib, - '"' + Jake.get_absolute( $preverified + "/rhodes.jar") +'"', + '"' + $preverified + "/rhodes.jar" +'"', appname, - $config["env"]["vendor"], - $config["env"]["version"], + $app_config["vendor"], + $app_config["version"], "resources/icon.png", false, true @@ -346,7 +387,10 @@ namespace "package" do exit 1 end $stdout.flush - cp $builddir + "/rhodesApp.alx", $targetdir if not FileUtils.uptodate?( $targetdir + "/rhodesApp.alx", $builddir + "/rhodesApp.alx") + if not FileUtils.uptodate?( $targetdir + "/" + $outfilebase + ".alx", $builddir + "/rhodesApp.alx" ) + cp $builddir + "/rhodesApp.alx", $targetdir + "/" + $outfilebase + ".alx" + freplace( $targetdir + "/" + $outfilebase + ".alx", /rhodesApp/, appname ) + end else puts 'rhodes .cod files are up to date' $stdout.flush @@ -354,7 +398,7 @@ namespace "package" do end - desc "Package all production (all parts in one package)" +# desc "Package all production (all parts in one package)" task :production => ["build:bb:rhodes"] do jdehome = $config["env"]["paths"][$bbver]["jde"] rm_rf $tmpdir @@ -380,17 +424,17 @@ namespace "package" do end end - Jake.jar($bindir + "/rhodesApp.jar",$builddir + "/manifest.mf",$tmpdir,true) + Jake.jar($bindir + "/" + $outfilebase + ".jar",$builddir + "/manifest.mf",$tmpdir,true) - appname = $config["env"]["appname"].nil? ? "rhodesApp" : $config["env"]["appname"] + appname = $app_config["name"].nil? ? "rhodesApp" : $app_config["name"] - Jake.rapc("rhodesApp", + Jake.rapc($outfilebase, $targetdir, jdehome + "/lib/net_rim_api.jar", - '"' + Jake.get_absolute( $bindir + "/rhodesApp.jar") +'"', + '"' + $bindir + "/" + $outfilebase + ".jar" +'"', appname, - $config["env"]["vendor"], - $config["env"]["version"], + $app_config["vendor"], + $app_config["version"], "resources/icon.png", false, true @@ -400,12 +444,13 @@ namespace "package" do exit 1 end $stdout.flush - cp $builddir +"/rhodesApp.alx", $targetdir if not FileUtils.uptodate?( $targetdir+"/rhodesApp.alx", $builddir + "/rhodesApp.alx") - - + if not FileUtils.uptodate?( $targetdir + "/" + $outfilebase + ".alx", $builddir + "/rhodesApp.alx" ) + cp $builddir +"/rhodesApp.alx", $targetdir + "/" + $outfilebase + ".alx" + freplace( $targetdir + "/" + $outfilebase + ".alx", /rhodesApp/, appname ) + end end - desc "Package all dev (each part in separate package)" +# desc "Package all dev (each part in separate package)" task :dev => [ :rubyvm,:rhobundle,:rhodes] do end end @@ -416,8 +461,8 @@ end namespace "device" do namespace "bb" do - desc "Build and package dev for device" - task :dev => "package:bb:dev" do + desc "Build debug for device" + task :debug => "package:bb:dev" do #make into functions if $config["build"]["bbsignpwd"] and $config["build"]["bbsignpwd"] != "" @@ -430,16 +475,16 @@ namespace "device" do mkdir_p $targetdir + "/web" cp $targetdir + "/RhoBundle.jad", $targetdir + "/web" - cp $targetdir + "/rhodesApp.jad", $targetdir + "/web" + cp $targetdir + "/"+$outfilebase+".jad", $targetdir + "/web" cp $targetdir + "/RubyVM.jad", $targetdir + "/web" Jake.unjar($targetdir + "/RhoBundle.cod", $targetdir + "/web") - Jake.unjar($targetdir + "/rhodesApp.cod", $targetdir + "/web") + Jake.unjar($targetdir + "/"+$outfilebase+".cod", $targetdir + "/web") Jake.unjar($targetdir + "/RubyVM.cod", $targetdir + "/web") end - desc "Build and package dev rhobundle for device" +# desc "Build and package dev rhobundle for device" task :rhobundle => "package:bb:rhobundle" do if $config["build"]["bbsignpwd"] and $config["build"]["bbsignpwd"] != "" @@ -456,7 +501,7 @@ namespace "device" do end - desc "Build and package for production" + desc "Build production for device" task :production => "package:bb:production" do if $config["build"]["bbsignpwd"] and $config["build"]["bbsignpwd"] != "" @@ -465,12 +510,14 @@ namespace "device" do manualsign end - rm_rf $targetdir + "/web" - mkdir_p $targetdir + "/web" + rm_rf $targetdir + "/ota-web" + mkdir_p $targetdir + "/ota-web" - cp $targetdir + "/rhodesApp.jad", $targetdir + "/web" + cp $targetdir + "/"+$outfilebase+".jad", $targetdir + "/ota-web" - Jake.unjar($targetdir + "/rhodesApp.cod", $targetdir + "/web") + Jake.unjar($targetdir + "/"+$outfilebase+".cod", $targetdir + "/ota-web") + + rm_rf Dir.glob($targetdir + "/*.debug") end @@ -478,46 +525,53 @@ namespace "device" do end namespace "clean" do + desc "Clean bb" + task :bb => "clean:bb:all" namespace "bb" do - desc "Clean preverified jars" +# desc "Clean preverified jars" task :preverified => "config:bb" do rm_rf $preverified if File.exists? $preverified - mkdir_p $preverified end - desc "Clean packaged files" +# desc "Clean packaged files" task :packaged => "config:bb" do - rm_rf $targetdir - mkdir_p $targetdir + rm_rf $targetdir +"/../" end - desc "Clean temp dir" +# desc "Clean temp dir" task :tempdir => "config:bb" do rm_rf $tmpdir - mkdir_p $tmpdir end - desc "Clean all" +# desc "Clean all" task :all => [:preverified,:packaged,:tempdir] do rm_rf $bindir + rm_rf $rhobundledir end end end namespace "run" do + namespace "bb" do + task :stopmdsandsim => ["config:bb"] do + stopsim + stopmds + end - task :stopmdsandsim => ["config:bb"] do - stopsim - stopmds +# desc "Starts mds and sim" + task :startmdsandsim => ["config:bb"] do + startmds + startsim + end end - desc "Builds everything, loads and starts sim" - task :bb => [:stopmdsandsim, "package:bb:dev"] do + desc "Builds everything, loads and starts bb sim and mds" + task :bb => ["run:bb:stopmdsandsim", "package:bb:dev"] do #sim = $config["env"]["paths"][$bbver]["sim"] jde = $config["env"]["paths"][$bbver]["jde"] - cp_r Jake.get_absolute(File.join($targetdir,"/.")), jde + "/simulator" + cp_r File.join($targetdir,"/."), jde + "/simulator" startmds startsim @@ -589,23 +643,4 @@ namespace "config" do puts "Config appears valid" end -end - -namespace "prebuild" do - desc "Prebuild binaries for blackberry gems" - task :bb => ["build:bb:rubyvm", "build:bb:rhodes"] do - if File.exists? $preverified + "/RubyVM.jar" and File.exists? $preverified + "/rhodes.jar" - prebuilt = "rhodes/rhodes-build/res/prebuilt/bb" - - rm_rf prebuilt if File.exists? prebuilt - mkdir_p prebuilt - - cp $preverified + "/RubyVM.jar", prebuilt - cp $preverified + "/rhodes.jar", prebuilt - - cp $builddir + "/MANIFEST.MF", prebuilt - cp $builddir + "/rhodesApp.alx", prebuilt - - end - end end \ No newline at end of file platform/bb/build/bb.rake @@ -4,9 +4,8 @@ platform\bb\Hsqldb\src\com\rho\db\HsqlDBRowResult.java platform\bb\Hsqldb\src\com\rho\db\HsqlDBStorage.java platform\bb\Hsqldb\src\com\rho\db\Journal.java platform\bb\Hsqldb\src\com\rho\db\RandomAccessFile.java -platform\bb\Hsqldb\src\com\rho\db\file\Jsr75RAFileImpl.java -platform\bb\Hsqldb\src\com\rho\db\file\PersistRAFileImpl.java -platform\bb\Hsqldb\src\com\rho\db\file\RAFileImpl.java +platform\bb\Hsqldb\src\com\rho\file\FileAccessBB.java +platform\bb\Hsqldb\src\com\rho\file\Jsr75RAFileImpl.java platform\bb\Hsqldb\src\j2me\io\BufferedOutputStream.java platform\bb\Hsqldb\src\j2me\io\FilterOutputStream.java platform\bb\Hsqldb\src\j2me\math\BigDecimal.java platform/bb/build/hsqldb_build.files @@ -1,5 +1,9 @@ ## RIM Java Development Environment # RIM Project file +# +# This file is generated and managed by BlackBerry developer tools. +# It SHOULD NOT BE modified manually. +# AddOn=0 AlwaysBuild=0 [AlxImports @@ -28,6 +32,7 @@ src\com\rho\location\GeoLocationImpl.java src\com\rho\net\bb\BBHttpConnection.java src\com\rho\net\bb\NativeBBHttpConnection.java src\com\rho\net\NetworkAccess.java +src\com\rho\RhoMainScreen.java src\com\rho\RhoRubyHelper.java src\com\rho\Version.java src\rhomobile\Alert.java platform/bb/rhodes/rhodes.jdp @@ -16,12 +16,20 @@ import rhomobile.datetime.DateTimePicker; import com.rho.db.HsqlDBStorage; import com.rho.db.IDBStorage; +import com.rho.file.FileAccessBB; +import com.rho.file.Jsr75RAFileImpl; +import com.rho.file.PersistRAFileImpl; import com.xruby.runtime.builtin.RubyArray; import com.xruby.runtime.lang.RubyProgram; import com.xruby.runtime.lang.RubyRuntime; public class RhoRubyHelper implements IRhoRubyHelper { + // WARNING!!! Be very carefull when modify these lines! There was a case when + // entire application has verification error in case if this line is not at start + // of class. It is impossible to explain why it happened but need to be remembered + public static final String USE_PERSISTENT = "use_persistent_storage"; + public static final int COVERAGE_BIS_B = 4; public void initRubyExtensions(){ @@ -67,6 +75,7 @@ public class RhoRubyHelper implements IRhoRubyHelper { public boolean isSimulator(){ return DeviceInfo.isSimulator(); + //return false; } public String getModuleName() @@ -142,4 +151,15 @@ public class RhoRubyHelper implements IRhoRubyHelper { public IDBStorage createDBStorage() { return new HsqlDBStorage(); } + + public IFileAccess createFileAccess() { + return new FileAccessBB(); + } + + public IRAFile createRAFile() { + if (RhoConf.getInstance().getBool(USE_PERSISTENT)) + return new PersistRAFileImpl(); + else + return new Jsr75RAFileImpl(); + } } platform/bb/rhodes/src/com/rho/RhoRubyHelper.java @@ -30,6 +30,7 @@ public class Version { public static class SoftVersion{ public int nMajor = 0; public int nMinor = 0; + public int nMinor2 = 0; }; private static SoftVersion m_softVer; @@ -50,7 +51,13 @@ public class Version { int nDot2 = strVer.indexOf('.',nDot+1); if ( nDot2 >= 0 ) + { m_softVer.nMinor = Integer.parseInt( strVer.substring(nDot+1,nDot2) ); + + int nDot3 = strVer.indexOf('.',nDot2+1); + if ( nDot3 >= 0 ) + m_softVer.nMinor2 = Integer.parseInt( strVer.substring(nDot2+1,nDot3) ); + } else m_softVer.nMinor = Integer.parseInt( strVer.substring(nDot+1) ); }else platform/bb/rhodes/src/com/rho/Version.java @@ -6,6 +6,7 @@ import javax.microedition.io.Connector; import javax.microedition.io.HttpConnection; import rhomobile.RhodesApplication; +import rhomobile.Utilities; import net.rim.device.api.servicebook.ServiceBook; import net.rim.device.api.servicebook.ServiceRecord; @@ -16,6 +17,8 @@ import com.rho.BBVersionSpecific; import com.rho.RhoEmptyLogger; import com.rho.RhoLogger; import com.rho.net.bb.BBHttpConnection; +import com.rho.net.bb.NativeBBHttpConnection; + import net.rim.device.api.io.http.HttpHeaders; public class NetworkAccess implements INetworkAccess { @@ -41,7 +44,7 @@ public class NetworkAccess implements INetworkAccess { String strDeviceside = ";deviceside=true"; if ( com.rho.RhoConf.getInstance().getInt("no_deviceside_postfix") == 1 ) strDeviceside = ""; - + if (DeviceInfo.isSimulator()) { URLsuffix = ";deviceside=true"; networkConfigured = true; @@ -63,18 +66,6 @@ public class NetworkAccess implements INetworkAccess { } ServiceRecord[] srs = sb.getRecords(); - // search for BES transport - for (int i = 0; i < srs.length; i++) { - if (srs[i].isDisabled() || !srs[i].isValid()) - continue; - if (srs[i].getCid().equals("IPPP") - && srs[i].getName().equals("Desktop")) { - URLsuffix = ""; - networkConfigured = true; - bes = true; - break; - } - } // search for BIS-B transport if (URLsuffix == null) { for (int i = 0; i < srs.length; i++) { @@ -90,25 +81,54 @@ public class NetworkAccess implements INetworkAccess { } } } + + // search for BES transport + for (int i = 0; i < srs.length; i++) { + LOG.INFO("SB: " + srs[i].getName() + ";UID: " + srs[i].getUid() + + ";CID: " + srs[i].getCid() + + ";APN: " + srs[i].getAPN() + ";Descr: " + srs[i].getDataSourceId() + + ";Valid: " + (srs[i].isValid() ? "true" : "false") + + ";Disabled: "+ (srs[i].isDisabled()? "true" : "false") ); + + if (srs[i].isDisabled() || !srs[i].isValid()) + continue; + if (srs[i].getCid().equals("IPPP") + && srs[i].getName().equals("Desktop")) { + URLsuffix = ""; + networkConfigured = true; + bes = true; + break; + } + } + } } - if (networkConfigured == false) { + String strConfPostfix = com.rho.RhoConf.getInstance().getString("bb_connection_postfix"); + if ( strConfPostfix != null && strConfPostfix.length() > 0 ) + { + URLsuffix = strConfPostfix; + networkConfigured = true; + }else if (networkConfigured == false) { URLsuffix = strDeviceside;//";deviceside=true"; networkConfigured = true; } - + + LOG.INFO("Postfix: " + URLsuffix); } - public boolean doLocalRequest(String strUrl, String strBody) + /*public IHttpConnection doLocalRequest(String strUrl, String strBody) { HttpHeaders headers = new HttpHeaders(); headers.addProperty("Content-Type", "application/x-www-form-urlencoded"); - RhodesApplication.getInstance().postUrl(strUrl, strBody, headers); - return true; - } + HttpConnection http = Utilities.makeConnection(strUrl, headers, strBody.getBytes()); + +// RhodesApplication.getInstance().postUrl(strUrl, strBody, headers); + + return new BBHttpConnection(http); + }*/ public boolean isWifiActive() { @@ -119,6 +139,12 @@ public class NetworkAccess implements INetworkAccess { { HttpConnection http = null; + if ( URI.isLocalHost(url) ) + { + URI uri = new URI(url); + return new RhoConnection(uri); + } + int fragment = url.indexOf('#'); if (-1 != fragment) { url = url.substring(0, fragment); @@ -144,11 +170,30 @@ public class NetworkAccess implements INetworkAccess { LOG.INFO(url + URLsuffix); http = (HttpConnection) Connector.open(url + URLsuffix); } catch (IOException ioe) { - LOG.ERROR("Connector.open exception", ioe ); - if (http != null) - http.close(); - http = null; - throw ioe; + + if ( URLsuffix.length() > 0 ) + { + try{ + LOG.INFO(url); + http = (HttpConnection) Connector.open(url); + } catch (IOException ioe2) { + LOG.ERROR("Connector.open exception", ioe2 ); + if (http != null) + http.close(); + http = null; + throw ioe2; + } + }else + { + LOG.ERROR("Connector.open exception", ioe ); + if (http != null) + http.close(); + http = null; + throw ioe; + } + }catch(Exception exc) + { + throw new IOException("Could not open network connection."); } } platform/bb/rhodes/src/com/rho/net/NetworkAccess.java @@ -29,13 +29,7 @@ import net.rim.device.api.system.KeyListener; import net.rim.device.api.system.SystemListener; //import javax.microedition.io.file.FileSystemListener; import net.rim.device.api.system.TrackwheelListener; -import net.rim.device.api.ui.ContextMenu; -import net.rim.device.api.ui.Field; -import net.rim.device.api.ui.FieldChangeListener; -import net.rim.device.api.ui.Graphics; -import net.rim.device.api.ui.Keypad; -import net.rim.device.api.ui.MenuItem; -import net.rim.device.api.ui.UiApplication; +import net.rim.device.api.ui.*; import net.rim.device.api.ui.component.Dialog; import net.rim.device.api.ui.component.Menu; import net.rim.device.api.ui.component.Status; @@ -53,13 +47,18 @@ import com.rho.Mutex; import com.rho.RhoClassFactory; import com.rho.RhoConf; import com.rho.RhoEmptyLogger; +import com.rho.RhoEmptyProfiler; import com.rho.RhoLogger; +import com.rho.RhoMainScreen; +import com.rho.RhoProfiler; import com.rho.RhoRuby; import com.rho.RhoThread; import com.rho.SimpleFile; import com.rho.Version; +import com.rho.db.DBAdapter; import com.rho.location.GeoLocation; import com.rho.net.RhoConnection; +import com.rho.net.URI; import com.rho.sync.SyncThread; import com.rho.sync.ISyncStatusListener; import com.rho.Jsr75File; @@ -82,6 +81,9 @@ final public class RhodesApplication extends UiApplication implements RenderingA private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : new RhoLogger("RhodesApplication"); + + private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : + new RhoProfiler(); /*boolean m_bSDCardAdded = false; public void rootChanged(int arg0, String arg1) @@ -146,12 +148,17 @@ final public class RhodesApplication extends UiApplication implements RenderingA //} + boolean isExternalUrl(String strUrl) + { + return strUrl.startsWith("http://") || strUrl.startsWith("https://"); + } + String canonicalizeURL( String url ){ if ( url == null || url.length() == 0 ) return ""; url.replace('\\', '/'); - if ( !url.startsWith(_httpRoot) ){ + if ( !url.startsWith(_httpRoot) && !isExternalUrl(url) ){ if ( url.charAt(0) == '/' ) url = _httpRoot.substring(0, _httpRoot.length()-1) + url; else @@ -233,7 +240,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA void addToHistory(String strUrl, String refferer ) { - if ( !strUrl.startsWith(_httpRoot) ) + if ( !strUrl.startsWith(_httpRoot) && !isExternalUrl(strUrl) ) strUrl = _httpRoot + (strUrl.startsWith("/") ? strUrl.substring(1) : strUrl); int nPos = -1; @@ -268,23 +275,33 @@ final public class RhodesApplication extends UiApplication implements RenderingA saveCurrentLocation(strUrl); } - void openLink(){ + private boolean m_bOpenLink = false; + boolean openLink(){ LOG.INFO("openLink"); - Menu menu = _mainScreen.getMenu(0); - int size = menu.getSize(); - for(int i=0; i<size; i++) - { - MenuItem item = menu.getItem(i); - String label = item.toString(); - if(label.equalsIgnoreCase("Get Link")) //TODO: catch by ID? - { - item.run(); - } - } + try{ + m_bOpenLink = true; + Menu menu = _mainScreen.getMenu(0); + int size = menu.getSize(); + for(int i=0; i<size; i++) + { + MenuItem item = menu.getItem(i); + String label = item.toString(); + if(label.equalsIgnoreCase("Get Link")) //TODO: catch by ID? + { + item.run(); + return true; + } + } + }finally + { + m_bOpenLink = false; + } // MenuItem item = _mainScreen.getSavedGetLinkItem(); // if ( item != null ) { // item.run(); // } + + return false; } public void showPopup(final String message) { @@ -352,7 +369,11 @@ final public class RhodesApplication extends UiApplication implements RenderingA //retrieve the file Class clazz = Class.forName("rhomobile.RhodesApplication"); file = RhoClassFactory.createFile(); - InputStream is = file.getResourceAsStream(clazz.getClass(), "/apps" + file_name); + String strClassName = file_name; + if ( !strClassName.startsWith("/apps") ) + strClassName = "/apps" + file_name; + + InputStream is = file.getResourceAsStream(clazz.getClass(), strClassName); //create an instance of the player from the InputStream Player player = javax.microedition.media.Manager.createPlayer(is,type); player.realize(); @@ -469,6 +490,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA } m_bActivated = true; + doStartupWork(); LOG.TRACE("Rhodes activate ***--------------------------***"); @@ -483,6 +505,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA public void deactivate() { LOG.TRACE("Rhodes deactivate ***--------------------------***"); + // SyncEngine.stop(null); GeoLocation.stop(); RingtoneManager.stop(); @@ -504,13 +527,19 @@ final public class RhodesApplication extends UiApplication implements RenderingA //LOG.INFO("Sync status: " + status); //if (_syncStatusPopup == null && error != 0) { // createStatusPopup(); - //} else - if (_syncStatusPopup != null) { - _syncStatusPopup.showStatus(status); - } + //} else + invokeLater( new Runnable() { + public void run() { + if (_syncStatusPopup != null) { + _syncStatusPopup.showStatus(_lastStatusMessage); + } + } + }); + } public void createStatusPopup() { + _lastStatusMessage = null; invokeLater( new Runnable() { public void run() { if (_syncStatusPopup == null) { @@ -537,9 +566,9 @@ final public class RhodesApplication extends UiApplication implements RenderingA public void showStatus(String status) { if (status == null) return; - synchronized (Application.getEventLock()) { + //synchronized (Application.getEventLock()) { _labelStatus.setText(status); - } + // } } protected boolean keyDown( int keycode, int status ) { @@ -564,9 +593,18 @@ final public class RhodesApplication extends UiApplication implements RenderingA } } - class CMainScreen extends MainScreen{ + class CMainScreen extends RhoMainScreen{ - private Vector menuItems = new Vector(); + protected boolean navigationClick(int status, int time) { + //LOG.INFO("navigationClick: " + status); + return super.navigationClick(status, time); + } + + protected void onTouchUnclick() { + openLink(); + } + + private Vector menuItems = new Vector(); private MenuItem homeItem = new MenuItem(RhodesApplication.LABEL_HOME, 200000, 10) { public void run() { @@ -615,11 +653,20 @@ final public class RhodesApplication extends UiApplication implements RenderingA private MenuItem savedGetLinkItem = null; - protected void makeMenu(Menu menu, int instance) { + protected void makeMenu(Menu menu, int instance) + { + if (m_bOpenLink) + { + super.makeMenu(menu, instance); + return; + } + + menu.deleteAll(); +/* // TODO: This is really a hack, we should replicate the "Get Link" functionality // Also, for some reason the menu size becomes 0 when there is 1 item left (page view) for(int i=0; i < menu.getSize(); i++) { - System.out.println("Getting menu item: " + i); + //System.out.println("Getting menu item: " + i); MenuItem item = menu.getItem(i); String label = item.toString(); // Save the get link menuitem @@ -643,7 +690,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA // item with index 0 cause exception - menu is actually empty! } if (pgview != null && pgview.getId() == 853) - menu.deleteItem(0); + menu.deleteItem(0);*/ // Don't draw menu if menuItems is null if (menuItems == null) @@ -670,6 +717,8 @@ final public class RhodesApplication extends UiApplication implements RenderingA contextMenu.addItem(item); } + //setDefaultItemToMenu(RhodesApplication.LABEL_SYNC, syncItem, contextMenu); + this.makeContextMenu(contextMenu); menu.add(contextMenu); } @@ -834,7 +883,24 @@ final public class RhodesApplication extends UiApplication implements RenderingA LOG.ERROR(exc.getMessage()); } + //PROF.createSqlCounters(); + RhoRuby.RhoRubyStart(""); + + /* + DBAdapter db = DBAdapter.getInstance(); + String sql = "select * from object_values"; + + //PROF.flushSqlCounters("First run"); + + for (int i = 0; i < 3; ++i) { + LOG.INFO("Doing select: " + i); + db.executeSQL(sql); + LOG.INFO("Done"); + //PROF.flushSqlCounters("SQL operation: " + i); + } + */ + SyncThread sync = SyncThread.Create( new RhoClassFactory() ); if (sync != null) { sync.setStatusListener(this); @@ -847,6 +913,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA PrimaryResourceFetchThread.Create(); + RhoRuby.RhoRubyInitApp(); LOG.INFO("RHODES STARTUP COMPLETED: ***----------------------------------*** " ); }catch(Exception exc) { @@ -955,11 +1022,15 @@ final public class RhodesApplication extends UiApplication implements RenderingA browserContent.finishLoading(); else { - synchronized (Application.getEventLock()) - //synchronized (getAppEventLock()) - { - browserContent.finishLoading(); - } + if ( URI.isLocalHost(connection.getURL()) ) + { + synchronized (Application.getEventLock()) + //synchronized (getAppEventLock()) + { + browserContent.finishLoading(); + } + }else + browserContent.finishLoading(); } } @@ -984,8 +1055,8 @@ final public class RhodesApplication extends UiApplication implements RenderingA UrlRequestedEvent urlRequestedEvent = (UrlRequestedEvent) event; String absoluteUrl = urlRequestedEvent.getURL(); - if ( !absoluteUrl.startsWith(_httpRoot) ) - absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5); + //if ( !absoluteUrl.startsWith(_httpRoot) ) + // absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5); if ( urlRequestedEvent.getPostData() == null || urlRequestedEvent.getPostData().length == 0 ) @@ -1002,7 +1073,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA } case Event.EVENT_BROWSER_CONTENT_CHANGED: { // browser field title might have changed update title - BrowserContentChangedEvent browserContentChangedEvent = (BrowserContentChangedEvent) event; + /*BrowserContentChangedEvent browserContentChangedEvent = (BrowserContentChangedEvent) event; if (browserContentChangedEvent.getSource() instanceof BrowserContent) { BrowserContent browserField = (BrowserContent) browserContentChangedEvent.getSource(); @@ -1014,7 +1085,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA _mainScreen.setTitle(newTitle); } } - } + }*/ break; @@ -1046,8 +1117,8 @@ final public class RhodesApplication extends UiApplication implements RenderingA // MSIE, Mozilla, and Opera all send the original // request's Referer as the Referer for the new // request. - if ( !absoluteUrl.startsWith(_httpRoot) ) - absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5); + //if ( !absoluteUrl.startsWith(_httpRoot) ) + // absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5); addToHistory(absoluteUrl,referrer); Object eventSource = e.getSource(); @@ -1135,18 +1206,24 @@ final public class RhodesApplication extends UiApplication implements RenderingA } // if referrer is null we must return the connection - //if (referrer == null) { - HttpConnection connection = Utilities.makeConnection(resource.getUrl(), resource.getRequestHeaders(), null); + if (referrer == null) { + HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null); return connection; - //} else { - - // if referrer is provided we can set up the connection on a separate thread - // SecondaryResourceFetchThread.enqueue(resource, referrer); - - //} + } else + { + if ( URI.isLocalHost(url) ) + { + HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null); + return connection; + }else + { + // if referrer is provided we can set up the connection on a separate thread + SecondaryResourceFetchThread.enqueue(resource, referrer); + } + } - //return null; + return null; } /** platform/bb/rhodes/src/rhomobile/RhodesApplication.java @@ -128,8 +128,11 @@ class SecondaryResourceFetchThread extends Thread { resource.setHttpConnection(connection); // signal to the browser field that resource is ready - if (_browserField != null) { - _browserField.resourceReady(resource); + if (_browserField != null) { + //synchronized (RhodesApplication.getEventLock()) + { + _browserField.resourceReady(resource); + } } } platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java @@ -27,8 +27,9 @@ public class Utilities { OutputStream out = null; try { - URI uri = new URI(url); - if ( "localhost".equals(uri.getHost())) { + if ( URI.isLocalHost(url) ) + { + URI uri = new URI(url); conn = new NativeBBHttpConnection( new RhoConnection(uri) ); } else { // conn = (HttpConnection) Connector.open(url); @@ -46,7 +47,7 @@ public class Utilities { // referring page was transferred with a secure // protocol. String referer = requestHeaders.getPropertyValue("referer"); - boolean sendReferrer = true; + boolean sendReferrer = false; if (referer != null && StringUtilities.startsWithIgnoreCase(referer, "https:") platform/bb/rhodes/src/rhomobile/Utilities.java @@ -1,5 +1,7 @@ package rhomobile; +import com.rho.RhoEmptyLogger; +import com.rho.RhoLogger; import com.xruby.runtime.builtin.ObjectFactory; import com.xruby.runtime.builtin.RubyArray; import com.xruby.runtime.builtin.RubyHash; @@ -10,8 +12,11 @@ import com.xruby.runtime.lang.RubyConstant; import com.xruby.runtime.lang.RubyNoArgMethod; import com.xruby.runtime.lang.RubyOneArgMethod; import com.xruby.runtime.lang.RubyValue; +import com.xruby.runtime.lang.RubyVarArgMethod; public class WebView extends RubyBasic { + private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : + new RhoLogger("WebView"); public WebView(RubyClass arg0) { super(arg0); @@ -45,6 +50,7 @@ public class WebView extends RubyBasic { String value = values.get(i).toString(); RhodesApplication.getInstance().addMenuItem(label, value); } + LOG.INFO("set_menu_items end"); return RubyConstant.QTRUE; } @@ -54,9 +60,9 @@ public class WebView extends RubyBasic { return WebView.refresh(); } }); - klass.getSingletonClass().defineMethod("navigate", new RubyOneArgMethod() { - protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) { - return WebView.navigate(arg0); + klass.getSingletonClass().defineMethod("navigate", new RubyVarArgMethod() { + protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){ + return WebView.navigate(args.get(0)); } }); klass.getSingletonClass().defineMethod("current_location", new RubyNoArgMethod() { @@ -69,6 +75,16 @@ public class WebView extends RubyBasic { return WebView.set_menu_items(arg0); } }); + klass.getSingletonClass().defineMethod("execute_js", new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) { + return RubyConstant.QNIL; + } + }); + klass.getSingletonClass().defineMethod("active_tab", new RubyNoArgMethod() { + protected RubyValue run(RubyValue receiver, RubyBlock block) { + return ObjectFactory.createInteger(0); + } + }); } } platform/bb/rhodes/src/rhomobile/WebView.java @@ -36,6 +36,7 @@ import com.rho.RhoClassFactory; import com.rho.RhoEmptyLogger; import com.rho.RhoLogger; +import com.rho.Version; public class CameraScreen extends MainScreen { @@ -251,11 +252,21 @@ public class CameraScreen extends MainScreen { LOG.TRACE("initializeCamera"); Player player = null; try { - // First of all, attempting to capture picture using MM API - - //Create a player for the Blackberry's camera. - player = Manager.createPlayer( "capture://video" ); - LOG.TRACE("Recording using MM API"); + Version.SoftVersion ver = Version.getSoftVersion(); + if ( ver.nMajor == 4 && ver.nMinor == 6 && ver.nMinor2 == 1) + { + //http://rim.lithium.com/rim/board/message?board.id=java_dev&view=by_date_ascending&message.id=21891 + //takeSnapShot does not work on BlackBerry handheld software version 4.6.1: + //The only work around is to invoke the camera application and listen for an image + //being saved (would occur when the user takes a picture). + }else + { + // First of all, attempting to capture picture using MM API + + //Create a player for the Blackberry's camera. + player = Manager.createPlayer( "capture://video" ); + LOG.TRACE("Recording using MM API"); + } } catch(Exception e) { // Try to capture picture using BB Camera application platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java @@ -136,6 +136,8 @@ public class DateTimeScreen extends MainScreen { headers.addProperty("Content-Type", "application/x-www-form-urlencoded"); String body = "status=cancel"; + if (_opaque != null) + body += "&opaque=" + _opaque; LOG.INFO("Callback with result: " + body); _dateTimeScreen.setFieldsEditable(false); platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java @@ -7,19 +7,21 @@ // #import <Foundation/Foundation.h> +#import "WebViewController.h" @interface BarItem : NSObject { @private - BOOL loaded; + BOOL loaded,reload; NSString* label,*location,*icon; - UIViewController* viewController; + WebViewController* viewController; } @property(nonatomic,assign) BOOL loaded; +@property(nonatomic,assign) BOOL reload; @property(nonatomic,retain) NSString* label; @property(nonatomic,retain) NSString* location; @property(nonatomic,retain) NSString* icon; -@property(nonatomic,retain) UIViewController* viewController; +@property(nonatomic,retain) WebViewController* viewController; @end platform/iphone/Classes/BarItem.h @@ -11,11 +11,12 @@ @implementation BarItem -@synthesize loaded, label, location, icon, viewController; +@synthesize loaded, reload, label, location, icon, viewController; - (id) init { if ( self = [super init] ) { self.loaded = NO; + self.reload = NO; } return self; } platform/iphone/Classes/BarItem.m @@ -1,69 +1,69 @@ -// -// PickImageDelegate.m -// rhorunner -// -// Created by Vlad on 2/12/09. -// Copyright 2009 __MyCompanyName__. All rights reserved. -// - -#import "PickImageDelegate.h" -#import "AppManager.h" - -@implementation PickImageDelegate - -- (void)useImage:(UIImage*)theImage { - NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/public/db-files"]; - - NSFileManager *fileManager = [NSFileManager defaultManager]; - if (![fileManager fileExistsAtPath:folder]) { - [fileManager createDirectoryAtPath:folder attributes:nil]; - } - - NSString *now = [[[NSDate date] descriptionWithLocale:nil] - stringByReplacingOccurrencesOfString: @":" withString: @"."]; - now = [now stringByReplacingOccurrencesOfString: @" " withString: @"_"]; - now = [now stringByReplacingOccurrencesOfString: @"+" withString: @"_"]; - NSString *filename = [NSString stringWithFormat:@"Image_%@.png", now]; - NSString *fullname = [folder stringByAppendingPathComponent:filename]; - NSData *pngImage = UIImagePNGRepresentation(theImage); - - NSString* message; - if([pngImage writeToFile:fullname atomically:YES]) { - // Send new image uri to the view - message = [@"status=ok&image_uri=%2Fpublic%2Fdb-files%2F" stringByAppendingString:filename]; - } else { - // Notify view about error - message = @"status=error&message=Can't write image to the storage."; - } - [self doCallback:message]; -} - -- (void)imagePickerController:(UIImagePickerController *)picker - didFinishPickingImage:(UIImage *)image - editingInfo:(NSDictionary *)editingInfo -{ - //If image editing is enabled and the user successfully picks an image, the image parameter of the - //imagePickerController:didFinishPicking Image:editingInfo:method contains the edited image. - //You should treat this image as the selected image, but if you want to store the original image, you can get - //it (along with the crop rectangle) from the dictionary in the editingInfo parameter. - [self useImage:image]; - // Remove the picker interface and release the picker object. - //[[picker parentViewController] dismissModalViewControllerAnimated:YES]; - [picker dismissModalViewControllerAnimated:YES]; - picker.view.hidden = YES; - //[picker release]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker -{ - // Notify view about cancel - NSString* message = @"status=cancel&message=User canceled operation."; - [self doCallback:message]; - - // Remove the picker interface and release the picker object. - [picker dismissModalViewControllerAnimated:YES]; - picker.view.hidden = YES; - //[picker release]; -} - -@end +// +// PickImageDelegate.m +// rhorunner +// +// Created by Vlad on 2/12/09. +// Copyright 2009 __MyCompanyName__. All rights reserved. +// + +#import "PickImageDelegate.h" +#import "AppManager.h" + +@implementation PickImageDelegate + +- (void)useImage:(UIImage*)theImage { + NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/public/db-files"]; + + NSFileManager *fileManager = [NSFileManager defaultManager]; + if (![fileManager fileExistsAtPath:folder]) { + [fileManager createDirectoryAtPath:folder attributes:nil]; + } + + NSString *now = [[[NSDate date] descriptionWithLocale:nil] + stringByReplacingOccurrencesOfString: @":" withString: @"."]; + now = [now stringByReplacingOccurrencesOfString: @" " withString: @"_"]; + now = [now stringByReplacingOccurrencesOfString: @"+" withString: @"_"]; + NSString *filename = [NSString stringWithFormat:@"Image_%@.png", now]; + NSString *fullname = [folder stringByAppendingPathComponent:filename]; + NSData *pngImage = UIImagePNGRepresentation(theImage); + + NSString* message; + if([pngImage writeToFile:fullname atomically:YES]) { + // Send new image uri to the view + message = [@"status=ok&image_uri=%2Fpublic%2Fdb-files%2F" stringByAppendingString:filename]; + } else { + // Notify view about error + message = @"status=error&message=Can't write image to the storage."; + } + [self doCallback:message]; +} + +- (void)imagePickerController:(UIImagePickerController *)picker + didFinishPickingImage:(UIImage *)image + editingInfo:(NSDictionary *)editingInfo +{ + //If image editing is enabled and the user successfully picks an image, the image parameter of the + //imagePickerController:didFinishPicking Image:editingInfo:method contains the edited image. + //You should treat this image as the selected image, but if you want to store the original image, you can get + //it (along with the crop rectangle) from the dictionary in the editingInfo parameter. + [self useImage:image]; + // Remove the picker interface and release the picker object. + //[[picker parentViewController] dismissModalViewControllerAnimated:YES]; + [picker dismissModalViewControllerAnimated:YES]; + picker.view.hidden = YES; + //[picker release]; +} + +- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker +{ + // Notify view about cancel + NSString* message = @"status=cancel&message=User canceled operation."; + [self doCallback:message]; + + // Remove the picker interface and release the picker object. + [picker dismissModalViewControllerAnimated:YES]; + picker.view.hidden = YES; + //[picker release]; +} + +@end platform/iphone/Classes/Camera/PickImageDelegate.m @@ -1,16 +1,16 @@ -// -// DateTime.m -// rhorunner -// -// Created by lars on 8/12/09. -// Copyright 2009 Home. All rights reserved. -// - -#import "DateTime.h" - - -@implementation DateTime - -@synthesize url, title, initialTime, format, data; - -@end +// +// DateTime.m +// rhorunner +// +// Created by lars on 8/12/09. +// Copyright 2009 Home. All rights reserved. +// + +#import "DateTime.h" + + +@implementation DateTime + +@synthesize url, title, initialTime, format, data; + +@end platform/iphone/Classes/DateTime.m @@ -102,6 +102,10 @@ break; } + if (self.dateTime.initialTime) { + self.pickerView.date = [NSDate dateWithTimeIntervalSince1970:self.dateTime.initialTime]; + } + // Add toolbar to view CGRect mainViewBounds = self.pickerView.bounds; [self createPickerBar:mainViewBounds]; platform/iphone/Classes/DateTimePickerDelegate.m @@ -23,6 +23,8 @@ #undef DEFAULT_LOGCATEGORY #define DEFAULT_LOGCATEGORY "Dispatcher" +extern void _rho_map_location(char* query); + char *trim(char *str) { char *ibuf = str, *obuf = str; @@ -192,6 +194,14 @@ int _ExecuteApp(HttpContextRef context, RouteRef route) { } else { return HTTPRedirect(context, "/app/"); } + } else if (route->_model && !strcmp(route->_model,"map")) { + char* query = ""; + if (context->_request->_query) { + RAWLOG_INFO1("Map %s", context->_request->_query); + query = context->_request->_query; + } + _rho_map_location(query); + return HTTPSendReply(context,""); } } } else if (route->_application && !strcmp(route->_application,"shared")) { platform/iphone/Classes/Dispatcher/Dispatcher.c @@ -12,6 +12,7 @@ #include "phonebook.h" static int _getProperty(char* property); +static CFStringRef getAddressPartValue(ABRecordRef record, const char* property) ; void* openPhonebook() { @@ -56,6 +57,8 @@ static void _getAllPeople(LocalPhonebook* phonebook) { } } + + static void _addPropertyToHash(VALUE hash, const char* key, CFStringRef property) { if (property) { char buf[256]; @@ -65,6 +68,18 @@ static void _addPropertyToHash(VALUE hash, const char* key, CFStringRef property } } +static void _addDatePropertyToHash(VALUE hash, const char* key, NSDate* date) { + if (date) { + NSDateFormatter *df = [[NSDateFormatter alloc] init]; + [df setDateFormat:@"yyyy-MM-dd"]; + NSString* dt = [df stringFromDate:date]; + [dt retain]; + _addPropertyToHash(hash, key, (CFStringRef)dt); + [date release]; + [df release]; + } +} + static void _addPhonesToHash(VALUE hash,ABRecordRef ref) { ABMultiValueRef phones = ABRecordCopyValue(ref,kABPersonPhoneProperty); if (phones) { @@ -76,11 +91,26 @@ static void _addPhonesToHash(VALUE hash,ABRecordRef ref) { ABMultiValueCopyValueAtIndex(phones,n)); } else if(CFStringCompare(label,kABHomeLabel,0)==kCFCompareEqualTo) { _addPropertyToHash(hash,RUBY_PB_HOME_NUMBER, - ABMultiValueCopyValueAtIndex(phones,n)); + ABMultiValueCopyValueAtIndex(phones,n)); } else if(CFStringCompare(label,kABPersonPhoneMobileLabel,0)==kCFCompareEqualTo) { _addPropertyToHash(hash,RUBY_PB_MOBILE_NUMBER, - ABMultiValueCopyValueAtIndex(phones,n)); - } + ABMultiValueCopyValueAtIndex(phones,n)); + } else if(CFStringCompare(label,kABPersonPhoneMainLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_MAIN_MUMBER, + ABMultiValueCopyValueAtIndex(phones,n)); + } else if(CFStringCompare(label,kABPersonPhonePagerLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_PAGER_NUMBER, + ABMultiValueCopyValueAtIndex(phones,n)); + } else if(CFStringCompare(label,kABPersonPhoneHomeFAXLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_HOME_FAX, + ABMultiValueCopyValueAtIndex(phones,n)); + } else if(CFStringCompare(label,kABPersonPhoneWorkFAXLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_WORK_FAX, + ABMultiValueCopyValueAtIndex(phones,n)); + } else if(CFStringCompare(label,(CFStringRef)@"assistant_number",0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_ASSISTANT_NUMBER, + ABMultiValueCopyValueAtIndex(phones,n)); + } CFRelease(label); } CFRelease(phones); @@ -96,6 +126,12 @@ static void _addEmailToHash(VALUE hash,ABRecordRef ref) { if(CFStringCompare(label,kABWorkLabel,0)==kCFCompareEqualTo) { _addPropertyToHash(hash,RUBY_PB_EMAIL_ADDRESS, ABMultiValueCopyValueAtIndex(emails,n)); + } else if(CFStringCompare(label,kABHomeLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_HOME_EMAIL_ADDRESS, + ABMultiValueCopyValueAtIndex(emails,n)); + } else if(CFStringCompare(label,kABOtherLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_OTHER_EMAIL_ADDRESS, + ABMultiValueCopyValueAtIndex(emails,n)); } CFRelease(label); } @@ -103,6 +139,63 @@ static void _addEmailToHash(VALUE hash,ABRecordRef ref) { } } +static void _addUrlToHash(VALUE hash,ABRecordRef ref) { + ABMultiValueRef urls = ABRecordCopyValue(ref,kABPersonURLProperty); + if (urls) { + int num_urls = ABMultiValueGetCount(urls); + for (int n = 0; n < num_urls; n++) { + CFStringRef label = ABMultiValueCopyLabelAtIndex(urls,n); + if(CFStringCompare(label,kABPersonHomePageLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_HOME_PAGE, + ABMultiValueCopyValueAtIndex(urls,n)); + } + CFRelease(label); + } + CFRelease(urls); + } +} + +static void _addRelatedNamesToHash(VALUE hash,ABRecordRef ref) { + ABMultiValueRef names = ABRecordCopyValue(ref,kABPersonRelatedNamesProperty); + if (names) { + int num_names = ABMultiValueGetCount(names); + for (int n = 0; n < num_names; n++) { + CFStringRef label = ABMultiValueCopyLabelAtIndex(names,n); + if(CFStringCompare(label,kABPersonSpouseLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_SPOUSE_NAME, + ABMultiValueCopyValueAtIndex(names,n)); + } else if(CFStringCompare(label,kABPersonAssistantLabel,0)==kCFCompareEqualTo) { + _addPropertyToHash(hash,RUBY_PB_ASSISTANT_NAME, + ABMultiValueCopyValueAtIndex(names,n)); + } + CFRelease(label); + } + CFRelease(names); + } +} + +static void _addDatesToHash(VALUE hash,ABRecordRef ref) { + ABMultiValueRef dates = ABRecordCopyValue(ref,kABPersonDateProperty); + if (dates) { + int num_dates = ABMultiValueGetCount(dates); + for (int n = 0; n < num_dates; n++) { + CFStringRef label = ABMultiValueCopyLabelAtIndex(dates,n); + if(CFStringCompare(label,kABPersonAnniversaryLabel,0)==kCFCompareEqualTo) { + _addDatePropertyToHash(hash,RUBY_PB_ANNIVERSARY, + (NSDate*)ABMultiValueCopyValueAtIndex(dates,n)); + } else if(CFStringCompare(label,(CFStringRef)@"created",0)==kCFCompareEqualTo) { + _addDatePropertyToHash(hash,RUBY_PB_CREATED, + (NSDate*)ABMultiValueCopyValueAtIndex(dates,n)); + } else if(CFStringCompare(label,(CFStringRef)@"updated",0)==kCFCompareEqualTo) { + _addDatePropertyToHash(hash,RUBY_PB_UPDATED, + (NSDate*)ABMultiValueCopyValueAtIndex(dates,n)); + } + CFRelease(label); + } + CFRelease(dates); + } +} + static VALUE _getRecord(ABRecordRef ref, ABRecordID* precordId) { char buf[256]; @@ -116,19 +209,97 @@ static VALUE _getRecord(ABRecordRef ref, ABRecordID* precordId) { snprintf(buf, sizeof(buf), "{%d}", recordId); addStrToHash(hash, RUBY_PB_ID, buf, strlen(buf)); + _addPropertyToHash(hash, RUBY_PB_PREFIX, + ABRecordCopyValue(ref, kABPersonPrefixProperty)); + _addPropertyToHash(hash, RUBY_PB_FIRST_NAME, - ABRecordCopyValue(ref, kABPersonFirstNameProperty)); + ABRecordCopyValue(ref, kABPersonFirstNameProperty)); + + _addPropertyToHash(hash, RUBY_PB_MIDDLE_NAME, + ABRecordCopyValue(ref, kABPersonMiddleNameProperty)); _addPropertyToHash(hash, RUBY_PB_LAST_NAME, ABRecordCopyValue(ref, kABPersonLastNameProperty)); + _addPropertyToHash(hash, RUBY_PB_SUFFIX, + ABRecordCopyValue(ref, kABPersonSuffixProperty)); + + _addPropertyToHash(hash, RUBY_PB_NICKNAME, + ABRecordCopyValue(ref, kABPersonNicknameProperty)); + + _addPropertyToHash(hash, RUBY_PB_NOTE, + ABRecordCopyValue(ref, kABPersonNoteProperty)); + _addPropertyToHash(hash, RUBY_PB_COMPANY_NAME, ABRecordCopyValue(ref, kABPersonOrganizationProperty)); + _addPropertyToHash(hash, RUBY_PB_JOB_TITLE, + ABRecordCopyValue(ref, kABPersonJobTitleProperty)); + + NSDate* birthdate = (NSDate *)ABRecordCopyValue(ref, kABPersonBirthdayProperty); + NSDateFormatter *df = [[NSDateFormatter alloc] init]; + [df setDateFormat:@"yyyy-MM-dd"]; + NSString* bd = [df stringFromDate:birthdate]; + [bd retain]; + _addPropertyToHash(hash, RUBY_PB_BIRTHDAY, (CFStringRef)bd); + [birthdate release]; + [df release]; + + _addPropertyToHash(hash, RUBY_PB_STREET_ADDRESS_1, + getAddressPartValue(ref,RUBY_PB_STREET_ADDRESS_1)); + + _addPropertyToHash(hash, RUBY_PB_CITY_1, + getAddressPartValue(ref,RUBY_PB_CITY_1)); + + _addPropertyToHash(hash, RUBY_PB_STATE_1, + getAddressPartValue(ref,RUBY_PB_STATE_1)); + + _addPropertyToHash(hash, RUBY_PB_ZIP_1, + getAddressPartValue(ref,RUBY_PB_ZIP_1)); + + _addPropertyToHash(hash, RUBY_PB_COUNTRY_1, + getAddressPartValue(ref,RUBY_PB_COUNTRY_1)); + + _addPropertyToHash(hash, RUBY_PB_STREET_ADDRESS_2, + getAddressPartValue(ref,RUBY_PB_STREET_ADDRESS_2)); + + _addPropertyToHash(hash, RUBY_PB_CITY_2, + getAddressPartValue(ref,RUBY_PB_CITY_2)); + + _addPropertyToHash(hash, RUBY_PB_STATE_2, + getAddressPartValue(ref,RUBY_PB_STATE_2)); + + _addPropertyToHash(hash, RUBY_PB_ZIP_2, + getAddressPartValue(ref,RUBY_PB_ZIP_2)); + + _addPropertyToHash(hash, RUBY_PB_COUNTRY_2, + getAddressPartValue(ref,RUBY_PB_COUNTRY_2)); + + _addPropertyToHash(hash, RUBY_PB_STREET_ADDRESS_3, + getAddressPartValue(ref,RUBY_PB_STREET_ADDRESS_3)); + + _addPropertyToHash(hash, RUBY_PB_CITY_3, + getAddressPartValue(ref,RUBY_PB_CITY_3)); + + _addPropertyToHash(hash, RUBY_PB_STATE_3, + getAddressPartValue(ref,RUBY_PB_STATE_3)); + + _addPropertyToHash(hash, RUBY_PB_ZIP_3, + getAddressPartValue(ref,RUBY_PB_ZIP_3)); + + _addPropertyToHash(hash, RUBY_PB_COUNTRY_3, + getAddressPartValue(ref,RUBY_PB_COUNTRY_3)); + _addPhonesToHash(hash,ref); _addEmailToHash(hash,ref); + _addUrlToHash(hash,ref); + + _addRelatedNamesToHash(hash, ref); + + _addDatesToHash(hash, ref); + return hash; } @@ -220,8 +391,18 @@ static CFStringRef _getPhoneLabel(const char* property) { return kABWorkLabel; } else if (strcmp(RUBY_PB_HOME_NUMBER, property)==0) { return kABHomeLabel; - } if (strcmp(RUBY_PB_MOBILE_NUMBER, property)==0) { + } else if (strcmp(RUBY_PB_MOBILE_NUMBER, property)==0) { return kABPersonPhoneMobileLabel; + } else if (strcmp(RUBY_PB_MAIN_MUMBER, property)==0) { + return kABPersonPhoneMainLabel; + } else if (strcmp(RUBY_PB_PAGER_NUMBER, property)==0) { + return kABPersonPhonePagerLabel; + } else if (strcmp(RUBY_PB_HOME_FAX, property)==0) { + return kABPersonPhoneHomeFAXLabel; + } else if (strcmp(RUBY_PB_WORK_FAX, property)==0) { + return kABPersonPhoneWorkFAXLabel; + } else if (strcmp(RUBY_PB_ASSISTANT_NUMBER, property)==0) { + return (CFStringRef)@"assistant_number"; } return NULL; } @@ -229,10 +410,42 @@ static CFStringRef _getPhoneLabel(const char* property) { static CFStringRef _getEmailLabel(const char* property) { if (strcmp(RUBY_PB_EMAIL_ADDRESS,property)==0) { return kABWorkLabel; + } else if (strcmp(RUBY_PB_HOME_EMAIL_ADDRESS,property)==0) { + return kABHomeLabel; + } else if (strcmp(RUBY_PB_OTHER_EMAIL_ADDRESS,property)==0) { + return kABOtherLabel; + } + return NULL; +} + +static CFStringRef _getUrlLabel(const char* property) { + if (strcmp(RUBY_PB_HOME_PAGE,property)==0) { + return kABPersonHomePageLabel; + } + return NULL; +} + +static CFStringRef _getRelatedNamesLabel(const char* property) { + if (strcmp(RUBY_PB_SPOUSE_NAME,property)==0) { + return kABPersonSpouseLabel; + } else if (strcmp(RUBY_PB_ASSISTANT_NAME,property)==0) { + return kABPersonAssistantLabel; + } + return NULL; +} + +static CFStringRef _getDatesLabel(const char* property) { + if (strcmp(RUBY_PB_ANNIVERSARY,property)==0) { + return kABPersonAnniversaryLabel; + } else if (strcmp(RUBY_PB_CREATED,property)==0) { + return (CFStringRef)@"created"; + } else if (strcmp(RUBY_PB_UPDATED,property)==0) { + return (CFStringRef)@"updated"; } return NULL; } + static boolean_t _replaceProperty(ABMutableMultiValueRef mv, CFStringRef label, CFStringRef value, int index) { CFStringRef lbl = ABMultiValueCopyLabelAtIndex(mv,index); boolean_t found = CFStringCompare(lbl,label,0)==kCFCompareEqualTo; @@ -243,37 +456,193 @@ static boolean_t _replaceProperty(ABMutableMultiValueRef mv, CFStringRef label, return found; } -static void _updateMultiValueProperty(ABRecordRef record, ABPropertyID propId, CFStringRef label, const char* value) { - CFStringRef v = CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding()); +static void __updateMultiValueProperty(ABRecordRef record, ABPropertyID propId, CFStringRef label, CFTypeRef v) { + if (!v) return; ABMutableMultiValueRef mv = ABRecordCopyValue(record,propId); if (!mv) { mv = ABMultiValueCreateMutable(kABMultiStringPropertyType); ABMultiValueAddValueAndLabel(mv,v,label,nil); } else { + ABMutableMultiValueRef lmv = ABMultiValueCreateMutableCopy(mv); boolean_t replaced = FALSE; - int num_phones = ABMultiValueGetCount(mv); + int num_phones = ABMultiValueGetCount(lmv); for (int n = 0; n < num_phones; n++) { - replaced = _replaceProperty(mv,label,v,n); + replaced = _replaceProperty(lmv,label,v,n); if (replaced) break; } if (!replaced) { - ABMultiValueAddValueAndLabel(mv,v,label,nil); + ABMultiValueAddValueAndLabel(lmv,v,label,nil); } + CFRelease(mv); + mv = lmv; } ABRecordSetValue(record, propId, mv, nil); CFRelease(mv); CFRelease(v); } +static void _updateMultiValueProperty(ABRecordRef record, ABPropertyID propId, CFStringRef label, const char* value) { + CFStringRef v = CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding()); + __updateMultiValueProperty(record, propId, label, v); +} + +bool getAddressLabelAndKey(const char* property, CFStringRef* label, CFStringRef* key) { + if (strcmp(property,RUBY_PB_STREET_ADDRESS_1)==0) { + *label = kABWorkLabel; + *key = kABPersonAddressStreetKey; + } else if (strcmp(property,RUBY_PB_CITY_1)==0) { + *label = kABWorkLabel; + *key = kABPersonAddressCityKey; + } else if (strcmp(property,RUBY_PB_STATE_1)==0) { + *label = kABWorkLabel; + *key = kABPersonAddressStateKey; + } else if (strcmp(property,RUBY_PB_ZIP_1)==0) { + *label = kABWorkLabel; + *key = kABPersonAddressZIPKey; + } else if (strcmp(property,RUBY_PB_COUNTRY_1)==0) { + *label = kABWorkLabel; + *key = kABPersonAddressCountryKey; + } else if (strcmp(property,RUBY_PB_STREET_ADDRESS_2)==0) { + *label = kABHomeLabel; + *key = kABPersonAddressStreetKey; + } else if (strcmp(property,RUBY_PB_CITY_2)==0) { + *label = kABHomeLabel; + *key = kABPersonAddressCityKey; + } else if (strcmp(property,RUBY_PB_STATE_2)==0) { + *label = kABHomeLabel; + *key = kABPersonAddressStateKey; + } else if (strcmp(property,RUBY_PB_ZIP_2)==0) { + *label = kABHomeLabel; + *key = kABPersonAddressZIPKey; + } else if (strcmp(property,RUBY_PB_COUNTRY_2)==0) { + *label = kABHomeLabel; + *key = kABPersonAddressCountryKey; + } else if (strcmp(property,RUBY_PB_STREET_ADDRESS_3)==0) { + *label = kABOtherLabel; + *key = kABPersonAddressStreetKey; + } else if (strcmp(property,RUBY_PB_CITY_3)==0) { + *label = kABOtherLabel; + *key = kABPersonAddressCityKey; + } else if (strcmp(property,RUBY_PB_STATE_3)==0) { + *label = kABOtherLabel; + *key = kABPersonAddressStateKey; + } else if (strcmp(property,RUBY_PB_ZIP_3)==0) { + *label = kABOtherLabel; + *key = kABPersonAddressZIPKey; + } else if (strcmp(property,RUBY_PB_COUNTRY_3)==0) { + *label = kABOtherLabel; + *key = kABPersonAddressCountryKey; + } else { + return false; + } + return true; +} + +CFStringRef getAddressPartValue(ABRecordRef record, const char* property) { + CFStringRef label; + CFStringRef key; + CFStringRef v = nil; + + if ( getAddressLabelAndKey(property, &label, &key) ) { + ABMutableMultiValueRef mv = ABRecordCopyValue(record,kABPersonAddressProperty); + if (mv) { + int addresses = ABMultiValueGetCount(mv); + for (int n = 0; n < addresses; n++) { + CFStringRef lbl = ABMultiValueCopyLabelAtIndex(mv,n); + if (CFStringCompare(lbl,label,0)==kCFCompareEqualTo) { + NSMutableDictionary *addressDictionary = + (NSMutableDictionary *)ABMultiValueCopyValueAtIndex(mv,n); + if (addressDictionary) { + v = (CFStringRef)[addressDictionary objectForKey:(NSString*)key]; + //[addressDictionary release]; + CFRelease(lbl); + break; + } + } + CFRelease(lbl); + } + CFRelease(mv); + } + } + return v; +} + +bool setAddressValue(void* record, const char* property, const char* value) { + CFStringRef label; + CFStringRef key; + + if ( !getAddressLabelAndKey(property, &label, &key) ) { + return false; + } + + CFStringRef v = CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding()); + ABMutableMultiValueRef mv = ABRecordCopyValue(record,kABPersonAddressProperty); + if (!mv) { + mv = ABMultiValueCreateMutable(kABMultiDictionaryPropertyType); + } else { + ABMutableMultiValueRef lmv = ABMultiValueCreateMutableCopy(mv); + CFRelease(mv); + mv = lmv; + } + + int addresses = ABMultiValueGetCount(mv); + int index = -1; + for (int n = 0; n < addresses; n++) { + CFStringRef lbl = ABMultiValueCopyLabelAtIndex(mv,n); + if (CFStringCompare(lbl,label,0)==kCFCompareEqualTo) { + index = n; + break; + } + } + + NSMutableDictionary *addressDictionary; + + if (index>=0) { + addressDictionary = (NSMutableDictionary *)ABMultiValueCopyValueAtIndex(mv,index); + } else { + addressDictionary = [[NSMutableDictionary alloc] init]; + } + + [addressDictionary setObject:(NSString *)v forKey:(NSString *)key]; + + if (index>=0) { + ABMultiValueReplaceValueAtIndex(mv, addressDictionary, index); + } else { + ABMultiValueAddValueAndLabel(mv, addressDictionary, label, NULL); + } + + ABRecordSetValue(record, kABPersonAddressProperty, mv, nil); + + //[addressDictionary release]; + CFRelease(mv); + CFRelease(v); + return true; +} + +NSDate* string2date(CFStringRef v) { + NSDateFormatter *df = [[NSDateFormatter alloc] init]; + [df setDateFormat:@"yyyy-MM-dd"]; + NSDate *date = [df dateFromString: (NSString*)v]; + [date retain]; + [df release]; + return date; +} + int setRecordValue(void* record, char* property, char* value) { - if (record) { + if (record && (value!=NULL) && strlen(value)) { int prop = _getProperty(property); if (prop >= 0) { CFStringRef v = CFStringCreateWithCString(NULL, value, - CFStringGetSystemEncoding()); - ABRecordSetValue(record, prop, v, nil); + CFStringGetSystemEncoding()); + if (prop == kABPersonBirthdayProperty) { + NSDate *birthdate = string2date(v); + ABRecordSetValue(record, prop, birthdate, nil); + [birthdate release]; + } else { + ABRecordSetValue(record, prop, v, nil); + } CFRelease(v); - } else { + } else if ( !setAddressValue(record,property,value) ) { CFStringRef label = _getPhoneLabel(property); if (label) { _updateMultiValueProperty(record,kABPersonPhoneProperty,label,value); @@ -281,6 +650,24 @@ int setRecordValue(void* record, char* property, char* value) { label = _getEmailLabel(property); if (label) { _updateMultiValueProperty(record,kABPersonEmailProperty,label,value); + } else { + label = _getUrlLabel(property); + if (label) { + _updateMultiValueProperty(record,kABPersonURLProperty,label,value); + } else { + label = _getRelatedNamesLabel(property); + if (label) { + _updateMultiValueProperty(record,kABPersonRelatedNamesProperty,label,value); + } else { + label = _getDatesLabel(property); + if (label) { + CFStringRef v = CFStringCreateWithCString(NULL, value, + CFStringGetSystemEncoding()); + NSDate *date = string2date(v); + __updateMultiValueProperty(record,kABPersonDateProperty,label,date); + } + } + } } } } @@ -317,14 +704,21 @@ int deleteRecord(void* pb, void* record) { //================================================================================== -enum {pbUnknown=0,pbFirstName,pbLastName,pbCompanyName}; +enum {pbUnknown=0,pbPrefix,pbFirstName,pbMiddleName,pbLastName,pbSuffix,pbNickname,pbNote,pbCompanyName,pbJobTitle,pbBirthday}; static const struct { const char* _name; const int _value; } pbp[] = { +{ RUBY_PB_PREFIX, pbPrefix }, { RUBY_PB_FIRST_NAME, pbFirstName }, +{ RUBY_PB_MIDDLE_NAME, pbMiddleName }, { RUBY_PB_LAST_NAME, pbLastName }, +{ RUBY_PB_SUFFIX, pbSuffix }, +{ RUBY_PB_NICKNAME, pbNickname }, +{ RUBY_PB_NOTE, pbNote }, { RUBY_PB_COMPANY_NAME, pbCompanyName }, +{ RUBY_PB_JOB_TITLE, pbJobTitle }, +{ RUBY_PB_BIRTHDAY, pbBirthday }, { NULL, 0 } }; @@ -337,12 +731,26 @@ static int _getProperty(char* property) { } } switch(prop) { + case pbPrefix: + return kABPersonPrefixProperty; case pbFirstName: return kABPersonFirstNameProperty; + case pbMiddleName: + return kABPersonMiddleNameProperty; case pbLastName: return kABPersonLastNameProperty; + case pbSuffix: + return kABPersonSuffixProperty; + case pbNickname: + return kABPersonNicknameProperty; + case pbNote: + return kABPersonNoteProperty; case pbCompanyName: return kABPersonOrganizationProperty; + case pbJobTitle: + return kABPersonJobTitleProperty; + case pbBirthday: + return kABPersonBirthdayProperty; } return -1; } platform/iphone/Classes/Phonebook/phonebook.m @@ -1,19 +1,19 @@ -// -// RhoDelegate.h -// rhorunner -// -// Created by lars on 8/11/09. -// Copyright 2009 Home. All rights reserved. -// - -#import <Foundation/Foundation.h> - -@interface RhoDelegate : NSObject { - NSString* postUrl; -} - -@property (readwrite, copy) NSString *postUrl; - -- (void)doCallback:(NSString*)message; - +// +// RhoDelegate.h +// rhorunner +// +// Created by lars on 8/11/09. +// Copyright 2009 Home. All rights reserved. +// + +#import <Foundation/Foundation.h> + +@interface RhoDelegate : NSObject { + NSString* postUrl; +} + +@property (readwrite, copy) NSString *postUrl; + +- (void)doCallback:(NSString*)message; + @end \ No newline at end of file platform/iphone/Classes/RhoDelegate.h @@ -18,7 +18,11 @@ #import "DateTime.h" #import "NativeBar.h" #import "BarItem.h" +#import "WebViewUrl.h" #import "RhoDelegate.h" +#ifdef __IPHONE_3_0 +#import "MapViewController.h" +#endif #undef DEFAULT_LOGCATEGORY #define DEFAULT_LOGCATEGORY "RhoRunnerAppDelegate" @@ -38,6 +42,15 @@ return location; } +- (void)loadStartPath:(NSString*)location { + if (nativeBar.barType == TOOLBAR_TYPE || nativeBar.barType == NOBAR_TYPE) { + [webViewController navigateRedirect:location]; + } else { + // Load tab #0 on app load + [tabBarDelegate loadTabBarItemFirstPage:(BarItem*)[tabBarDelegate.barItems objectAtIndex:0]]; + } +} + - (void)onServerStarted:(NSString*)data { RAWLOG_INFO("Server Started notification is recived"); NSString* location = NULL; @@ -57,25 +70,25 @@ location = [self normalizeUrl:(NSString*)data]; } - // only navigate main webViewController if there is no tabbar - if (self.nativeBar.barType == TOOLBAR_TYPE || self.nativeBar.barType == NOBAR_TYPE) { - [webViewController navigateRedirect:location]; - } else { - // Load tab #0 on app load - [tabBarDelegate loadTabBarItemFirstPage:(BarItem*)[tabBarDelegate.barItems objectAtIndex:0]]; - } appStarted = true; + [self loadStartPath:location]; } - (void)onRefreshView { [webViewController refresh]; } -- (void)onNavigateTo:(NSString *)url { - [webViewController navigateRedirect:url]; +- (void)onNavigateTo:(WebViewUrl*) wvUrl { + if (self.nativeBar.barType == TABBAR_TYPE) { + BarItem* bItem = (BarItem*)[tabBarDelegate.barItems objectAtIndex:wvUrl.webViewIndex]; + WebViewController* wvController = (WebViewController*)[bItem viewController]; + [wvController navigateRedirect:wvUrl.url]; + } else { + [webViewController navigateRedirect:wvUrl.url]; + } } -- (void)onExecuteJs:(NSString *)js { +- (void)onExecuteJs:(JSString *)js { [webViewController executeJs:js]; } @@ -83,6 +96,17 @@ [webViewController setViewHomeUrl:url]; } +#ifdef __IPHONE_3_0 +-(void) onCreateMap:(NSMutableArray*)items { + MapViewController* map = [[MapViewController alloc] init]; + [map setParams:[items objectAtIndex:0]]; + [map setAnnotations:[items objectAtIndex:1]]; + map.actionTarget = self; + map.onNavigate = @selector(onNavigateTo:); + [window addSubview:map.view]; +} +#endif + -(BOOL)startCameraPickerFromViewController:(UIViewController*)controller usingDelegate:(id<UINavigationControllerDelegate, UIImagePickerControllerDelegate>)delegateObject sourceType:(UIImagePickerControllerSourceType)type @@ -160,14 +184,22 @@ } - (void)onCreateNativeBar:(NativeBar*)bar { + // retain the nativebar so it doesn't get deleted + [bar retain]; self.nativeBar = bar; - if (nativeBar.barType == TABBAR_TYPE) { + if (self.nativeBar.barType == TABBAR_TYPE) { tabBarDelegate.tabBar = self.nativeBar; [self startNativeBarFromViewController:webViewController usingDelegate:tabBarDelegate]; - } else if(nativeBar.barType == TOOLBAR_TYPE) { + } else if(self.nativeBar.barType == TOOLBAR_TYPE) { webViewController.toolbar.hidden = NO; - } else if(nativeBar.barType == NOBAR_TYPE) { + [window sendSubviewToBack:webViewController.webView]; + [window bringSubviewToFront:webViewController.toolbar]; + [webViewController.webView sizeToFit]; + } else if(self.nativeBar.barType == NOBAR_TYPE) { webViewController.toolbar.hidden = YES; + [window sendSubviewToBack:webViewController.toolbar]; + [window bringSubviewToFront:webViewController.webView]; + [webViewController.webView sizeToFit]; } } @@ -247,6 +279,21 @@ [params release]; } +- (void)onMapLocation:(NSString*)query { + NSURL* url = [NSURL URLWithString:[@"http://maps.google.com/?" stringByAppendingString:query]]; + [[UIApplication sharedApplication] openURL:url]; +} + +- (void)onActiveTab:(NSValue*)val { + //TODO: This is a bit weird, but saves us creating another wrapper class + int* res = val.pointerValue; + if (tabBarDelegate && tabBarDelegate.tabBar) { + *res = tabBarDelegate.activeTab; + } else { + *res = 0; + } +} + #ifdef __IPHONE_3_0 - (void)processDoSync:(NSDictionary *)userInfo { @@ -298,8 +345,17 @@ } #endif +- (void) showLoadingPage { + NSString *filePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"apps/app/loading.html"]; + NSFileManager *fileManager = [NSFileManager defaultManager]; + if ([fileManager fileExistsAtPath:filePath]) { + NSData *data = [fileManager contentsAtPath:filePath]; + NSString *loadingPage = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + [webViewController loadHTMLString:loadingPage]; + } +} + - (void) doStartUp { - // appStarted = false; // Log View logViewController = [[LogViewController alloc] init]; @@ -311,15 +367,17 @@ webViewController->actionTarget = self; webViewController->onShowLog = @selector(onShowLog); + //TabBar delegate + tabBarDelegate = [[TabBarDelegate alloc] init]; + + [self showLoadingPage]; + //Camera delegate pickImageDelegate = [[PickImageDelegate alloc] init]; //DateTime delegate dateTimePickerDelegate = [[DateTimePickerDelegate alloc] init]; - //TabBar delegate - tabBarDelegate = [[TabBarDelegate alloc] init]; - //Create local server and start it //serverHost = [[ServerHost alloc] init]; serverHost = [ServerHost sharedInstance]; @@ -338,9 +396,13 @@ serverHost->onVibrate = @selector(onVibrate:); serverHost->onPlayFile = @selector(onPlayFile:); serverHost->onSysCall = @selector(onSysCall:); + serverHost->onMapLocation = @selector(onMapLocation:); + serverHost->onCreateMap = @selector(onCreateMap:); + serverHost->onActiveTab = @selector(onActiveTab:); [serverHost start]; // Create View + webViewController.toolbar.hidden = YES; [window addSubview:webViewController.view]; [window makeKeyAndVisible]; @@ -359,8 +421,6 @@ #endif - (void)applicationDidFinishLaunching:(UIApplication *)application { - // Hide the toolbar initially, we will re-draw it if there are no tabs - webViewController.toolbar.hidden = YES; [self doStartUp]; } platform/iphone/Classes/RhoRunnerAppDelegate.m @@ -33,6 +33,9 @@ SEL onVibrate; SEL onPlayFile; SEL onSysCall; + SEL onMapLocation; + SEL onCreateMap; + SEL onActiveTab; } // callbacks @@ -52,6 +55,9 @@ @property (assign) SEL onVibrate; @property (assign) SEL onPlayFile; @property (assign) SEL onSysCall; +@property (assign) SEL onMapLocation; +@property (assign) SEL onCreateMap; +@property (assign) SEL onActiveTab; - (void) start; //TODO - implement pause and stop operations and graceful termination of the thread... platform/iphone/Classes/Server/ServerHost.h @@ -23,9 +23,11 @@ #include "logging/RhoLogConf.h" #include "sync/syncthread.h" #include "JSString.h" +#import "WebViewUrl.h" #import "ParamsWrapper.h" #import "DateTime.h" #import "NativeBar.h" +#import "MapViewController.h" #import "logging/RhoLog.h" #undef DEFAULT_LOGCATEGORY @@ -74,7 +76,7 @@ static ServerHost* sharedSH = nil; @synthesize actionTarget, onStartFailure, onStartSuccess, onRefreshView, onNavigateTo, onExecuteJs; @synthesize onSetViewHomeUrl, onSetViewOptionsUrl, onTakePicture, onChoosePicture, onChooseDateTime, onCreateNativeBar; -@synthesize onShowPopup, onVibrate, onPlayFile, onSysCall; +@synthesize onShowPopup, onVibrate, onPlayFile, onSysCall, onMapLocation, onCreateMap, onActiveTab; - (void)serverStarted:(NSString*)data { if(actionTarget && [actionTarget respondsToSelector:onStartSuccess]) { @@ -96,9 +98,9 @@ static ServerHost* sharedSH = nil; } } -- (void)navigateTo:(NSString*) url { +- (void)navigateTo:(WebViewUrl*) wvUrl { if(actionTarget && [actionTarget respondsToSelector:onNavigateTo]) { - [actionTarget performSelectorOnMainThread:onNavigateTo withObject:url waitUntilDone:NO]; + [actionTarget performSelectorOnMainThread:onNavigateTo withObject:wvUrl waitUntilDone:NO]; } } @@ -178,6 +180,28 @@ static ServerHost* sharedSH = nil; } } +- (void)mapLocation:(NSString*) query { + if(actionTarget && [actionTarget respondsToSelector:onMapLocation]) { + [actionTarget performSelectorOnMainThread:onMapLocation withObject:query waitUntilDone:NO]; + } +} + +- (void)createMap:(NSMutableArray*)items { + if(actionTarget && [actionTarget respondsToSelector:onCreateMap]) { + [actionTarget performSelectorOnMainThread:onCreateMap withObject:items waitUntilDone:NO]; + } +} + +- (int)activeTab { + int retval = 0; + if(actionTarget && [actionTarget respondsToSelector:onActiveTab]) { + NSValue* result = [NSValue valueWithPointer: &retval]; + if (!result) return 0; + [actionTarget performSelectorOnMainThread:onActiveTab withObject:result waitUntilDone:YES]; + } + return retval; +} + - (void)sysCall:(PARAMS_WRAPPER*)params { } @@ -211,11 +235,13 @@ static ServerHost* sharedSH = nil; ServerRef server = ServerCreate(NULL, AcceptConnection, &c); if (server != NULL && ServerConnect(server, NULL, kServiceType, 8080)) { RAWLOG_INFO("HTTP Server started and ready"); - [self performSelectorOnMainThread:@selector(serverStarted:) - withObject:homeUrl waitUntilDone:NO]; RAWLOG_INFO("Create Sync"); rho_sync_create(); + RhoRubyInitApp(); + + [self performSelectorOnMainThread:@selector(serverStarted:) + withObject:homeUrl waitUntilDone:NO]; [[NSRunLoop currentRunLoop] run]; RAWLOG_INFO("Invalidating local server"); @@ -257,7 +283,6 @@ extern const char* RhoGetRootPath(); // Startup the sync engine thread //start_sync_engine(database); - // Start server thread [NSThread detachNewThreadSelector:@selector(ServerHostThreadRoutine:) toTarget:self withObject:nil]; @@ -334,8 +359,11 @@ void webview_refresh() { [[ServerHost sharedInstance] refreshView]; } -void webview_navigate(char* url) { - [[ServerHost sharedInstance] navigateTo:[NSString stringWithCString:url]]; +void webview_navigate(char* url, int index) { + WebViewUrl *webViewUrl = [[[WebViewUrl alloc] init] autorelease]; + webViewUrl.url = [NSString stringWithUTF8String:url]; + webViewUrl.webViewIndex = index; + [[ServerHost sharedInstance] navigateTo:webViewUrl]; } char* webview_execute_js(char* js) { @@ -397,6 +425,21 @@ void choose_datetime(char* callback, char* title, long initial_time, int format, data:[NSString stringWithCString:data]]; } +void _rho_map_location(char* query) { + [[ServerHost sharedInstance] mapLocation:[NSString stringWithCString:query]]; +} + +void mapview_create(int nparams, char** params, int nannotations, char** annotation) { +#ifdef __IPHONE_3_0 + NSMutableArray *settings = parse_settings(nparams, params); + NSMutableArray *annotations = parse_annotations(nannotations,annotation); + NSMutableArray *items = [NSMutableArray arrayWithCapacity:2]; + [items addObject:settings]; + [items addObject:annotations]; + [[ServerHost sharedInstance] createMap:items]; +#endif +} + void _rho_ext_syscall(PARAMS_WRAPPER* params) { [[ServerHost sharedInstance] doSysCall:params]; } @@ -414,3 +457,7 @@ void create_nativebar(int bar_type, int nparams, char** params) { } [[ServerHost sharedInstance] createNativeBar:bar_type dataArray:items]; } + +int webview_active_tab() { + return [[ServerHost sharedInstance] activeTab]; +} \ No newline at end of file platform/iphone/Classes/Server/ServerHost.m @@ -18,14 +18,17 @@ NativeBar* tabBar; UIWindow* mainWindow; NSMutableArray* barItems; + int activeTab; } @property(nonatomic, assign) NativeBar* tabBar; @property(nonatomic, retain) UITabBarController* tabBarController; @property(nonatomic, retain) UIWindow* mainWindow; @property(nonatomic, retain) NSMutableArray* barItems; +@property(assign) int activeTab; - (void)createTabBar:(UIWindow*)window; - (void)loadTabBarItemFirstPage:(BarItem*)item; +- (void)loadTabBarItemLocation:(BarItem*)item url:(NSString*)url; - (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController; @end platform/iphone/Classes/TabBarDelegate.h @@ -12,16 +12,17 @@ @implementation TabBarDelegate -@synthesize tabBarController, mainWindow, tabBar, barItems; +@synthesize tabBarController, mainWindow, tabBar, barItems, activeTab; - (void)dealloc { [tabBarController release]; [barItems release]; + [tabBar release]; [super dealloc]; } - (void)loadTabBarItemFirstPage:(BarItem*)item { - if (item.loaded == NO) { + if (item.loaded == NO || item.reload == YES) { NSString* escapedUrl = [item.location stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; escapedUrl = [escapedUrl stringByReplacingOccurrencesOfString: @"&" withString: @"%26"]; NSString* startLocation = [@"http://localhost:8080/system/redirect_to?url=" stringByAppendingString:escapedUrl]; @@ -30,6 +31,10 @@ } } +- (void)loadTabBarItemLocation:(BarItem*)item url:(NSString*)url { + [item.viewController navigateRedirect:url]; +} + - (void)createTabBar:(UIWindow*)window { self.mainWindow = window; // Load the tab bar (just one of them) @@ -39,7 +44,7 @@ } tabBarController.moreNavigationController.navigationBar.barStyle = UIBarStyleBlackOpaque; - int barSize = [tabBar.barItemDataArray count] / 3; + int barSize = [tabBar.barItemDataArray count] / 4; NSMutableArray *tabs = [NSMutableArray arrayWithCapacity:barSize]; if(!self.barItems) { @@ -47,20 +52,22 @@ } // Setup each tabbar item with elements in specific order: - // label, action, icon + // label, action, icon, reload for(int i=0; i < barSize; i++) { BarItem* item = [[BarItem alloc] init]; - item.label = (NSString*)[tabBar.barItemDataArray objectAtIndex:i*3]; - item.location = (NSString*)[tabBar.barItemDataArray objectAtIndex:(i*3)+1]; - item.icon = (NSString*)[tabBar.barItemDataArray objectAtIndex:(i*3)+2]; + item.label = (NSString*)[tabBar.barItemDataArray objectAtIndex:i*4]; + item.location = (NSString*)[tabBar.barItemDataArray objectAtIndex:(i*4)+1]; + item.icon = (NSString*)[tabBar.barItemDataArray objectAtIndex:(i*4)+2]; + item.reload = [(NSString*)[tabBar.barItemDataArray objectAtIndex:(i*4)+3] isEqualToString:@"true"] ? YES : NO; if (item.label && item.location && item.icon) { - UIViewController *subController = [[WebViewController alloc] initWithNibName:nil bundle:nil]; + WebViewController *subController = [[WebViewController alloc] initWithNibName:nil bundle:nil]; UIWebView *wView = [[UIWebView alloc] init]; NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:item.icon]; - NSLog(@"PATH: %@", imagePath); subController.title = item.label; subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath]; + //TODO: Figure out why view and webView need to point to the same object! subController.view = wView; + subController.webView = wView; item.viewController = subController; [barItems addObject:item]; [tabs addObject:subController]; @@ -75,7 +82,12 @@ } - (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController { - [self loadTabBarItemFirstPage:(BarItem*)[barItems objectAtIndex:self.tabBarController.selectedIndex]]; + if(self.tabBarController.selectedIndex > barItems.count) { + [NSException raise:@"Exception" format:@"Rhodes currently only supports up to 5 tabs. Please change your tabs array and try again."]; + } else { + [self loadTabBarItemFirstPage:(BarItem*)[barItems objectAtIndex:self.tabBarController.selectedIndex]]; + } + self.activeTab = self.tabBarController.selectedIndex; } @end platform/iphone/Classes/TabBarDelegate.m @@ -26,9 +26,12 @@ @property (assign) id actionTarget; @property (assign) UIToolbar* toolbar; +@property (assign) UIWebView* webView; @property (assign) SEL onShowLog; +-(void)loadHTMLString:(NSString*)data; + -(void)navigate:(NSString*)url; -(void)navigateRedirect:(NSString*)url; @@ -44,6 +47,8 @@ -(IBAction)refresh; +-(void)executeJs:(JSString *)js; + -(void)active; -(void)inactive; platform/iphone/Classes/WebViewController.h @@ -35,10 +35,8 @@ char* get_current_location() { @implementation WebViewController -NSString *loadingText = @"Loading..."; - @synthesize viewHomeUrl, viewOptionsUrl; -@synthesize actionTarget, onShowLog, toolbar; +@synthesize actionTarget, onShowLog, toolbar, webView; -(void)viewDidLoad { [super viewDidLoad]; @@ -62,6 +60,11 @@ NSString *loadingText = @"Loading..."; } } +-(void)loadHTMLString:(NSString*)data { + RAWLOG_INFO("Loading specified HTML string"); + [webView loadHTMLString:data baseURL: [NSURL URLWithString:@""]]; +} + -(void)navigate:(NSString*)url { RAWLOG_INFO("Navigating to the specifyed URL"); [webView loadRequest:[NSURLRequest requestWithURL: [NSURL URLWithString:url]]]; @@ -69,15 +72,14 @@ NSString *loadingText = @"Loading..."; -(void)executeJs:(JSString*)js { RAWLOG_INFO1("Executing JS: %s", [js.inputJs UTF8String] ); - //NSLog(@"Executing JS: %@\n", js.inputJs); js.outputJs = [webView stringByEvaluatingJavaScriptFromString:js.inputJs]; } -(void)navigateRedirect:(NSString*)url { NSString* escapedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; escapedUrl = [escapedUrl stringByReplacingOccurrencesOfString: @"&" withString: @"%26"]; - NSString* redirctor = [@"http://localhost:8080/system/redirect_to?url=" stringByAppendingString:escapedUrl]; - [webView loadRequest:[NSURLRequest requestWithURL: [NSURL URLWithString:redirctor]]]; + NSString* redirector = [@"http://localhost:8080/system/redirect_to?url=" stringByAppendingString:escapedUrl]; + [webView loadRequest:[NSURLRequest requestWithURL: [NSURL URLWithString:redirector]]]; } -(IBAction)goBack { @@ -90,14 +92,12 @@ NSString *loadingText = @"Loading..."; -(IBAction)goHome { if (viewHomeUrl != NULL) { - //[self navigate:viewHomeUrl]; [self navigateRedirect:viewHomeUrl]; } } -(IBAction)goOptions { if (viewOptionsUrl != NULL) { - //[self navigate:viewOptionsUrl]; [self navigateRedirect:viewOptionsUrl]; } } @@ -147,7 +147,6 @@ NSString *loadingText = @"Loading..."; NSString* location = [webview stringByEvaluatingJavaScriptFromString:@"location.href"]; set_current_location((CFStringRef)location); - } - (void)runSync platform/iphone/Classes/WebViewController.m @@ -55,6 +55,10 @@ public: { return m_nRespCode == 200; } + virtual boolean isUnathorized() + { + return m_nRespCode == 401; + } virtual boolean isResponseRecieved(){ return m_nRespCode!=-1;} }; @@ -102,8 +106,8 @@ static const char* szMultipartPrefix = static const char* szMultipartPostfix = "\r\n------------A6174410D6AD474183FDE48F5662FCC5--"; -static const char* szMultipartContType = -"multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5\r\n"; +//static const char* szMultipartContType = +//"multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5\r\n"; INetResponse* CNetRequest::pushFile(const String& strUrl, const String& strFilePath) { platform/iphone/Classes/rho/net/NetRequest.cpp @@ -228,6 +228,9 @@ char* rho_net_impl_requestCookies(const char* szMethod, const char* szUrl, cons errorCode == NSURLErrorUserAuthenticationRequired || errorCode == NSURLErrorBadServerResponse ) { + if ( pnRespCode ) + *pnRespCode = 401; + rho_net_impl_deleteAllCookies(); } } else @@ -309,6 +312,8 @@ char* rho_net_impl_request(const char* szMethod, const char* szUrl, const char* if (errorCode == NSURLErrorUserCancelledAuthentication || errorCode == NSURLErrorUserAuthenticationRequired) { + if ( pnRespCode ) + *pnRespCode = 401; rho_net_impl_deleteAllCookies(); } } else @@ -371,6 +376,8 @@ char* rho_net_impl_pullFile(const char* szUrl, int* pnRespCode, int (*writeFunc) if (errorCode == NSURLErrorUserCancelledAuthentication || errorCode == NSURLErrorUserAuthenticationRequired) { + if ( pnRespCode ) + *pnRespCode = 401; rho_net_impl_deleteAllCookies(); } } else @@ -449,8 +456,8 @@ int rho_net_impl_pushFile(const char* szUrl, const char* szFilePath, int* pbRes void rho_net_impl_cancel(void* pConnData) { NSURLConnection* pConn = (NSURLConnection*)pConnData; - if ( pConn != NULL ) - [pConn cancel]; + //if ( pConn != NULL ) + // [pConn cancel]; } /* * Pushes changes from list to rhosync server @@ -512,6 +519,8 @@ char* rho_net_impl_pushMultipartData(const char* url, const char* data, size_t d if (errorCode == NSURLErrorUserCancelledAuthentication || errorCode == NSURLErrorUserAuthenticationRequired) { + if ( pnRespCode ) + *pnRespCode = 401; rho_net_impl_deleteAllCookies(); } platform/iphone/Classes/rho/net/NetRequestImpl.m @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">512</int> - <string key="IBDocument.SystemVersion">9E27</string> - <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.33</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">10B504</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038.2</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="NS.object.0">62</string> + </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="83"/> @@ -16,7 +20,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys" id="0"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -46,7 +50,7 @@ <object class="IBUIWebView" id="842565669"> <reference key="NSNextResponder" ref="178952735"/> <int key="NSvFlags">1316</int> - <string key="NSFrame">{{0, 20}, {320, 416}}</string> + <string key="NSFrame">{{0, 20}, {320, 460}}</string> <reference key="NSSuperview" ref="178952735"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">1</int> @@ -55,6 +59,7 @@ <bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIMultipleTouchEnabled">YES</bool> <bool key="IBUIScalesPageToFit">YES</bool> + <int key="IBUIDataDetectorTypes">1</int> <bool key="IBUIDetectsPhoneNumbers">YES</bool> </object> <object class="IBUIToolbar" id="368036388"> @@ -75,9 +80,9 @@ <reference key="IBUIToolbar" ref="368036388"/> </object> <object class="IBUIBarButtonItem" id="888280739"> - <float key="IBUIWidth">2.000000e+01</float> - <int key="IBUISystemItemIdentifier">6</int> + <float key="IBUIWidth">20</float> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">6</int> </object> <object class="IBUIBarButtonItem" id="494127799"> <object class="NSCustomResource" key="IBUIImage"> @@ -87,13 +92,13 @@ <reference key="IBUIToolbar" ref="368036388"/> </object> <object class="IBUIBarButtonItem" id="291919474"> - <float key="IBUIWidth">3.000000e+01</float> - <int key="IBUISystemItemIdentifier">6</int> + <float key="IBUIWidth">30</float> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">6</int> </object> <object class="IBUIBarButtonItem" id="849367448"> - <int key="IBUISystemItemIdentifier">5</int> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">5</int> </object> <object class="IBUIBarButtonItem" id="596451217"> <object class="NSCustomResource" key="IBUIImage"> @@ -103,18 +108,18 @@ <reference key="IBUIToolbar" ref="368036388"/> </object> <object class="IBUIBarButtonItem" id="359249268"> - <float key="IBUIWidth">1.300000e+01</float> - <int key="IBUISystemItemIdentifier">6</int> + <float key="IBUIWidth">13</float> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">6</int> </object> <object class="IBUIBarButtonItem" id="145899196"> - <int key="IBUISystemItemIdentifier">13</int> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">13</int> </object> <object class="IBUIBarButtonItem" id="52347604"> - <float key="IBUIWidth">1.700000e+01</float> - <int key="IBUISystemItemIdentifier">6</int> + <float key="IBUIWidth">17</float> <reference key="IBUIToolbar" ref="368036388"/> + <int key="IBUISystemItemIdentifier">6</int> </object> <object class="IBUIBarButtonItem" id="581169041"> <object class="NSCustomResource" key="IBUIImage"> @@ -150,7 +155,7 @@ </object> <nil key="IBUIHighlightedColor"/> <int key="IBUIBaselineAdjustment">1</int> - <float key="IBUIMinimumFontSize">1.000000e+01</float> + <float key="IBUIMinimumFontSize">10</float> </object> </object> <string key="NSFrameSize">{320, 480}</string> @@ -330,9 +335,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="957960031"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="object" ref="0"/> <reference key="children" ref="1000"/> <nil key="parent"/> </object> @@ -343,24 +346,24 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="178952735"/> </object> - <reference key="parent" ref="957960031"/> + <reference key="parent" ref="0"/> <string key="objectName">MainWindow</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="841351856"/> - <reference key="parent" ref="957960031"/> - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> </object> <object class="IBObjectRecord"> <int key="objectID">3</int> <reference key="object" ref="664661524"/> - <reference key="parent" ref="957960031"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="427554174"/> - <reference key="parent" ref="957960031"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">11</int> @@ -368,7 +371,7 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> </object> - <reference key="parent" ref="957960031"/> + <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">83</int> @@ -469,7 +472,7 @@ </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-1.CustomClassName</string> <string>-2.CustomClassName</string> @@ -513,9 +516,7 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -536,9 +537,7 @@ </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -546,9 +545,7 @@ <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -564,7 +561,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>webViewController</string> <string>window</string> @@ -589,14 +586,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">UINavigationItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">UIWebView</string> <string key="superclassName">UIView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -609,7 +598,7 @@ <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>goBack</string> <string>goForward</string> @@ -628,8 +617,9 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>actionTarget</string> <string>activity</string> <string>activityInfo</string> <string>backBtn</string> @@ -642,6 +632,7 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> <string>UIActivityIndicatorView</string> <string>UILabel</string> <string>UIBarButtonItem</string> @@ -671,9 +662,282 @@ </object> </object> </object> + <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AddressBook.framework/Headers/ABActions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSError.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="53732556"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIActivityIndicatorView</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIActivityIndicatorView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIApplication</string> + <string key="superclassName">UIResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIApplication.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIBarButtonItem</string> + <string key="superclassName">UIBarItem</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIBarItem</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UILabel</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UILabel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UINavigationBar</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIResponder</string> + <string key="superclassName">NSObject</string> + <reference key="sourceIdentifier" ref="53732556"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UISearchBar</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UISearchDisplayController</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIToolbar</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UITextField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIView</string> + <string key="superclassName">UIResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <string key="superclassName">UIResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIWebView</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIWebView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIWindow</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIWindow.h</string> + </object> + </object> + </object> </object> <int key="IBDocument.localizationMode">0</int> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> + <integer value="512" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> + <integer value="544" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">rhorunner.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <string key="IBCocoaTouchPluginVersion">3.1</string> </data> </archive> platform/iphone/MainWindow.xib @@ -33,9 +33,14 @@ 5C7162880F8B7E330096B6AA /* RhoLogSink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C71627F0F8B7E330096B6AA /* RhoLogSink.cpp */; }; 5C7162890F8B7E330096B6AA /* RhoLogSink.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7162800F8B7E330096B6AA /* RhoLogSink.h */; }; 5C71628A0F8B7E330096B6AA /* RhoPlainLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7162810F8B7E330096B6AA /* RhoPlainLog.cpp */; }; + 5C7405921064AF1600163569 /* Tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405901064AF1600163569 /* Tokenizer.cpp */; }; + 5C7405931064AF1600163569 /* Tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7405911064AF1600163569 /* Tokenizer.h */; }; 5C98174C0FBC4FCE002597A5 /* AutoPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9817490FBC4FCE002597A5 /* AutoPointer.h */; }; 5C98174D0FBC4FCE002597A5 /* InputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C98174A0FBC4FCE002597A5 /* InputStream.h */; }; 5C98174E0FBC4FCE002597A5 /* irhoclassfactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */; }; + 5CBD46291087399700107D0D /* inetrequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46261087399700107D0D /* inetrequest.h */; }; + 5CBD462A1087399700107D0D /* URI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CBD46271087399700107D0D /* URI.cpp */; }; + 5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; }; 5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE294111009D8D9009A75F6 /* isysteminfo.h */; }; /* End PBXBuildFile section */ @@ -66,9 +71,14 @@ 5C71627F0F8B7E330096B6AA /* RhoLogSink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoLogSink.cpp; path = ../../shared/logging/RhoLogSink.cpp; sourceTree = SOURCE_ROOT; }; 5C7162800F8B7E330096B6AA /* RhoLogSink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoLogSink.h; path = ../../shared/logging/RhoLogSink.h; sourceTree = SOURCE_ROOT; }; 5C7162810F8B7E330096B6AA /* RhoPlainLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoPlainLog.cpp; path = ../../shared/logging/RhoPlainLog.cpp; sourceTree = SOURCE_ROOT; }; + 5C7405901064AF1600163569 /* Tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tokenizer.cpp; path = ../../shared/common/Tokenizer.cpp; sourceTree = SOURCE_ROOT; }; + 5C7405911064AF1600163569 /* Tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Tokenizer.h; path = ../../shared/common/Tokenizer.h; sourceTree = SOURCE_ROOT; }; 5C9817490FBC4FCE002597A5 /* AutoPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoPointer.h; path = ../../shared/common/AutoPointer.h; sourceTree = SOURCE_ROOT; }; 5C98174A0FBC4FCE002597A5 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InputStream.h; path = ../../shared/common/InputStream.h; sourceTree = SOURCE_ROOT; }; 5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irhoclassfactory.h; path = ../../shared/common/irhoclassfactory.h; sourceTree = SOURCE_ROOT; }; + 5CBD46261087399700107D0D /* inetrequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inetrequest.h; path = ../../shared/net/inetrequest.h; sourceTree = SOURCE_ROOT; }; + 5CBD46271087399700107D0D /* URI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = URI.cpp; path = ../../shared/net/URI.cpp; sourceTree = SOURCE_ROOT; }; + 5CBD46281087399700107D0D /* URI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URI.h; path = ../../shared/net/URI.h; sourceTree = SOURCE_ROOT; }; 5CE294111009D8D9009A75F6 /* isysteminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isysteminfo.h; path = ../../shared/common/isysteminfo.h; sourceTree = SOURCE_ROOT; }; D2AAC046055464E500DB518D /* librholib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librholib.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -97,6 +107,7 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 5CBD46251087397B00107D0D /* net */, 5C6B45280F9468C5003CB43A /* statistic */, 5C7162600F8B7DEE0096B6AA /* common */, 5C7162630F8B7DF40096B6AA /* logging */, @@ -124,6 +135,8 @@ 5C7162600F8B7DEE0096B6AA /* common */ = { isa = PBXGroup; children = ( + 5C7405901064AF1600163569 /* Tokenizer.cpp */, + 5C7405911064AF1600163569 /* Tokenizer.h */, 5CE294111009D8D9009A75F6 /* isysteminfo.h */, 5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */, 5C5335510FC2977600F268F0 /* RhoThread.cpp */, @@ -163,6 +176,16 @@ name = logging; sourceTree = "<group>"; }; + 5CBD46251087397B00107D0D /* net */ = { + isa = PBXGroup; + children = ( + 5CBD46261087399700107D0D /* inetrequest.h */, + 5CBD46271087399700107D0D /* URI.cpp */, + 5CBD46281087399700107D0D /* URI.h */, + ); + name = net; + sourceTree = "<group>"; + }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( @@ -199,6 +222,9 @@ 5C5335530FC2977600F268F0 /* IRhoThreadImpl.h in Headers */, 5C5335550FC2977600F268F0 /* RhoThread.h in Headers */, 5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */, + 5C7405931064AF1600163569 /* Tokenizer.h in Headers */, + 5CBD46291087399700107D0D /* inetrequest.h in Headers */, + 5CBD462B1087399700107D0D /* URI.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -252,6 +278,8 @@ 5C6B448C0F946589003CB43A /* RhoConf.cpp in Sources */, 5C6B452C0F9468E2003CB43A /* RhoProfiler.cpp in Sources */, 5C5335540FC2977600F268F0 /* RhoThread.cpp in Sources */, + 5C7405921064AF1600163569 /* Tokenizer.cpp in Sources */, + 5CBD462A1087399700107D0D /* URI.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -301,7 +329,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = iphonesimulator2.2.1; + SDKROOT = iphonesimulator3.0; }; name = Debug; }; platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj @@ -21,13 +21,30 @@ def set_app_name(newname) end +def set_signing_identity(identity,entitlements) + fname = $config["build"]["iphonepath"] + "/rhorunner.xcodeproj/project.pbxproj" + buf = "" + File.new(fname,"r").read.each_line do |line| + line.gsub!(/CODE_SIGN_ENTITLEMENTS = .*;/,"CODE_SIGN_ENTITLEMENTS = \"#{entitlements}\";") + line.gsub!(/CODE_SIGN_IDENTITY = .*;/,"CODE_SIGN_IDENTITY = \"#{identity}\";") + line.gsub!(/"CODE_SIGN_IDENTITY\[sdk=iphoneos\*\]" = .*;/,"\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"#{identity}\";") + + puts line if line =~ /CODE_SIGN/ + buf << line + end + + File.open(fname,"w") { |f| f.write(buf) } + +end + + namespace "config" do - task :iphone => ["config:common"] do - $rubypath = "rhodes/rhodes-build/res/RubyMac" #path to RubyMac + task :iphone => ["config:common", "switch_app"] do + $config["platform"] = "iphone" + $rubypath = "res/build-tools/RubyMac" #path to RubyMac iphonepath = $config["build"]["iphonepath"] - $bbver = $config["env"]["bbver"] $builddir = iphonepath + "/rbuild" - $bindir = iphonepath + "/bin" + $bindir = Jake.get_absolute(iphonepath) + "/bin" $srcdir = $bindir + "/RhoBundle" $targetdir = iphonepath + "/target" $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb'] @@ -38,15 +55,29 @@ namespace "config" do $simlink="#{$homedir}/Library/Application Support/iPhone Simulator/User/Library/Preferences" $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications" $guid="364FFCAF-C71D-4543-B293-9058E31CFFEE" - $applog = File.join($homedir,$config["env"]["applog"]) + $applog = File.join($homedir,$app_config["applog"]) if $app_config["applog"] + if $app_config["iphone"].nil? + $signidentity = $config["env"]["iphone"]["codesignidentity"] + $entitlements = $config["env"]["iphone"]["entitlements"] + $configuration = $config["env"]["iphone"]["configuration"] + $sdk = $config["env"]["iphone"]["sdk"] + else + $signidentity = $app_config["iphone"]["codesignidentity"] + $entitlements = $app_config["iphone"]["entitlements"] + $configuration = $app_config["iphone"]["configuration"] + $sdk = $app_config["iphone"]["sdk"] + end + unless File.exists? $homedir + "/.profile" + File.open($homedir + "/.profile") {|f| f << "#" } + end end end namespace "build" do namespace "iphone" do - desc "Build iphone rhobundle" +# desc "Build iphone rhobundle" task :rhobundle => ["config:iphone"] do chdir 'platform/iphone' rm_rf 'bin' @@ -59,15 +90,17 @@ namespace "build" do end - desc "Build rhodes" +# desc "Build rhodes" task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do - set_app_name($config["env"]["appname"]) unless $config["env"]["appname"].nil? - cp $config["env"]["app"] + "/icon/icon.png", $config["build"]["iphonepath"] + set_app_name($app_config["name"]) unless $app_config["name"].nil? + cp $app_path + "/icon/icon.png", $config["build"]["iphonepath"] + + set_signing_identity($signidentity,$entitlements.to_s) if $signidentity.to_s != "" chdir $config["build"]["iphonepath"] - - args = ['build', '-target', 'rhorunner', '-configuration', $config["env"]["iphone"]["configuration"], '-sdk', $config["env"]["iphone"]["sdk"]] + args = ['build', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk] + puts Jake.run("xcodebuild",args) unless $? == 0 puts "Error cleaning" @@ -81,16 +114,16 @@ namespace "build" do end namespace "run" do - desc "Builds and launches app in simulator" + desc "Builds everything, launches iphone simulator" task :iphone => ["config:iphone", "build:iphone:rhodes"] do - unless $config["env"]["iphone"]["sdk"] =~ /^iphonesimulator/ - puts "SDK must be one of the iphonesimulator sdks" + unless $sdk =~ /^iphonesimulator/ + puts "SDK must be one of the iphonesimulator sdks to run in the iphone simulator" exit 1 end `killall "iPhone Simulator"` - rhorunner = $config["build"]["iphonepath"] + "/build/#{$config["env"]["iphone"]["configuration"]}-iphonesimulator/rhorunner.app" + rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app" Find.find($simapp) do |path| if File.basename(path) == "rhorunner.app" @@ -114,17 +147,20 @@ namespace "run" do f << "(version 1)\n(debug deny)\n(allow default)\n" f.close + system("open \"#{$sim}/iPhone Simulator.app\"") end end namespace "clean" do + desc "Clean iphone" + task :iphone => ["clean:iphone:all"] namespace "iphone" do - desc "Clean rhodes binaries" +# desc "Clean rhodes binaries" task :rhodes => ["config:iphone"] do chdir $config["build"]["iphonepath"] - args = ['clean', '-target', 'rhorunner', '-configuration', $config["env"]["iphone"]["configuration"], '-sdk', $config["env"]["iphone"]["sdk"]] + args = ['clean', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk] puts Jake.run("xcodebuild",args) unless $? == 0 puts "Error cleaning" @@ -139,9 +175,19 @@ namespace "clean" do end - desc "Clean rhobundle" +# desc "Clean rhobundle" task :rhobundle => ["config:iphone"] do rm_rf $bindir end + + task :all => ["clean:iphone:rhodes", "clean:iphone:rhobundle"] end end + +namespace "device" do + namespace "iphone" do + desc "Builds and signs iphone for production" + task :production => ["config:iphone", "build:iphone:rhodes"] + end + +end \ No newline at end of file platform/iphone/rbuild/iphone.rake @@ -186,7 +186,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; - SDKROOT = iphonesimulator2.2.1; + SDKROOT = iphonesimulator3.0; SYMROOT = ../build; USER_HEADER_SEARCH_PATHS = "../../shared/ ../../shared/syncengine ../../shared/logging ../../shared/common ../../shared/ruby ../../shared/ruby/include ../../shared/ruby/iphone"; }; platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj @@ -110,6 +110,7 @@ F5E362FF0EB79F0200226287 /* miniprelude.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E362FE0EB79F0200226287 /* miniprelude.c */; }; F5E363050EB79F8400226287 /* lgamma_r.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E363040EB79F8400226287 /* lgamma_r.c */; }; F5E363080EB7A0DB00226287 /* newline.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E363070EB7A0DB00226287 /* newline.c */; }; + F5FD0A3D10619E7900B7B8ED /* mapview_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0A3C10619E7900B7B8ED /* mapview_wrap.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -217,6 +218,7 @@ F5E362FE0EB79F0200226287 /* miniprelude.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniprelude.c; path = ../../shared/ruby/miniprelude.c; sourceTree = SOURCE_ROOT; }; F5E363040EB79F8400226287 /* lgamma_r.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgamma_r.c; path = ../../shared/ruby/missing/lgamma_r.c; sourceTree = SOURCE_ROOT; }; F5E363070EB7A0DB00226287 /* newline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = newline.c; path = ../../shared/ruby/newline.c; sourceTree = SOURCE_ROOT; }; + F5FD0A3C10619E7900B7B8ED /* mapview_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mapview_wrap.c; path = ../../shared/ruby/ext/mapview/mapview_wrap.c; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -435,6 +437,7 @@ F5E360B00EB6A63B00226287 /* ext */ = { isa = PBXGroup; children = ( + F5FD0A3910619E5300B7B8ED /* mapview */, 46AF502B103DE480006E02E1 /* nativebar */, 46056D131031DC7E00C21967 /* datetimepicker */, 46A4ABBC101A25DD00AF74C7 /* rhoconf */, @@ -529,6 +532,14 @@ name = ruby; sourceTree = "<group>"; }; + F5FD0A3910619E5300B7B8ED /* mapview */ = { + isa = PBXGroup; + children = ( + F5FD0A3C10619E7900B7B8ED /* mapview_wrap.c */, + ); + name = mapview; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -684,6 +695,7 @@ 46A4ABC0101A25DD00AF74C7 /* rhoconf_wrap.c in Sources */, 46056D171031DC7E00C21967 /* datetimepicker_wrap.c in Sources */, 46AF502F103DE480006E02E1 /* nativebar_wrap.c in Sources */, + F5FD0A3D10619E7900B7B8ED /* mapview_wrap.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -745,7 +757,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = iphoneos2.2.1; + SDKROOT = iphonesimulator3.0; SYMROOT = ../build; }; name = Debug; platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj @@ -20,12 +20,14 @@ 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 46056D221031EDA900C21967 /* DateTimePickerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 46056D211031EDA900C21967 /* DateTimePickerDelegate.m */; }; 461B5A880F82D89700B08CB9 /* gears.png in Resources */ = {isa = PBXBuildFile; fileRef = 461B5A870F82D89700B08CB9 /* gears.png */; }; + 463577BF107272A400BEC653 /* JSString.m in Sources */ = {isa = PBXBuildFile; fileRef = 463577BE107272A400BEC653 /* JSString.m */; }; 4640FE950F410A3400B7975E /* back_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4640FE930F410A3400B7975E /* back_btn.png */; }; 4640FE960F410A3400B7975E /* forward_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4640FE940F410A3400B7975E /* forward_btn.png */; }; 466B0FCD0F3CFA9400A52314 /* home_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 466B0FCB0F3CFA9400A52314 /* home_btn.png */; }; 4678FCA90F8185920054340C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4678FCA80F8185920054340C /* SystemConfiguration.framework */; }; 467E716E0EB673F000E5958D /* lib in Resources */ = {isa = PBXBuildFile; fileRef = 467E713F0EB673F000E5958D /* lib */; }; 467E71720EB6740400E5958D /* db in Resources */ = {isa = PBXBuildFile; fileRef = 467E716F0EB6740400E5958D /* db */; }; + 468276F010713FD600ADBCD4 /* WebViewUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = 468276EF10713FD600ADBCD4 /* WebViewUrl.m */; }; 4684391210445A810019C7F0 /* BarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4684391110445A810019C7F0 /* BarItem.m */; }; 468E57421035DBC100A2293C /* TabBarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 468E57411035DBC100A2293C /* TabBarDelegate.m */; }; 46AF5163103F150D006E02E1 /* NativeBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 46AF5162103F150D006E02E1 /* NativeBar.m */; }; @@ -34,11 +36,14 @@ 46B007071033776600D0C2F4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46B007061033776600D0C2F4 /* CoreGraphics.framework */; }; 46C25E3B103240A400A26428 /* RhoDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 46C25E3A103240A400A26428 /* RhoDelegate.m */; }; 46C744690EAFA99D00CC76F1 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 46C744680EAFA99D00CC76F1 /* icon.png */; }; - 46E9DE330FC3577B00726D6B /* JSString.m in Sources */ = {isa = PBXBuildFile; fileRef = 46E9DE320FC3577B00726D6B /* JSString.m */; }; 5C53337A0FC1B20000F268F0 /* NetRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5333770FC1B20000F268F0 /* NetRequest.cpp */; }; 5C53337B0FC1B20000F268F0 /* NetRequestImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C5333790FC1B20000F268F0 /* NetRequestImpl.m */; }; 5C53354C0FC2974D00F268F0 /* RhoThreadImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C53354A0FC2974D00F268F0 /* RhoThreadImpl.cpp */; }; 5C5335C60FC2F44500F268F0 /* RhoClassFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */; }; + BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = BDE35A79107F900A009941C7 /* RhoFileImpl.m */; }; + BDE35AB9107F977D009941C7 /* RhoFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE35AB7107F977D009941C7 /* RhoFile.cpp */; }; + F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128ADC1069752F002F00E5 /* MapAnnotation.m */; }; + F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */; }; F51668E00FFD5F740079F023 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F51668DF0FFD5F740079F023 /* AudioToolbox.framework */; }; F51669600FFD78770079F023 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F516695F0FFD78770079F023 /* AVFoundation.framework */; }; F52181130F96B13500B7F974 /* LogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F52181120F96B13500B7F974 /* LogViewController.m */; }; @@ -56,6 +61,7 @@ F5B8FAD40F44EA7B00C9AF85 /* PickImageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B8FAD30F44EA7B00C9AF85 /* PickImageDelegate.m */; }; F5C106500E917D2A0049A94A /* Dispatcher.c in Sources */ = {isa = PBXBuildFile; fileRef = F5C1064F0E917D2A0049A94A /* Dispatcher.c */; }; F5F06668102CB134006CFD39 /* ParamsWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F06667102CB134006CFD39 /* ParamsWrapper.m */; }; + F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0943106151C200B7B8ED /* MapViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -155,12 +161,16 @@ 46056D201031EDA900C21967 /* DateTimePickerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTimePickerDelegate.h; sourceTree = "<group>"; }; 46056D211031EDA900C21967 /* DateTimePickerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateTimePickerDelegate.m; sourceTree = "<group>"; }; 461B5A870F82D89700B08CB9 /* gears.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gears.png; sourceTree = SOURCE_ROOT; }; + 463577BD107272A400BEC653 /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSString.h; path = Classes/JSString.h; sourceTree = SOURCE_ROOT; }; + 463577BE107272A400BEC653 /* JSString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSString.m; path = Classes/JSString.m; sourceTree = SOURCE_ROOT; }; 4640FE930F410A3400B7975E /* back_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_btn.png; sourceTree = "<group>"; }; 4640FE940F410A3400B7975E /* forward_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward_btn.png; sourceTree = "<group>"; }; 466B0FCB0F3CFA9400A52314 /* home_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = home_btn.png; sourceTree = "<group>"; }; 4678FCA80F8185920054340C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = ../../../../../../../../Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SOURCE_ROOT; }; 467E713F0EB673F000E5958D /* lib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = lib; path = bin/RhoBundle/lib; sourceTree = "<group>"; }; 467E716F0EB6740400E5958D /* db */ = {isa = PBXFileReference; lastKnownFileType = folder; name = db; path = bin/RhoBundle/db; sourceTree = "<group>"; }; + 468276EE10713FD600ADBCD4 /* WebViewUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewUrl.h; path = Server/WebViewUrl.h; sourceTree = "<group>"; }; + 468276EF10713FD600ADBCD4 /* WebViewUrl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewUrl.m; path = Server/WebViewUrl.m; sourceTree = "<group>"; }; 4684391010445A810019C7F0 /* BarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarItem.h; sourceTree = "<group>"; }; 4684391110445A810019C7F0 /* BarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarItem.m; sourceTree = "<group>"; }; 468E57401035DBC100A2293C /* TabBarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabBarDelegate.h; sourceTree = "<group>"; }; @@ -174,8 +184,6 @@ 46C25E39103240A400A26428 /* RhoDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoDelegate.h; sourceTree = "<group>"; }; 46C25E3A103240A400A26428 /* RhoDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoDelegate.m; sourceTree = "<group>"; }; 46C744680EAFA99D00CC76F1 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = SOURCE_ROOT; }; - 46E9DE310FC3577B00726D6B /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSString.h; path = ../JSString.h; sourceTree = "<group>"; }; - 46E9DE320FC3577B00726D6B /* JSString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSString.m; path = ../JSString.m; sourceTree = "<group>"; }; 5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tcmalloc.xcodeproj; path = tcmalloc/tcmalloc.xcodeproj; sourceTree = "<group>"; }; 5C5333770FC1B20000F268F0 /* NetRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetRequest.cpp; path = rho/net/NetRequest.cpp; sourceTree = "<group>"; }; 5C5333780FC1B20000F268F0 /* NetRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetRequest.h; path = rho/net/NetRequest.h; sourceTree = "<group>"; }; @@ -187,6 +195,13 @@ 5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RhoLib.xcodeproj; path = RhoLib/RhoLib.xcodeproj; sourceTree = "<group>"; }; 5CE293FF1009D74F009A75F6 /* SystemInfoImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemInfoImpl.h; path = rho/common/SystemInfoImpl.h; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + BDE35A79107F900A009941C7 /* RhoFileImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoFileImpl.m; sourceTree = "<group>"; }; + BDE35AB7107F977D009941C7 /* RhoFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoFile.cpp; path = ../shared/common/RhoFile.cpp; sourceTree = SOURCE_ROOT; }; + BDE35AB8107F977D009941C7 /* RhoFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoFile.h; path = ../shared/common/RhoFile.h; sourceTree = SOURCE_ROOT; }; + F5128ADB1069752F002F00E5 /* MapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapAnnotation.h; path = MapView/MapAnnotation.h; sourceTree = "<group>"; }; + F5128ADC1069752F002F00E5 /* MapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapAnnotation.m; path = MapView/MapAnnotation.m; sourceTree = "<group>"; }; + F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GoogleGeocoder.h; path = Classes/MapView/GoogleGeocoder.h; sourceTree = SOURCE_ROOT; }; + F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GoogleGeocoder.m; path = Classes/MapView/GoogleGeocoder.m; sourceTree = SOURCE_ROOT; }; F51668DF0FFD5F740079F023 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; F516695F0FFD78770079F023 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; F52181110F96B13500B7F974 /* LogViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogViewController.h; sourceTree = "<group>"; }; @@ -218,6 +233,8 @@ F5F0648C102B946F006CFD39 /* rhoextlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = rhoextlib.xcodeproj; path = rhoextlib/rhoextlib.xcodeproj; sourceTree = SOURCE_ROOT; }; F5F06666102CB134006CFD39 /* ParamsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParamsWrapper.h; sourceTree = "<group>"; }; F5F06667102CB134006CFD39 /* ParamsWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParamsWrapper.m; sourceTree = "<group>"; }; + F5FD0942106151C200B7B8ED /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapViewController.h; path = MapView/MapViewController.h; sourceTree = "<group>"; }; + F5FD0943106151C200B7B8ED /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapViewController.m; path = MapView/MapViewController.m; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -244,8 +261,8 @@ 05377CEE0E74D6CB003B8BD1 /* Server */ = { isa = PBXGroup; children = ( - 46E9DE310FC3577B00726D6B /* JSString.h */, - 46E9DE320FC3577B00726D6B /* JSString.m */, + 463577BD107272A400BEC653 /* JSString.h */, + 463577BE107272A400BEC653 /* JSString.m */, 05CF724F0E7B16F800D41986 /* HttpMessage.h */, 05CF724E0E7B16F800D41986 /* HttpMessage.c */, 05CF70E90E78B14D00D41986 /* ServerHost.h */, @@ -255,6 +272,8 @@ 05377CEB0E74D6C0003B8BD1 /* Server.h */, 05377CEA0E74D6C0003B8BD1 /* Server.c */, 05CF72930E7F2EAC00D41986 /* defs.h */, + 468276EE10713FD600ADBCD4 /* WebViewUrl.h */, + 468276EF10713FD600ADBCD4 /* WebViewUrl.m */, ); name = Server; sourceTree = "<group>"; @@ -262,6 +281,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + F5425BCD1060539A000CCA8C /* MapView */, 468E573F1035DBA600A2293C /* NativeBar */, 46056CEE1031CFB700C21967 /* DateTimePicker */, 5C5332610FBD6AC700F268F0 /* rho */, @@ -415,11 +435,14 @@ 5C5335490FC2973900F268F0 /* common */ = { isa = PBXGroup; children = ( + BDE35AB7107F977D009941C7 /* RhoFile.cpp */, + BDE35AB8107F977D009941C7 /* RhoFile.h */, 5CE293FF1009D74F009A75F6 /* SystemInfoImpl.h */, 5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */, 5C5335C50FC2F44500F268F0 /* RhoClassFactory.h */, 5C53354A0FC2974D00F268F0 /* RhoThreadImpl.cpp */, 5C53354B0FC2974D00F268F0 /* RhoThreadImpl.h */, + BDE35A79107F900A009941C7 /* RhoFileImpl.m */, ); name = common; sourceTree = "<group>"; @@ -432,6 +455,19 @@ name = Products; sourceTree = "<group>"; }; + F5425BCD1060539A000CCA8C /* MapView */ = { + isa = PBXGroup; + children = ( + F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */, + F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */, + F5FD0942106151C200B7B8ED /* MapViewController.h */, + F5FD0943106151C200B7B8ED /* MapViewController.m */, + F5128ADB1069752F002F00E5 /* MapAnnotation.h */, + F5128ADC1069752F002F00E5 /* MapAnnotation.m */, + ); + name = MapView; + sourceTree = "<group>"; + }; F547F3D10F9CEB05007C2CD2 /* Log */ = { isa = PBXGroup; children = ( @@ -708,7 +744,6 @@ 5C53337B0FC1B20000F268F0 /* NetRequestImpl.m in Sources */, 5C53354C0FC2974D00F268F0 /* RhoThreadImpl.cpp in Sources */, 5C5335C60FC2F44500F268F0 /* RhoClassFactory.cpp in Sources */, - 46E9DE330FC3577B00726D6B /* JSString.m in Sources */, F5F06668102CB134006CFD39 /* ParamsWrapper.m in Sources */, 46056D221031EDA900C21967 /* DateTimePickerDelegate.m in Sources */, 46C25E3B103240A400A26428 /* RhoDelegate.m in Sources */, @@ -716,6 +751,13 @@ 468E57421035DBC100A2293C /* TabBarDelegate.m in Sources */, 46AF5163103F150D006E02E1 /* NativeBar.m in Sources */, 4684391210445A810019C7F0 /* BarItem.m in Sources */, + F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */, + F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */, + F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */, + 468276F010713FD600ADBCD4 /* WebViewUrl.m in Sources */, + 463577BF107272A400BEC653 /* JSString.m in Sources */, + BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */, + BDE35AB9107F977D009941C7 /* RhoFile.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -773,6 +815,28 @@ "-lrholib", "-lrhoextlib", ); + "OTHER_LDFLAGS[sdk=iphoneos3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphoneos3.1][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); "OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = ( "-framework", CFNetwork, @@ -782,10 +846,32 @@ "-lrholib", "-lrhoextlib", ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); PRODUCT_NAME = rhorunner; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos2.2.1; + SDKROOT = iphoneos3.0; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib"; }; @@ -795,7 +881,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Lars Burgess"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = rhorunner_Prefix.pch; @@ -822,7 +908,7 @@ "-lrhoextlib", ); PRODUCT_NAME = rhorunner; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E302C486-8C38-4E23-B945-196D8B2BA5B9"; SDKROOT = iphoneos2.2.1; USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib"; }; @@ -846,6 +932,28 @@ "-lrholib", "-lrhoextlib", ); + "OTHER_LDFLAGS[sdk=iphoneos3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphoneos3.1][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); "OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = ( "-framework", CFNetwork, @@ -855,6 +963,28 @@ "-lrholib", "-lrhoextlib", ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); PREBINDING = NO; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos2.0; @@ -867,6 +997,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; + CODE_SIGN_IDENTITY = "Don't Code Sign"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -876,15 +1007,48 @@ "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = ( "-framework", CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphoneos3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphoneos3.1][arch=*]" = ( "-framework", - CoreGraphics, + MapKit, + "-framework", + CFNetwork, "-lrhorubylib", "-lrhosynclib", "-ltcmalloc", "-lrholib", "-lrhoextlib", ); - "OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = ( + "OTHER_LDFLAGS[sdk=iphonesimulator3.0][arch=*]" = ( + "-framework", + MapKit, + "-framework", + CFNetwork, + "-lrhorubylib", + "-lrhosynclib", + "-ltcmalloc", + "-lrholib", + "-lrhoextlib", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1][arch=*]" = ( + "-framework", + MapKit, "-framework", CFNetwork, "-lrhorubylib", @@ -894,6 +1058,7 @@ "-lrhoextlib", ); PRODUCT_NAME = rhorunner; + PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos2.2.1; USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib"; @@ -938,7 +1103,7 @@ PREBINDING = NO; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos2.2.1; + SDKROOT = iphonesimulator3.0; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; SYMROOT = build; USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib"; platform/iphone/rhorunner.xcodeproj/project.pbxproj @@ -27,6 +27,10 @@ 46E9214D0E9BF40A00F14AC8 /* printbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9213B0E9BF40A00F14AC8 /* printbuf.h */; }; 5C5335AC0FC2F3AB00F268F0 /* syncthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */; }; 5C5335AD0FC2F3AB00F268F0 /* syncthread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335AB0FC2F3AB00F268F0 /* syncthread.h */; }; + 5C74058A1064AA4900163569 /* DBAttrManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405881064AA4900163569 /* DBAttrManager.cpp */; }; + 5C74058B1064AA4900163569 /* DBAttrManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7405891064AA4900163569 /* DBAttrManager.h */; }; + 5C7405F2106CF7F400163569 /* SyncNotify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405F0106CF7F400163569 /* SyncNotify.cpp */; }; + 5C7405F3106CF7F400163569 /* SyncNotify.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7405F1106CF7F400163569 /* SyncNotify.h */; }; 5C9817230FBC4F20002597A5 /* JSONIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9817210FBC4F20002597A5 /* JSONIterator.cpp */; }; 5C9817240FBC4F20002597A5 /* JSONIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9817220FBC4F20002597A5 /* JSONIterator.h */; }; 5C98172A0FBC4F41002597A5 /* SyncEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9817260FBC4F41002597A5 /* SyncEngine.cpp */; }; @@ -65,6 +69,10 @@ 46E9213B0E9BF40A00F14AC8 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = printbuf.h; path = ../../shared/json/printbuf.h; sourceTree = SOURCE_ROOT; }; 5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syncthread.cpp; path = ../../shared/sync/syncthread.cpp; sourceTree = SOURCE_ROOT; }; 5C5335AB0FC2F3AB00F268F0 /* syncthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = syncthread.h; path = ../../shared/sync/syncthread.h; sourceTree = SOURCE_ROOT; }; + 5C7405881064AA4900163569 /* DBAttrManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DBAttrManager.cpp; path = ../../shared/db/DBAttrManager.cpp; sourceTree = SOURCE_ROOT; }; + 5C7405891064AA4900163569 /* DBAttrManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBAttrManager.h; path = ../../shared/db/DBAttrManager.h; sourceTree = SOURCE_ROOT; }; + 5C7405F0106CF7F400163569 /* SyncNotify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SyncNotify.cpp; path = ../../shared/sync/SyncNotify.cpp; sourceTree = SOURCE_ROOT; }; + 5C7405F1106CF7F400163569 /* SyncNotify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SyncNotify.h; path = ../../shared/sync/SyncNotify.h; sourceTree = SOURCE_ROOT; }; 5C9817210FBC4F20002597A5 /* JSONIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONIterator.cpp; sourceTree = "<group>"; }; 5C9817220FBC4F20002597A5 /* JSONIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONIterator.h; sourceTree = "<group>"; }; 5C9817260FBC4F41002597A5 /* SyncEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SyncEngine.cpp; path = ../../shared/sync/SyncEngine.cpp; sourceTree = SOURCE_ROOT; }; @@ -153,6 +161,8 @@ 5C9817250FBC4F27002597A5 /* sync */ = { isa = PBXGroup; children = ( + 5C7405F0106CF7F400163569 /* SyncNotify.cpp */, + 5C7405F1106CF7F400163569 /* SyncNotify.h */, 5CE294091009D8B7009A75F6 /* ClientRegister.cpp */, 5CE2940A1009D8B7009A75F6 /* ClientRegister.h */, 5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */, @@ -168,6 +178,8 @@ 5C98172E0FBC4F53002597A5 /* db */ = { isa = PBXGroup; children = ( + 5C7405881064AA4900163569 /* DBAttrManager.cpp */, + 5C7405891064AA4900163569 /* DBAttrManager.h */, 5C98172F0FBC4F70002597A5 /* DBAdapter.cpp */, 5C9817300FBC4F70002597A5 /* DBAdapter.h */, 5C9817310FBC4F70002597A5 /* DBResult.cpp */, @@ -208,6 +220,8 @@ 5C9817360FBC4F70002597A5 /* DBResult.h in Headers */, 5C5335AD0FC2F3AB00F268F0 /* syncthread.h in Headers */, 5CE2940C1009D8B7009A75F6 /* ClientRegister.h in Headers */, + 5C74058B1064AA4900163569 /* DBAttrManager.h in Headers */, + 5C7405F3106CF7F400163569 /* SyncNotify.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -267,6 +281,8 @@ 5C9817350FBC4F70002597A5 /* DBResult.cpp in Sources */, 5C5335AC0FC2F3AB00F268F0 /* syncthread.cpp in Sources */, 5CE2940B1009D8B7009A75F6 /* ClientRegister.cpp in Sources */, + 5C74058A1064AA4900163569 /* DBAttrManager.cpp in Sources */, + 5C7405F2106CF7F400163569 /* SyncNotify.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -312,7 +328,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = iphonesimulator2.2.1; + SDKROOT = iphonesimulator3.0; SYMROOT = ../build; }; name = Debug; platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj @@ -321,7 +321,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = iphoneos2.2.1; + SDKROOT = iphonesimulator3.0; }; name = Debug; }; platform/iphone/tcmalloc/tcmalloc.xcodeproj/project.pbxproj @@ -111,6 +111,17 @@ String RhoSettings::getString(const char* szName){ return String(); } +String RhoSettings::getPath(const char* szName){ + String strPath = getString(szName); + if ( strPath.length() == 0 ) + return strPath; + + if ( strPath.at(strPath.length()-1) != '/' && strPath.at(strPath.length()-1) != '\\' ) + strPath += '/'; + + return strPath; +} + int RhoSettings::getInt(const char* szName){ std::map<String,String>::iterator it = m_mapValues.find(szName); if ( it != m_mapValues.end() ) platform/shared/common/RhoConf.cpp @@ -18,6 +18,7 @@ class RhoSettings{ public: String getString(const char* szName); + String getPath(const char* szName); int getInt(const char* szName); bool getBool(const char* szName); void setString(const char* szName, const String& str); platform/shared/common/RhoConf.h @@ -172,6 +172,36 @@ void CRhoFile::deleteFile( const char* szFilePath ){ #endif } +void CRhoFile::deleteFilesInFolder(const char* szFolderPath) +{ +#if defined(OS_WINDOWS) || defined(OS_WINCE) + StringW wFolderName; + common::convertToStringW(szFolderPath,wFolderName); + StringW wFolderMask = wFolderName + L"/*"; + + WIN32_FIND_DATAW FindFileData; + HANDLE hFind = INVALID_HANDLE_VALUE; + + hFind = FindFirstFileW(wFolderMask.c_str(), &FindFileData); + if (hFind == INVALID_HANDLE_VALUE) + return; + + while (FindNextFileW(hFind, &FindFileData) != 0) + { + if ( FindFileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY ) + continue; + + StringW wFileName = wFolderName + L"/" + FindFileData.cFileName; + DeleteFileW(wFileName.c_str()); + } + + FindClose(hFind); + +#else + delete_files_in_folder(szFolderPath); +#endif +} + /*static*/ void CRhoFile::renameFile( const char* szOldFilePath, const char* szNewFilePath ) { #if defined(OS_WINDOWS) || defined(OS_WINCE) platform/shared/common/RhoFile.cpp @@ -39,6 +39,7 @@ public: static bool isFileExist( const char* szFilePath ); static void deleteFile( const char* szFilePath ); static void renameFile( const char* szOldFilePath, const char* szNewFilePath ); + static void deleteFilesInFolder(const char* szFolderPath); private: CRhoFile(const CRhoFile&); void operator=(const CRhoFile&); @@ -48,4 +49,6 @@ private: } } +extern "C" void delete_files_in_folder(const char *szFolderPath); + #endif //_RHOFILE_H_ platform/shared/common/RhoFile.h @@ -1,61 +1,61 @@ #ifndef _RHOFILEPATH_H_ #define _RHOFILEPATH_H_ - -#include "RhoStd.h" - -namespace rho{ -namespace common{ - -class CFilePath{ -public: - CFilePath(const char* path) : m_szPath(path){} - CFilePath(const String& str) : m_szPath(str.c_str()){} - - const char* getBaseName(){ - const char* base = findLastSlash(); - if (base) - return base+1; - - return m_szPath; - } - - String makeFullPath(const char* szFileName){ - String res = m_szPath; - if ( res.length() > 0 && !findLastSlash() ) - res += "/"; - - res += szFileName; - - return res; - } - - String changeBaseName( const char* szFileName ) - { - const char* base = findLastSlash(); - if ( base && *(base+1) ){ - String res( m_szPath, base-m_szPath+1); - res += szFileName; - - return res; - } - - return makeFullPath(szFileName); - } - -private: - - const char* findLastSlash(){ + +#include "RhoStd.h" + +namespace rho{ +namespace common{ + +class CFilePath{ +public: + CFilePath(const char* path) : m_szPath(path){} + CFilePath(const String& str) : m_szPath(str.c_str()){} + + const char* getBaseName(){ + const char* base = findLastSlash(); + if (base) + return base+1; + + return m_szPath; + } + + String makeFullPath(const char* szFileName){ + String res = m_szPath; + if ( res.length() > 0 && !findLastSlash() ) + res += "/"; + + res += szFileName; + + return res; + } + + String changeBaseName( const char* szFileName ) + { + const char* base = findLastSlash(); + if ( base && *(base+1) ){ + String res( m_szPath, base-m_szPath+1); + res += szFileName; + + return res; + } + + return makeFullPath(szFileName); + } + +private: + + const char* findLastSlash(){ const char* slash = strrchr(m_szPath, '/'); if ( !slash ) slash = strrchr(m_szPath, '\\'); return slash; - } - - const char* m_szPath; -}; - -} -} - -#endif //_RHOFILEPATH_H_ + } + + const char* m_szPath; +}; + +} +} + +#endif //_RHOFILEPATH_H_ platform/shared/common/RhoFilePath.h @@ -60,6 +60,8 @@ private: void operator=(const CMutexLock&); }; +#define synchronized(mutex) CMutexLock __lock(mutex); + class CLocalMutexLock { public: explicit CLocalMutexLock() : m_Mutex() { m_Mutex.Lock(); } platform/shared/common/RhoMutexLock.h @@ -97,9 +97,17 @@ public: erase(key); } - TVALUE& get(const TKEY& key) + TVALUE get(const TKEY& key) { - return (*this)[key]; + if ( containsKey(key) ) + return (*this)[key]; + + return TVALUE(); + } + + boolean containsKey(const TKEY& key) + { + return find(key) != std::map<TKEY,TVALUE>::end(); } }; platform/shared/common/RhoStd.h @@ -1,164 +1,164 @@ -#ifndef _RHOTIME_H_ -#define _RHOTIME_H_ - -#include "RhoPort.h" - -#if !defined( OS_WINDOWS ) && !defined(OS_WINCE) -#include <sys/time.h> -#endif - -namespace rho{ -namespace common{ - -class CBaseTime{ -public: - CBaseTime(){ memset( &m_nativeTime, 0, sizeof(m_nativeTime) ); } - CBaseTime(const CBaseTime& time ){ m_nativeTime = time.m_nativeTime; } - const CBaseTime& operator=(const CBaseTime& time ){ m_nativeTime = time.m_nativeTime; return *this; } - - void setToCurTime(){ - time( &m_nativeTime ); - } - -protected: - time_t m_nativeTime; - -}; - -class CLocalTime : public CBaseTime{ -public: - CLocalTime(){ setToCurTime(); } - - String toString(){ - char timeBuf[22]; - - struct tm* locTime = localtime(&m_nativeTime); - - int nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900, - locTime->tm_hour, locTime->tm_min, locTime->tm_sec ); - timeBuf[nSize] = 0; - return String(timeBuf); - } - -}; - -class CTimeInterval { -public: - CTimeInterval() : m_nativeTime(0){} - - String toString(){ - char timeBuf[22]; - - int nMin = m_nativeTime/(60*1000); - int nSec = (m_nativeTime - nMin*(60*1000))/1000; - int mSec = m_nativeTime - nSec*1000 - nMin*(60*1000); - - int nSize = sprintf(timeBuf, "%d:%02d:%03d", nMin, nSec, mSec ); - timeBuf[nSize] = 0; - return String(timeBuf); - } - - unsigned long toULong() - { - return m_nativeTime; - } - - CTimeInterval minus(const CTimeInterval& time)const{ - CTimeInterval res; - res.m_nativeTime = m_nativeTime - time.m_nativeTime; - return res; - } - - CTimeInterval& operator+=(const CTimeInterval& time){ - m_nativeTime += time.m_nativeTime; - return *this; - } - - static CTimeInterval getCurrentTime(){ - CTimeInterval res; - -#if defined( OS_WINDOWS ) || defined(OS_WINCE) - res.m_nativeTime = GetTickCount(); -#else - struct timeval tv; - gettimeofday( &tv, NULL ); - res.m_nativeTime = (unsigned long)((tv.tv_sec) * 1000 + tv.tv_usec / 1000); -#endif - - return res; - } - - bool isEmpty()const{ return m_nativeTime == 0 ; } - -private: - unsigned long m_nativeTime; -}; - -inline CTimeInterval operator-(const CTimeInterval& time1, const CTimeInterval& time2){ - return time1.minus(time2); -} - -#if 0 -class CBaseTime{ -#if defined(OS_WINDOWS) || defined(OS_WINCE) -typedef SYSTEMTIME TimeType; -#else -#endif - -public: - CBaseTime(){ memset( &m_nativeTime, 0, sizeof(m_nativeTime) ); } -/* - static int64 getTickCount() { - #if defined( OS_WINDOWS ) || defined(OS_WINCE) - SYSTEMTIME now; - GetSystemTime(&now); - return (static_cast<int64>(now.wSecond) * 1000000 + - static_cast<int64>(now.wMilliseconds) * 1000); - #else - struct timeval tv; - gettimeofday(&tv, NULL); - return static_cast<int64>(tv.tv_sec) * 1000000 + tv.tv_usec; - #endif - } -*/ - void setToLocalTime(){ -#if defined( OS_WINDOWS ) || defined(OS_WINCE) - GetLocalTime(&m_nativeTime); -#else -#endif - } - void setToUTCTime(){ -#if defined( OS_WINDOWS ) || defined(OS_WINCE) - GetSystemTime(&m_nativeTime); -#else -#endif - } - -protected: - - TimeType m_nativeTime; -}; - -class CLocalTime : public CBaseTime{ -public: - CLocalTime(){ setToLocalTime(); } - - String toString(){ - char timeBuf[100]; - -#if defined( OS_WINDOWS ) || defined(OS_WINCE) - sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", m_nativeTime.wMonth, m_nativeTime.wDay, m_nativeTime.wYear, - m_nativeTime.wHour, m_nativeTime.wMinute, m_nativeTime.wSecond ); -#else -#endif - - return String(timeBuf); - } - -}; - -#endif //0 -} -} - -#endif //_RHOFILEPATH_H_ +#ifndef _RHOTIME_H_ +#define _RHOTIME_H_ + +#include "RhoPort.h" + +#if !defined( OS_WINDOWS ) && !defined(OS_WINCE) +#include <sys/time.h> +#endif + +namespace rho{ +namespace common{ + +class CBaseTime{ +public: + CBaseTime(){ memset( &m_nativeTime, 0, sizeof(m_nativeTime) ); } + CBaseTime(const CBaseTime& time ){ m_nativeTime = time.m_nativeTime; } + const CBaseTime& operator=(const CBaseTime& time ){ m_nativeTime = time.m_nativeTime; return *this; } + + void setToCurTime(){ + time( &m_nativeTime ); + } + +protected: + time_t m_nativeTime; + +}; + +class CLocalTime : public CBaseTime{ +public: + CLocalTime(){ setToCurTime(); } + + String toString(){ + char timeBuf[22]; + + struct tm* locTime = localtime(&m_nativeTime); + + int nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900, + locTime->tm_hour, locTime->tm_min, locTime->tm_sec ); + timeBuf[nSize] = 0; + return String(timeBuf); + } + +}; + +class CTimeInterval { +public: + CTimeInterval() : m_nativeTime(0){} + + String toString(){ + char timeBuf[22]; + + int nMin = m_nativeTime/(60*1000); + int nSec = (m_nativeTime - nMin*(60*1000))/1000; + int mSec = m_nativeTime - nSec*1000 - nMin*(60*1000); + + int nSize = sprintf(timeBuf, "%d:%02d:%03d", nMin, nSec, mSec ); + timeBuf[nSize] = 0; + return String(timeBuf); + } + + unsigned long toULong() + { + return m_nativeTime; + } + + CTimeInterval minus(const CTimeInterval& time)const{ + CTimeInterval res; + res.m_nativeTime = m_nativeTime - time.m_nativeTime; + return res; + } + + CTimeInterval& operator+=(const CTimeInterval& time){ + m_nativeTime += time.m_nativeTime; + return *this; + } + + static CTimeInterval getCurrentTime(){ + CTimeInterval res; + +#if defined( OS_WINDOWS ) || defined(OS_WINCE) + res.m_nativeTime = GetTickCount(); +#else + struct timeval tv; + gettimeofday( &tv, NULL ); + res.m_nativeTime = (unsigned long)((tv.tv_sec) * 1000 + tv.tv_usec / 1000); +#endif + + return res; + } + + bool isEmpty()const{ return m_nativeTime == 0 ; } + +private: + unsigned long m_nativeTime; +}; + +inline CTimeInterval operator-(const CTimeInterval& time1, const CTimeInterval& time2){ + return time1.minus(time2); +} + +#if 0 +class CBaseTime{ +#if defined(OS_WINDOWS) || defined(OS_WINCE) +typedef SYSTEMTIME TimeType; +#else +#endif + +public: + CBaseTime(){ memset( &m_nativeTime, 0, sizeof(m_nativeTime) ); } +/* + static int64 getTickCount() { + #if defined( OS_WINDOWS ) || defined(OS_WINCE) + SYSTEMTIME now; + GetSystemTime(&now); + return (static_cast<int64>(now.wSecond) * 1000000 + + static_cast<int64>(now.wMilliseconds) * 1000); + #else + struct timeval tv; + gettimeofday(&tv, NULL); + return static_cast<int64>(tv.tv_sec) * 1000000 + tv.tv_usec; + #endif + } +*/ + void setToLocalTime(){ +#if defined( OS_WINDOWS ) || defined(OS_WINCE) + GetLocalTime(&m_nativeTime); +#else +#endif + } + void setToUTCTime(){ +#if defined( OS_WINDOWS ) || defined(OS_WINCE) + GetSystemTime(&m_nativeTime); +#else +#endif + } + +protected: + + TimeType m_nativeTime; +}; + +class CLocalTime : public CBaseTime{ +public: + CLocalTime(){ setToLocalTime(); } + + String toString(){ + char timeBuf[100]; + +#if defined( OS_WINDOWS ) || defined(OS_WINCE) + sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", m_nativeTime.wMonth, m_nativeTime.wDay, m_nativeTime.wYear, + m_nativeTime.wHour, m_nativeTime.wMinute, m_nativeTime.wSecond ); +#else +#endif + + return String(timeBuf); + } + +}; + +#endif //0 +} +} + +#endif //_RHOFILEPATH_H_ platform/shared/common/RhoTime.h @@ -109,6 +109,7 @@ CONVERT_TYPE_A( float, "%f" ); CONVERT_TYPE_A( double, "%f" ); CONVERT_TYPE_A( uint64, "%llu" ); +CONVERT_TYPE_A( int64, "%lli" ); } } platform/shared/common/StringConverter.h @@ -1,7 +1,9 @@ #include "DBAdapter.h" +#include "sync/SyncThread.h" #include "common/RhoFile.h" #include "common/RhoFilePath.h" +#include "common/RhoConf.h" extern "C" const char* RhoGetRootPath(); extern "C" const char* RhoGetRelativeBlobsPath(); @@ -21,7 +23,7 @@ static int onDBBusy(void* data,int nTry) void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs) { char* type = NULL; - if ( nArgs < 2 ) + if ( nArgs < 4 ) return; type = (char*)sqlite3_value_text(*(ppArgs+1)); @@ -32,6 +34,16 @@ void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu strFilePath += (char*)sqlite3_value_text(*(ppArgs)); CRhoFile::deleteFile(strFilePath.c_str()); } + + sync::CSyncThread::getDBAdapter().getAttrMgr().remove( sqlite3_value_int(*(ppArgs+2)), (char*)sqlite3_value_text(*(ppArgs+3)) ); +} + +void SyncBlob_InsertCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs) +{ + if ( nArgs < 2 ) + return; + + sync::CSyncThread::getDBAdapter().getAttrMgr().add( sqlite3_value_int(*(ppArgs)), (char*)sqlite3_value_text(*(ppArgs+1)) ); } /*static*/ String CDBAdapter::makeBlobFolderName() @@ -53,16 +65,36 @@ boolean CDBAdapter::checkDbError(int rc) return false; } -void CDBAdapter::open (String strDbPath, String strVer) +boolean CDBAdapter::checkDbErrorEx(int rc, rho::db::CDBResult& res) +{ + if ( rc == SQLITE_OK || rc == SQLITE_ROW || rc == SQLITE_DONE ) + return true; + + const char * szErrMsg = sqlite3_errmsg(m_dbHandle); + int nErrCode = sqlite3_errcode(m_dbHandle); + + res.setErrorCode(nErrCode); + if ( nErrCode == SQLITE_CONSTRAINT && res.getReportNonUnique() ) + return true; + + LOG(ERROR)+"DB query failed. Error code: " + nErrCode + ";Message: " + szErrMsg; + return false; +} + +void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp) { if ( strcasecmp(strDbPath.c_str(),m_strDbPath.c_str() ) == 0 ) return; close(); m_strDbPath = strDbPath; - m_strDbVer = strVer; + if ( !bTemp ) + { + m_strDbVerPath = strDbPath+".version"; + m_strDbVer = strVer; - checkVersion(strVer); + checkDBVersion(strVer); + } boolean bExist = CRhoFile::isFileExist(strDbPath.c_str()); int nRes = sqlite3_open(strDbPath.c_str(),&m_dbHandle); @@ -72,9 +104,76 @@ void CDBAdapter::open (String strDbPath, String strVer) if ( !bExist ) createSchema(); - sqlite3_create_function( m_dbHandle, "rhoOnDeleteObjectRecord", 3, SQLITE_ANY, 0, + sqlite3_create_function( m_dbHandle, "rhoOnDeleteObjectRecord", 4, SQLITE_ANY, 0, SyncBlob_DeleteCallback, 0, 0 ); + sqlite3_create_function( m_dbHandle, "rhoOnInsertObjectRecord", 2, SQLITE_ANY, 0, + SyncBlob_InsertCallback, 0, 0 ); + sqlite3_busy_handler(m_dbHandle, onDBBusy, 0 ); + + getAttrMgr().load(*this); +} + +void CDBAdapter::checkDBVersion(String& strRhoDBVer) +{ + String strAppDBVer = RHOCONF().getString("app_db_version"); + + CDBVersion dbVer = readDBVersion(); + + boolean bReset = false; + + if ( strRhoDBVer.length() > 0 ) + { + if ( dbVer.m_strRhoVer.compare(strRhoDBVer) != 0 ) + bReset = true; + } + if ( strAppDBVer.length() > 0 ) + { + if ( dbVer.m_strAppVer.compare(strAppDBVer) != 0 ) + bReset = true; + } + + if ( bReset ) + { + LOG(INFO) + "Reset database bacause version is changed."; + + CRhoFile::deleteFile(m_strDbPath.c_str()); + CRhoFile::deleteFile((m_strDbPath+"-journal").c_str()); + + String strBlobFolderName = makeBlobFolderName(); + CRhoFile::deleteFilesInFolder(strBlobFolderName.c_str()); + + writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) ); + } +} + +CDBAdapter::CDBVersion CDBAdapter::readDBVersion()//throws Exception +{ + String strFullVer; + CRhoFile oFile; + if ( !oFile.open(m_strDbVerPath.c_str(),CRhoFile::OpenReadOnly) ) + return CDBVersion(); + + oFile.readString(strFullVer); + + if ( strFullVer.length() == 0 ) + return CDBVersion(); + + int nSep = strFullVer.find(';'); + if ( nSep == -1 ) + return CDBVersion(strFullVer, ""); + + return CDBVersion(strFullVer.substr(0,nSep), strFullVer.substr(nSep+1) ); +} + +void CDBAdapter::writeDBVersion(const CDBVersion& ver)//throws Exception +{ + String strFullVer = ver.m_strRhoVer + ";" + ver.m_strAppVer; + CRhoFile oFile; + if ( !oFile.open(m_strDbVerPath.c_str(),CRhoFile::OpenForWrite) ) + return; + + oFile.write(strFullVer.c_str(), strFullVer.length() ); } sqlite3_stmt* CDBAdapter::createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert) @@ -145,14 +244,16 @@ sqlite3_stmt* CDBAdapter::createInsertStatement(rho::db::CDBResult& res, const S void CDBAdapter::destroy_table(String strTable) { + getAttrMgr().reset(*this); CFilePath oFilePath(m_strDbPath); String dbNewName = oFilePath.changeBaseName("resetdbtemp.sqlite"); CRhoFile::deleteFile(dbNewName.c_str()); CRhoFile::deleteFile((dbNewName+"-journal").c_str()); + CRhoFile::deleteFile((dbNewName+".version").c_str()); CDBAdapter db; - db.open( dbNewName, m_strDbVer ); + db.open( dbNewName, m_strDbVer, true ); //Copy all tables @@ -190,14 +291,13 @@ void CDBAdapter::destroy_table(String strTable) String dbOldName = m_strDbPath; close(); + + String strBlobFolderName = makeBlobFolderName(); + CRhoFile::deleteFilesInFolder(strBlobFolderName.c_str()); + CRhoFile::deleteFile(dbOldName.c_str()); CRhoFile::renameFile(dbNewName.c_str(),dbOldName.c_str()); - open( dbOldName, m_strDbVer ); -} - -void CDBAdapter::checkVersion(String& strVer) -{ - //TODO: checkVersion + open( dbOldName, m_strDbVer, false ); } static const char* g_szDbSchema = @@ -210,13 +310,21 @@ static const char* g_szDbSchema = " last_sync_success VARCHAR(100) default NULL);" "CREATE TABLE object_values (" " id INTEGER PRIMARY KEY," - " token INTEGER default NULL," " source_id int default NULL," " attrib varchar(255) default NULL," " object varchar(255) default NULL," " value text default NULL," - " update_type varchar(255) default NULL," " attrib_type varchar(255) default NULL);" + "CREATE TABLE changed_values (" + " id INTEGER PRIMARY KEY," + " source_id int default NULL," + " attrib varchar(255) default NULL," + " object varchar(255) default NULL," + " value text default NULL," + " attrib_type varchar(255) default NULL," + " update_type varchar(255) default NULL," + " sent int default 0," + " main_id INTEGER default 0);" "CREATE TABLE sources (" " id INTEGER PRIMARY KEY," " token INTEGER default NULL," @@ -230,13 +338,21 @@ static const char* g_szDbSchema = " last_sync_duration int default 0," " last_sync_success int default 0," " source_attribs varchar default NULL);" - "CREATE INDEX by_attrib_utype on object_values (attrib,update_type);" - "CREATE INDEX by_src_type ON object_values (source_id, attrib_type, object);" - "CREATE INDEX by_src_utype on object_values (source_id,update_type);" - "CREATE INDEX by_type ON object_values (attrib_type);" + //"CREATE INDEX by_attrib_utype on object_values (attrib,update_type);" + //"CREATE INDEX by_src_type ON object_values (source_id, attrib_type, object);" + //"CREATE INDEX by_src_utype on object_values (source_id,update_type);" + //"CREATE INDEX by_type ON object_values (attrib_type);" + "CREATE INDEX by_src_id on object_values (source_id);" + "CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);" + "CREATE INDEX by_src_value ON object_values (attrib, source_id, value);" "CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW " "BEGIN " - "SELECT rhoOnDeleteObjectRecord(OLD.value,OLD.attrib_type,OLD.update_type);" + "SELECT rhoOnDeleteObjectRecord(OLD.value, OLD.attrib_type, OLD.source_id, OLD.attrib );" + "END;" + ";" + "CREATE TRIGGER rhoinsertTrigger AFTER INSERT ON object_values FOR EACH ROW " + "BEGIN " + "SELECT rhoOnInsertObjectRecord( NEW.source_id, NEW.attrib );" "END;" ";"; @@ -280,7 +396,7 @@ DBResultPtr CDBAdapter::prepareStatement( const char* szSt ) } int rc = sqlite3_prepare_v2(m_dbHandle, szSt, -1, &st, NULL); - if ( !checkDbError(rc) ) + if ( !checkDbErrorEx(rc,*res) ) { //TODO: raise exception return res; @@ -309,7 +425,7 @@ DBResultPtr CDBAdapter::executeStatement(DBResultPtr& res) res->setStatement(null); if ( rc != SQLITE_OK && rc != SQLITE_ROW && rc != SQLITE_DONE ) { - checkDbError(rc); + checkDbErrorEx(rc, *res); //TODO: raise exception return res; } @@ -335,8 +451,10 @@ void CDBAdapter::endTransaction() { char *zErr = 0; int rc = 0; + if (m_dbHandle) { + getAttrMgr().save(*this); rc = sqlite3_exec(m_dbHandle, "END;",0,0,&zErr); checkDbError(rc); } platform/shared/db/DBAdapter.cpp @@ -1,6 +1,7 @@ #pragma once #include "DBResult.h" +#include "DBAttrManager.h" #include "logging/RhoLog.h" namespace rho{ @@ -8,13 +9,27 @@ namespace db{ class CDBAdapter { - String m_strDbPath, m_strDbVer; + String m_strDbPath, m_strDbVer, m_strDbVerPath; sqlite3* m_dbHandle; Hashtable<String,sqlite3_stmt*> m_mapStatements; common::CMutex m_mxDB; common::CMutex m_mxTransDB; boolean m_bInsideTransaction; boolean m_bUnlockDB; + CDBAttrManager m_attrMgr; + + struct CDBVersion + { + String m_strRhoVer; + String m_strAppVer; + + CDBVersion(){} + CDBVersion( String strRhoVer, String strAppVer ) + { + m_strRhoVer = strRhoVer; + m_strAppVer = strAppVer; + } + }; public: DEFINE_LOGCLASS; @@ -22,14 +37,16 @@ public: CDBAdapter(void) : m_dbHandle(0), m_strDbPath(""), m_bUnlockDB(false), m_bInsideTransaction(false){} ~CDBAdapter(void){} - void open (String strDbPath, String strVer); + void open (String strDbPath, String strVer, boolean bTemp); void close(); sqlite3* getDbHandle(){ return m_dbHandle; } + CDBAttrManager& getAttrMgr(){ return m_attrMgr; } boolean isUnlockDB()const{ return m_bUnlockDB; } void setUnlockDB(boolean b){ m_bUnlockDB = b; } void Lock(){ m_mxDB.Lock(); } void Unlock(){ setUnlockDB(false); m_mxDB.Unlock(); } + boolean isInsideTransaction(){ return m_bInsideTransaction; } void bind(sqlite3_stmt* st, int nPos, int val) { @@ -79,6 +96,37 @@ public: return executeStatement(res); } + template<typename T1, typename T2, typename T3, typename T4> + DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4 ) + { + DBResultPtr res = prepareStatement(szSt); + if ( res->getStatement() == null ) + return res; + + bind(res->getStatement(), 1, p1); + bind(res->getStatement(), 2, p2); + bind(res->getStatement(), 3, p3); + bind(res->getStatement(), 4, p4); + + return executeStatement(res); + } + + template<typename T1, typename T2, typename T3, typename T4, typename T5> + DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5 ) + { + DBResultPtr res = prepareStatement(szSt); + if ( res->getStatement() == null ) + return res; + + bind(res->getStatement(), 1, p1); + bind(res->getStatement(), 2, p2); + bind(res->getStatement(), 3, p3); + bind(res->getStatement(), 4, p4); + bind(res->getStatement(), 5, p5); + + return executeStatement(res); + } + template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6 ) { @@ -96,6 +144,24 @@ public: return executeStatement(res); } + template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> + DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6 ) + { + DBResultPtr res = prepareStatement(szSt); + if ( res->getStatement() == null ) + return res; + + bind(res->getStatement(), 1, p1); + bind(res->getStatement(), 2, p2); + bind(res->getStatement(), 3, p3); + bind(res->getStatement(), 4, p4); + bind(res->getStatement(), 5, p5); + bind(res->getStatement(), 6, p6); + + res->setReportNonUnique(true); + return executeStatement(res); + } + template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7 ) { @@ -136,9 +202,12 @@ public: //private: DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res); - void checkVersion(String& strVer); + void checkDBVersion(String& strVer); + CDBVersion readDBVersion();//throws Exception + void writeDBVersion(const CDBVersion& ver);//throws Exception void createSchema(); boolean checkDbError(int rc); + boolean checkDbErrorEx(int rc, rho::db::CDBResult& res); sqlite3_stmt* createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert); virtual DBResultPtr prepareStatement( const char* szSt ); platform/shared/db/DBAdapter.h @@ -12,14 +12,21 @@ class CDBResult { sqlite3_stmt* m_dbStatement; common::CMutexLock m_lockDB; + boolean m_bReportNonUnique; + int m_nErrorCode; public: - CDBResult(sqlite3_stmt* st,common::CMutex& mx) : m_lockDB(mx), m_dbStatement(st){} - CDBResult(common::CMutex& mx) : m_lockDB(mx), m_dbStatement(null){} + CDBResult(sqlite3_stmt* st,common::CMutex& mx) : m_lockDB(mx), m_dbStatement(st){m_bReportNonUnique=false;m_nErrorCode=0;} + CDBResult(common::CMutex& mx) : m_lockDB(mx), m_dbStatement(null){m_bReportNonUnique=false;m_nErrorCode=0;} ~CDBResult(void); void setStatement(sqlite3_stmt* st); sqlite3_stmt* getStatement(){ return m_dbStatement; } + boolean getReportNonUnique(){ return m_bReportNonUnique; } + void setReportNonUnique(boolean bSet){ m_bReportNonUnique = bSet; } + boolean isNonUnique(){ return m_nErrorCode==SQLITE_CONSTRAINT; } + int getErrorCode(){ return m_nErrorCode; } + void setErrorCode(int nError){ m_nErrorCode=nError; } virtual bool isEnd(){ return m_dbStatement == null; } void next() platform/shared/db/DBResult.h @@ -59,6 +59,11 @@ void CJSONArrayIterator::next() m_nCurItem++; } +void CJSONArrayIterator::reset(int nPos) +{ + m_nCurItem = nPos; +} + CJSONEntry CJSONArrayIterator::getCurItem() { return CJSONEntry( isEnd() ? 0 : @@ -107,7 +112,7 @@ int CJSONEntry::getInt(const char* name) int nRes = 0; struct json_object* obj = json_object_object_get(m_object,const_cast<char*>(name)); if ( obj != 0 ) - nRes = json_object_get_int(obj); + nRes = static_cast<int>(json_object_get_int(obj)); return nRes; } @@ -117,11 +122,22 @@ uint64 CJSONEntry::getUInt64(const char* name) uint64 nRes = 0; struct json_object* obj = json_object_object_get(m_object,const_cast<char*>(name)); if ( obj != 0 ) - nRes = rho_atoi64(json_object_get_string(obj)); + nRes = (uint64)json_object_get_int(obj); return nRes; } +/* +uint64 CJSONEntry::getUInt64(const char* name) +{ + uint64 nRes = 0; + struct json_object* obj = json_object_object_get(m_object,const_cast<char*>(name)); + if ( obj != 0 ) + nRes = rho_atoi64(json_object_get_string(obj)); + + return nRes; +}*/ + CJSONEntry CJSONEntry::getEntry(const char* name) { struct json_object* obj = json_object_object_get(m_object,const_cast<char*>(name)); platform/shared/json/JSONIterator.cpp @@ -43,6 +43,8 @@ public: boolean isEnd(); void next(); + void reset(int nPos); + int getCurPos(){ return m_nCurItem; } CJSONEntry getCurItem(); }; platform/shared/json/JSONIterator.h @@ -171,7 +171,7 @@ static struct json_object* json_object_new(enum json_type o_type) this->o_type = o_type; this->_ref_count = 1; this->_delete = &json_object_generic_delete; -#ifdef REFCOUNT_DEBUG + +#ifdef REFCOUNT_DEBUG lh_table_insert(json_object_table, this, this); MC_DEBUG2("json_object_new_%s: %p\n", json_type_name[this->o_type], this); #endif /* REFCOUNT_DEBUG */ @@ -324,10 +324,10 @@ boolean json_object_get_boolean(struct json_object *this) static int json_object_int_to_json_string(struct json_object* this, struct printbuf *pb) { - return sprintbuf(pb, "%d", this->o.c_int); + return sprintbuf(pb, "%lli", this->o.c_int); } -struct json_object* json_object_new_int(int i) +struct json_object* json_object_new_int(int64 i) { struct json_object *this = json_object_new(json_type_int); if(!this) return NULL; @@ -336,20 +336,20 @@ struct json_object* json_object_new_int(int i) return this; } -int json_object_get_int(struct json_object *this) +int64 json_object_get_int(struct json_object *this) { - int cint; + int64 cint; if(!this) return 0; switch(this->o_type) { case json_type_int: return this->o.c_int; case json_type_double: - return (int)this->o.c_double; + return (int64)this->o.c_double; case json_type_boolean: return this->o.c_boolean; case json_type_string: - if(sscanf(this->o.c_string, "%d", &cint) == 1) return cint; + if(sscanf(this->o.c_string, "%lli", &cint) == 1) return cint; default: return 0; } @@ -382,7 +382,7 @@ double json_object_get_double(struct json_object *this) case json_type_double: return this->o.c_double; case json_type_int: - return this->o.c_int; + return (double)this->o.c_int; case json_type_boolean: return this->o.c_boolean; case json_type_string: platform/shared/json/json_object.c @@ -12,6 +12,8 @@ #ifndef _json_object_h_ #define _json_object_h_ +#include "common/RhoPort.h" + #define JSON_OBJECT_DEF_HASH_ENTIRES 16 #undef FALSE @@ -247,7 +249,7 @@ extern boolean json_object_get_boolean(struct json_object *obj); * @param i the integer * @returns a json_object of type json_type_int */ -extern struct json_object* json_object_new_int(int i); +extern struct json_object* json_object_new_int(int64 i); /** Get the int value of a json_object * @@ -258,7 +260,7 @@ extern struct json_object* json_object_new_int(int i); * @param obj the json_object instance * @returns an int */ -extern int json_object_get_int(struct json_object *obj); +extern int64 json_object_get_int(struct json_object *obj); /* double type methods */ platform/shared/json/json_object.h @@ -26,7 +26,7 @@ struct json_object union data { boolean c_boolean; double c_double; - int c_int; + int64 c_int; struct lh_table *c_object; struct array_list *c_array; char *c_string; platform/shared/json/json_object_private.h @@ -396,9 +396,9 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, printbuf_memappend(tok->pb, &c, 1); if(c == '.' || c == 'e' || c == 'E') tok->is_double = 1; } else { - int numi; + int64 numi; double numd; - if(!tok->is_double && sscanf(tok->pb->buf, "%d", &numi) == 1) { + if(!tok->is_double && sscanf(tok->pb->buf, "%lli", &numi) == 1) { current = json_object_new_int(numi); } else if(tok->is_double && sscanf(tok->pb->buf, "%lf", &numd) == 1) { current = json_object_new_double(numd); platform/shared/json/json_tokener.c @@ -2,6 +2,7 @@ #include "common/RhoStd.h" #include "common/InputStream.h" +#include "common/AutoPointer.h" namespace rho { namespace net { @@ -16,6 +17,7 @@ struct INetResponse virtual int getRespCode() = 0; virtual boolean isOK() = 0; virtual boolean isResponseRecieved() = 0; + virtual boolean isUnathorized() = 0; }; struct INetRequest platform/shared/net/inetrequest.h @@ -1,31 +1,31 @@ -/* datetimepicker.i */ -%module DateTimePicker -%{ - extern void choose_datetime(char* callback, char* title, long initial_time, int format, char* data); - #define choose choose_datetime -%} - -%typemap(in) long initial_time { - VALUE t; - long val; - VALUE class; - VALUE class_str; - char *class_val; - - class = rb_funcall($input, rb_intern("class"), 0); - class_str = rb_funcall(class, rb_intern("to_s"), 0); - class_val = StringValuePtr(class_str); - - if (!strcmp(class_val, "Time") == 0) { - rb_raise(SWIG_Ruby_ErrorType(SWIG_AttributeError), " of type '" "Time""'"); - } - t = rb_funcall($input, rb_intern("to_i"), 0); - val = NUM2INT(t); - $1 = (long)val; -} - -%typemap(default) char* data { - $1 = NULL; -} - -extern void choose(char* callback, char* title, long initial_time, int format, char* data); +/* datetimepicker.i */ +%module DateTimePicker +%{ + extern void choose_datetime(char* callback, char* title, long initial_time, int format, char* data); + #define choose choose_datetime +%} + +%typemap(in) long initial_time { + VALUE t; + long val; + VALUE class; + VALUE class_str; + char *class_val; + + class = rb_funcall($input, rb_intern("class"), 0); + class_str = rb_funcall(class, rb_intern("to_s"), 0); + class_val = StringValuePtr(class_str); + + if (!strcmp(class_val, "Time") == 0) { + rb_raise(SWIG_Ruby_ErrorType(SWIG_AttributeError), " of type '" "Time""'"); + } + t = rb_funcall($input, rb_intern("to_i"), 0); + val = NUM2INT(t); + $1 = (long)val; +} + +%typemap(default) char* data { + $1 = NULL; +} + +extern void choose(char* callback, char* title, long initial_time, int format, char* data); platform/shared/ruby/ext/datetimepicker/datetimepicker.i @@ -1,2011 +1,2011 @@ -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.31 - * - * This file is not intended to be easily readable and contains a number of - * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. - * ----------------------------------------------------------------------------- */ - -#define SWIGRUBY -/* ----------------------------------------------------------------------------- - * This section contains generic SWIG labels for method/variable - * declarations/attributes, and other compiler dependent labels. - * ----------------------------------------------------------------------------- */ - -/* template workaround for compilers that cannot correctly implement the C++ standard */ -#ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) -# if (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# else -# define SWIGTEMPLATEDISAMBIGUATOR -# endif -# else -# define SWIGTEMPLATEDISAMBIGUATOR -# endif -#endif - -/* inline attribute */ -#ifndef SWIGINLINE -# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) -# define SWIGINLINE inline -# else -# define SWIGINLINE -# endif -#endif - -/* attribute recognised by some compilers to avoid 'unused' warnings */ -#ifndef SWIGUNUSED -# if defined(__GNUC__) -# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) -# define SWIGUNUSED __attribute__ ((__unused__)) -# else -# define SWIGUNUSED -# endif -# elif defined(__ICC) -# define SWIGUNUSED __attribute__ ((__unused__)) -# else -# define SWIGUNUSED -# endif -#endif - -#ifndef SWIGUNUSEDPARM -# ifdef __cplusplus -# define SWIGUNUSEDPARM(p) -# else -# define SWIGUNUSEDPARM(p) p SWIGUNUSED -# endif -#endif - -/* internal SWIG method */ -#ifndef SWIGINTERN -# define SWIGINTERN static SWIGUNUSED -#endif - -/* internal inline SWIG method */ -#ifndef SWIGINTERNINLINE -# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE -#endif - -/* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY -# endif -#endif - -#ifndef SWIGEXPORT -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT -# else -# define SWIGEXPORT __declspec(dllexport) -# endif -# else -# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) -# define SWIGEXPORT __attribute__ ((visibility("default"))) -# else -# define SWIGEXPORT -# endif -# endif -#endif - -/* calling conventions for Windows */ -#ifndef SWIGSTDCALL -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# define SWIGSTDCALL __stdcall -# else -# define SWIGSTDCALL -# endif -#endif - -/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ -#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE -#endif - -/* ----------------------------------------------------------------------------- - * This section contains generic SWIG labels for method/variable - * declarations/attributes, and other compiler dependent labels. - * ----------------------------------------------------------------------------- */ - -/* template workaround for compilers that cannot correctly implement the C++ standard */ -#ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) -# if (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# else -# define SWIGTEMPLATEDISAMBIGUATOR -# endif -# else -# define SWIGTEMPLATEDISAMBIGUATOR -# endif -#endif - -/* inline attribute */ -#ifndef SWIGINLINE -# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) -# define SWIGINLINE inline -# else -# define SWIGINLINE -# endif -#endif - -/* attribute recognised by some compilers to avoid 'unused' warnings */ -#ifndef SWIGUNUSED -# if defined(__GNUC__) -# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) -# define SWIGUNUSED __attribute__ ((__unused__)) -# else -# define SWIGUNUSED -# endif -# elif defined(__ICC) -# define SWIGUNUSED __attribute__ ((__unused__)) -# else -# define SWIGUNUSED -# endif -#endif - -#ifndef SWIGUNUSEDPARM -# ifdef __cplusplus -# define SWIGUNUSEDPARM(p) -# else -# define SWIGUNUSEDPARM(p) p SWIGUNUSED -# endif -#endif - -/* internal SWIG method */ -#ifndef SWIGINTERN -# define SWIGINTERN static SWIGUNUSED -#endif - -/* internal inline SWIG method */ -#ifndef SWIGINTERNINLINE -# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE -#endif - -/* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY -# endif -#endif - -#ifndef SWIGEXPORT -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT -# else -# define SWIGEXPORT __declspec(dllexport) -# endif -# else -# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) -# define SWIGEXPORT __attribute__ ((visibility("default"))) -# else -# define SWIGEXPORT -# endif -# endif -#endif - -/* calling conventions for Windows */ -#ifndef SWIGSTDCALL -# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# define SWIGSTDCALL __stdcall -# else -# define SWIGSTDCALL -# endif -#endif - -/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ -#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE -#endif - -/* ----------------------------------------------------------------------------- - * swigrun.swg - * - * This file contains generic CAPI SWIG runtime support for pointer - * type checking. - * ----------------------------------------------------------------------------- */ - -/* This should only be incremented when either the layout of swig_type_info changes, - or for whatever reason, the runtime changes incompatibly */ -#define SWIG_RUNTIME_VERSION "3" - -/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ -#ifdef SWIG_TYPE_TABLE -# define SWIG_QUOTE_STRING(x) #x -# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) -# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) -#else -# define SWIG_TYPE_TABLE_NAME -#endif - -/* - You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for - creating a static or dynamic library from the swig runtime code. - In 99.9% of the cases, swig just needs to declare them as 'static'. - - But only do this if is strictly necessary, ie, if you have problems - with your compiler or so. -*/ - -#ifndef SWIGRUNTIME -# define SWIGRUNTIME SWIGINTERN -#endif - -#ifndef SWIGRUNTIMEINLINE -# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE -#endif - -/* Generic buffer size */ -#ifndef SWIG_BUFFER_SIZE -# define SWIG_BUFFER_SIZE 1024 -#endif - -/* Flags for pointer conversions */ -#define SWIG_POINTER_DISOWN 0x1 - -/* Flags for new pointer objects */ -#define SWIG_POINTER_OWN 0x1 - - -/* - Flags/methods for returning states. - - The swig conversion methods, as ConvertPtr, return and integer - that tells if the conversion was successful or not. And if not, - an error code can be returned (see swigerrors.swg for the codes). - - Use the following macros/flags to set or process the returning - states. - - In old swig versions, you usually write code as: - - if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { - // success code - } else { - //fail code - } - - Now you can be more explicit as: - - int res = SWIG_ConvertPtr(obj,vptr,ty.flags); - if (SWIG_IsOK(res)) { - // success code - } else { - // fail code - } - - that seems to be the same, but now you can also do - - Type *ptr; - int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); - if (SWIG_IsOK(res)) { - // success code - if (SWIG_IsNewObj(res) { - ... - delete *ptr; - } else { - ... - } - } else { - // fail code - } - - I.e., now SWIG_ConvertPtr can return new objects and you can - identify the case and take care of the deallocation. Of course that - requires also to SWIG_ConvertPtr to return new result values, as - - int SWIG_ConvertPtr(obj, ptr,...) { - if (<obj is ok>) { - if (<need new object>) { - *ptr = <ptr to new allocated object>; - return SWIG_NEWOBJ; - } else { - *ptr = <ptr to old object>; - return SWIG_OLDOBJ; - } - } else { - return SWIG_BADOBJ; - } - } - - Of course, returning the plain '0(success)/-1(fail)' still works, but you can be - more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the - swig errors code. - - Finally, if the SWIG_CASTRANK_MODE is enabled, the result code - allows to return the 'cast rank', for example, if you have this - - int food(double) - int fooi(int); - - and you call - - food(1) // cast rank '1' (1 -> 1.0) - fooi(1) // cast rank '0' - - just use the SWIG_AddCast()/SWIG_CheckState() - - - */ -#define SWIG_OK (0) -#define SWIG_ERROR (-1) -#define SWIG_IsOK(r) (r >= 0) -#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) - -/* The CastRankLimit says how many bits are used for the cast rank */ -#define SWIG_CASTRANKLIMIT (1 << 8) -/* The NewMask denotes the object was created (using new/malloc) */ -#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) -/* The TmpMask is for in/out typemaps that use temporal objects */ -#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) -/* Simple returning values */ -#define SWIG_BADOBJ (SWIG_ERROR) -#define SWIG_OLDOBJ (SWIG_OK) -#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) -#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) -/* Check, add and del mask methods */ -#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) -#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) -#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) -#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) -#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) -#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) - - -/* Cast-Rank Mode */ -#if defined(SWIG_CASTRANK_MODE) -# ifndef SWIG_TypeRank -# define SWIG_TypeRank unsigned long -# endif -# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ -# define SWIG_MAXCASTRANK (2) -# endif -# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) -# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) -SWIGINTERNINLINE int SWIG_AddCast(int r) { - return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; -} -SWIGINTERNINLINE int SWIG_CheckState(int r) { - return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; -} -#else /* no cast-rank mode */ -# define SWIG_AddCast -# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) -#endif - - - - -#include <string.h> - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void *(*swig_converter_func)(void *); -typedef struct swig_type_info *(*swig_dycast_func)(void **); - -/* Structure to store inforomation on one type */ -typedef struct swig_type_info { - const char *name; /* mangled name of this type */ - const char *str; /* human readable name of this type */ - swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ - struct swig_cast_info *cast; /* linked list of types that can cast into this type */ - void *clientdata; /* language specific type data */ - int owndata; /* flag if the structure owns the clientdata */ -} swig_type_info; - -/* Structure to store a type and conversion function used for casting */ -typedef struct swig_cast_info { - swig_type_info *type; /* pointer to type that is equivalent to this type */ - swig_converter_func converter; /* function to cast the void pointers */ - struct swig_cast_info *next; /* pointer to next cast in linked list */ - struct swig_cast_info *prev; /* pointer to the previous cast */ -} swig_cast_info; - -/* Structure used to store module information - * Each module generates one structure like this, and the runtime collects - * all of these structures and stores them in a circularly linked list.*/ -typedef struct swig_module_info { - swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ - size_t size; /* Number of types in this module */ - struct swig_module_info *next; /* Pointer to next element in circularly linked list */ - swig_type_info **type_initial; /* Array of initially generated type structures */ - swig_cast_info **cast_initial; /* Array of initially generated casting structures */ - void *clientdata; /* Language specific module data */ -} swig_module_info; - -/* - Compare two type names skipping the space characters, therefore - "char*" == "char *" and "Class<int>" == "Class<int >", etc. - - Return 0 when the two name types are equivalent, as in - strncmp, but skipping ' '. -*/ -SWIGRUNTIME int -SWIG_TypeNameComp(const char *f1, const char *l1, - const char *f2, const char *l2) { - for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { - while ((*f1 == ' ') && (f1 != l1)) ++f1; - while ((*f2 == ' ') && (f2 != l2)) ++f2; - if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; - } - return (l1 - f1) - (l2 - f2); -} - -/* - Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if not equal, 1 if equal -*/ -SWIGRUNTIME int -SWIG_TypeEquiv(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; - } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; - } - return equiv; -} - -/* - Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if equal, -1 if nb < tb, 1 if nb > tb -*/ -SWIGRUNTIME int -SWIG_TypeCompare(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; - } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; - } - return equiv; -} - - -/* think of this as a c++ template<> or a scheme macro */ -#define SWIG_TypeCheck_Template(comparison, ty) \ - if (ty) { \ - swig_cast_info *iter = ty->cast; \ - while (iter) { \ - if (comparison) { \ - if (iter == ty->cast) return iter; \ - /* Move iter to the top of the linked list */ \ - iter->prev->next = iter->next; \ - if (iter->next) \ - iter->next->prev = iter->prev; \ - iter->next = ty->cast; \ - iter->prev = 0; \ - if (ty->cast) ty->cast->prev = iter; \ - ty->cast = iter; \ - return iter; \ - } \ - iter = iter->next; \ - } \ - } \ - return 0 - -/* - Check the typename -*/ -SWIGRUNTIME swig_cast_info * -SWIG_TypeCheck(const char *c, swig_type_info *ty) { - SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); -} - -/* Same as previous function, except strcmp is replaced with a pointer comparison */ -SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { - SWIG_TypeCheck_Template(iter->type == from, into); -} - -/* - Cast a pointer up an inheritance hierarchy -*/ -SWIGRUNTIMEINLINE void * -SWIG_TypeCast(swig_cast_info *ty, void *ptr) { - return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); -} - -/* - Dynamic pointer casting. Down an inheritance hierarchy -*/ -SWIGRUNTIME swig_type_info * -SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { - swig_type_info *lastty = ty; - if (!ty || !ty->dcast) return ty; - while (ty && (ty->dcast)) { - ty = (*ty->dcast)(ptr); - if (ty) lastty = ty; - } - return lastty; -} - -/* - Return the name associated with this type -*/ -SWIGRUNTIMEINLINE const char * -SWIG_TypeName(const swig_type_info *ty) { - return ty->name; -} - -/* - Return the pretty name associated with this type, - that is an unmangled type name in a form presentable to the user. -*/ -SWIGRUNTIME const char * -SWIG_TypePrettyName(const swig_type_info *type) { - /* The "str" field contains the equivalent pretty names of the - type, separated by vertical-bar characters. We choose - to print the last name, as it is often (?) the most - specific. */ - if (!type) return NULL; - if (type->str != NULL) { - const char *last_name = type->str; - const char *s; - for (s = type->str; *s; s++) - if (*s == '|') last_name = s+1; - return last_name; - } - else - return type->name; -} - -/* - Set the clientdata field for a type -*/ -SWIGRUNTIME void -SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { - swig_cast_info *cast = ti->cast; - /* if (ti->clientdata == clientdata) return; */ - ti->clientdata = clientdata; - - while (cast) { - if (!cast->converter) { - swig_type_info *tc = cast->type; - if (!tc->clientdata) { - SWIG_TypeClientData(tc, clientdata); - } - } - cast = cast->next; - } -} -SWIGRUNTIME void -SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { - SWIG_TypeClientData(ti, clientdata); - ti->owndata = 1; -} - -/* - Search for a swig_type_info structure only by mangled name - Search is a O(log #types) - - We start searching at module start, and finish searching when start == end. - Note: if start == end at the beginning of the function, we go all the way around - the circular list. -*/ -SWIGRUNTIME swig_type_info * -SWIG_MangledTypeQueryModule(swig_module_info *start, - swig_module_info *end, - const char *name) { - swig_module_info *iter = start; - do { - if (iter->size) { - register size_t l = 0; - register size_t r = iter->size - 1; - do { - /* since l+r >= 0, we can (>> 1) instead (/ 2) */ - register size_t i = (l + r) >> 1; - const char *iname = iter->types[i]->name; - if (iname) { - register int compare = strcmp(name, iname); - if (compare == 0) { - return iter->types[i]; - } else if (compare < 0) { - if (i) { - r = i - 1; - } else { - break; - } - } else if (compare > 0) { - l = i + 1; - } - } else { - break; /* should never happen */ - } - } while (l <= r); - } - iter = iter->next; - } while (iter != end); - return 0; -} - -/* - Search for a swig_type_info structure for either a mangled name or a human readable name. - It first searches the mangled names of the types, which is a O(log #types) - If a type is not found it then searches the human readable names, which is O(#types). - - We start searching at module start, and finish searching when start == end. - Note: if start == end at the beginning of the function, we go all the way around - the circular list. -*/ -SWIGRUNTIME swig_type_info * -SWIG_TypeQueryModule(swig_module_info *start, - swig_module_info *end, - const char *name) { - /* STEP 1: Search the name field using binary search */ - swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); - if (ret) { - return ret; - } else { - /* STEP 2: If the type hasn't been found, do a complete search - of the str field (the human readable name) */ - swig_module_info *iter = start; - do { - register size_t i = 0; - for (; i < iter->size; ++i) { - if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) - return iter->types[i]; - } - iter = iter->next; - } while (iter != end); - } - - /* neither found a match */ - return 0; -} - -/* - Pack binary data into a string -*/ -SWIGRUNTIME char * -SWIG_PackData(char *c, void *ptr, size_t sz) { - static const char hex[17] = "0123456789abcdef"; - register const unsigned char *u = (unsigned char *) ptr; - register const unsigned char *eu = u + sz; - for (; u != eu; ++u) { - register unsigned char uu = *u; - *(c++) = hex[(uu & 0xf0) >> 4]; - *(c++) = hex[uu & 0xf]; - } - return c; -} - -/* - Unpack binary data from a string -*/ -SWIGRUNTIME const char * -SWIG_UnpackData(const char *c, void *ptr, size_t sz) { - register unsigned char *u = (unsigned char *) ptr; - register const unsigned char *eu = u + sz; - for (; u != eu; ++u) { - register char d = *(c++); - register unsigned char uu; - if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); - else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); - else - return (char *) 0; - d = *(c++); - if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); - else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); - else - return (char *) 0; - *u = uu; - } - return c; -} - -/* - Pack 'void *' into a string buffer. -*/ -SWIGRUNTIME char * -SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { - char *r = buff; - if ((2*sizeof(void *) + 2) > bsz) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,&ptr,sizeof(void *)); - if (strlen(name) + 1 > (bsz - (r - buff))) return 0; - strcpy(r,name); - return buff; -} - -SWIGRUNTIME const char * -SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { - if (*c != '_') { - if (strcmp(c,"NULL") == 0) { - *ptr = (void *) 0; - return name; - } else { - return 0; - } - } - return SWIG_UnpackData(++c,ptr,sizeof(void *)); -} - -SWIGRUNTIME char * -SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { - char *r = buff; - size_t lname = (name ? strlen(name) : 0); - if ((2*sz + 2 + lname) > bsz) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,ptr,sz); - if (lname) { - strncpy(r,name,lname+1); - } else { - *r = 0; - } - return buff; -} - -SWIGRUNTIME const char * -SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { - if (*c != '_') { - if (strcmp(c,"NULL") == 0) { - memset(ptr,0,sz); - return name; - } else { - return 0; - } - } - return SWIG_UnpackData(++c,ptr,sz); -} - -#ifdef __cplusplus -} -#endif - -/* Errors in SWIG */ -#define SWIG_UnknownError -1 -#define SWIG_IOError -2 -#define SWIG_RuntimeError -3 -#define SWIG_IndexError -4 -#define SWIG_TypeError -5 -#define SWIG_DivisionByZero -6 -#define SWIG_OverflowError -7 -#define SWIG_SyntaxError -8 -#define SWIG_ValueError -9 -#define SWIG_SystemError -10 -#define SWIG_AttributeError -11 -#define SWIG_MemoryError -12 -#define SWIG_NullReferenceError -13 - - - -#include <ruby.h> - -/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */ -#ifndef NUM2LL -#define NUM2LL(x) NUM2LONG((x)) -#endif -#ifndef LL2NUM -#define LL2NUM(x) INT2NUM((long) (x)) -#endif -#ifndef ULL2NUM -#define ULL2NUM(x) UINT2NUM((unsigned long) (x)) -#endif - -/* Ruby 1.7 doesn't (yet) define NUM2ULL() */ -#ifndef NUM2ULL -#ifdef HAVE_LONG_LONG -#define NUM2ULL(x) rb_num2ull((x)) -#else -#define NUM2ULL(x) NUM2ULONG(x) -#endif -#endif - -/* RSTRING_LEN, etc are new in Ruby 1.9, but ->ptr and ->len no longer work */ -/* Define these for older versions so we can just write code the new way */ -#ifndef RSTRING_LEN -# define RSTRING_LEN(x) RSTRING(x)->len -#endif -#ifndef RSTRING_PTR -# define RSTRING_PTR(x) RSTRING(x)->ptr -#endif -#ifndef RARRAY_LEN -# define RARRAY_LEN(x) RARRAY(x)->len -#endif -#ifndef RARRAY_PTR -# define RARRAY_PTR(x) RARRAY(x)->ptr -#endif - -/* - * Need to be very careful about how these macros are defined, especially - * when compiling C++ code or C code with an ANSI C compiler. - * - * VALUEFUNC(f) is a macro used to typecast a C function that implements - * a Ruby method so that it can be passed as an argument to API functions - * like rb_define_method() and rb_define_singleton_method(). - * - * VOIDFUNC(f) is a macro used to typecast a C function that implements - * either the "mark" or "free" stuff for a Ruby Data object, so that it - * can be passed as an argument to API functions like Data_Wrap_Struct() - * and Data_Make_Struct(). - */ - -#ifdef __cplusplus -# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */ -# define PROTECTFUNC(f) ((VALUE (*)()) f) -# define VALUEFUNC(f) ((VALUE (*)()) f) -# define VOIDFUNC(f) ((void (*)()) f) -# else -# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */ -# define PROTECTFUNC(f) ((VALUE (*)()) f) -# define VALUEFUNC(f) ((VALUE (*)()) f) -# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f) -# else /* These definitions should work for Ruby 1.7+ */ -# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f) -# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f) -# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f) -# endif -# endif -#else -# define VALUEFUNC(f) (f) -# define VOIDFUNC(f) (f) -#endif - -/* Don't use for expressions have side effect */ -#ifndef RB_STRING_VALUE -#define RB_STRING_VALUE(s) (TYPE(s) == T_STRING ? (s) : (*(volatile VALUE *)&(s) = rb_str_to_str(s))) -#endif -#ifndef StringValue -#define StringValue(s) RB_STRING_VALUE(s) -#endif -#ifndef StringValuePtr -#define StringValuePtr(s) RSTRING_PTR(RB_STRING_VALUE(s)) -#endif -#ifndef StringValueLen -#define StringValueLen(s) RSTRING_LEN(RB_STRING_VALUE(s)) -#endif -#ifndef SafeStringValue -#define SafeStringValue(v) do {\ - StringValue(v);\ - rb_check_safe_str(v);\ -} while (0) -#endif - -#ifndef HAVE_RB_DEFINE_ALLOC_FUNC -#define rb_define_alloc_func(klass, func) rb_define_singleton_method((klass), "new", VALUEFUNC((func)), -1) -#define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new") -#endif - - -/* ----------------------------------------------------------------------------- - * error manipulation - * ----------------------------------------------------------------------------- */ - - -/* Define some additional error types */ -#define SWIG_ObjectPreviouslyDeletedError -100 - - -/* Define custom exceptions for errors that do not map to existing Ruby - exceptions. Note this only works for C++ since a global cannot be - initialized by a funtion in C. For C, fallback to rb_eRuntimeError.*/ - -SWIGINTERN VALUE -getNullReferenceError(void) { - static int init = 0; - static VALUE rb_eNullReferenceError ; - if (!init) { - init = 1; - rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError); - } - return rb_eNullReferenceError; -} - -SWIGINTERN VALUE -getObjectPreviouslyDeletedError(void) { - static int init = 0; - static VALUE rb_eObjectPreviouslyDeleted ; - if (!init) { - init = 1; - rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError); - } - return rb_eObjectPreviouslyDeleted; -} - - -SWIGINTERN VALUE -SWIG_Ruby_ErrorType(int SWIG_code) { - VALUE type; - switch (SWIG_code) { - case SWIG_MemoryError: - type = rb_eNoMemError; - break; - case SWIG_IOError: - type = rb_eIOError; - break; - case SWIG_RuntimeError: - type = rb_eRuntimeError; - break; - case SWIG_IndexError: - type = rb_eIndexError; - break; - case SWIG_TypeError: - type = rb_eTypeError; - break; - case SWIG_DivisionByZero: - type = rb_eZeroDivError; - break; - case SWIG_OverflowError: - type = rb_eRangeError; - break; - case SWIG_SyntaxError: - type = rb_eSyntaxError; - break; - case SWIG_ValueError: - type = rb_eArgError; - break; - case SWIG_SystemError: - type = rb_eFatal; - break; - case SWIG_AttributeError: - type = rb_eRuntimeError; - break; - case SWIG_NullReferenceError: - type = getNullReferenceError(); - break; - case SWIG_ObjectPreviouslyDeletedError: - type = getObjectPreviouslyDeletedError(); - break; - case SWIG_UnknownError: - type = rb_eRuntimeError; - break; - default: - type = rb_eRuntimeError; - } - return type; -} - - - - -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * rubytracking.swg - * - * This file contains support for tracking mappings from - * Ruby objects to C++ objects. This functionality is needed - * to implement mark functions for Ruby's mark and sweep - * garbage collector. - * ----------------------------------------------------------------------------- */ - -#ifdef __cplusplus -extern "C" { -#endif - - -/* Global Ruby hash table to store Trackings from C/C++ - structs to Ruby Objects. */ -static VALUE swig_ruby_trackings; - -/* Global variable that stores a reference to the ruby - hash table delete function. */ -static ID swig_ruby_hash_delete = 0; - -/* Setup a Ruby hash table to store Trackings */ -SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) { - /* Create a ruby hash table to store Trackings from C++ - objects to Ruby objects. Also make sure to tell - the garabage collector about the hash table. */ - swig_ruby_trackings = rb_hash_new(); - rb_gc_register_address(&swig_ruby_trackings); - - /* Now store a reference to the hash table delete function - so that we only have to look it up once.*/ - swig_ruby_hash_delete = rb_intern("delete"); -} - -/* Get a Ruby number to reference a pointer */ -SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) { - /* We cast the pointer to an unsigned long - and then store a reference to it using - a Ruby number object. */ - - /* Convert the pointer to a Ruby number */ - unsigned long value = (unsigned long) ptr; - return LONG2NUM(value); -} - -/* Get a Ruby number to reference an object */ -SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) { - /* We cast the object to an unsigned long - and then store a reference to it using - a Ruby number object. */ - - /* Convert the Object to a Ruby number */ - unsigned long value = (unsigned long) object; - return LONG2NUM(value); -} - -/* Get a Ruby object from a previously stored reference */ -SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) { - /* The provided Ruby number object is a reference - to the Ruby object we want.*/ - - /* First convert the Ruby number to a C number */ - unsigned long value = NUM2LONG(reference); - return (VALUE) value; -} - -/* Add a Tracking from a C/C++ struct to a Ruby object */ -SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) { - /* In a Ruby hash table we store the pointer and - the associated Ruby object. The trick here is - that we cannot store the Ruby object directly - if - we do then it cannot be garbage collected. So - instead we typecast it as a unsigned long and - convert it to a Ruby number object.*/ - - /* Get a reference to the pointer as a Ruby number */ - VALUE key = SWIG_RubyPtrToReference(ptr); - - /* Get a reference to the Ruby object as a Ruby number */ - VALUE value = SWIG_RubyObjectToReference(object); - - /* Store the mapping to the global hash table. */ - rb_hash_aset(swig_ruby_trackings, key, value); -} - -/* Get the Ruby object that owns the specified C/C++ struct */ -SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) { - /* Get a reference to the pointer as a Ruby number */ - VALUE key = SWIG_RubyPtrToReference(ptr); - - /* Now lookup the value stored in the global hash table */ - VALUE value = rb_hash_aref(swig_ruby_trackings, key); - - if (value == Qnil) { - /* No object exists - return nil. */ - return Qnil; - } - else { - /* Convert this value to Ruby object */ - return SWIG_RubyReferenceToObject(value); - } -} - -/* Remove a Tracking from a C/C++ struct to a Ruby object. It - is very important to remove objects once they are destroyed - since the same memory address may be reused later to create - a new object. */ -SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) { - /* Get a reference to the pointer as a Ruby number */ - VALUE key = SWIG_RubyPtrToReference(ptr); - - /* Delete the object from the hash table by calling Ruby's - do this we need to call the Hash.delete method.*/ - rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key); -} - -/* This is a helper method that unlinks a Ruby object from its - underlying C++ object. This is needed if the lifetime of the - Ruby object is longer than the C++ object */ -SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) { - VALUE object = SWIG_RubyInstanceFor(ptr); - - if (object != Qnil) { - DATA_PTR(object) = 0; - } -} - - -#ifdef __cplusplus -} -#endif - -/* ----------------------------------------------------------------------------- - * Ruby API portion that goes into the runtime - * ----------------------------------------------------------------------------- */ - -#ifdef __cplusplus -extern "C" { -#endif - -SWIGINTERN VALUE -SWIG_Ruby_AppendOutput(VALUE target, VALUE o) { - if (NIL_P(target)) { - target = o; - } else { - if (TYPE(target) != T_ARRAY) { - VALUE o2 = target; - target = rb_ary_new(); - rb_ary_push(target, o2); - } - rb_ary_push(target, o); - } - return target; -} - -#ifdef __cplusplus -} -#endif - - -/* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * - * rubyrun.swg - * - * This file contains the runtime support for Ruby modules - * and includes code for managing global variables and pointer - * type checking. - * ----------------------------------------------------------------------------- */ - -/* For backward compatibility only */ -#define SWIG_POINTER_EXCEPTION 0 - -/* for raw pointers */ -#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own) -#define SWIG_NewPointerObj(ptr, type, flags) SWIG_Ruby_NewPointerObj(ptr, type, flags) -#define SWIG_AcquirePtr(ptr, own) SWIG_Ruby_AcquirePtr(ptr, own) -#define swig_owntype ruby_owntype - -/* for raw packed data */ -#define SWIG_ConvertPacked(obj, ptr, sz, ty) SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Ruby_NewPackedObj(ptr, sz, type) - -/* for class or struct pointers */ -#define SWIG_ConvertInstance(obj, pptr, type, flags) SWIG_ConvertPtr(obj, pptr, type, flags) -#define SWIG_NewInstanceObj(ptr, type, flags) SWIG_NewPointerObj(ptr, type, flags) - -/* for C or C++ function pointers */ -#define SWIG_ConvertFunctionPtr(obj, pptr, type) SWIG_ConvertPtr(obj, pptr, type, 0) -#define SWIG_NewFunctionPtrObj(ptr, type) SWIG_NewPointerObj(ptr, type, 0) - -/* for C++ member pointers, ie, member methods */ -#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty) -#define SWIG_NewMemberObj(ptr, sz, type) SWIG_Ruby_NewPackedObj(ptr, sz, type) - - -/* Runtime API */ - -#define SWIG_GetModule(clientdata) SWIG_Ruby_GetModule() -#define SWIG_SetModule(clientdata, pointer) SWIG_Ruby_SetModule(pointer) - - -/* Error manipulation */ - -#define SWIG_ErrorType(code) SWIG_Ruby_ErrorType(code) -#define SWIG_Error(code, msg) rb_raise(SWIG_Ruby_ErrorType(code), msg) -#define SWIG_fail goto fail - - -/* Ruby-specific SWIG API */ - -#define SWIG_InitRuntime() SWIG_Ruby_InitRuntime() -#define SWIG_define_class(ty) SWIG_Ruby_define_class(ty) -#define SWIG_NewClassInstance(value, ty) SWIG_Ruby_NewClassInstance(value, ty) -#define SWIG_MangleStr(value) SWIG_Ruby_MangleStr(value) -#define SWIG_CheckConvert(value, ty) SWIG_Ruby_CheckConvert(value, ty) - - -/* ----------------------------------------------------------------------------- - * pointers/data manipulation - * ----------------------------------------------------------------------------- */ - -#ifdef __cplusplus -extern "C" { -#if 0 -} /* cc-mode */ -#endif -#endif - -typedef struct { - VALUE klass; - VALUE mImpl; - void (*mark)(void *); - void (*destroy)(void *); - int trackObjects; -} swig_class; - - -static VALUE _mSWIG = Qnil; -static VALUE _cSWIG_Pointer = Qnil; -static VALUE swig_runtime_data_type_pointer = Qnil; - -SWIGRUNTIME VALUE -getExceptionClass(void) { - static int init = 0; - static VALUE rubyExceptionClass ; - if (!init) { - init = 1; - rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception")); - } - return rubyExceptionClass; -} - -/* This code checks to see if the Ruby object being raised as part - of an exception inherits from the Ruby class Exception. If so, - the object is simply returned. If not, then a new Ruby exception - object is created and that will be returned to Ruby.*/ -SWIGRUNTIME VALUE -SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) { - VALUE exceptionClass = getExceptionClass(); - if (rb_obj_is_kind_of(obj, exceptionClass)) { - return obj; - } else { - return rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(obj)); - } -} - -/* Initialize Ruby runtime support */ -SWIGRUNTIME void -SWIG_Ruby_InitRuntime(void) -{ - if (_mSWIG == Qnil) { - _mSWIG = rb_define_module("SWIG"); - } -} - -/* Define Ruby class for C type */ -SWIGRUNTIME void -SWIG_Ruby_define_class(swig_type_info *type) -{ - VALUE klass; - char *klass_name = (char *) malloc(4 + strlen(type->name) + 1); - sprintf(klass_name, "TYPE%s", type->name); - if (NIL_P(_cSWIG_Pointer)) { - _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject); - rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new"); - } - klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer); - free((void *) klass_name); -} - -/* Create a new pointer object */ -SWIGRUNTIME VALUE -SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) -{ - int own = flags & SWIG_POINTER_OWN; - - char *klass_name; - swig_class *sklass; - VALUE klass; - VALUE obj; - - if (!ptr) - return Qnil; - - if (type->clientdata) { - sklass = (swig_class *) type->clientdata; - - /* Are we tracking this class and have we already returned this Ruby object? */ - if (sklass->trackObjects) { - obj = SWIG_RubyInstanceFor(ptr); - - /* Check the object's type and make sure it has the correct type. - It might not in cases where methods do things like - downcast methods. */ - if (obj != Qnil) { - VALUE value = rb_iv_get(obj, "__swigtype__"); - char* type_name = RSTRING_PTR(value); - - if (strcmp(type->name, type_name) == 0) { - return obj; - } - } - } - - /* Create a new Ruby object */ - obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr); - - /* If tracking is on for this class then track this object. */ - if (sklass->trackObjects) { - SWIG_RubyAddTracking(ptr, obj); - } - } else { - klass_name = (char *) malloc(4 + strlen(type->name) + 1); - sprintf(klass_name, "TYPE%s", type->name); - klass = rb_const_get(_mSWIG, rb_intern(klass_name)); - free((void *) klass_name); - obj = Data_Wrap_Struct(klass, 0, 0, ptr); - } - rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); - - return obj; -} - -/* Create a new class instance (always owned) */ -SWIGRUNTIME VALUE -SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type) -{ - VALUE obj; - swig_class *sklass = (swig_class *) type->clientdata; - obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0); - rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); - return obj; -} - -/* Get type mangle from class name */ -SWIGRUNTIMEINLINE char * -SWIG_Ruby_MangleStr(VALUE obj) -{ - VALUE stype = rb_iv_get(obj, "__swigtype__"); - return StringValuePtr(stype); -} - -/* Acquire a pointer value */ -typedef void (*ruby_owntype)(void*); - -SWIGRUNTIME ruby_owntype -SWIG_Ruby_AcquirePtr(VALUE obj, ruby_owntype own) { - if (obj) { - ruby_owntype oldown = RDATA(obj)->dfree; - RDATA(obj)->dfree = own; - return oldown; - } else { - return 0; - } -} - -/* Convert a pointer value */ -SWIGRUNTIME int -SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own) -{ - char *c; - swig_cast_info *tc; - void *vptr = 0; - - /* Grab the pointer */ - if (NIL_P(obj)) { - *ptr = 0; - return SWIG_OK; - } else { - if (TYPE(obj) != T_DATA) { - return SWIG_ERROR; - } - Data_Get_Struct(obj, void, vptr); - } - - if (own) *own = RDATA(obj)->dfree; - - /* Check to see if the input object is giving up ownership - of the underlying C struct or C++ object. If so then we - need to reset the destructor since the Ruby object no - longer owns the underlying C++ object.*/ - if (flags & SWIG_POINTER_DISOWN) { - /* Is tracking on for this class? */ - int track = 0; - if (ty && ty->clientdata) { - swig_class *sklass = (swig_class *) ty->clientdata; - track = sklass->trackObjects; - } - - if (track) { - /* We are tracking objects for this class. Thus we change the destructor - * to SWIG_RubyRemoveTracking. This allows us to - * remove the mapping from the C++ to Ruby object - * when the Ruby object is garbage collected. If we don't - * do this, then it is possible we will return a reference - * to a Ruby object that no longer exists thereby crashing Ruby. */ - RDATA(obj)->dfree = SWIG_RubyRemoveTracking; - } else { - RDATA(obj)->dfree = 0; - } - } - - /* Do type-checking if type info was provided */ - if (ty) { - if (ty->clientdata) { - if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) { - if (vptr == 0) { - /* The object has already been deleted */ - return SWIG_ObjectPreviouslyDeletedError; - } - *ptr = vptr; - return SWIG_OK; - } - } - if ((c = SWIG_MangleStr(obj)) == NULL) { - return SWIG_ERROR; - } - tc = SWIG_TypeCheck(c, ty); - if (!tc) { - return SWIG_ERROR; - } - *ptr = SWIG_TypeCast(tc, vptr); - } else { - *ptr = vptr; - } - - return SWIG_OK; -} - -/* Check convert */ -SWIGRUNTIMEINLINE int -SWIG_Ruby_CheckConvert(VALUE obj, swig_type_info *ty) -{ - char *c = SWIG_MangleStr(obj); - if (!c) return 0; - return SWIG_TypeCheck(c,ty) != 0; -} - -SWIGRUNTIME VALUE -SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) { - char result[1024]; - char *r = result; - if ((2*sz + 1 + strlen(type->name)) > 1000) return 0; - *(r++) = '_'; - r = SWIG_PackData(r, ptr, sz); - strcpy(r, type->name); - return rb_str_new2(result); -} - -/* Convert a packed value value */ -SWIGRUNTIME int -SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) { - swig_cast_info *tc; - const char *c; - - if (TYPE(obj) != T_STRING) goto type_error; - c = StringValuePtr(obj); - /* Pointer values must start with leading underscore */ - if (*c != '_') goto type_error; - c++; - c = SWIG_UnpackData(c, ptr, sz); - if (ty) { - tc = SWIG_TypeCheck(c, ty); - if (!tc) goto type_error; - } - return SWIG_OK; - - type_error: - return SWIG_ERROR; -} - -SWIGRUNTIME swig_module_info * -SWIG_Ruby_GetModule(void) -{ - VALUE pointer; - swig_module_info *ret = 0; - VALUE verbose = rb_gv_get("VERBOSE"); - - /* temporarily disable warnings, since the pointer check causes warnings with 'ruby -w' */ - rb_gv_set("VERBOSE", Qfalse); - - /* first check if pointer already created */ - pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME); - if (pointer != Qnil) { - Data_Get_Struct(pointer, swig_module_info, ret); - } - - /* reinstate warnings */ - rb_gv_set("VERBOSE", verbose); - return ret; -} - -SWIGRUNTIME void -SWIG_Ruby_SetModule(swig_module_info *pointer) -{ - /* register a new class */ - VALUE cl = rb_define_class("swig_runtime_data", rb_cObject); - /* create and store the structure pointer to a global variable */ - swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer); - rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer); -} - -#ifdef __cplusplus -#if 0 -{ /* cc-mode */ -#endif -} -#endif - - - -#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) - -#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else - - - -/* -------- TYPES TABLE (BEGIN) -------- */ - -#define SWIGTYPE_p_char swig_types[0] -static swig_type_info *swig_types[2]; -static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0}; -#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) -#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) - -/* -------- TYPES TABLE (END) -------- */ - -#define SWIG_init Init_DateTimePicker -#define SWIG_name "DateTimePicker" - -static VALUE mDateTimePicker; - -#define SWIGVERSION 0x010331 -#define SWIG_VERSION SWIGVERSION - - -#define SWIG_as_voidptr(a) (void *)((const void *)(a)) -#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) - - - extern void choose_datetime(char* callback, char* title, long initial_time, int format, char* data); - #define choose choose_datetime - - -SWIGINTERN swig_type_info* -SWIG_pchar_descriptor(void) -{ - static int init = 0; - static swig_type_info* info = 0; - if (!init) { - info = SWIG_TypeQuery("_p_char"); - init = 1; - } - return info; -} - - -SWIGINTERN int -SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) -{ - if (TYPE(obj) == T_STRING) { - - - - char *cstr = STR2CSTR(obj); - - size_t size = RSTRING_LEN(obj) + 1; - if (cptr) { - if (alloc) { - if (*alloc == SWIG_NEWOBJ) { - *cptr = (char *)memcpy((char *)malloc((size)*sizeof(char)), cstr, sizeof(char)*(size)); - } else { - *cptr = cstr; - *alloc = SWIG_OLDOBJ; - } - } - } - if (psize) *psize = size; - return SWIG_OK; - } else { - swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); - if (pchar_descriptor) { - void* vptr = 0; - if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) { - if (cptr) *cptr = (char *)vptr; - if (psize) *psize = vptr ? (strlen((char*)vptr) + 1) : 0; - if (alloc) *alloc = SWIG_OLDOBJ; - return SWIG_OK; - } - } - } - return SWIG_TypeError; -} - - - - - -#include <limits.h> -#ifndef LLONG_MIN -# define LLONG_MIN LONG_LONG_MIN -#endif -#ifndef LLONG_MAX -# define LLONG_MAX LONG_LONG_MAX -#endif -#ifndef ULLONG_MAX -# define ULLONG_MAX ULONG_LONG_MAX -#endif - - -SWIGINTERN VALUE -SWIG_ruby_failed(void) -{ - return Qnil; -} - - -/*@SWIG:%ruby_aux_method@*/ -SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) -{ - VALUE obj = args[0]; - VALUE type = TYPE(obj); - long *res = (long *)(args[1]); - *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj); - return obj; -} -/*@SWIG@*/ - -SWIGINTERN int -SWIG_AsVal_long (VALUE obj, long* val) -{ - VALUE type = TYPE(obj); - if ((type == T_FIXNUM) || (type == T_BIGNUM)) { - long v; - VALUE a[2]; - a[0] = obj; - a[1] = (VALUE)(&v); - if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) { - if (val) *val = v; - return SWIG_OK; - } - } - return SWIG_TypeError; -} - - -SWIGINTERN int -SWIG_AsVal_int (VALUE obj, int *val) -{ - long v; - int res = SWIG_AsVal_long (obj, &v); - if (SWIG_IsOK(res)) { - if ((v < INT_MIN || v > INT_MAX)) { - return SWIG_OverflowError; - } else { - if (val) *val = (int)(v); - } - } - return res; -} - -SWIGINTERN VALUE -_wrap_choose(int argc, VALUE *argv, VALUE self) { - char *arg1 = (char *) 0 ; - char *arg2 = (char *) 0 ; - long arg3 ; - int arg4 ; - char *arg5 = (char *) 0 ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int val4 ; - int ecode4 = 0 ; - int res5 ; - char *buf5 = 0 ; - int alloc5 = 0 ; - - { - arg5 = NULL; - } - if ((argc < 4) || (argc > 5)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; - } - res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "choose" "', argument " "1"" of type '" "char *""'"); - } - arg1 = (char *)(buf1); - res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "choose" "', argument " "2"" of type '" "char *""'"); - } - arg2 = (char *)(buf2); - { - VALUE t; - long val; - VALUE class; - VALUE class_str; - char *class_val; - - class = rb_funcall(argv[2], rb_intern("class"), 0); - class_str = rb_funcall(class, rb_intern("to_s"), 0); - class_val = StringValuePtr(class_str); - - if (!strcmp(class_val, "Time") == 0) { - rb_raise(SWIG_Ruby_ErrorType(SWIG_AttributeError), " of type '" "Time""'"); - } - t = rb_funcall(argv[2], rb_intern("to_i"), 0); - val = NUM2INT(t); - arg3 = (long)val; - } - ecode4 = SWIG_AsVal_int(argv[3], &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "choose" "', argument " "4"" of type '" "int""'"); - } - arg4 = (int)(val4); - if (argc > 4) { - res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "choose" "', argument " "5"" of type '" "char *""'"); - } - arg5 = (char *)(buf5); - } - choose(arg1,arg2,arg3,arg4,arg5); - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc5 == SWIG_NEWOBJ) free((char*)buf5); - return Qnil; -fail: - if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - if (alloc5 == SWIG_NEWOBJ) free((char*)buf5); - return Qnil; -} - - - -/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ - -static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; - -static swig_type_info *swig_type_initial[] = { - &_swigt__p_char, -}; - -static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; - -static swig_cast_info *swig_cast_initial[] = { - _swigc__p_char, -}; - - -/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ - -/* ----------------------------------------------------------------------------- - * Type initialization: - * This problem is tough by the requirement that no dynamic - * memory is used. Also, since swig_type_info structures store pointers to - * swig_cast_info structures and swig_cast_info structures store pointers back - * to swig_type_info structures, we need some lookup code at initialization. - * The idea is that swig generates all the structures that are needed. - * The runtime then collects these partially filled structures. - * The SWIG_InitializeModule function takes these initial arrays out of - * swig_module, and does all the lookup, filling in the swig_module.types - * array with the correct data and linking the correct swig_cast_info - * structures together. - * - * The generated swig_type_info structures are assigned staticly to an initial - * array. We just loop through that array, and handle each type individually. - * First we lookup if this type has been already loaded, and if so, use the - * loaded structure instead of the generated one. Then we have to fill in the - * cast linked list. The cast data is initially stored in something like a - * two-dimensional array. Each row corresponds to a type (there are the same - * number of rows as there are in the swig_type_initial array). Each entry in - * a column is one of the swig_cast_info structures for that type. - * The cast_initial array is actually an array of arrays, because each row has - * a variable number of columns. So to actually build the cast linked list, - * we find the array of casts associated with the type, and loop through it - * adding the casts to the list. The one last trick we need to do is making - * sure the type pointer in the swig_cast_info struct is correct. - * - * First off, we lookup the cast->type name to see if it is already loaded. - * There are three cases to handle: - * 1) If the cast->type has already been loaded AND the type we are adding - * casting info to has not been loaded (it is in this module), THEN we - * replace the cast->type pointer with the type pointer that has already - * been loaded. - * 2) If BOTH types (the one we are adding casting info to, and the - * cast->type) are loaded, THEN the cast info has already been loaded by - * the previous module so we just ignore it. - * 3) Finally, if cast->type has not already been loaded, then we add that - * swig_cast_info to the linked list (because the cast->type) pointer will - * be correct. - * ----------------------------------------------------------------------------- */ - -#ifdef __cplusplus -extern "C" { -#if 0 -} /* c-mode */ -#endif -#endif - -#if 0 -#define SWIGRUNTIME_DEBUG -#endif - - -SWIGRUNTIME void -SWIG_InitializeModule(void *clientdata) { - size_t i; - swig_module_info *module_head, *iter; - int found; - - clientdata = clientdata; - - /* check to see if the circular list has been setup, if not, set it up */ - if (swig_module.next==0) { - /* Initialize the swig_module */ - swig_module.type_initial = swig_type_initial; - swig_module.cast_initial = swig_cast_initial; - swig_module.next = &swig_module; - } - - /* Try and load any already created modules */ - module_head = SWIG_GetModule(clientdata); - if (!module_head) { - /* This is the first module loaded for this interpreter */ - /* so set the swig module into the interpreter */ - SWIG_SetModule(clientdata, &swig_module); - module_head = &swig_module; - } else { - /* the interpreter has loaded a SWIG module, but has it loaded this one? */ - found=0; - iter=module_head; - do { - if (iter==&swig_module) { - found=1; - break; - } - iter=iter->next; - } while (iter!= module_head); - - /* if the is found in the list, then all is done and we may leave */ - if (found) return; - /* otherwise we must add out module into the list */ - swig_module.next = module_head->next; - module_head->next = &swig_module; - } - - /* Now work on filling in swig_module.types */ -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: size %d\n", swig_module.size); -#endif - for (i = 0; i < swig_module.size; ++i) { - swig_type_info *type = 0; - swig_type_info *ret; - swig_cast_info *cast; - -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); -#endif - - /* if there is another module already loaded */ - if (swig_module.next != &swig_module) { - type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); - } - if (type) { - /* Overwrite clientdata field */ -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: found type %s\n", type->name); -#endif - if (swig_module.type_initial[i]->clientdata) { - type->clientdata = swig_module.type_initial[i]->clientdata; -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name); -#endif - } - } else { - type = swig_module.type_initial[i]; - } - - /* Insert casting types */ - cast = swig_module.cast_initial[i]; - while (cast->type) { - - /* Don't need to add information already in the list */ - ret = 0; -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: look cast %s\n", cast->type->name); -#endif - if (swig_module.next != &swig_module) { - ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); -#ifdef SWIGRUNTIME_DEBUG - if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name); -#endif - } - if (ret) { - if (type == swig_module.type_initial[i]) { -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: skip old type %s\n", ret->name); -#endif - cast->type = ret; - ret = 0; - } else { - /* Check for casting already in the list */ - swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type); -#ifdef SWIGRUNTIME_DEBUG - if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name); -#endif - if (!ocast) ret = 0; - } - } - - if (!ret) { -#ifdef SWIGRUNTIME_DEBUG - printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name); -#endif - if (type->cast) { - type->cast->prev = cast; - cast->next = type->cast; - } - type->cast = cast; - } - cast++; - } - /* Set entry in modules->types array equal to the type */ - swig_module.types[i] = type; - } - swig_module.types[i] = 0; - -#ifdef SWIGRUNTIME_DEBUG - printf("**** SWIG_InitializeModule: Cast List ******\n"); - for (i = 0; i < swig_module.size; ++i) { - int j = 0; - swig_cast_info *cast = swig_module.cast_initial[i]; - printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); - while (cast->type) { - printf("SWIG_InitializeModule: cast type %s\n", cast->type->name); - cast++; - ++j; - } - printf("---- Total casts: %d\n",j); - } - printf("**** SWIG_InitializeModule: Cast List ******\n"); -#endif -} - -/* This function will propagate the clientdata field of type to -* any new swig_type_info structures that have been added into the list -* of equivalent types. It is like calling -* SWIG_TypeClientData(type, clientdata) a second time. -*/ -SWIGRUNTIME void -SWIG_PropagateClientData(void) { - size_t i; - swig_cast_info *equiv; - static int init_run = 0; - - if (init_run) return; - init_run = 1; - - for (i = 0; i < swig_module.size; i++) { - if (swig_module.types[i]->clientdata) { - equiv = swig_module.types[i]->cast; - while (equiv) { - if (!equiv->converter) { - if (equiv->type && !equiv->type->clientdata) - SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); - } - equiv = equiv->next; - } - } - } -} - -#ifdef __cplusplus -#if 0 -{ /* c-mode */ -#endif -} -#endif - - -#ifdef __cplusplus -extern "C" -#endif -SWIGEXPORT void Init_DateTimePicker(void) { - size_t i; - - SWIG_InitRuntime(); - mDateTimePicker = rb_define_module("DateTimePicker"); - - SWIG_InitializeModule(0); - for (i = 0; i < swig_module.size; i++) { - SWIG_define_class(swig_module.types[i]); - } - - SWIG_RubyInitializeTrackings(); - rb_define_module_function(mDateTimePicker, "choose", _wrap_choose, -1); -} - +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 1.3.31 + * + * This file is not intended to be easily readable and contains a number of + * coding conventions designed to improve portability and efficiency. Do not make + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. + * ----------------------------------------------------------------------------- */ + +#define SWIGRUBY +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "3" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) +#else +# define SWIG_TYPE_TABLE_NAME +#endif + +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The swig conversion methods, as ConvertPtr, return and integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old swig versions, you usually write code as: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { + // success code + } else { + //fail code + } + + Now you can be more explicit as: + + int res = SWIG_ConvertPtr(obj,vptr,ty.flags); + if (SWIG_IsOK(res)) { + // success code + } else { + // fail code + } + + that seems to be the same, but now you can also do + + Type *ptr; + int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); + if (SWIG_IsOK(res)) { + // success code + if (SWIG_IsNewObj(res) { + ... + delete *ptr; + } else { + ... + } + } else { + // fail code + } + + I.e., now SWIG_ConvertPtr can return new objects and you can + identify the case and take care of the deallocation. Of course that + requires also to SWIG_ConvertPtr to return new result values, as + + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } + } + + Of course, returning the plain '0(success)/-1(fail)' still works, but you can be + more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the + swig errors code. + + Finally, if the SWIG_CASTRANK_MODE is enabled, the result code + allows to return the 'cast rank', for example, if you have this + + int food(double) + int fooi(int); + + and you call + + food(1) // cast rank '1' (1 -> 1.0) + fooi(1) // cast rank '0' + + just use the SWIG_AddCast()/SWIG_CheckState() + + + */ +#define SWIG_OK (0) +#define SWIG_ERROR (-1) +#define SWIG_IsOK(r) (r >= 0) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) + +/* The CastRankLimit says how many bits are used for the cast rank */ +#define SWIG_CASTRANKLIMIT (1 << 8) +/* The NewMask denotes the object was created (using new/malloc) */ +#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) +/* The TmpMask is for in/out typemaps that use temporal objects */ +#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) +/* Simple returning values */ +#define SWIG_BADOBJ (SWIG_ERROR) +#define SWIG_OLDOBJ (SWIG_OK) +#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) +#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) +/* Check, add and del mask methods */ +#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) +#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) +#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) +#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) +#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) +#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + + +/* Cast-Rank Mode */ +#if defined(SWIG_CASTRANK_MODE) +# ifndef SWIG_TypeRank +# define SWIG_TypeRank unsigned long +# endif +# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ +# define SWIG_MAXCASTRANK (2) +# endif +# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) +# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +} +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +} +#else /* no cast-rank mode */ +# define SWIG_AddCast +# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) +#endif + + + + +#include <string.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(*swig_converter_func)(void *); +typedef struct swig_type_info *(*swig_dycast_func)(void **); + +/* Structure to store inforomation on one type */ +typedef struct swig_type_info { + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ + int owndata; /* flag if the structure owns the clientdata */ +} swig_type_info; + +/* Structure to store a type and conversion function used for casting */ +typedef struct swig_cast_info { + swig_type_info *type; /* pointer to type that is equivalent to this type */ + swig_converter_func converter; /* function to cast the void pointers */ + struct swig_cast_info *next; /* pointer to next cast in linked list */ + struct swig_cast_info *prev; /* pointer to the previous cast */ +} swig_cast_info; + +/* Structure used to store module information + * Each module generates one structure like this, and the runtime collects + * all of these structures and stores them in a circularly linked list.*/ +typedef struct swig_module_info { + swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ + size_t size; /* Number of types in this module */ + struct swig_module_info *next; /* Pointer to next element in circularly linked list */ + swig_type_info **type_initial; /* Array of initially generated type structures */ + swig_cast_info **cast_initial; /* Array of initially generated casting structures */ + void *clientdata; /* Language specific module data */ +} swig_module_info; + +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. + + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +SWIGRUNTIME int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; + } + return (l1 - f1) - (l2 - f2); +} + +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if not equal, 1 if equal +*/ +SWIGRUNTIME int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; +} + +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if equal, -1 if nb < tb, 1 if nb > tb +*/ +SWIGRUNTIME int +SWIG_TypeCompare(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; +} + + +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + +/* + Check the typename +*/ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheck(const char *c, swig_type_info *ty) { + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); +} + +/* Same as previous function, except strcmp is replaced with a pointer comparison */ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); +} + +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { + swig_type_info *lastty = ty; + if (!ty || !ty->dcast) return ty; + while (ty && (ty->dcast)) { + ty = (*ty->dcast)(ptr); + if (ty) lastty = ty; + } + return lastty; +} + +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * +SWIG_TypeName(const swig_type_info *ty) { + return ty->name; +} + +/* + Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME const char * +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (!type) return NULL; + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; + } + else + return type->name; +} + +/* + Set the clientdata field for a type +*/ +SWIGRUNTIME void +SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ + ti->clientdata = clientdata; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); + } + } + cast = cast->next; + } +} +SWIGRUNTIME void +SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { + SWIG_TypeClientData(ti, clientdata); + ti->owndata = 1; +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); + } + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); + } + + /* neither found a match */ + return 0; +} + +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; + *(c++) = hex[(uu & 0xf0) >> 4]; + *(c++) = hex[uu & 0xf]; + } + return c; +} + +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu; + if ((d >= '0') && (d <= '9')) + uu = ((d - '0') << 4); + else if ((d >= 'a') && (d <= 'f')) + uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; + d = *(c++); + if ((d >= '0') && (d <= '9')) + uu |= (d - '0'); + else if ((d >= 'a') && (d <= 'f')) + uu |= (d - ('a'-10)); + else + return (char *) 0; + *u = uu; + } + return c; +} + +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); +} + +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} + +#ifdef __cplusplus +} +#endif + +/* Errors in SWIG */ +#define SWIG_UnknownError -1 +#define SWIG_IOError -2 +#define SWIG_RuntimeError -3 +#define SWIG_IndexError -4 +#define SWIG_TypeError -5 +#define SWIG_DivisionByZero -6 +#define SWIG_OverflowError -7 +#define SWIG_SyntaxError -8 +#define SWIG_ValueError -9 +#define SWIG_SystemError -10 +#define SWIG_AttributeError -11 +#define SWIG_MemoryError -12 +#define SWIG_NullReferenceError -13 + + + +#include <ruby.h> + +/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */ +#ifndef NUM2LL +#define NUM2LL(x) NUM2LONG((x)) +#endif +#ifndef LL2NUM +#define LL2NUM(x) INT2NUM((long) (x)) +#endif +#ifndef ULL2NUM +#define ULL2NUM(x) UINT2NUM((unsigned long) (x)) +#endif + +/* Ruby 1.7 doesn't (yet) define NUM2ULL() */ +#ifndef NUM2ULL +#ifdef HAVE_LONG_LONG +#define NUM2ULL(x) rb_num2ull((x)) +#else +#define NUM2ULL(x) NUM2ULONG(x) +#endif +#endif + +/* RSTRING_LEN, etc are new in Ruby 1.9, but ->ptr and ->len no longer work */ +/* Define these for older versions so we can just write code the new way */ +#ifndef RSTRING_LEN +# define RSTRING_LEN(x) RSTRING(x)->len +#endif +#ifndef RSTRING_PTR +# define RSTRING_PTR(x) RSTRING(x)->ptr +#endif +#ifndef RARRAY_LEN +# define RARRAY_LEN(x) RARRAY(x)->len +#endif +#ifndef RARRAY_PTR +# define RARRAY_PTR(x) RARRAY(x)->ptr +#endif + +/* + * Need to be very careful about how these macros are defined, especially + * when compiling C++ code or C code with an ANSI C compiler. + * + * VALUEFUNC(f) is a macro used to typecast a C function that implements + * a Ruby method so that it can be passed as an argument to API functions + * like rb_define_method() and rb_define_singleton_method(). + * + * VOIDFUNC(f) is a macro used to typecast a C function that implements + * either the "mark" or "free" stuff for a Ruby Data object, so that it + * can be passed as an argument to API functions like Data_Wrap_Struct() + * and Data_Make_Struct(). + */ + +#ifdef __cplusplus +# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */ +# define PROTECTFUNC(f) ((VALUE (*)()) f) +# define VALUEFUNC(f) ((VALUE (*)()) f) +# define VOIDFUNC(f) ((void (*)()) f) +# else +# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */ +# define PROTECTFUNC(f) ((VALUE (*)()) f) +# define VALUEFUNC(f) ((VALUE (*)()) f) +# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f) +# else /* These definitions should work for Ruby 1.7+ */ +# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f) +# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f) +# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f) +# endif +# endif +#else +# define VALUEFUNC(f) (f) +# define VOIDFUNC(f) (f) +#endif + +/* Don't use for expressions have side effect */ +#ifndef RB_STRING_VALUE +#define RB_STRING_VALUE(s) (TYPE(s) == T_STRING ? (s) : (*(volatile VALUE *)&(s) = rb_str_to_str(s))) +#endif +#ifndef StringValue +#define StringValue(s) RB_STRING_VALUE(s) +#endif +#ifndef StringValuePtr +#define StringValuePtr(s) RSTRING_PTR(RB_STRING_VALUE(s)) +#endif +#ifndef StringValueLen +#define StringValueLen(s) RSTRING_LEN(RB_STRING_VALUE(s)) +#endif +#ifndef SafeStringValue +#define SafeStringValue(v) do {\ + StringValue(v);\ + rb_check_safe_str(v);\ +} while (0) +#endif + +#ifndef HAVE_RB_DEFINE_ALLOC_FUNC +#define rb_define_alloc_func(klass, func) rb_define_singleton_method((klass), "new", VALUEFUNC((func)), -1) +#define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new") +#endif + + +/* ----------------------------------------------------------------------------- + * error manipulation + * ----------------------------------------------------------------------------- */ + + +/* Define some additional error types */ +#define SWIG_ObjectPreviouslyDeletedError -100 + + +/* Define custom exceptions for errors that do not map to existing Ruby + exceptions. Note this only works for C++ since a global cannot be + initialized by a funtion in C. For C, fallback to rb_eRuntimeError.*/ + +SWIGINTERN VALUE +getNullReferenceError(void) { + static int init = 0; + static VALUE rb_eNullReferenceError ; + if (!init) { + init = 1; + rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError); + } + return rb_eNullReferenceError; +} + +SWIGINTERN VALUE +getObjectPreviouslyDeletedError(void) { + static int init = 0; + static VALUE rb_eObjectPreviouslyDeleted ; + if (!init) { + init = 1; + rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError); + } + return rb_eObjectPreviouslyDeleted; +} + + +SWIGINTERN VALUE +SWIG_Ruby_ErrorType(int SWIG_code) { + VALUE type; + switch (SWIG_code) { + case SWIG_MemoryError: + type = rb_eNoMemError; + break; + case SWIG_IOError: + type = rb_eIOError; + break; + case SWIG_RuntimeError: + type = rb_eRuntimeError; + break; + case SWIG_IndexError: + type = rb_eIndexError; + break; + case SWIG_TypeError: + type = rb_eTypeError; + break; + case SWIG_DivisionByZero: + type = rb_eZeroDivError; + break; + case SWIG_OverflowError: + type = rb_eRangeError; + break; + case SWIG_SyntaxError: + type = rb_eSyntaxError; + break; + case SWIG_ValueError: + type = rb_eArgError; + break; + case SWIG_SystemError: + type = rb_eFatal; + break; + case SWIG_AttributeError: + type = rb_eRuntimeError; + break; + case SWIG_NullReferenceError: + type = getNullReferenceError(); + break; + case SWIG_ObjectPreviouslyDeletedError: + type = getObjectPreviouslyDeletedError(); + break; + case SWIG_UnknownError: + type = rb_eRuntimeError; + break; + default: + type = rb_eRuntimeError; + } + return type; +} + + + + +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * rubytracking.swg + * + * This file contains support for tracking mappings from + * Ruby objects to C++ objects. This functionality is needed + * to implement mark functions for Ruby's mark and sweep + * garbage collector. + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Global Ruby hash table to store Trackings from C/C++ + structs to Ruby Objects. */ +static VALUE swig_ruby_trackings; + +/* Global variable that stores a reference to the ruby + hash table delete function. */ +static ID swig_ruby_hash_delete = 0; + +/* Setup a Ruby hash table to store Trackings */ +SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) { + /* Create a ruby hash table to store Trackings from C++ + objects to Ruby objects. Also make sure to tell + the garabage collector about the hash table. */ + swig_ruby_trackings = rb_hash_new(); + rb_gc_register_address(&swig_ruby_trackings); + + /* Now store a reference to the hash table delete function + so that we only have to look it up once.*/ + swig_ruby_hash_delete = rb_intern("delete"); +} + +/* Get a Ruby number to reference a pointer */ +SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) { + /* We cast the pointer to an unsigned long + and then store a reference to it using + a Ruby number object. */ + + /* Convert the pointer to a Ruby number */ + unsigned long value = (unsigned long) ptr; + return LONG2NUM(value); +} + +/* Get a Ruby number to reference an object */ +SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) { + /* We cast the object to an unsigned long + and then store a reference to it using + a Ruby number object. */ + + /* Convert the Object to a Ruby number */ + unsigned long value = (unsigned long) object; + return LONG2NUM(value); +} + +/* Get a Ruby object from a previously stored reference */ +SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) { + /* The provided Ruby number object is a reference + to the Ruby object we want.*/ + + /* First convert the Ruby number to a C number */ + unsigned long value = NUM2LONG(reference); + return (VALUE) value; +} + +/* Add a Tracking from a C/C++ struct to a Ruby object */ +SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) { + /* In a Ruby hash table we store the pointer and + the associated Ruby object. The trick here is + that we cannot store the Ruby object directly - if + we do then it cannot be garbage collected. So + instead we typecast it as a unsigned long and + convert it to a Ruby number object.*/ + + /* Get a reference to the pointer as a Ruby number */ + VALUE key = SWIG_RubyPtrToReference(ptr); + + /* Get a reference to the Ruby object as a Ruby number */ + VALUE value = SWIG_RubyObjectToReference(object); + + /* Store the mapping to the global hash table. */ + rb_hash_aset(swig_ruby_trackings, key, value); +} + +/* Get the Ruby object that owns the specified C/C++ struct */ +SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) { + /* Get a reference to the pointer as a Ruby number */ + VALUE key = SWIG_RubyPtrToReference(ptr); + + /* Now lookup the value stored in the global hash table */ + VALUE value = rb_hash_aref(swig_ruby_trackings, key); + + if (value == Qnil) { + /* No object exists - return nil. */ + return Qnil; + } + else { + /* Convert this value to Ruby object */ + return SWIG_RubyReferenceToObject(value); + } +} + +/* Remove a Tracking from a C/C++ struct to a Ruby object. It + is very important to remove objects once they are destroyed + since the same memory address may be reused later to create + a new object. */ +SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) { + /* Get a reference to the pointer as a Ruby number */ + VALUE key = SWIG_RubyPtrToReference(ptr); + + /* Delete the object from the hash table by calling Ruby's + do this we need to call the Hash.delete method.*/ + rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key); +} + +/* This is a helper method that unlinks a Ruby object from its + underlying C++ object. This is needed if the lifetime of the + Ruby object is longer than the C++ object */ +SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) { + VALUE object = SWIG_RubyInstanceFor(ptr); + + if (object != Qnil) { + DATA_PTR(object) = 0; + } +} + + +#ifdef __cplusplus +} +#endif + +/* ----------------------------------------------------------------------------- + * Ruby API portion that goes into the runtime + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#endif + +SWIGINTERN VALUE +SWIG_Ruby_AppendOutput(VALUE target, VALUE o) { + if (NIL_P(target)) { + target = o; + } else { + if (TYPE(target) != T_ARRAY) { + VALUE o2 = target; + target = rb_ary_new(); + rb_ary_push(target, o2); + } + rb_ary_push(target, o); + } + return target; +} + +#ifdef __cplusplus +} +#endif + + +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * rubyrun.swg + * + * This file contains the runtime support for Ruby modules + * and includes code for managing global variables and pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* For backward compatibility only */ +#define SWIG_POINTER_EXCEPTION 0 + +/* for raw pointers */ +#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) +#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own) +#define SWIG_NewPointerObj(ptr, type, flags) SWIG_Ruby_NewPointerObj(ptr, type, flags) +#define SWIG_AcquirePtr(ptr, own) SWIG_Ruby_AcquirePtr(ptr, own) +#define swig_owntype ruby_owntype + +/* for raw packed data */ +#define SWIG_ConvertPacked(obj, ptr, sz, ty) SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags) +#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Ruby_NewPackedObj(ptr, sz, type) + +/* for class or struct pointers */ +#define SWIG_ConvertInstance(obj, pptr, type, flags) SWIG_ConvertPtr(obj, pptr, type, flags) +#define SWIG_NewInstanceObj(ptr, type, flags) SWIG_NewPointerObj(ptr, type, flags) + +/* for C or C++ function pointers */ +#define SWIG_ConvertFunctionPtr(obj, pptr, type) SWIG_ConvertPtr(obj, pptr, type, 0) +#define SWIG_NewFunctionPtrObj(ptr, type) SWIG_NewPointerObj(ptr, type, 0) + +/* for C++ member pointers, ie, member methods */ +#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty) +#define SWIG_NewMemberObj(ptr, sz, type) SWIG_Ruby_NewPackedObj(ptr, sz, type) + + +/* Runtime API */ + +#define SWIG_GetModule(clientdata) SWIG_Ruby_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Ruby_SetModule(pointer) + + +/* Error manipulation */ + +#define SWIG_ErrorType(code) SWIG_Ruby_ErrorType(code) +#define SWIG_Error(code, msg) rb_raise(SWIG_Ruby_ErrorType(code), msg) +#define SWIG_fail goto fail + + +/* Ruby-specific SWIG API */ + +#define SWIG_InitRuntime() SWIG_Ruby_InitRuntime() +#define SWIG_define_class(ty) SWIG_Ruby_define_class(ty) +#define SWIG_NewClassInstance(value, ty) SWIG_Ruby_NewClassInstance(value, ty) +#define SWIG_MangleStr(value) SWIG_Ruby_MangleStr(value) +#define SWIG_CheckConvert(value, ty) SWIG_Ruby_CheckConvert(value, ty) + + +/* ----------------------------------------------------------------------------- + * pointers/data manipulation + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* cc-mode */ +#endif +#endif + +typedef struct { + VALUE klass; + VALUE mImpl; + void (*mark)(void *); + void (*destroy)(void *); + int trackObjects; +} swig_class; + + +static VALUE _mSWIG = Qnil; +static VALUE _cSWIG_Pointer = Qnil; +static VALUE swig_runtime_data_type_pointer = Qnil; + +SWIGRUNTIME VALUE +getExceptionClass(void) { + static int init = 0; + static VALUE rubyExceptionClass ; + if (!init) { + init = 1; + rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception")); + } + return rubyExceptionClass; +} + +/* This code checks to see if the Ruby object being raised as part + of an exception inherits from the Ruby class Exception. If so, + the object is simply returned. If not, then a new Ruby exception + object is created and that will be returned to Ruby.*/ +SWIGRUNTIME VALUE +SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) { + VALUE exceptionClass = getExceptionClass(); + if (rb_obj_is_kind_of(obj, exceptionClass)) { + return obj; + } else { + return rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(obj)); + } +} + +/* Initialize Ruby runtime support */ +SWIGRUNTIME void +SWIG_Ruby_InitRuntime(void) +{ + if (_mSWIG == Qnil) { + _mSWIG = rb_define_module("SWIG"); + } +} + +/* Define Ruby class for C type */ +SWIGRUNTIME void +SWIG_Ruby_define_class(swig_type_info *type) +{ + VALUE klass; + char *klass_name = (char *) malloc(4 + strlen(type->name) + 1); + sprintf(klass_name, "TYPE%s", type->name); + if (NIL_P(_cSWIG_Pointer)) { + _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject); + rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new"); + } + klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer); + free((void *) klass_name); +} + +/* Create a new pointer object */ +SWIGRUNTIME VALUE +SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) +{ + int own = flags & SWIG_POINTER_OWN; + + char *klass_name; + swig_class *sklass; + VALUE klass; + VALUE obj; + + if (!ptr) + return Qnil; + + if (type->clientdata) { + sklass = (swig_class *) type->clientdata; + + /* Are we tracking this class and have we already returned this Ruby object? */ + if (sklass->trackObjects) { + obj = SWIG_RubyInstanceFor(ptr); + + /* Check the object's type and make sure it has the correct type. + It might not in cases where methods do things like + downcast methods. */ + if (obj != Qnil) { + VALUE value = rb_iv_get(obj, "__swigtype__"); + char* type_name = RSTRING_PTR(value); + + if (strcmp(type->name, type_name) == 0) { + return obj; + } + } + } + + /* Create a new Ruby object */ + obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr); + + /* If tracking is on for this class then track this object. */ + if (sklass->trackObjects) { + SWIG_RubyAddTracking(ptr, obj); + } + } else { + klass_name = (char *) malloc(4 + strlen(type->name) + 1); + sprintf(klass_name, "TYPE%s", type->name); + klass = rb_const_get(_mSWIG, rb_intern(klass_name)); + free((void *) klass_name); + obj = Data_Wrap_Struct(klass, 0, 0, ptr); + } + rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); + + return obj; +} + +/* Create a new class instance (always owned) */ +SWIGRUNTIME VALUE +SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type) +{ + VALUE obj; + swig_class *sklass = (swig_class *) type->clientdata; + obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0); + rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); + return obj; +} + +/* Get type mangle from class name */ +SWIGRUNTIMEINLINE char * +SWIG_Ruby_MangleStr(VALUE obj) +{ + VALUE stype = rb_iv_get(obj, "__swigtype__"); + return StringValuePtr(stype); +} + +/* Acquire a pointer value */ +typedef void (*ruby_owntype)(void*); + +SWIGRUNTIME ruby_owntype +SWIG_Ruby_AcquirePtr(VALUE obj, ruby_owntype own) { + if (obj) { + ruby_owntype oldown = RDATA(obj)->dfree; + RDATA(obj)->dfree = own; + return oldown; + } else { + return 0; + } +} + +/* Convert a pointer value */ +SWIGRUNTIME int +SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own) +{ + char *c; + swig_cast_info *tc; + void *vptr = 0; + + /* Grab the pointer */ + if (NIL_P(obj)) { + *ptr = 0; + return SWIG_OK; + } else { + if (TYPE(obj) != T_DATA) { + return SWIG_ERROR; + } + Data_Get_Struct(obj, void, vptr); + } + + if (own) *own = RDATA(obj)->dfree; + + /* Check to see if the input object is giving up ownership + of the underlying C struct or C++ object. If so then we + need to reset the destructor since the Ruby object no + longer owns the underlying C++ object.*/ + if (flags & SWIG_POINTER_DISOWN) { + /* Is tracking on for this class? */ + int track = 0; + if (ty && ty->clientdata) { + swig_class *sklass = (swig_class *) ty->clientdata; + track = sklass->trackObjects; + } + + if (track) { + /* We are tracking objects for this class. Thus we change the destructor + * to SWIG_RubyRemoveTracking. This allows us to + * remove the mapping from the C++ to Ruby object + * when the Ruby object is garbage collected. If we don't + * do this, then it is possible we will return a reference + * to a Ruby object that no longer exists thereby crashing Ruby. */ + RDATA(obj)->dfree = SWIG_RubyRemoveTracking; + } else { + RDATA(obj)->dfree = 0; + } + } + + /* Do type-checking if type info was provided */ + if (ty) { + if (ty->clientdata) { + if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) { + if (vptr == 0) { + /* The object has already been deleted */ + return SWIG_ObjectPreviouslyDeletedError; + } + *ptr = vptr; + return SWIG_OK; + } + } + if ((c = SWIG_MangleStr(obj)) == NULL) { + return SWIG_ERROR; + } + tc = SWIG_TypeCheck(c, ty); + if (!tc) { + return SWIG_ERROR; + } + *ptr = SWIG_TypeCast(tc, vptr); + } else { + *ptr = vptr; + } + + return SWIG_OK; +} + +/* Check convert */ +SWIGRUNTIMEINLINE int +SWIG_Ruby_CheckConvert(VALUE obj, swig_type_info *ty) +{ + char *c = SWIG_MangleStr(obj); + if (!c) return 0; + return SWIG_TypeCheck(c,ty) != 0; +} + +SWIGRUNTIME VALUE +SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) { + char result[1024]; + char *r = result; + if ((2*sz + 1 + strlen(type->name)) > 1000) return 0; + *(r++) = '_'; + r = SWIG_PackData(r, ptr, sz); + strcpy(r, type->name); + return rb_str_new2(result); +} + +/* Convert a packed value value */ +SWIGRUNTIME int +SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) { + swig_cast_info *tc; + const char *c; + + if (TYPE(obj) != T_STRING) goto type_error; + c = StringValuePtr(obj); + /* Pointer values must start with leading underscore */ + if (*c != '_') goto type_error; + c++; + c = SWIG_UnpackData(c, ptr, sz); + if (ty) { + tc = SWIG_TypeCheck(c, ty); + if (!tc) goto type_error; + } + return SWIG_OK; + + type_error: + return SWIG_ERROR; +} + +SWIGRUNTIME swig_module_info * +SWIG_Ruby_GetModule(void) +{ + VALUE pointer; + swig_module_info *ret = 0; + VALUE verbose = rb_gv_get("VERBOSE"); + + /* temporarily disable warnings, since the pointer check causes warnings with 'ruby -w' */ + rb_gv_set("VERBOSE", Qfalse); + + /* first check if pointer already created */ + pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME); + if (pointer != Qnil) { + Data_Get_Struct(pointer, swig_module_info, ret); + } + + /* reinstate warnings */ + rb_gv_set("VERBOSE", verbose); + return ret; +} + +SWIGRUNTIME void +SWIG_Ruby_SetModule(swig_module_info *pointer) +{ + /* register a new class */ + VALUE cl = rb_define_class("swig_runtime_data", rb_cObject); + /* create and store the structure pointer to a global variable */ + swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer); + rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer); +} + +#ifdef __cplusplus +#if 0 +{ /* cc-mode */ +#endif +} +#endif + + + +#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) + +#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else + + + +/* -------- TYPES TABLE (BEGIN) -------- */ + +#define SWIGTYPE_p_char swig_types[0] +static swig_type_info *swig_types[2]; +static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0}; +#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) +#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) + +/* -------- TYPES TABLE (END) -------- */ + +#define SWIG_init Init_DateTimePicker +#define SWIG_name "DateTimePicker" + +static VALUE mDateTimePicker; + +#define SWIGVERSION 0x010331 +#define SWIG_VERSION SWIGVERSION + + +#define SWIG_as_voidptr(a) (void *)((const void *)(a)) +#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) + + + extern void choose_datetime(char* callback, char* title, long initial_time, int format, char* data); + #define choose choose_datetime + + +SWIGINTERN swig_type_info* +SWIG_pchar_descriptor(void) +{ + static int init = 0; + static swig_type_info* info = 0; + if (!init) { + info = SWIG_TypeQuery("_p_char"); + init = 1; + } + return info; +} + + +SWIGINTERN int +SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) +{ + if (TYPE(obj) == T_STRING) { + + + + char *cstr = STR2CSTR(obj); + + size_t size = RSTRING_LEN(obj) + 1; + if (cptr) { + if (alloc) { + if (*alloc == SWIG_NEWOBJ) { + *cptr = (char *)memcpy((char *)malloc((size)*sizeof(char)), cstr, sizeof(char)*(size)); + } else { + *cptr = cstr; + *alloc = SWIG_OLDOBJ; + } + } + } + if (psize) *psize = size; + return SWIG_OK; + } else { + swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); + if (pchar_descriptor) { + void* vptr = 0; + if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) { + if (cptr) *cptr = (char *)vptr; + if (psize) *psize = vptr ? (strlen((char*)vptr) + 1) : 0; + if (alloc) *alloc = SWIG_OLDOBJ; + return SWIG_OK; + } + } + } + return SWIG_TypeError; +} + + + + + +#include <limits.h> +#ifndef LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#ifndef LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + + +SWIGINTERN VALUE +SWIG_ruby_failed(void) +{ + return Qnil; +} + + +/*@SWIG:%ruby_aux_method@*/ +SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) +{ + VALUE obj = args[0]; + VALUE type = TYPE(obj); + long *res = (long *)(args[1]); + *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj); + return obj; +} +/*@SWIG@*/ + +SWIGINTERN int +SWIG_AsVal_long (VALUE obj, long* val) +{ + VALUE type = TYPE(obj); + if ((type == T_FIXNUM) || (type == T_BIGNUM)) { + long v; + VALUE a[2]; + a[0] = obj; + a[1] = (VALUE)(&v); + if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) { + if (val) *val = v; + return SWIG_OK; + } + } + return SWIG_TypeError; +} + + +SWIGINTERN int +SWIG_AsVal_int (VALUE obj, int *val) +{ + long v; + int res = SWIG_AsVal_long (obj, &v); + if (SWIG_IsOK(res)) { + if ((v < INT_MIN || v > INT_MAX)) { + return SWIG_OverflowError; + } else { + if (val) *val = (int)(v); + } + } + return res; +} + +SWIGINTERN VALUE +_wrap_choose(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + long arg3 ; + int arg4 ; + char *arg5 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val4 ; + int ecode4 = 0 ; + int res5 ; + char *buf5 = 0 ; + int alloc5 = 0 ; + + { + arg5 = NULL; + } + if ((argc < 4) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "choose" "', argument " "1"" of type '" "char *""'"); + } + arg1 = (char *)(buf1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "choose" "', argument " "2"" of type '" "char *""'"); + } + arg2 = (char *)(buf2); + { + VALUE t; + long val; + VALUE class; + VALUE class_str; + char *class_val; + + class = rb_funcall(argv[2], rb_intern("class"), 0); + class_str = rb_funcall(class, rb_intern("to_s"), 0); + class_val = StringValuePtr(class_str); + + if (!strcmp(class_val, "Time") == 0) { + rb_raise(SWIG_Ruby_ErrorType(SWIG_AttributeError), " of type '" "Time""'"); + } + t = rb_funcall(argv[2], rb_intern("to_i"), 0); + val = NUM2INT(t); + arg3 = (long)val; + } + ecode4 = SWIG_AsVal_int(argv[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "choose" "', argument " "4"" of type '" "int""'"); + } + arg4 = (int)(val4); + if (argc > 4) { + res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "choose" "', argument " "5"" of type '" "char *""'"); + } + arg5 = (char *)(buf5); + } + choose(arg1,arg2,arg3,arg4,arg5); + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc5 == SWIG_NEWOBJ) free((char*)buf5); + return Qnil; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + if (alloc5 == SWIG_NEWOBJ) free((char*)buf5); + return Qnil; +} + + + +/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ + +static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; + +static swig_type_info *swig_type_initial[] = { + &_swigt__p_char, +}; + +static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; + +static swig_cast_info *swig_cast_initial[] = { + _swigc__p_char, +}; + + +/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ + +/* ----------------------------------------------------------------------------- + * Type initialization: + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to + * swig_cast_info structures and swig_cast_info structures store pointers back + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of + * swig_module, and does all the lookup, filling in the swig_module.types + * array with the correct data and linking the correct swig_cast_info + * structures together. + * + * The generated swig_type_info structures are assigned staticly to an initial + * array. We just loop through that array, and handle each type individually. + * First we lookup if this type has been already loaded, and if so, use the + * loaded structure instead of the generated one. Then we have to fill in the + * cast linked list. The cast data is initially stored in something like a + * two-dimensional array. Each row corresponds to a type (there are the same + * number of rows as there are in the swig_type_initial array). Each entry in + * a column is one of the swig_cast_info structures for that type. + * The cast_initial array is actually an array of arrays, because each row has + * a variable number of columns. So to actually build the cast linked list, + * we find the array of casts associated with the type, and loop through it + * adding the casts to the list. The one last trick we need to do is making + * sure the type pointer in the swig_cast_info struct is correct. + * + * First off, we lookup the cast->type name to see if it is already loaded. + * There are three cases to handle: + * 1) If the cast->type has already been loaded AND the type we are adding + * casting info to has not been loaded (it is in this module), THEN we + * replace the cast->type pointer with the type pointer that has already + * been loaded. + * 2) If BOTH types (the one we are adding casting info to, and the + * cast->type) are loaded, THEN the cast info has already been loaded by + * the previous module so we just ignore it. + * 3) Finally, if cast->type has not already been loaded, then we add that + * swig_cast_info to the linked list (because the cast->type) pointer will + * be correct. + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* c-mode */ +#endif +#endif + +#if 0 +#define SWIGRUNTIME_DEBUG +#endif + + +SWIGRUNTIME void +SWIG_InitializeModule(void *clientdata) { + size_t i; + swig_module_info *module_head, *iter; + int found; + + clientdata = clientdata; + + /* check to see if the circular list has been setup, if not, set it up */ + if (swig_module.next==0) { + /* Initialize the swig_module */ + swig_module.type_initial = swig_type_initial; + swig_module.cast_initial = swig_cast_initial; + swig_module.next = &swig_module; + } + + /* Try and load any already created modules */ + module_head = SWIG_GetModule(clientdata); + if (!module_head) { + /* This is the first module loaded for this interpreter */ + /* so set the swig module into the interpreter */ + SWIG_SetModule(clientdata, &swig_module); + module_head = &swig_module; + } else { + /* the interpreter has loaded a SWIG module, but has it loaded this one? */ + found=0; + iter=module_head; + do { + if (iter==&swig_module) { + found=1; + break; + } + iter=iter->next; + } while (iter!= module_head); + + /* if the is found in the list, then all is done and we may leave */ + if (found) return; + /* otherwise we must add out module into the list */ + swig_module.next = module_head->next; + module_head->next = &swig_module; + } + + /* Now work on filling in swig_module.types */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: size %d\n", swig_module.size); +#endif + for (i = 0; i < swig_module.size; ++i) { + swig_type_info *type = 0; + swig_type_info *ret; + swig_cast_info *cast; + +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); +#endif + + /* if there is another module already loaded */ + if (swig_module.next != &swig_module) { + type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); + } + if (type) { + /* Overwrite clientdata field */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found type %s\n", type->name); +#endif + if (swig_module.type_initial[i]->clientdata) { + type->clientdata = swig_module.type_initial[i]->clientdata; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name); +#endif + } + } else { + type = swig_module.type_initial[i]; + } + + /* Insert casting types */ + cast = swig_module.cast_initial[i]; + while (cast->type) { + + /* Don't need to add information already in the list */ + ret = 0; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: look cast %s\n", cast->type->name); +#endif + if (swig_module.next != &swig_module) { + ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); +#ifdef SWIGRUNTIME_DEBUG + if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name); +#endif + } + if (ret) { + if (type == swig_module.type_initial[i]) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: skip old type %s\n", ret->name); +#endif + cast->type = ret; + ret = 0; + } else { + /* Check for casting already in the list */ + swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type); +#ifdef SWIGRUNTIME_DEBUG + if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name); +#endif + if (!ocast) ret = 0; + } + } + + if (!ret) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name); +#endif + if (type->cast) { + type->cast->prev = cast; + cast->next = type->cast; + } + type->cast = cast; + } + cast++; + } + /* Set entry in modules->types array equal to the type */ + swig_module.types[i] = type; + } + swig_module.types[i] = 0; + +#ifdef SWIGRUNTIME_DEBUG + printf("**** SWIG_InitializeModule: Cast List ******\n"); + for (i = 0; i < swig_module.size; ++i) { + int j = 0; + swig_cast_info *cast = swig_module.cast_initial[i]; + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); + while (cast->type) { + printf("SWIG_InitializeModule: cast type %s\n", cast->type->name); + cast++; + ++j; + } + printf("---- Total casts: %d\n",j); + } + printf("**** SWIG_InitializeModule: Cast List ******\n"); +#endif +} + +/* This function will propagate the clientdata field of type to +* any new swig_type_info structures that have been added into the list +* of equivalent types. It is like calling +* SWIG_TypeClientData(type, clientdata) a second time. +*/ +SWIGRUNTIME void +SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } + } + } +} + +#ifdef __cplusplus +#if 0 +{ /* c-mode */ +#endif +} +#endif + + +#ifdef __cplusplus +extern "C" +#endif +SWIGEXPORT void Init_DateTimePicker(void) { + size_t i; + + SWIG_InitRuntime(); + mDateTimePicker = rb_define_module("DateTimePicker"); + + SWIG_InitializeModule(0); + for (i = 0; i < swig_module.size; i++) { + SWIG_define_class(swig_module.types[i]); + } + + SWIG_RubyInitializeTrackings(); + rb_define_module_function(mDateTimePicker, "choose", _wrap_choose, -1); +} + platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c @@ -52,8 +52,6 @@ fail: extern "C" #endif void Init_GeoLocation(void) { - size_t i; - mGeoLocation = rb_define_module("GeoLocation"); rb_define_module_function(mGeoLocation, "latitude", wrap_geo_latitude, -1); platform/shared/ruby/ext/geolocation/geolocation_rhowrap.c @@ -12,13 +12,13 @@ char **ret_val; if (input_arr) { len = RARRAY_LEN(input_arr); - ret_val = (char **)malloc(3*len*sizeof(char*)); + ret_val = (char **)malloc(4*len*sizeof(char*)); for(i=0; i<len; i++) { - char *val1, *val2, *val3; + char *val1, *val2, *val3, *val4; VALUE hash = rb_ary_entry($input,i); VALUE keys_arr = rb_funcall(hash, rb_intern("keys"), 0, NULL); int keys_len = RARRAY_LEN(keys_arr); - val1 = val2 = val3 = NULL; + val1 = val2 = val3 = val4 = NULL; for(j=0; j<keys_len; j++) { VALUE val; char *tmp; @@ -33,10 +33,17 @@ val = rb_funcall(data, rb_intern("to_s"), 0, NULL); tmp = StringValuePtr(val); break; + case T_TRUE: + val = rb_funcall(data, rb_intern("to_s"), 0, NULL); + tmp = StringValuePtr(val); + break; + case T_FALSE: + val = rb_funcall(data, rb_intern("to_s"), 0, NULL); + tmp = StringValuePtr(val); + break; default: tmp = NULL; break; - } if (!strcmp(key_str,"label")) { val1 = tmp; @@ -44,11 +51,14 @@ val2 = tmp; } else if (!strcmp(key_str, "icon")) { val3 = tmp; - } + } else if (!strcmp(key_str, "reload")) { + val4 = tmp; + } } ret_val[arr_len++] = val1; ret_val[arr_len++] = val2; ret_val[arr_len++] = val3; + ret_val[arr_len++] = val4; } } $1 = arr_len; @@ -56,7 +66,7 @@ } %typemap(freearg) (int nparams, char** params) { - free((void *) $2); + free((void *) $2); } extern void create(int bar_type, int nparams, char** params); \ No newline at end of file platform/shared/ruby/ext/nativebar/nativebar.i @@ -1636,13 +1636,13 @@ _wrap_create(int argc, VALUE *argv, VALUE self) { char **ret_val; if (input_arr) { len = RARRAY_LEN(input_arr); - ret_val = (char **)malloc(3*len*sizeof(char*)); + ret_val = (char **)malloc(4*len*sizeof(char*)); for(i=0; i<len; i++) { - char *val1, *val2, *val3; + char *val1, *val2, *val3, *val4; VALUE hash = rb_ary_entry(argv[1],i); VALUE keys_arr = rb_funcall(hash, rb_intern("keys"), 0, NULL); int keys_len = RARRAY_LEN(keys_arr); - val1 = val2 = val3 = NULL; + val1 = val2 = val3 = val4 = NULL; for(j=0; j<keys_len; j++) { VALUE val; char *tmp; @@ -1657,10 +1657,17 @@ _wrap_create(int argc, VALUE *argv, VALUE self) { val = rb_funcall(data, rb_intern("to_s"), 0, NULL); tmp = StringValuePtr(val); break; + case T_TRUE: + val = rb_funcall(data, rb_intern("to_s"), 0, NULL); + tmp = StringValuePtr(val); + break; + case T_FALSE: + val = rb_funcall(data, rb_intern("to_s"), 0, NULL); + tmp = StringValuePtr(val); + break; default: tmp = NULL; break; - } if (!strcmp(key_str,"label")) { val1 = tmp; @@ -1668,11 +1675,14 @@ _wrap_create(int argc, VALUE *argv, VALUE self) { val2 = tmp; } else if (!strcmp(key_str, "icon")) { val3 = tmp; - } + } else if (!strcmp(key_str, "reload")) { + val4 = tmp; + } } ret_val[arr_len++] = val1; ret_val[arr_len++] = val2; ret_val[arr_len++] = val3; + ret_val[arr_len++] = val4; } } arg2 = arr_len; platform/shared/ruby/ext/nativebar/nativebar_wrap.c @@ -10,15 +10,60 @@ extern "C" { ********************************************/ #define RUBY_PB_ID "id" +#define RUBY_PB_PREFIX "prefix" #define RUBY_PB_FIRST_NAME "first_name" +#define RUBY_PB_MIDDLE_NAME "middle_name" #define RUBY_PB_LAST_NAME "last_name" -#define RUBY_PB_MOBILE_NUMBER "mobile_number" -#define RUBY_PB_HOME_NUMBER "home_number" -#define RUBY_PB_BUSINESS_NUMBER "business_number" +#define RUBY_PB_SUFFIX "suffix" +#define RUBY_PB_NICKNAME "nickname" + +#define RUBY_PB_NOTE "person_note" + +#define RUBY_PB_BUSINESS_NUMBER "business_number" +#define RUBY_PB_HOME_NUMBER "home_number" +#define RUBY_PB_MOBILE_NUMBER "mobile_number" + +#define RUBY_PB_MAIN_MUMBER "main_number" +#define RUBY_PB_PAGER_NUMBER "pager_number" +#define RUBY_PB_HOME_FAX "home_fax" +#define RUBY_PB_WORK_FAX "work_fax" +#define RUBY_PB_ASSISTANT_NUMBER "assistant_number" + #define RUBY_PB_EMAIL_ADDRESS "email_address" +#define RUBY_PB_HOME_EMAIL_ADDRESS "home_email_address" +#define RUBY_PB_OTHER_EMAIL_ADDRESS "other_email_address" + #define RUBY_PB_COMPANY_NAME "company_name" +#define RUBY_PB_JOB_TITLE "job_title" +#define RUBY_PB_BIRTHDAY "birthday" + +#define RUBY_PB_STREET_ADDRESS_1 "street_address_1" +#define RUBY_PB_CITY_1 "city_1" +#define RUBY_PB_STATE_1 "state_1" +#define RUBY_PB_ZIP_1 "zip_1" +#define RUBY_PB_COUNTRY_1 "country_1" + +#define RUBY_PB_STREET_ADDRESS_2 "street_address_2" +#define RUBY_PB_CITY_2 "city_2" +#define RUBY_PB_STATE_2 "state_2" +#define RUBY_PB_ZIP_2 "zip_2" +#define RUBY_PB_COUNTRY_2 "country_2" +#define RUBY_PB_STREET_ADDRESS_3 "street_address_3" +#define RUBY_PB_CITY_3 "city_3" +#define RUBY_PB_STATE_3 "state_3" +#define RUBY_PB_ZIP_3 "zip_3" +#define RUBY_PB_COUNTRY_3 "country_3" + +#define RUBY_PB_HOME_PAGE "home_page" +#define RUBY_PB_SPOUSE_NAME "spouse_name" +#define RUBY_PB_ASSISTANT_NAME "assistant_name" + +#define RUBY_PB_ANNIVERSARY "anniversary" +#define RUBY_PB_CREATED "created" +#define RUBY_PB_UPDATED "updated" + #ifdef __cplusplus } #endif platform/shared/ruby/ext/phonebook/phonebook.h @@ -36,6 +36,7 @@ extern void Init_Camera(void); extern void Init_stringio(void); extern void Init_DateTimePicker(void); extern void Init_NativeBar(void); +extern void Init_MapView(void); //RhoSupport extension extern void Init_RhoSupport(void); @@ -46,25 +47,22 @@ extern VALUE RhoPreparePath(VALUE path); static VALUE framework; static ID framework_mid; static ID framework_mid2; - -static VALUE classRhomAttribManager; -static ID midRhomAttribManager_save; -static ID midRhomAttribManager_delete_attribs; -static ID midRhomAttribManager_add_attrib; +static ID initApp_mid; static char* rb_type_to_s(VALUE obj); -extern int ruby_thread_set_native(rb_thread_t *th); -extern int native_mutex_lock(rb_thread_lock_t *); +//extern int ruby_thread_set_native(rb_thread_t *th); +//extern int native_mutex_lock(rb_thread_lock_t *); +//extern void Init_native_thread2(rb_thread_t *th); -rb_thread_t * __getCurrentThread() +/*rb_thread_t * __getCurrentThread() { rb_thread_t * res = ruby_thread_from_native(); if ( res ) return res; return ruby_current_thread; -} - +}*/ +/* void RhoRubyThreadStart() { rb_thread_t *th; @@ -79,19 +77,25 @@ void RhoRubyThreadStart() rb_gc_register_mark_object(self); + Init_native_thread2(th); + + //st_insert(th->vm->living_threads, 0, (st_data_t) th->thread_id); // RhoRuby_RhomAttribManager_add_attrib(0, "test"); //native_mutex_lock(&th->vm->global_vm_lock); -} - +} */ +/* void RhoRubyThreadStop() { //rb_thread_t *th = GET_THREAD(); + //st_delete(th->vm->living_threads, &(th->self), 0); //native_mutex_unlock(&th->vm->global_vm_lock); -} + + //native_mutex_destroy(&th->interrupt_lock); +} */ void RhoRubyStart() { - VALUE moduleRhom; + //VALUE moduleRhom; #ifdef HAVE_LOCALE_H setlocale(LC_CTYPE, ""); #endif @@ -126,7 +130,8 @@ void RhoRubyStart() Init_DateTimePicker(); Init_NativeBar(); Init_RhoSupport(); - + Init_MapView(); + #ifdef ENABLE_RUBY_VM_STAT struct timeval start; struct timeval end; @@ -150,13 +155,9 @@ void RhoRubyStart() CONST_ID(framework_mid, "serve"); CONST_ID(framework_mid2, "serve_index"); + CONST_ID(initApp_mid, "init_app"); - moduleRhom = rb_const_get(rb_cObject, rb_intern("Rhom")); - classRhomAttribManager = rb_const_get(moduleRhom, rb_intern("RhomAttribManager")); - - CONST_ID(midRhomAttribManager_save, "save"); - CONST_ID(midRhomAttribManager_delete_attribs, "delete_attribs"); - CONST_ID(midRhomAttribManager_add_attrib, "add_attrib"); + //moduleRhom = rb_const_get(rb_cObject, rb_intern("Rhom")); #ifdef ENABLE_RUBY_VM_STAT g_collect_stat = 0; @@ -164,6 +165,17 @@ void RhoRubyStart() } } +void RhoRubyInitApp() +{ + rb_funcall(framework, initApp_mid, 0); +} + +char* RhoRuby_getRhoDBVersion() +{ + VALUE moduleRhodes = rb_const_get(rb_cObject, rb_intern("Rhodes")); + VALUE valVer = rb_const_get(moduleRhodes, rb_intern("DBVERSION")); + return RSTRING_PTR(valVer); +} #if defined(WIN32) #if defined(_WIN32_WCE) @@ -221,6 +233,21 @@ VALUE getnil() { return Qnil; } +VALUE rho_ruby_create_array() +{ + return rb_ary_new(); +} + +VALUE rho_ruby_create_string(const char* szVal) +{ + return rb_str_new2(szVal); +} + +void rho_ruby_add_to_array(VALUE ar, VALUE val) +{ + rb_ary_push(ar,val); +} + VALUE createHash() { return rb_hash_new(); } @@ -292,20 +319,25 @@ VALUE callServeIndex(char* index_name) { return callres; } -void RhoRuby_RhomAttribManager_save(int nSrcID) +/*static int s_gcWasDisabled; +//extern void native_sleep(rb_thread_t *th, struct timeval *tv); +extern void sleep_for_polling(rb_thread_t *th); +static void start_ruby_call() { - rb_funcall(classRhomAttribManager, midRhomAttribManager_save, 1, INT2FIX(nSrcID)); -} + rb_thread_t *th = GET_THREAD(); -void RhoRuby_RhomAttribManager_delete_attribs(int nSrcID,uint64__ objID) -{ - rb_funcall(classRhomAttribManager, midRhomAttribManager_delete_attribs, 2, INT2FIX(nSrcID), ULL2NUM(objID) ); -} + while( rb_during_gc() ) + { + sleep_for_polling(th); + } -void RhoRuby_RhomAttribManager_add_attrib(int nSrcID,const char* szAttrib) -{ - rb_funcall(classRhomAttribManager, midRhomAttribManager_add_attrib, 2, INT2FIX(nSrcID), rb_str_new2(szAttrib) ); + s_gcWasDisabled = rb_gc_disable(); } +static void end_ruby_call() +{ + if ( !s_gcWasDisabled ) + rb_gc_enable(); +}*/ static char* rb_type_to_s(VALUE obj) platform/shared/ruby/ext/rho/rhoruby.c @@ -28,8 +28,9 @@ typedef unsigned long long uint64__; #endif void RhoRubyStart(); -void RhoRubyThreadStart(); -void RhoRubyThreadStop(); +void RhoRubyInitApp(); +//void RhoRubyThreadStart(); +//void RhoRubyThreadStop(); VALUE getnil(); VALUE createHash(); @@ -44,14 +45,16 @@ void releaseValue(VALUE val); VALUE callFramework(VALUE hashReq); VALUE callServeIndex(char* index_name); -void RhoRuby_RhomAttribManager_save(int nSrcID); -void RhoRuby_RhomAttribManager_delete_attribs(int nSrcID,uint64__ objID); -void RhoRuby_RhomAttribManager_add_attrib(int nSrcID,const char* szAttrib); void RhoRubyStop(); const char* RhoGetRootPath(); +VALUE rho_ruby_create_array(); +VALUE rho_ruby_create_string(const char* szVal); +void rho_ruby_add_to_array(VALUE ar, VALUE val); + +char* RhoRuby_getRhoDBVersion(); #if defined(__cplusplus) } platform/shared/ruby/ext/rho/rhoruby.h @@ -184,7 +184,7 @@ static VALUE find_file(VALUE fname) }else{ int i = 0; VALUE load_path = GET_VM()->load_path; - VALUE dir; + //VALUE dir; fname = checkRhoBundleInPath(fname); //TODO: support document relative require in case of multiple apps @@ -314,13 +314,22 @@ VALUE RhoPreparePath(VALUE path){ static void Init_RhoLog(); static void Init_RhoBlobs(); +static VALUE +rb_obj_rhom_init(VALUE obj, VALUE iv) +{ + //TODO: if render will slow implement this function to fasten rhom member access(see BB) + return Qnil; +} + void Init_RhoSupport() { rb_define_global_function("require", rb_require_compiled, 1); rb_define_global_function("eval_compiled_file", rb_f_eval_compiled, -1); rb_define_global_function("__rhoGetCurrentDir", __rhoGetCurrentDir, 0); rb_define_global_function("load", rb_require_compiled, 1); - + + rb_define_method(rb_mKernel, "rhom_init", rb_obj_rhom_init, 1); + Init_RhoLog(); Init_RhoBlobs(); } @@ -330,6 +339,8 @@ static void Init_RhoBlobs() VALUE path = __rhoGetCurrentDir(); rb_funcall(path, rb_intern("concat"), 1, rb_str_new2(RhoGetRelativeBlobsPath())); + RAWLOG_INFO1("Init_RhoBlobs: %s", RSTRING_PTR(path) ); + if ( rb_funcall(rb_cDir, rb_intern("exist?"), 1, path)==Qfalse ) rb_funcall(rb_cDir, rb_intern("mkdir"), 1, path); @@ -402,7 +413,7 @@ int rhoRubyFPrintf(FILE *file, const char *format, ...){ static VALUE rb_RhoLogClass; static void Init_RhoLog(){ - VALUE appLog, appErrLog; + VALUE appLog; //, appErrLog; rb_RhoLogClass = rb_define_class("RhoLog", rb_cObject); rb_define_method(rb_RhoLogClass, "write", rb_RhoLogWrite, 1); @@ -423,8 +434,8 @@ static void Init_RhoLog2() stdioPath = rb_funcall(rb_cIO, rb_intern("read"), 1, path); if ( stdioPath != 0 && stdioPath != Qnil && RSTRING_LEN(stdioPath)>0 ) { - char* szPath = RSTRING_PTR(stdioPath); - int len = RSTRING_LEN(stdioPath); + //char* szPath = RSTRING_PTR(stdioPath); + //int len = RSTRING_LEN(stdioPath); #if defined(WIN32) freopen( RSTRING_PTR(stdioPath), "w", stdout ); #endif platform/shared/ruby/ext/rho/rhosupport.c @@ -18,7 +18,7 @@ extern void* rho_db_get_handle(); static VALUE db_allocate(VALUE klass) { - sqlite3 **db = malloc(sizeof(sqlite3 **)); + //sqlite3 **db = malloc(sizeof(sqlite3 **)); return Data_Wrap_Struct(klass, 0, 0, 0); } @@ -42,7 +42,7 @@ static VALUE db_init(int argc, VALUE *argv, VALUE self) } static VALUE db_close(int argc, VALUE *argv, VALUE self){ - sqlite3 * db = NULL; + //sqlite3 * db = NULL; sqlite3 **ppDB = NULL; int rc = 0; @@ -57,7 +57,7 @@ static VALUE db_close(int argc, VALUE *argv, VALUE self){ } static VALUE db_start_transaction(int argc, VALUE *argv, VALUE self){ - sqlite3 * db = NULL; + //sqlite3 * db = NULL; sqlite3 **ppDB = NULL; int rc = 0; @@ -72,7 +72,7 @@ static VALUE db_start_transaction(int argc, VALUE *argv, VALUE self){ } static VALUE db_commit(int argc, VALUE *argv, VALUE self){ - sqlite3 * db = NULL; + //sqlite3 * db = NULL; sqlite3 **ppDB = NULL; int rc = 0; @@ -87,7 +87,7 @@ static VALUE db_commit(int argc, VALUE *argv, VALUE self){ } static VALUE db_rollback(int argc, VALUE *argv, VALUE self){ - sqlite3 * db = NULL; + //sqlite3 * db = NULL; sqlite3 **ppDB = NULL; int rc = 0; @@ -117,7 +117,7 @@ static VALUE* getColNames(sqlite3_stmt* statement, int nCount) static VALUE db_destroy_table(int argc, VALUE *argv, VALUE self) { - sqlite3 * db = NULL; + //sqlite3 * db = NULL; sqlite3 **ppDB = NULL; const char* szTableName = NULL; int rc = 0; @@ -144,8 +144,8 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self) int nRes = 0; char * szErrMsg = 0; - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); + if ((argc < 1) || (argc > 2)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); Data_Get_Struct(self, sqlite3 *, ppDB); db = (sqlite3 *)rho_db_get_handle(); @@ -154,12 +154,42 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self) RAWTRACE1("db_execute: %s", sql); if ( (nRes = sqlite3_prepare_v2(db, sql, -1, &statement, NULL)) != SQLITE_OK) { - szErrMsg = sqlite3_errmsg(db); + szErrMsg = (char *)sqlite3_errmsg(db); rb_raise(rb_eArgError, "could not prepare statement: %d; Message: %s",nRes, (szErrMsg?szErrMsg:"")); } - while(sqlite3_step(statement) == SQLITE_ROW) { + if ( argc > 1 ) + { + int i = 0; + VALUE args = argv[1]; + if ( RARRAY_LEN(args) > 0 && TYPE(RARRAY_PTR(args)[0]) == T_ARRAY ) + args = RARRAY_PTR(args)[0]; + + for( ; i < RARRAY_LEN(args); i++ ) + { + VALUE arg = RARRAY_PTR(args)[i]; + if (NIL_P(arg)) + { + sqlite3_bind_null(statement, i+1); + continue; + } + + switch( TYPE(arg) ) + { + case T_STRING: + sqlite3_bind_text(statement, i+1, RSTRING_PTR(arg), -1, SQLITE_TRANSIENT); + break; + case T_FIXNUM: + case T_FLOAT: + case T_BIGNUM: + sqlite3_bind_int64(statement, i+1, NUM2LL(arg)); + break; + } + } + } + + while( (nRes=sqlite3_step(statement)) == SQLITE_ROW) { int nCount = sqlite3_data_count(statement); int nCol = 0; VALUE hashRec = rb_hash_new(); @@ -178,8 +208,8 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self) break; case SQLITE_INTEGER: { - int nVal = sqlite3_column_int(statement, nCol); - colValue = INT2NUM(nVal); + sqlite_int64 nVal = sqlite3_column_int64(statement, nCol); + colValue = LL2NUM(nVal); break; } default:{ @@ -195,6 +225,13 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self) rb_ary_push(arRes, hashRec); } + if ( nRes != SQLITE_OK && nRes != SQLITE_ROW && nRes != SQLITE_DONE ) + { + szErrMsg = (char*)sqlite3_errmsg(db); + + rb_raise(rb_eArgError, "could not execute statement: %d; Message: %s",nRes, (szErrMsg?szErrMsg:"")); + } + sqlite3_finalize(statement); if ( colNames ) platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c @@ -6,7 +6,7 @@ #define dosync_source rho_sync_doSyncSource extern void rho_sync_doSyncSource(int source_id,int show_status_popup); #define dosearch_source rho_sync_doSearchSource - extern void rho_sync_doSearchSource(int source_id, const char *from, const char *params); + extern void rho_sync_doSearchSource(int source_id, const char *from, const char *params, int sync_changes, int nProgressStep); #define dosync rho_sync_doSyncAllSources extern void rho_sync_lock(); #define lock_sync_mutex rho_sync_lock @@ -28,6 +28,25 @@ #define set_pollinterval rho_sync_set_pollinterval extern void rho_sync_set_syncserver(char* syncserver); #define set_syncserver rho_sync_set_syncserver + extern VALUE rho_sync_get_attrs(int source_id); + #define get_src_attrs rho_sync_get_attrs + + extern void rho_sync_setobjectnotify_url(const char* szUrl); + #define set_objectnotify_url rho_sync_setobjectnotify_url + extern void rho_sync_addobjectnotify(int nSrcID, const char* szObject); + #define add_objectnotify rho_sync_addobjectnotify + extern void rho_sync_cleanobjectnotify(); + #define clean_objectnotify rho_sync_cleanobjectnotify + + extern int rho_sync_get_lastsync_objectcount(int nSrcID); + #define get_lastsync_objectcount rho_sync_get_lastsync_objectcount + + extern int rho_sync_get_pagesize(); + #define get_pagesize rho_sync_get_pagesize + + extern void rho_sync_set_pagesize(int pagesize); + #define set_pagesize rho_sync_set_pagesize + #if !defined(bool) #define bool int #define true 1 @@ -40,7 +59,7 @@ } extern void dosync(bool show_status_popup); extern void dosync_source(int source_id, bool show_status_popup); -extern void dosearch_source(int source_id, const char *from, const char *params); +extern void dosearch_source(int source_id, const char *from, const char *params, bool sync_changes, int nProgressStep); extern void lock_sync_mutex(); extern void unlock_sync_mutex(); extern void login(const char *login, const char *password, const char* callback); @@ -51,3 +70,10 @@ extern void set_notification(int source_id, const char *url, char* params); extern void clear_notification(int source_id); extern void set_pollinterval(int interval); extern void set_syncserver(char* syncserver); +extern VALUE get_src_attrs(int source_id); +extern void set_objectnotify_url(const char* szUrl); +extern void add_objectnotify(int nSrcID, const char* szObject); +extern void clean_objectnotify(); +extern int get_lastsync_objectcount(int nSrcID); +extern int get_pagesize(); +extern void set_pagesize(int pagesize); \ No newline at end of file platform/shared/ruby/ext/syncengine/syncengine.i @@ -1550,7 +1550,7 @@ static VALUE mSyncEngine; #define dosync_source rho_sync_doSyncSource extern void rho_sync_doSyncSource(int source_id,int show_status_popup); #define dosearch_source rho_sync_doSearchSource - extern void rho_sync_doSearchSource(int source_id, const char *from, const char *params); + extern void rho_sync_doSearchSource(int source_id, const char *from, const char *params, int sync_changes, int nProgressStep); #define dosync rho_sync_doSyncAllSources extern void rho_sync_lock(); #define lock_sync_mutex rho_sync_lock @@ -1572,6 +1572,25 @@ static VALUE mSyncEngine; #define set_pollinterval rho_sync_set_pollinterval extern void rho_sync_set_syncserver(char* syncserver); #define set_syncserver rho_sync_set_syncserver + extern VALUE rho_sync_get_attrs(int source_id); + #define get_src_attrs rho_sync_get_attrs + + extern void rho_sync_setobjectnotify_url(const char* szUrl); + #define set_objectnotify_url rho_sync_setobjectnotify_url + extern void rho_sync_addobjectnotify(int nSrcID, const char* szObject); + #define add_objectnotify rho_sync_addobjectnotify + extern void rho_sync_cleanobjectnotify(); + #define clean_objectnotify rho_sync_cleanobjectnotify + + extern int rho_sync_get_lastsync_objectcount(int nSrcID); + #define get_lastsync_objectcount rho_sync_get_lastsync_objectcount + + extern int rho_sync_get_pagesize(); + #define get_pagesize rho_sync_get_pagesize + + extern void rho_sync_set_pagesize(int pagesize); + #define set_pagesize rho_sync_set_pagesize + #if !defined(bool) #define bool int #define true 1 @@ -1791,6 +1810,8 @@ _wrap_dosearch_source(int argc, VALUE *argv, VALUE self) { int arg1 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; + bool arg4 ; + int arg5 ; int val1 ; int ecode1 = 0 ; int res2 ; @@ -1799,9 +1820,13 @@ _wrap_dosearch_source(int argc, VALUE *argv, VALUE self) { int res3 ; char *buf3 = 0 ; int alloc3 = 0 ; + bool val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; - if ((argc < 3) || (argc > 3)) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail; + if ((argc < 5) || (argc > 5)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail; } ecode1 = SWIG_AsVal_int(argv[0], &val1); if (!SWIG_IsOK(ecode1)) { @@ -1818,7 +1843,17 @@ _wrap_dosearch_source(int argc, VALUE *argv, VALUE self) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "dosearch_source" "', argument " "3"" of type '" "char const *""'"); } arg3 = (char *)(buf3); - dosearch_source(arg1,(char const *)arg2,(char const *)arg3); + ecode4 = SWIG_AsVal_bool(argv[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "dosearch_source" "', argument " "4"" of type '" "bool""'"); + } + arg4 = (bool)(val4); + ecode5 = SWIG_AsVal_int(argv[4], &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "dosearch_source" "', argument " "5"" of type '" "int""'"); + } + arg5 = (int)(val5); + dosearch_source(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); return Qnil; @@ -2048,6 +2083,159 @@ fail: } +SWIGINTERN VALUE +_wrap_get_src_attrs(int argc, VALUE *argv, VALUE self) { + int arg1 ; + VALUE result; + int val1 ; + int ecode1 = 0 ; + VALUE vresult = Qnil; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + ecode1 = SWIG_AsVal_int(argv[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "get_src_attrs" "', argument " "1"" of type '" "int""'"); + } + arg1 = (int)(val1); + result = (VALUE)get_src_attrs(arg1); + vresult = result; + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_set_objectnotify_url(int argc, VALUE *argv, VALUE self) { + char *arg1 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_objectnotify_url" "', argument " "1"" of type '" "char const *""'"); + } + arg1 = (char *)(buf1); + set_objectnotify_url((char const *)arg1); + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return Qnil; +fail: + if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_add_objectnotify(int argc, VALUE *argv, VALUE self) { + int arg1 ; + char *arg2 = (char *) 0 ; + int val1 ; + int ecode1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + + if ((argc < 2) || (argc > 2)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail; + } + ecode1 = SWIG_AsVal_int(argv[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "add_objectnotify" "', argument " "1"" of type '" "int""'"); + } + arg1 = (int)(val1); + res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "add_objectnotify" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = (char *)(buf2); + add_objectnotify(arg1,(char const *)arg2); + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +fail: + if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_clean_objectnotify(int argc, VALUE *argv, VALUE self) { + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + clean_objectnotify(); + return Qnil; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_get_lastsync_objectcount(int argc, VALUE *argv, VALUE self) { + int arg1 ; + int result; + int val1 ; + int ecode1 = 0 ; + VALUE vresult = Qnil; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + ecode1 = SWIG_AsVal_int(argv[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "get_lastsync_objectcount" "', argument " "1"" of type '" "int""'"); + } + arg1 = (int)(val1); + result = (int)get_lastsync_objectcount(arg1); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_get_pagesize(int argc, VALUE *argv, VALUE self) { + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + result = (int)get_pagesize(); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_set_pagesize(int argc, VALUE *argv, VALUE self) { + int arg1 ; + int val1 ; + int ecode1 = 0 ; + + if ((argc < 1) || (argc > 1)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + ecode1 = SWIG_AsVal_int(argv[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "set_pagesize" "', argument " "1"" of type '" "int""'"); + } + arg1 = (int)(val1); + set_pagesize(arg1); + return Qnil; +fail: + return Qnil; +} + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ @@ -2323,5 +2511,12 @@ SWIGEXPORT void Init_SyncEngine(void) { rb_define_module_function(mSyncEngine, "clear_notification", _wrap_clear_notification, -1); rb_define_module_function(mSyncEngine, "set_pollinterval", _wrap_set_pollinterval, -1); rb_define_module_function(mSyncEngine, "set_syncserver", _wrap_set_syncserver, -1); + rb_define_module_function(mSyncEngine, "get_src_attrs", _wrap_get_src_attrs, -1); + rb_define_module_function(mSyncEngine, "set_objectnotify_url", _wrap_set_objectnotify_url, -1); + rb_define_module_function(mSyncEngine, "add_objectnotify", _wrap_add_objectnotify, -1); + rb_define_module_function(mSyncEngine, "clean_objectnotify", _wrap_clean_objectnotify, -1); + rb_define_module_function(mSyncEngine, "get_lastsync_objectcount", _wrap_get_lastsync_objectcount, -1); + rb_define_module_function(mSyncEngine, "get_pagesize", _wrap_get_pagesize, -1); + rb_define_module_function(mSyncEngine, "set_pagesize", _wrap_set_pagesize, -1); } platform/shared/ruby/ext/syncengine/syncengine_wrap.c @@ -3,7 +3,7 @@ %{ extern void webview_refresh(); #define refresh webview_refresh -extern void webview_navigate(char* url); +extern void webview_navigate(char* url, int index); #define navigate webview_navigate extern char* webview_current_location(); #define current_location webview_current_location @@ -11,10 +11,17 @@ extern char* execute_js(char* js); #define execute_js webview_execute_js extern void set_menu_items(VALUE argv); #define set_menu_items webview_set_menu_items +extern int active_tab(); +#define active_tab webview_active_tab %} +%typemap(default) int index { + $1 = 0; +} + extern void refresh(); -extern void navigate(char* url); +extern void navigate(char* url, int index); extern char* current_location(); extern char* execute_js(char* js); -extern void set_menu_items(VALUE argv); \ No newline at end of file +extern void set_menu_items(VALUE argv); +extern int active_tab(); \ No newline at end of file platform/shared/ruby/ext/webview/webview.i @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.36 + * Version 1.3.31 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -16,14 +16,14 @@ /* template workaround for compilers that cannot correctly implement the C++ standard */ #ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# elif defined(__HP_aCC) -/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ -/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ -# define SWIGTEMPLATEDISAMBIGUATOR template +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif # else -# define SWIGTEMPLATEDISAMBIGUATOR +# define SWIGTEMPLATEDISAMBIGUATOR # endif #endif @@ -51,12 +51,6 @@ # endif #endif -#ifndef SWIG_MSC_UNSUPPRESS_4505 -# if defined(_MSC_VER) -# pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif -#endif - #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) @@ -112,12 +106,6 @@ # define _CRT_SECURE_NO_DEPRECATE #endif -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -125,14 +113,14 @@ /* template workaround for compilers that cannot correctly implement the C++ standard */ #ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# elif defined(__HP_aCC) -/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ -/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ -# define SWIGTEMPLATEDISAMBIGUATOR template +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif # else -# define SWIGTEMPLATEDISAMBIGUATOR +# define SWIGTEMPLATEDISAMBIGUATOR # endif #endif @@ -160,12 +148,6 @@ # endif #endif -#ifndef SWIG_MSC_UNSUPPRESS_4505 -# if defined(_MSC_VER) -# pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif -#endif - #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) @@ -221,12 +203,6 @@ # define _CRT_SECURE_NO_DEPRECATE #endif -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - /* ----------------------------------------------------------------------------- * swigrun.swg * @@ -236,7 +212,7 @@ /* This should only be incremented when either the layout of swig_type_info changes, or for whatever reason, the runtime changes incompatibly */ -#define SWIG_RUNTIME_VERSION "4" +#define SWIG_RUNTIME_VERSION "3" /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ #ifdef SWIG_TYPE_TABLE @@ -271,7 +247,6 @@ /* Flags for pointer conversions */ #define SWIG_POINTER_DISOWN 0x1 -#define SWIG_CAST_NEW_MEMORY 0x2 /* Flags for new pointer objects */ #define SWIG_POINTER_OWN 0x1 @@ -412,10 +387,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) { extern "C" { #endif -typedef void *(*swig_converter_func)(void *, int *); +typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); -/* Structure to store information on one type */ +/* Structure to store inforomation on one type */ typedef struct swig_type_info { const char *name; /* mangled name of this type */ const char *str; /* human readable name of this type */ @@ -460,7 +435,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1, while ((*f2 == ' ') && (f2 != l2)) ++f2; if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; } - return (int)((l1 - f1) - (l2 - f2)); + return (l1 - f1) - (l2 - f2); } /* @@ -542,8 +517,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { Cast a pointer up an inheritance hierarchy */ SWIGRUNTIMEINLINE void * -SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) { - return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory); +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); } /* @@ -816,15 +791,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #include <ruby.h> -/* Remove global macros defined in Ruby's win32.h */ -#ifdef write -# undef write -#endif -#ifdef read -# undef read -#endif - - /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */ #ifndef NUM2LL #define NUM2LL(x) NUM2LONG((x)) @@ -853,44 +819,12 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #ifndef RSTRING_PTR # define RSTRING_PTR(x) RSTRING(x)->ptr #endif -#ifndef RSTRING_END -# define RSTRING_END(x) (RSTRING_PTR(x) + RSTRING_LEN(x)) -#endif #ifndef RARRAY_LEN # define RARRAY_LEN(x) RARRAY(x)->len #endif #ifndef RARRAY_PTR # define RARRAY_PTR(x) RARRAY(x)->ptr #endif -#ifndef RFLOAT_VALUE -# define RFLOAT_VALUE(x) RFLOAT(x)->value -#endif -#ifndef DOUBLE2NUM -# define DOUBLE2NUM(x) rb_float_new(x) -#endif -#ifndef RHASH_TBL -# define RHASH_TBL(x) (RHASH(x)->tbl) -#endif -#ifndef RHASH_ITER_LEV -# define RHASH_ITER_LEV(x) (RHASH(x)->iter_lev) -#endif -#ifndef RHASH_IFNONE -# define RHASH_IFNONE(x) (RHASH(x)->ifnone) -#endif -#ifndef RHASH_SIZE -# define RHASH_SIZE(x) (RHASH(x)->tbl->num_entries) -#endif -#ifndef RHASH_EMPTY_P -# define RHASH_EMPTY_P(x) (RHASH_SIZE(x) == 0) -#endif -#ifndef RSTRUCT_LEN -# define RSTRUCT_LEN(x) RSTRUCT(x)->len -#endif -#ifndef RSTRUCT_PTR -# define RSTRUCT_PTR(x) RSTRUCT(x)->ptr -#endif - - /* * Need to be very careful about how these macros are defined, especially @@ -952,7 +886,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new") #endif -static VALUE _mSWIG = Qnil; /* ----------------------------------------------------------------------------- * error manipulation @@ -1043,71 +976,7 @@ SWIG_Ruby_ErrorType(int SWIG_code) { } -/* This function is called when a user inputs a wrong argument to - a method. - */ -SWIGINTERN -const char* Ruby_Format_TypeError( const char* msg, - const char* type, - const char* name, - const int argn, - VALUE input ) -{ - char buf[128]; - VALUE str; - VALUE asStr; - if ( msg && *msg ) - { - str = rb_str_new2(msg); - } - else - { - str = rb_str_new(NULL, 0); - } - - str = rb_str_cat2( str, "Expected argument " ); - sprintf( buf, "%d of type ", argn-1 ); - str = rb_str_cat2( str, buf ); - str = rb_str_cat2( str, type ); - str = rb_str_cat2( str, ", but got " ); - str = rb_str_cat2( str, rb_obj_classname(input) ); - str = rb_str_cat2( str, " " ); - asStr = rb_inspect(input); - if ( RSTRING_LEN(asStr) > 30 ) - { - str = rb_str_cat( str, StringValuePtr(asStr), 30 ); - str = rb_str_cat2( str, "..." ); - } - else - { - str = rb_str_append( str, asStr ); - } - - if ( name ) - { - str = rb_str_cat2( str, "\n\tin SWIG method '" ); - str = rb_str_cat2( str, name ); - str = rb_str_cat2( str, "'" ); - } - - return StringValuePtr( str ); -} -/* This function is called when an overloaded method fails */ -SWIGINTERN -void Ruby_Format_OverloadedError( - const int argc, - const int maxargs, - const char* method, - const char* prototypes - ) -{ - const char* msg = "Wrong # of arguments"; - if ( argc <= maxargs ) msg = "Wrong arguments"; - rb_raise(rb_eArgError,"%s for overloaded method '%s'.\n" - "Possible C/C++ prototypes are:\n%s", - msg, method, prototypes); -} /* ----------------------------------------------------------------------------- * See the LICENSE file for information on copyright, usage and redistribution @@ -1125,51 +994,23 @@ void Ruby_Format_OverloadedError( extern "C" { #endif -/* Ruby 1.8 actually assumes the first case. */ -#if SIZEOF_VOIDP == SIZEOF_LONG -# define SWIG2NUM(v) LONG2NUM((unsigned long)v) -# define NUM2SWIG(x) (unsigned long)NUM2LONG(x) -#elif SIZEOF_VOIDP == SIZEOF_LONG_LONG -# define SWIG2NUM(v) LL2NUM((unsigned long long)v) -# define NUM2SWIG(x) (unsigned long long)NUM2LL(x) -#else -# error sizeof(void*) is not the same as long or long long -#endif - /* Global Ruby hash table to store Trackings from C/C++ - structs to Ruby Objects. -*/ -static VALUE swig_ruby_trackings = Qnil; + structs to Ruby Objects. */ +static VALUE swig_ruby_trackings; /* Global variable that stores a reference to the ruby hash table delete function. */ -static ID swig_ruby_hash_delete; +static ID swig_ruby_hash_delete = 0; /* Setup a Ruby hash table to store Trackings */ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) { /* Create a ruby hash table to store Trackings from C++ - objects to Ruby objects. */ - - /* Try to see if some other .so has already created a - tracking hash table, which we keep hidden in an instance var - in the SWIG module. - This is done to allow multiple DSOs to share the same - tracking table. - */ - ID trackings_id = rb_intern( "@__trackings__" ); - VALUE verbose = rb_gv_get("VERBOSE"); - rb_gv_set("VERBOSE", Qfalse); - swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id ); - rb_gv_set("VERBOSE", verbose); - - /* No, it hasn't. Create one ourselves */ - if ( swig_ruby_trackings == Qnil ) - { - swig_ruby_trackings = rb_hash_new(); - rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings ); - } - + objects to Ruby objects. Also make sure to tell + the garabage collector about the hash table. */ + swig_ruby_trackings = rb_hash_new(); + rb_gc_register_address(&swig_ruby_trackings); + /* Now store a reference to the hash table delete function so that we only have to look it up once.*/ swig_ruby_hash_delete = rb_intern("delete"); @@ -1182,7 +1023,8 @@ SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) { a Ruby number object. */ /* Convert the pointer to a Ruby number */ - return SWIG2NUM(ptr); + unsigned long value = (unsigned long) ptr; + return LONG2NUM(value); } /* Get a Ruby number to reference an object */ @@ -1192,7 +1034,8 @@ SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) { a Ruby number object. */ /* Convert the Object to a Ruby number */ - return SWIG2NUM(object); + unsigned long value = (unsigned long) object; + return LONG2NUM(value); } /* Get a Ruby object from a previously stored reference */ @@ -1200,8 +1043,9 @@ SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) { /* The provided Ruby number object is a reference to the Ruby object we want.*/ - /* Convert the Ruby number to a Ruby object */ - return NUM2SWIG(reference); + /* First convert the Ruby number to a C number */ + unsigned long value = NUM2LONG(reference); + return (VALUE) value; } /* Add a Tracking from a C/C++ struct to a Ruby object */ @@ -1293,15 +1137,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) { return target; } -/* For ruby1.8.4 and earlier. */ -#ifndef RUBY_INIT_STACK - RUBY_EXTERN void Init_stack(VALUE* addr); -# define RUBY_INIT_STACK \ - VALUE variable_in_this_stack_frame; \ - Init_stack(&variable_in_this_stack_frame); -#endif - - #ifdef __cplusplus } #endif @@ -1366,7 +1201,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) { #define SWIG_MangleStr(value) SWIG_Ruby_MangleStr(value) #define SWIG_CheckConvert(value, ty) SWIG_Ruby_CheckConvert(value, ty) -#include "assert.h" /* ----------------------------------------------------------------------------- * pointers/data manipulation @@ -1374,6 +1208,9 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) { #ifdef __cplusplus extern "C" { +#if 0 +} /* cc-mode */ +#endif #endif typedef struct { @@ -1385,44 +1222,10 @@ typedef struct { } swig_class; -/* Global pointer used to keep some internal SWIG stuff */ +static VALUE _mSWIG = Qnil; static VALUE _cSWIG_Pointer = Qnil; static VALUE swig_runtime_data_type_pointer = Qnil; -/* Global IDs used to keep some internal SWIG stuff */ -static ID swig_arity_id = 0; -static ID swig_call_id = 0; - -/* - If your swig extension is to be run within an embedded ruby and has - director callbacks, you should set -DRUBY_EMBEDDED during compilation. - This will reset ruby's stack frame on each entry point from the main - program the first time a virtual director function is invoked (in a - non-recursive way). - If this is not done, you run the risk of Ruby trashing the stack. -*/ - -#ifdef RUBY_EMBEDDED - -# define SWIG_INIT_STACK \ - if ( !swig_virtual_calls ) { RUBY_INIT_STACK } \ - ++swig_virtual_calls; -# define SWIG_RELEASE_STACK --swig_virtual_calls; -# define Ruby_DirectorTypeMismatchException(x) \ - rb_raise( rb_eTypeError, x ); return c_result; - - static unsigned int swig_virtual_calls = 0; - -#else /* normal non-embedded extension */ - -# define SWIG_INIT_STACK -# define SWIG_RELEASE_STACK -# define Ruby_DirectorTypeMismatchException(x) \ - throw Swig::DirectorTypeMismatchException( x ); - -#endif /* RUBY_EMBEDDED */ - - SWIGRUNTIME VALUE getExceptionClass(void) { static int init = 0; @@ -1454,8 +1257,6 @@ SWIG_Ruby_InitRuntime(void) { if (_mSWIG == Qnil) { _mSWIG = rb_define_module("SWIG"); - swig_call_id = rb_intern("call"); - swig_arity_id = rb_intern("arity"); } } @@ -1479,7 +1280,7 @@ SWIGRUNTIME VALUE SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) { int own = flags & SWIG_POINTER_OWN; - int track; + char *klass_name; swig_class *sklass; VALUE klass; @@ -1492,15 +1293,14 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) sklass = (swig_class *) type->clientdata; /* Are we tracking this class and have we already returned this Ruby object? */ - track = sklass->trackObjects; - if (track) { + if (sklass->trackObjects) { obj = SWIG_RubyInstanceFor(ptr); /* Check the object's type and make sure it has the correct type. It might not in cases where methods do things like downcast methods. */ if (obj != Qnil) { - VALUE value = rb_iv_get(obj, "@__swigtype__"); + VALUE value = rb_iv_get(obj, "__swigtype__"); char* type_name = RSTRING_PTR(value); if (strcmp(type->name, type_name) == 0) { @@ -1510,13 +1310,10 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) } /* Create a new Ruby object */ - obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), - ( own ? VOIDFUNC(sklass->destroy) : - (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 ) - ), ptr); + obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr); /* If tracking is on for this class then track this object. */ - if (track) { + if (sklass->trackObjects) { SWIG_RubyAddTracking(ptr, obj); } } else { @@ -1526,7 +1323,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags) free((void *) klass_name); obj = Data_Wrap_Struct(klass, 0, 0, ptr); } - rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name)); + rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); return obj; } @@ -1538,7 +1335,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type) VALUE obj; swig_class *sklass = (swig_class *) type->clientdata; obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0); - rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name)); + rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name)); return obj; } @@ -1546,7 +1343,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type) SWIGRUNTIMEINLINE char * SWIG_Ruby_MangleStr(VALUE obj) { - VALUE stype = rb_iv_get(obj, "@__swigtype__"); + VALUE stype = rb_iv_get(obj, "__swigtype__"); return StringValuePtr(stype); } @@ -1628,11 +1425,8 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, tc = SWIG_TypeCheck(c, ty); if (!tc) { return SWIG_ERROR; - } else { - int newmemory = 0; - *ptr = SWIG_TypeCast(tc, vptr, &newmemory); - assert(!newmemory); /* newmemory handling not yet implemented */ } + *ptr = SWIG_TypeCast(tc, vptr); } else { *ptr = vptr; } @@ -1713,42 +1507,10 @@ SWIG_Ruby_SetModule(swig_module_info *pointer) rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer); } -/* This function can be used to check whether a proc or method or similarly - callable function has been passed. Usually used in a %typecheck, like: - - %typecheck(c_callback_t, precedence=SWIG_TYPECHECK_POINTER) { - $result = SWIG_Ruby_isCallable( $input ); - } - */ -SWIGINTERN -int SWIG_Ruby_isCallable( VALUE proc ) -{ - if ( rb_respond_to( proc, swig_call_id ) == Qtrue ) - return 1; - return 0; -} - -/* This function can be used to check the arity (number of arguments) - a proc or method can take. Usually used in a %typecheck. - Valid arities will be that equal to minimal or those < 0 - which indicate a variable number of parameters at the end. - */ -SWIGINTERN -int SWIG_Ruby_arity( VALUE proc, int minimal ) -{ - if ( rb_respond_to( proc, swig_arity_id ) == Qtrue ) - { - VALUE num = rb_funcall( proc, swig_arity_id, 0 ); - int arity = NUM2INT(num); - if ( arity < 0 && (arity+1) < -minimal ) return 1; - if ( arity == minimal ) return 1; - return 1; - } - return 0; -} - - #ifdef __cplusplus +#if 0 +{ /* cc-mode */ +#endif } #endif @@ -1775,11 +1537,7 @@ static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0}; static VALUE mWebView; -#define SWIG_RUBY_THREAD_BEGIN_BLOCK -#define SWIG_RUBY_THREAD_END_BLOCK - - -#define SWIGVERSION 0x010336 +#define SWIGVERSION 0x010331 #define SWIG_VERSION SWIGVERSION @@ -1789,7 +1547,7 @@ static VALUE mWebView; extern void webview_refresh(); #define refresh webview_refresh -extern void webview_navigate(char* url); +extern void webview_navigate(char* url, int index); #define navigate webview_navigate extern char* webview_current_location(); #define current_location webview_current_location @@ -1797,6 +1555,8 @@ extern char* execute_js(char* js); #define execute_js webview_execute_js extern void set_menu_items(VALUE argv); #define set_menu_items webview_set_menu_items +extern int active_tab(); +#define active_tab webview_active_tab SWIGINTERN swig_type_info* @@ -1816,11 +1576,11 @@ SWIGINTERN int SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) { if (TYPE(obj) == T_STRING) { - #if defined(StringValuePtr) - char *cstr = StringValuePtr(obj); - #else + + + char *cstr = STR2CSTR(obj); - #endif + size_t size = RSTRING_LEN(obj) + 1; if (cptr) { if (alloc) { @@ -1853,6 +1613,70 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc) +#include <limits.h> +#ifndef LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#ifndef LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + + +SWIGINTERN VALUE +SWIG_ruby_failed(void) +{ + return Qnil; +} + + +/*@SWIG:%ruby_aux_method@*/ +SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) +{ + VALUE obj = args[0]; + VALUE type = TYPE(obj); + long *res = (long *)(args[1]); + *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj); + return obj; +} +/*@SWIG@*/ + +SWIGINTERN int +SWIG_AsVal_long (VALUE obj, long* val) +{ + VALUE type = TYPE(obj); + if ((type == T_FIXNUM) || (type == T_BIGNUM)) { + long v; + VALUE a[2]; + a[0] = obj; + a[1] = (VALUE)(&v); + if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) { + if (val) *val = v; + return SWIG_OK; + } + } + return SWIG_TypeError; +} + + +SWIGINTERN int +SWIG_AsVal_int (VALUE obj, int *val) +{ + long v; + int res = SWIG_AsVal_long (obj, &v); + if (SWIG_IsOK(res)) { + if ((v < INT_MIN || v > INT_MAX)) { + return SWIG_OverflowError; + } else { + if (val) *val = (int)(v); + } + } + return res; +} + + SWIGINTERNINLINE VALUE SWIG_FromCharPtrAndSize(const char* carray, size_t size) { @@ -1876,6 +1700,16 @@ SWIG_FromCharPtr(const char *cptr) return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0)); } + + #define SWIG_From_long LONG2NUM + + +SWIGINTERNINLINE VALUE +SWIG_From_int (int value) +{ + return SWIG_From_long (value); +} + SWIGINTERN VALUE _wrap_refresh(int argc, VALUE *argv, VALUE self) { if ((argc < 0) || (argc > 0)) { @@ -1891,19 +1725,32 @@ fail: SWIGINTERN VALUE _wrap_navigate(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; + int arg2 ; int res1 ; char *buf1 = 0 ; int alloc1 = 0 ; + int val2 ; + int ecode2 = 0 ; - if ((argc < 1) || (argc > 1)) { + { + arg2 = 0; + } + if ((argc < 1) || (argc > 2)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char *","navigate", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "navigate" "', argument " "1"" of type '" "char *""'"); } arg1 = (char *)(buf1); - navigate(arg1); + if (argc > 1) { + ecode2 = SWIG_AsVal_int(argv[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "navigate" "', argument " "2"" of type '" "int""'"); + } + arg2 = (int)(val2); + } + navigate(arg1,arg2); if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); return Qnil; fail: @@ -1931,10 +1778,10 @@ fail: SWIGINTERN VALUE _wrap_execute_js(int argc, VALUE *argv, VALUE self) { char *arg1 = (char *) 0 ; + char *result = 0 ; int res1 ; char *buf1 = 0 ; int alloc1 = 0 ; - char *result = 0 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1)) { @@ -1942,7 +1789,7 @@ _wrap_execute_js(int argc, VALUE *argv, VALUE self) { } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char *","execute_js", 1, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "execute_js" "', argument " "1"" of type '" "char *""'"); } arg1 = (char *)(buf1); result = (char *)execute_js(arg1); @@ -1970,6 +1817,22 @@ fail: } +SWIGINTERN VALUE +_wrap_active_tab(int argc, VALUE *argv, VALUE self) { + int result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + result = (int)active_tab(); + vresult = SWIG_From_int((int)(result)); + return vresult; +fail: + return Qnil; +} + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ @@ -2045,7 +1908,7 @@ SWIGRUNTIME void SWIG_InitializeModule(void *clientdata) { size_t i; swig_module_info *module_head, *iter; - int found, init; + int found; clientdata = clientdata; @@ -2055,9 +1918,6 @@ SWIG_InitializeModule(void *clientdata) { swig_module.type_initial = swig_type_initial; swig_module.cast_initial = swig_cast_initial; swig_module.next = &swig_module; - init = 1; - } else { - init = 0; } /* Try and load any already created modules */ @@ -2086,12 +1946,6 @@ SWIG_InitializeModule(void *clientdata) { module_head->next = &swig_module; } - /* When multiple interpeters are used, a module could have already been initialized in - a different interpreter, but not yet have a pointer in this interpreter. - In this case, we do not want to continue adding types... everything should be - set up already */ - if (init == 0) return; - /* Now work on filling in swig_module.types */ #ifdef SWIGRUNTIME_DEBUG printf("SWIG_InitializeModule: size %d\n", swig_module.size); @@ -2225,9 +2079,7 @@ SWIG_PropagateClientData(void) { } #endif -/* -*/ #ifdef __cplusplus extern "C" #endif @@ -2248,5 +2100,6 @@ SWIGEXPORT void Init_WebView(void) { rb_define_module_function(mWebView, "current_location", _wrap_current_location, -1); rb_define_module_function(mWebView, "execute_js", _wrap_execute_js, -1); rb_define_module_function(mWebView, "set_menu_items", _wrap_set_menu_items, -1); + rb_define_module_function(mWebView, "active_tab", _wrap_active_tab, -1); } platform/shared/ruby/ext/webview/webview_wrap.c @@ -1998,6 +1998,7 @@ void rb_gc_mark_encodings(void); static int garbage_collect(rb_objspace_t *objspace) { + int i = 0; struct gc_list *list; rb_thread_t *th = GET_THREAD(); INIT_GC_PROF_PARAMS; @@ -2020,6 +2021,12 @@ garbage_collect(rb_objspace_t *objspace) during_gc++; objspace->count++; + /*for ( i = 0; i < 100000; i++ ) + { + char* mem = malloc(1000); + free(mem); + }*/ + GC_PROF_TIMER_START; GC_PROF_MARK_TIMER_START; SET_STACK_END; platform/shared/ruby/gc.c @@ -39,6 +39,7 @@ main(int argc, char **argv) ruby_sysinit(&argc, &argv); RhoRubyStart(); + RhoRubyInitApp(); RhoRubyStop(); } platform/shared/ruby/main.c @@ -20,8 +20,8 @@ static void native_mutex_lock(pthread_mutex_t *lock); static void native_mutex_unlock(pthread_mutex_t *lock); static int native_mutex_trylock(pthread_mutex_t *lock); -static void native_mutex_initialize(pthread_mutex_t *lock); -static void native_mutex_destroy(pthread_mutex_t *lock); +void native_mutex_initialize(pthread_mutex_t *lock); +void native_mutex_destroy(pthread_mutex_t *lock); static void native_cond_signal(pthread_cond_t *cond); static void native_cond_broadcast(pthread_cond_t *cond); @@ -62,7 +62,7 @@ native_mutex_trylock(pthread_mutex_t *lock) return 0; } -static void +void native_mutex_initialize(pthread_mutex_t *lock) { int r = pthread_mutex_init(lock, 0); @@ -71,7 +71,7 @@ native_mutex_initialize(pthread_mutex_t *lock) } } -static void +void native_mutex_destroy(pthread_mutex_t *lock) { int r = pthread_mutex_destroy(lock); @@ -146,7 +146,7 @@ null_func(int i) /* null */ } -rb_thread_t * +static rb_thread_t * ruby_thread_from_native(void) { if ( !ruby_native_thread_key ) @@ -155,7 +155,7 @@ ruby_thread_from_native(void) return pthread_getspecific(ruby_native_thread_key); } -int +static int ruby_thread_set_native(rb_thread_t *th) { return pthread_setspecific(ruby_native_thread_key, th) == 0; platform/shared/ruby/thread_pthread.c @@ -24,21 +24,21 @@ static volatile DWORD ruby_native_thread_key = TLS_OUT_OF_INDEXES; static int native_mutex_lock(rb_thread_lock_t *); static int native_mutex_unlock(rb_thread_lock_t *); static int native_mutex_trylock(rb_thread_lock_t *); -static void native_mutex_initialize(rb_thread_lock_t *); +void native_mutex_initialize(rb_thread_lock_t *); static void native_cond_signal(rb_thread_cond_t *cond); static void native_cond_broadcast(rb_thread_cond_t *cond); static void native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex); static void native_cond_initialize(rb_thread_cond_t *cond); -static void native_cond_destroy(rb_thread_cond_t *cond); +void native_cond_destroy(rb_thread_cond_t *cond); -rb_thread_t * +static rb_thread_t * ruby_thread_from_native(void) { return TlsGetValue(ruby_native_thread_key); } -int +static int ruby_thread_set_native(rb_thread_t *th) { return TlsSetValue(ruby_native_thread_key, th); @@ -310,7 +310,7 @@ native_mutex_trylock(rb_thread_lock_t *lock) #endif } -static void +void native_mutex_initialize(rb_thread_lock_t *lock) { #if USE_WIN32_MUTEX @@ -324,7 +324,7 @@ native_mutex_initialize(rb_thread_lock_t *lock) #endif } -static void +void native_mutex_destroy(rb_thread_lock_t *lock) { #if USE_WIN32_MUTEX platform/shared/ruby/thread_win32.c @@ -601,14 +601,10 @@ NOINLINE(void rb_gc_save_machine_context(rb_thread_t *)); #if RUBY_VM_THREAD_MODEL == 2 RUBY_EXTERN rb_thread_t *ruby_current_thread; extern rb_vm_t *ruby_current_vm; -//RHO -extern rb_thread_t * ruby_thread_from_native(void); -extern rb_thread_t * __getCurrentThread(); #define GET_VM() ruby_current_vm -#define GET_THREAD() __getCurrentThread() -//ruby_current_thread -//RHO +#define GET_THREAD() ruby_current_thread + #define rb_thread_set_current_raw(th) (void)(ruby_current_thread = (th)) #define rb_thread_set_current(th) do { \ rb_thread_set_current_raw(th); \ platform/shared/ruby/vm_core.h @@ -10,6 +10,8 @@ public interface IRhoRubyHelper { public abstract String getPlatform(); public abstract IDBStorage createDBStorage(); + public abstract IFileAccess createFileAccess(); + public abstract IRAFile createRAFile(); public void loadBackTrace(RubyArray backtrace); public String getDeviceId(); platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java @@ -38,33 +38,19 @@ public class RhoClassFactory } + public static IFileAccess createFileAccess() throws Exception + { + return RhoClassFactory.createRhoRubyHelper().createFileAccess(); + } + + public static IRAFile createRAFile() throws Exception + { + return RhoClassFactory.createRhoRubyHelper().createRAFile(); + } + public static IDBStorage createDBStorage() throws Exception { return RhoClassFactory.createRhoRubyHelper().createDBStorage(); - /* - LOG.INFO("createDBStorage"); - Class wrapperClass; - try { - wrapperClass = Class.forName("com.rho.db.HsqlDBStorage"); - } catch (ClassNotFoundException exc) { - try { - wrapperClass = Class.forName("com.rhomobile.rhodes.db.DBStorage"); //android - } catch (ClassNotFoundException e) { - LOG.ERROR("createDBStorage- Class not found",e); - - throw e; - } - } - - try{ - return (IDBStorage)wrapperClass.newInstance(); - }catch(Exception e) - { - LOG.ERROR("createDBStorage - newInstance failed",e); - - throw e; - } - */ } public static IRhoRubyHelper createRhoRubyHelper() throws Exception platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java @@ -127,6 +127,18 @@ public class RhoConf { return ""; } + public String getPath(String szName) + { + String strPath = getString(szName); + if ( strPath.length() == 0 ) + return strPath; + + if ( strPath.charAt(strPath.length()-1) != '/' && strPath.charAt(strPath.length()-1) != '\\' ) + strPath += '/'; + + return strPath; + } + public int getInt(String szName){ String value = (String)m_mapValues.get(szName); if ( value != null && value.length() > 0 ) @@ -238,7 +250,7 @@ public class RhoConf { LOG.ERROR("send_log:loadClientID failed", exc); } - String strQuery = RhoConf.getInstance().getString("syncserver") + "client_log?" + + String strQuery = RhoConf.getInstance().getPath("syncserver") + "client_log?" + "client_id=" + strClientID + "&device_pin=" + strDevicePin; nq.pushFile(strQuery, RhoLogger.getLogConf().getLogFilePath(), null ); } platform/shared/rubyJVM/src/com/rho/RhoConf.java @@ -4,7 +4,23 @@ import java.util.Calendar; public class RhoProfiler { - public static boolean RHO_STRIP_PROFILER = true; + public static boolean RHO_STRIP_PROFILER = false; + + public static final String FILE_READ = "FileRead"; + public static final String FILE_WRITE = "FileWrite"; + public static final String FILE_SYNC = "FileSync"; + public static final String FILE_SET_SIZE = "FileSetSize"; + public static final String FILE_DELETE = "FileDelete"; + public static final String FILE_RENAME = "FileRename"; + + //public static final String SQL_SELECT = "SqlSelect"; + //public static final String SQL_FIND_NODE = "SqlFindNode"; + //public static final String SQL_GET_OBJECT_FROM_CACHE = "SqlGetObjectFromCache"; + //public static final String SQL_READ_OBJECT = "SqlReadObject"; + //public static final String SQL_GET_OBJECT_FROM_STORE = "SqlGetObjectFromStore"; + //public static final String SQL_PUT_OBJECT_TO_CACHE = "SqlPutObjectToCache"; + //public static final String SQL_READ_DATA = "SqlReadData"; + //public static final String SQL_READ_STRING = "SqlReadString"; private static final RhoLogger LOG = new RhoLogger("PROFILER"); @@ -130,4 +146,39 @@ public class RhoProfiler { (msg !=null&&msg.length()>0 ? msg : "" ) + " (" + intervalToString(oInterval) + ") : STOP" ); } + + /* + public void createSqlCounters() { + CREATE_COUNTER(SQL_SELECT); + CREATE_COUNTER(SQL_FIND_NODE); + CREATE_COUNTER(SQL_GET_OBJECT_FROM_CACHE); + CREATE_COUNTER(SQL_READ_OBJECT); + CREATE_COUNTER(SQL_GET_OBJECT_FROM_STORE); + CREATE_COUNTER(SQL_PUT_OBJECT_TO_CACHE); + CREATE_COUNTER(SQL_READ_DATA); + //CREATE_COUNTER(SQL_READ_STRING); + } + + public void destroySqlCounters() { + DESTROY_COUNTER(SQL_SELECT); + DESTROY_COUNTER(SQL_FIND_NODE); + DESTROY_COUNTER(SQL_GET_OBJECT_FROM_CACHE); + DESTROY_COUNTER(SQL_READ_OBJECT); + DESTROY_COUNTER(SQL_GET_OBJECT_FROM_STORE); + DESTROY_COUNTER(SQL_PUT_OBJECT_TO_CACHE); + DESTROY_COUNTER(SQL_READ_DATA); + //DESTROY_COUNTER(SQL_READ_STRING); + } + + public void flushSqlCounters(String msg) { + FLUSH_COUNTER(SQL_SELECT, msg); + FLUSH_COUNTER(SQL_FIND_NODE, msg); + FLUSH_COUNTER(SQL_GET_OBJECT_FROM_CACHE, msg); + FLUSH_COUNTER(SQL_READ_OBJECT, msg); + FLUSH_COUNTER(SQL_GET_OBJECT_FROM_STORE, msg); + FLUSH_COUNTER(SQL_PUT_OBJECT_TO_CACHE, msg); + FLUSH_COUNTER(SQL_READ_DATA, msg); + //FLUSH_COUNTER(SQL_READ_STRING, msg); + } + */ } platform/shared/rubyJVM/src/com/rho/RhoProfiler.java @@ -17,17 +17,18 @@ public class RhoRuby { private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : new RhoLogger("RhoRuby"); + private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : + new RhoProfiler(); public static final RubyID serveID = RubyID.intern("serve_hash"); public static final RubyID serveIndexID = RubyID.intern("serve_index_hash"); public static final RubyID raiseRhoError = RubyID.intern("raise_rhoerror"); + public static final RubyID initApp = RubyID.intern("init_app"); // public static final RubyID getStartPath = RubyID.intern("get_start_path"); // public static final RubyID getOptionsPath = RubyID.intern("get_options_path"); static RubyValue receiver; static RubyProgram mainObj; - static RubyMethod m_RhomAttribManager_delete_attribs, m_RhomAttribManager_add_attrib, m_RhomAttribManager_save; - static RubyClass m_classRhomAttribManager; static RubyClass m_classRhoError; static RubyMethod m_RhoError_err_message; @@ -40,6 +41,8 @@ public class RhoRuby { public static final int ERR_NOSERVERRESPONSE = 6; public static final int ERR_CLIENTISNOTLOGGEDIN = 7; public static final int ERR_CUSTOMSYNCSERVER = 8; + public static final int ERR_UNATHORIZED = 9; + public static final int ERR_CANCELBYUSER = 10; public static int getNetErrorCode(Exception exc) { @@ -109,11 +112,6 @@ public class RhoRuby { DBAdapter.getInstance().commit(); RubyModule modRhom = (RubyModule)RubyRuntime.ObjectClass.getConstant("Rhom"); - m_classRhomAttribManager = (RubyClass)modRhom.getConstant("RhomAttribManager"); - m_RhomAttribManager_delete_attribs = m_classRhomAttribManager.findMethod( RubyID.intern("delete_attribs") ); - m_RhomAttribManager_add_attrib = m_classRhomAttribManager.findMethod( RubyID.intern("add_attrib") ); - m_RhomAttribManager_save = m_classRhomAttribManager.findMethod( RubyID.intern("save") ); - } /*}catch(ClassNotFoundException exc){ @@ -123,6 +121,10 @@ public class RhoRuby { } } + public static void RhoRubyInitApp(){ + RubyAPI.callPublicNoArgMethod(receiver, null, initApp); + } + public static void RhoRubyStop(){ receiver = null; @@ -197,7 +199,8 @@ public class RhoRuby { addHashToHash( rh, "headers", headers ); - return callFramework(rh); + RubyValue res = callFramework(rh); + return res; } static RubyValue callFramework(RubyValue hashReq) { @@ -210,6 +213,19 @@ public class RhoRuby { return ObjectFactory.createHash(); } + public static RubyArray create_array() { + return new RubyArray(); + } + + public static RubyString create_string(String str) { + return ObjectFactory.createString(str); + } + + public static void add_to_array(RubyValue ar, RubyValue val) + { + ((RubyArray)ar).add(val); + } + public static RubyValue addTimeToHash(RubyHash hash, String key, long val) { return hash.add( ObjectFactory.createString(key), ObjectFactory.createTime(val) ); } @@ -226,21 +242,4 @@ public class RhoRuby { return hash.add( ObjectFactory.createString(key), val); } - public static void RhomAttribManager_add_attrib( Integer nSrcID, String strAttribute) - { - m_RhomAttribManager_add_attrib.invoke( m_classRhomAttribManager, ObjectFactory.createInteger(nSrcID.longValue()), - ObjectFactory.createString(strAttribute), null); - } - - public static void RhomAttribManager_delete_attribs( Integer nSrcID, long objID) - { - m_RhomAttribManager_delete_attribs.invoke( m_classRhomAttribManager, ObjectFactory.createInteger(nSrcID.longValue()), - ObjectFactory.createInteger(objID), null); - } - - public static void RhomAttribManager_save(Integer nSrcID) - { - m_RhomAttribManager_save.invoke( m_classRhomAttribManager, ObjectFactory.createInteger(nSrcID.longValue()), null); - } - } platform/shared/rubyJVM/src/com/rho/RhoRuby.java @@ -14,6 +14,8 @@ public class RhoThread extends Thread m_isInWaitState = false; } + public Object getSyncObject(){ return m_syncObj; } + public void start(int ePriority) { super.start(); @@ -66,11 +68,9 @@ public class RhoThread extends Thread public void stopWait() { - if ( m_isInWaitState ) - { - synchronized (m_syncObj) { - m_syncObj.notify(); - } + synchronized (m_syncObj) { + if ( m_isInWaitState ) + m_syncObj.notify(); } } }; platform/shared/rubyJVM/src/com/rho/RhoThread.java @@ -10,13 +10,14 @@ public class DBAdapter extends RubyBasic { private static DBAdapter m_Instance; - private IDBCallback m_dbCallback; private IDBStorage m_dbStorage; private boolean m_bIsOpen = false; private String m_strDBPath; private String m_strDBVerPath; + private DBAttrManager m_attrMgr = new DBAttrManager(); Mutex m_mxDB = new Mutex(); + boolean m_bInsideTransaction=false; boolean m_bUnlockDB = false; DBAdapter(RubyClass c) { @@ -36,63 +37,63 @@ public class DBAdapter extends RubyBasic { return m_Instance; } - public void setDbCallback(IDBCallback callback){ - m_dbCallback = callback; - - m_dbStorage.setDbCallback(callback); + public DBAttrManager getAttrMgr() + { + return m_attrMgr; } public IDBResult executeSQL(String strStatement, Object[] values)throws DBException{ LOG.TRACE("executeSQL: " + strStatement); - return m_dbStorage.executeSQL(strStatement,values); + return m_dbStorage.executeSQL(strStatement,values,false); } public IDBResult executeSQL(String strStatement)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - return executeSQL(strStatement,null); } public IDBResult executeSQL(String strStatement, Object arg1)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = {arg1}; return executeSQL(strStatement,values); } public IDBResult executeSQL(String strStatement, int arg1)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = { new Integer(arg1)}; return executeSQL(strStatement,values); } public IDBResult executeSQL(String strStatement, long arg1)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = { new Long(arg1)}; return executeSQL(strStatement,values); } public IDBResult executeSQL(String strStatement, Object arg1, Object arg2)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = {arg1,arg2}; return executeSQL(strStatement,values); } public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = {arg1,arg2,arg3}; return executeSQL(strStatement,values); } + public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4)throws DBException{ + Object[] values = {arg1,arg2,arg3,arg4}; + return executeSQL(strStatement,values); + } + + public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5)throws DBException{ + Object[] values = {arg1,arg2,arg3,arg4,arg5}; + return executeSQL(strStatement,values); + } public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); - Object[] values = {arg1,arg2,arg3,arg4,arg5,arg6}; return executeSQL(strStatement,values); } - public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)throws DBException{ - LOG.TRACE("executeSQL: " + strStatement); + + public IDBResult executeSQLReportNonUnique(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6)throws DBException{ + LOG.TRACE("executeSQLReportNonUnique: " + strStatement); + Object[] values = {arg1,arg2,arg3,arg4,arg5,arg6}; + return m_dbStorage.executeSQL(strStatement,values, true); + } + + public IDBResult executeSQL(String strStatement, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)throws DBException{ Object[] values = {arg1,arg2,arg3,arg4,arg5,arg6,arg7}; return executeSQL(strStatement,values); } @@ -101,6 +102,7 @@ public class DBAdapter extends RubyBasic { public void setUnlockDB(boolean b){ m_bUnlockDB = b; } public void Lock(){ m_mxDB.Lock(); } public void Unlock(){ setUnlockDB(false); m_mxDB.Unlock(); } + public boolean isInsideTransaction(){ return m_bInsideTransaction; } public static IDBResult createResult(){ return getInstance().m_dbStorage.createResult(); @@ -160,14 +162,22 @@ public class DBAdapter extends RubyBasic { "port VARCHAR(10) default NULL,"+ "last_sync_success VARCHAR(100) default NULL);"+ "CREATE TABLE object_values ("+ - " id INTEGER default NULL,"+ - " token varchar(30) default NULL,"+ + " id INTEGER PRIMARY KEY,"+ " source_id int default NULL,"+ " attrib varchar(255) default NULL,"+ " object varchar(255) default NULL,"+ " value varchar default NULL,"+ - " update_type varchar(255) default NULL,"+ " attrib_type varchar(255) default NULL);"+ + "CREATE TABLE changed_values ("+ + " id INTEGER default NULL,"+ + " source_id int default NULL,"+ + " attrib varchar(255) default NULL,"+ + " object varchar(255) default NULL,"+ + " value varchar default NULL,"+ + " attrib_type varchar(255) default NULL," + + " update_type varchar(255) default NULL, " + + " sent int default 0," + + " main_id INTEGER default 0 );"+ "CREATE TABLE sources ("+ //"id INTEGER PRIMARY KEY,"+ "source_id int PRIMARY KEY,"+ @@ -184,22 +194,69 @@ public class DBAdapter extends RubyBasic { //"CREATE INDEX by_attrib_obj_utype on object_values (attrib,object,update_type);"+ //"CREATE INDEX by_attrib_utype on object_values (attrib,update_type);"+ //"CREATE INDEX by_src_type ON object_values (source_id, attrib_type, object);"+ + "CREATE INDEX by_src_id ON object_values (source_id);"+ + "CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);"+ + "CREATE INDEX by_src_value ON object_values (attrib, source_id, value);";//+ + //"CREATE INDEX by_id ON object_values (id);"; //for delete operation + //"CREATE INDEX by_src_object ON object_values (source_id, object);"+ + //"CREATE INDEX by_src_up_value ON object_values (source_id, update_type, value);"; + //"CREATE INDEX by_type ON object_values (attrib_type)"; + } + + /*private String getSqlScript(){ + //TODO: read script from jar + return "CREATE TABLE client_info ("+ + "client_id VARCHAR(255) PRIMARY KEY,"+ + "token VARCHAR(255) default NULL,"+ + "token_sent int default 0,"+ + "reset int default 0,"+ + "port VARCHAR(10) default NULL,"+ + "last_sync_success VARCHAR(100) default NULL);"+ + "CREATE TABLE object_values ("+ + " id INTEGER PRIMARY KEY,"+ + " source_id int default NULL,"+ + " attrib varchar(255) default NULL,"+ + " object varchar(255) default NULL,"+ + " value varchar default NULL,"+ + " attrib_type varchar(32) default NULL);"+ + "CREATE TABLE changed_values ("+ + " id INTEGER PRIMARY KEY,"+ + " update_type varchar(255) default NULL);"+ + "CREATE TABLE sources ("+ + //"id INTEGER PRIMARY KEY,"+ + "source_id int PRIMARY KEY,"+ + "name varchar(255) default NULL,"+ + "token varchar(32) default NULL,"+ + "source_url VARCHAR(255) default NULL,"+ + "session VARCHAR(255) default NULL,"+ + "last_updated int default 0,"+ + "last_inserted_size int default 0,"+ + "last_deleted_size int default 0,"+ + "last_sync_duration int default 0,"+ + "last_sync_success int default 0," + + "source_attribs varchar default NULL);"+ + //"CREATE INDEX by_attrib_obj_utype on object_values (attrib,object,update_type);"+ + //"CREATE INDEX by_attrib_utype on object_values (attrib,update_type);"+ + //"CREATE INDEX by_src_type ON object_values (source_id, attrib_type, object);"+ "CREATE INDEX by_src_update ON object_values (source_id, update_type);"+ "CREATE INDEX by_id ON object_values (id);"; //for delete operation //"CREATE INDEX by_src_object ON object_values (source_id, object);"+ //"CREATE INDEX by_src_up_value ON object_values (source_id, update_type, value);"; //"CREATE INDEX by_type ON object_values (attrib_type)"; - } + }*/ public void startTransaction()throws DBException { Lock(); + m_bInsideTransaction=true; m_dbStorage.startTransaction(); } public void commit()throws DBException { + getAttrMgr().save(this); m_dbStorage.commit(); + m_bInsideTransaction=false; Unlock(); } public void endTransaction()throws DBException @@ -223,15 +280,20 @@ public class DBAdapter extends RubyBasic { DBVersion readDBVersion()throws Exception { - SimpleFile file = RhoClassFactory.createFile(); - file.open(m_strDBVerPath, true, true); - byte buf[] = new byte[20]; - int len = file.read(0, buf); - file.close(); - String strFullVer = ""; - if ( len > 0 ) - strFullVer = new String(buf,0,len); - + String strFullVer = ""; + try { + IRAFile file = RhoClassFactory.createRAFile(); + file.open(m_strDBVerPath); + byte buf[] = new byte[20]; + int len = file.read(buf, 0, buf.length); + file.close(); + if ( len > 0 ) + strFullVer = new String(buf,0,len); + } + catch (Exception e) { + LOG.TRACE("readDBVersion: Exception: " + e.getMessage()); + } + if ( strFullVer.length() == 0 ) return new DBVersion(); @@ -244,10 +306,11 @@ public class DBAdapter extends RubyBasic { void writeDBVersion(DBVersion ver)throws Exception { - SimpleFile file = RhoClassFactory.createFile(); - file.open(m_strDBVerPath, false, false); + IRAFile file = RhoClassFactory.createRAFile(); + file.open(m_strDBVerPath, "rw"); String strFullVer = ver.m_strRhoVer + ";" + ver.m_strAppVer; - file.write(0, strFullVer.getBytes() ); + byte[] buf = strFullVer.getBytes(); + file.write(buf, 0, buf.length); file.close(); } @@ -295,6 +358,10 @@ public class DBAdapter extends RubyBasic { //executeSQL("CREATE INDEX by_src ON object_values (source_id)", null); m_bIsOpen = true; + + getAttrMgr().load(this); + + m_dbStorage.setDbCallback(new DBCallback(this)); } private String createInsertStatement(IDBResult res, String tableName) @@ -327,16 +394,31 @@ public class DBAdapter extends RubyBasic { IDBStorage db = null; try{ + getAttrMgr().reset(this); + String strTable = v.toStr(); String dbName = getNameNoExt(m_strDBPath); String dbNewName = dbName + "new"; - SimpleFile fs = RhoClassFactory.createFile(); + IFileAccess fs = RhoClassFactory.createFileAccess(); - fs.delete(dbNewName + ".data"); - fs.delete(dbNewName + ".script"); - + String dbNameData = dbName + ".data"; + String dbNewNameData = dbNewName + ".data"; + String dbNameScript = dbName + ".script"; + String dbNewNameScript = dbNewName + ".script"; + String dbNameJournal = dbName + ".journal"; + String dbNewNameJournal = dbNewName + ".journal"; + + //LOG.TRACE("DBAdapter: " + dbNewNameDate + ": " + (fs.exists(dbNewNameData) ? "" : "not ") + "exists"); + fs.delete(dbNewNameData); + //LOG.TRACE("DBAdapter: " + dbNewNameScript + ": " + (fs.exists(dbNewNameScript) ? "" : "not ") + "exists"); + fs.delete(dbNewNameScript); + //LOG.TRACE("DBAdapter: " + dbNewNameJournal + ": " + (fs.exists(dbNewNameJournal) ? "" : "not ") + "exists"); + fs.delete(dbNewNameJournal); + + LOG.TRACE("1. Size of " + dbNameData + ": " + fs.size(dbNameData)); + db = RhoClassFactory.createDBStorage(); db.open( dbNewName, getSqlScript() ); @@ -358,7 +440,7 @@ public class DBAdapter extends RubyBasic { if ( strInsert.length() == 0 ) strInsert = createInsertStatement(res, tableName); - db.executeSQL(strInsert, res.getCurData() ); + db.executeSQL(strInsert, res.getCurData(), false ); } } @@ -369,12 +451,27 @@ public class DBAdapter extends RubyBasic { m_dbStorage = null; m_bIsOpen = false; - fs.renameOverwrite(dbNewName + ".data", dbName+".data"); - fs.renameOverwrite(dbNewName + ".script", dbName+".script"); + LOG.TRACE("2. Size of " + dbNewNameData + ": " + fs.size(dbNewNameData)); + + fs.delete(dbNameJournal); + + String fName = makeBlobFolderName(); + RhoClassFactory.createFile().delete(fName); + DBAdapter.makeBlobFolderName(); //Create folder back + + fs.renameOverwrite(dbNewNameData, dbNameData); + fs.renameOverwrite(dbNewNameScript, dbNameScript); + + LOG.TRACE("3. Size of " + dbNameData + ": " + fs.size(dbNameData)); m_dbStorage = RhoClassFactory.createDBStorage(); m_dbStorage.open(m_strDBPath, getSqlScript() ); m_bIsOpen = true; + + getAttrMgr().load(this); + + m_dbStorage.setDbCallback(new DBCallback(this)); + }catch(Exception e) { LOG.ERROR("execute failed.", e); @@ -406,10 +503,12 @@ public class DBAdapter extends RubyBasic { public void rollback()throws DBException { + m_dbStorage.rollback(); + m_bInsideTransaction=false; + Unlock(); - throw new DBException("Not implemented"); } - +/* public RubyValue rb_execute(RubyValue v) { RubyArray res = new RubyArray(); @@ -432,8 +531,51 @@ public class DBAdapter extends RubyBasic { } return res; + }*/ + + public RubyValue rb_execute(RubyValue v, RubyValue arg) + { + RubyArray res = new RubyArray(); + try{ + Object[] values = null; + if ( arg != null ) + { + RubyArray args1 = arg.toAry(); + RubyArray args = args1; + if ( args.size() > 0 && args.get(0) instanceof RubyArray ) + args = (RubyArray)args.get(0); + + values = new Object[args.size()]; + for ( int i = 0; i < args.size(); i++ ) + { + RubyValue val = args.get(i); + if ( val instanceof RubyFixnum ) + values[i] = new Long( ((RubyFixnum)val).toLong() ); + else + values[i] = val.toString(); + } + } + + IDBResult rows = executeSQL(v.toStr(), values); + RubyString[] colNames = getColNames(rows); + + for( ; !rows.isEnd(); rows.next() ) + { + RubyHash row = ObjectFactory.createHash(); + for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ ) + row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) ); + + res.add( row ); + } + }catch(Exception e) + { + LOG.ERROR("execute failed.", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + + return res; } - + //@RubyAllocMethod private static RubyValue alloc(RubyValue receiver) { return getInstance(); @@ -493,7 +635,6 @@ public class DBAdapter extends RubyBasic { m_dbStorage = null; } - m_dbCallback = null; }catch( Exception e ){ LOG.ERROR("close failed.", e); throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); @@ -517,10 +658,12 @@ public class DBAdapter extends RubyBasic { protected RubyValue run(RubyValue receiver, RubyBlock block ){ return ((DBAdapter)receiver).rb_close();} }); - klass.defineMethod( "execute", new RubyOneArgMethod(){ - protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ - return ((DBAdapter)receiver).rb_execute(arg);} + klass.defineMethod( "execute", new RubyVarArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){ + return ((DBAdapter)receiver).rb_execute(args.get(0), + (args.size() > 1 ? args.get(1):null));} }); + klass.defineMethod( "start_transaction", new RubyNoArgMethod(){ protected RubyValue run(RubyValue receiver, RubyBlock block ){ return ((DBAdapter)receiver).rb_start_transaction();} @@ -539,4 +682,75 @@ public class DBAdapter extends RubyBasic { }); } + + public static class DBCallback implements IDBCallback + { + private DBAdapter m_db; + DBCallback(DBAdapter db){ m_db = db; } + /*public void OnDeleteAll() { + OnDeleteAllFromTable("object_values"); + } + + public void OnDeleteAllFromTable(String tableName) { + if ( !tableName.equals("object_values") ) + return; + + try{ + String fName = DBAdapter.makeBlobFolderName(); + RhoClassFactory.createFile().delete(fName); + DBAdapter.makeBlobFolderName(); //Create folder back + }catch(Exception exc){ + LOG.ERROR("DBCallback.OnDeleteAllFromTable: Error delete files from table: " + tableName, exc); + } + }*/ + + public void OnInsertIntoTable(String tableName, IDBResult rows2Insert) + { + if ( !tableName.equalsIgnoreCase("object_values") ) + return; + + for( ; !rows2Insert.isEnd(); rows2Insert.next() ) + { + int nSrcID = rows2Insert.getIntByIdx(1); + String name = rows2Insert.getStringByIdx(2); + m_db.getAttrMgr().add(nSrcID, name); + } + + } + + public void OnDeleteFromTable(String tableName, IDBResult rows2Delete) + { + if ( !tableName.equalsIgnoreCase("object_values") ) + return; + + for( ; !rows2Delete.isEnd(); rows2Delete.next() ) + { + int nSrcID = rows2Delete.getIntByIdx(1); + String attrib = rows2Delete.getStringByIdx(2); + m_db.getAttrMgr().remove(nSrcID, attrib); + + String attrib_type = rows2Delete.getStringByIdx(5); + if ( !attrib_type.equals("blob.file") ) + continue; + + String url = rows2Delete.getStringByIdx(4); + if ( url == null || url.length() == 0 ) + continue; + + try{ + SimpleFile oFile = RhoClassFactory.createFile(); + + String strFilePath = oFile.getDirPath(""); + strFilePath += url; + + oFile.delete(strFilePath); + }catch(Exception exc){ + LOG.ERROR("DBCallback.OnDeleteFromTable: Error delete file: " + url, exc); + } + + } + } + + } + } platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java @@ -2,8 +2,9 @@ package com.rho.db; public interface IDBCallback { - public abstract void OnDeleteAll(); - public abstract void OnDeleteAllFromTable(String tableName); + //public abstract void OnDeleteAll(); + //public abstract void OnDeleteAllFromTable(String tableName); public abstract void OnDeleteFromTable(String tableName, IDBResult rows2Delete); + public abstract void OnInsertIntoTable(String tableName, IDBResult rows2Insert); } platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java @@ -34,4 +34,7 @@ public interface IDBResult { public abstract String getString(String colname); public abstract Object[] getCurData(); + + public abstract boolean isNonUnique(); + } platform/shared/rubyJVM/src/com/rho/db/IDBResult.java @@ -5,13 +5,14 @@ public interface IDBStorage { public abstract void open(String strPath, String strSqlScript)throws DBException; public abstract void close()throws DBException; - public abstract IDBResult executeSQL(String strStatement, Object[] values)throws DBException; + public abstract IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)throws DBException; public abstract IDBResult createResult(); public abstract void deleteAllFiles(String strPath)throws Exception; public abstract void startTransaction()throws DBException; public abstract void commit()throws DBException; + public abstract void rollback()throws DBException; public abstract void setDbCallback(IDBCallback callback); platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java @@ -22,7 +22,7 @@ public interface IHttpConnection { public static int HTTP_NOT_FOUND = 404; public static int HTTP_UNAUTHORIZED = 401; public static int HTTP_INTERNAL_ERROR = 500; - + public static int HTTP_NOTMODIFIED = 304; public abstract String getHost(); platform/shared/rubyJVM/src/com/rho/net/IHttpConnection.java @@ -9,5 +9,4 @@ public interface INetworkAccess { public abstract void close(); public abstract String getHomeUrl(); - public boolean doLocalRequest(String strUrl, String strBody); } platform/shared/rubyJVM/src/com/rho/net/INetworkAccess.java @@ -7,6 +7,7 @@ import java.io.OutputStream; import javolution.io.UTF8StreamReader; import com.rho.RhoClassFactory; +import com.rho.RhoConf; import com.rho.RhoEmptyLogger; import com.rho.RhoLogger; import com.rho.SimpleFile; @@ -17,7 +18,7 @@ public class NetRequest private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : new RhoLogger("Net"); - static final int MAX_NETREQUEST_RETRY = 1; + static final int MAX_NETREQUEST_RETRY = 3; boolean m_bCancel = false; public static interface IRhoSession @@ -72,10 +73,13 @@ public class NetRequest m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl); String strSession = oSession.getSession(); + LOG.INFO("Cookie : " + (strSession != null ? strSession : "") ); if ( strSession != null && strSession.length() > 0 ) m_connection.setRequestProperty("Cookie", strSession ); - m_connection.setRequestProperty("content-type", "application/x-www-form-urlencoded"); + m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); + m_connection.setRequestProperty("Connection", "keep-alive"); + //m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html"); if ( strBody != null && strBody.length() > 0 ) { @@ -96,9 +100,16 @@ public class NetRequest if (code == IHttpConnection.HTTP_UNAUTHORIZED) oSession.logout(); - if ( code != IHttpConnection.HTTP_INTERNAL_ERROR ) + //if ( code != IHttpConnection.HTTP_INTERNAL_ERROR ) + { buffer = readFully(is); - + + if ( code == IHttpConnection.HTTP_MOVED_TEMPORARILY || + code == IHttpConnection.HTTP_MOVED_PERMANENTLY ) + LOG.INFO("Response body: " + buffer.toString() ); + else + LOG.TRACE("Response body: " + buffer.toString() ); + } }else { long len = m_connection.getLength(); @@ -133,14 +144,7 @@ public class NetRequest public NetResponse pushData(String strUrl, String strBody, IRhoSession oSession)throws Exception { - URI uri = new URI(strUrl); - if ( "localhost".equals(uri.getHost()) || "127.0.0.1".equals(uri.getHost()) ) - { - boolean bRes = RhoClassFactory.getNetworkAccess().doLocalRequest(strUrl, strBody); - return new NetResponse("", bRes ? IHttpConnection.HTTP_OK : IHttpConnection.HTTP_INTERNAL_ERROR); - } - - return doRequestTry(strUrl, strBody, oSession, true); + return doRequest(strUrl, strBody, oSession, true); } static class ParsedCookie { @@ -157,6 +161,7 @@ public class NetRequest { ParsedCookie cookie = makeCookie(m_connection); resp.setCharData(cookie.strAuth + ";" + cookie.strSession + ";"); + LOG.INFO("pullCookies: " + resp.getCharData() ); } }finally { @@ -417,7 +422,40 @@ public class NetRequest if (tok.length() == 0) { continue; } - int i = tok.indexOf('='); + + int i = 0; + if ( (i=tok.indexOf("auth_token=")) >= 0 ) + { + String val = tok.substring(i+11); + val.trim(); + if ( val.length() > 0 ) + { + cookie.strAuth = "auth_token=" + val; + bAuth = true; + } + }else if ( (i=tok.indexOf("path=")) >= 0 ) + { + String val = tok.substring(i+6); + val.trim(); + if ( val.length() > 0 ) + { + if (bAuth) + cookie.strAuth += ";path=" + val; + else if (bSession) + cookie.strSession += ";path=" + val; + } + }else if ( (i=tok.indexOf("rhosync_session=")) >= 0 ) + { + String val = tok.substring(i+16); + val.trim(); + if ( val.length() > 0 ) + { + cookie.strSession = "rhosync_session=" + val; + bSession = true; + } + } + +/* int i = tok.indexOf('='); String s1; String s2; if (i > 0) { @@ -442,7 +480,7 @@ public class NetRequest && s2.length() > 0) { cookie.strSession = s1 + "=" + s2; bSession = true; - } + }*/ } } @@ -458,6 +496,15 @@ public class NetRequest return null; } + /*public static void TEST() + { + ParsedCookie cookie = new ParsedCookie(); + //parseCookie("auth_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT, auth_token=887b2ffd30a7b97be9a0986d7746a934421eec7d; path=/; expires=Sat, 24 Oct 2009 20:56:55 GMT, rhosync_session=BAh7BzoMdXNlcl9pZGkIIgpmbGFzaElDOidBY3Rpb25Db250cm9sbGVyOjpGbGFzaDo6Rmxhc2hIYXNoewAGOgpAdXNlZHsA--f9b67d99397fc534107fb3b7483ccdae23b4a761; path=/; expires=Sun, 10 Oct 2010 19:10:58 GMT; HttpOnly", cookie); + parseCookie("auth_token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT", cookie); + parseCookie("rhosync_session=BAh7CToNcGFzc3dvcmQiFTiMYru1W11zuoAlN%2FPtgjc6CmxvZ2luIhU4jGK7tVtdc7qAJTfz7YI3Ogx1c2VyX2lkaQYiCmZsYXNoSUM6J0FjdGlvbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA%3D--a7829a70171203d72cd4e83d07b18e8fcf5e2f78; path=/; expires=Thu, 02 Sep 2010 23:51:31 GMT; HttpOnly", cookie); + + }*/ + private static ParsedCookie makeCookie(IHttpConnection connection) throws IOException { ParsedCookie cookie = new ParsedCookie(); @@ -492,7 +539,10 @@ public class NetRequest private final StringBuffer readFully(InputStream in) throws Exception { - boolean bReadByBytes = RhoClassFactory.createRhoRubyHelper().isSimulator(); + boolean bReadByBytes = false; + if ( RhoConf.getInstance().getInt("bb_netreadbybytes") > 0 ) + bReadByBytes = RhoClassFactory.createRhoRubyHelper().isSimulator(); + StringBuffer buffer = new StringBuffer(); UTF8StreamReader reader = new UTF8StreamReader(4096,bReadByBytes); reader.setInput(in); platform/shared/rubyJVM/src/com/rho/net/NetRequest.java @@ -31,4 +31,9 @@ public class NetResponse { return m_nRespCode == IHttpConnection.HTTP_OK; } + public boolean isUnathorized() + { + return m_nRespCode == IHttpConnection.HTTP_UNAUTHORIZED; + } + } platform/shared/rubyJVM/src/com/rho/net/NetResponse.java @@ -16,6 +16,7 @@ import com.xruby.runtime.lang.RubyConstant; import com.xruby.runtime.lang.RubyValue; import com.xruby.runtime.lang.RhoSupport; import com.rho.net.URI; +import com.rho.sync.SyncThread; import com.rho.*; import com.rho.location.GeoLocation; @@ -177,8 +178,9 @@ public class RhoConnection implements IHttpConnection { } public int getResponseCode() throws IOException { - LOG.TRACE("getResponseCode" + responseCode); processRequest(); + LOG.TRACE("getResponseCode" + responseCode); + return responseCode; } @@ -343,7 +345,7 @@ public class RhoConnection implements IHttpConnection { public boolean isEnd(){ return nStart >= strPath.length(); } public String next(){ if ( isEnd() ) - return ""; + return null; int nEnd = strPath.indexOf('/',nStart); if ( nEnd < 0 ) @@ -377,6 +379,12 @@ public class RhoConnection implements IHttpConnection { responseMsg = "Success"; contentLength = 0; } + + void respondNotModified(){ + responseCode = HTTP_NOTMODIFIED; + responseMsg = "Success"; + contentLength = 0; + } void respondNotFound( String strError ){ responseCode = HTTP_NOT_FOUND; @@ -622,7 +630,7 @@ public class RhoConnection implements IHttpConnection { String model = up.next(); - if ( model.length() == 0 ) + if ( model == null || model.length() == 0 ) return false; if ( checkRhoExtensions(application, model ) ) @@ -636,7 +644,7 @@ public class RhoConnection implements IHttpConnection { String actionid = up.next(); String actionnext = up.next(); - if ( actionid.length() > 0 ){ + if ( actionid != null && actionid.length() > 0 ){ if ( actionid.length() > 2 && actionid.charAt(0)=='{' && actionid.charAt(actionid.length()-1)=='}' ){ reqHash.setProperty( "id", actionid); @@ -661,6 +669,10 @@ public class RhoConnection implements IHttpConnection { RubyValue res = RhoRuby.processRequest( reqHash, reqHeaders, resHeaders); processResponse(res); + if ( actionid !=null && actionid.length() > 2 && + actionid.charAt(0)=='{' && actionid.charAt(actionid.length()-1)=='}' ) + SyncThread.getInstance().addobjectnotify_bysrcname( model, actionid); + LOG.INFO("dispatch end"); return true; } platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java @@ -150,6 +150,8 @@ package com.rho.net; fgLookupTable['{'] |= MARK_CHARACTERS; fgLookupTable['}'] |= MARK_CHARACTERS; + fgLookupTable['|'] |= MARK_CHARACTERS; + // Add Scheme Characters // fgLookupTable['+'] |= SCHEME_CHARACTERS; // fgLookupTable['-'] |= SCHEME_CHARACTERS; @@ -2223,6 +2225,13 @@ package com.rho.net; } return sb.toString(); } + + public static boolean isLocalHost(String strUrl) + { + return strUrl.startsWith("http://localhost") || + strUrl.startsWith("http://127.0.0.1"); + } + /* public String getEscapedURL(){ String fullPath = m_scheme + "://" + m_host + ":" + m_port + m_path; platform/shared/rubyJVM/src/com/rho/net/URI.java @@ -51,7 +51,8 @@ public class ClientRegister extends RhoThread m_strDevicePin = m_sysInfo.getDeviceId(); m_NetRequest = RhoClassFactory.createNetRequest(); - start(epLow); + //send client register request in login + //start(epLow); } public static ClientRegister getInstance(){ return m_pInstance; } @@ -85,7 +86,7 @@ public class ClientRegister extends RhoThread { String client_id = oSync.loadClientID(); if ( client_id == null || client_id.length() == 0 ) - return ""; + return null; IDBResult res = oSync.getDB().executeSQL("SELECT token,token_sent from client_info"); if ( !res.isEnd() ) { @@ -116,10 +117,12 @@ public class ClientRegister extends RhoThread return false; String strBody = getRegisterBody(oSync); - if ( strBody == null || strBody.length() == 0 ) + if ( strBody == null ) return false; + if ( strBody.length() == 0) + return true; //already register - String serverUrl = RhoConf.getInstance().getString("syncserver"); + String serverUrl = RhoConf.getInstance().getPath("syncserver"); if (serverUrl != null && serverUrl.length()>0) { NetResponse resp = getNet().pushData(serverUrl+"clientregister", strBody, oSync); platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java @@ -31,6 +31,13 @@ class JSONArrayIterator m_nCurItem++; } + void reset(int nPos) + { + m_nCurItem = nPos; + } + + int getCurPos(){ return m_nCurItem; } + JSONEntry getCurItem()throws JSONException { return new JSONEntry( isEnd() ? null : (JSONObject) m_array.get(m_nCurItem) ); platform/shared/rubyJVM/src/com/rho/sync/JSONArrayIterator.java @@ -21,7 +21,9 @@ package com.rho.sync; import com.rho.RhoClassFactory; import com.rho.RhoConf; import com.rho.RhoEmptyLogger; +import com.rho.RhoEmptyProfiler; import com.rho.RhoLogger; +import com.rho.RhoProfiler; import com.rho.RhoRuby; import com.rho.db.*; import com.rho.net.*; @@ -34,73 +36,64 @@ public class SyncEngine implements NetRequest.IRhoSession { private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : new RhoLogger("Sync"); - - static class SyncNotification - { - String m_strUrl, m_strParams; - SyncNotification(String strUrl, String strParams){ m_strUrl = strUrl; m_strParams = strParams; } - }; - + private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : + new RhoProfiler(); + public static final int esNone = 0, esSyncAllSources = 1, esSyncSource = 2, esStop = 3, esExit = 4; static String SYNC_SOURCE_FORMAT() { return "?format=json"; } + int SYNC_VERSION() { return 2; } static String SYNC_ASK_ACTION() { return "/ask"; } - static String SYNC_PAGE_SIZE() { return "1000"; } Vector/*<SyncSource*>*/ m_sources = new Vector(); DBAdapter m_dbAdapter; NetRequest m_NetRequest; int m_syncState; String m_clientID = ""; - Hashtable/*<int,SyncNotification>*/ m_mapNotifications = new Hashtable(); - Mutex m_mxNotifications = new Mutex(); Mutex m_mxLoadClientID = new Mutex(); String m_strSession = ""; - - ISyncStatusListener m_statusListener = null; - - public void setStatusListener(ISyncStatusListener listener) { m_statusListener = listener; } - private void reportStatus(String status, int error, String strDetails) { - if (m_statusListener != null) { - if ( strDetails.length() == 0 ) - strDetails = RhoRuby.getErrorText(error); - status += (strDetails.length() > 0 ? " Details: " + strDetails: ""); - - LOG.INFO("Status: "+status); - - m_statusListener.reportStatus( status, error); - } - } + SyncNotify m_oSyncNotify = new SyncNotify(this); + boolean m_bStopByUser = false; + int m_nSyncPageSize = 2000; void setState(int eState){ m_syncState = eState; } int getState(){ return m_syncState; } boolean isContinueSync(){ return m_syncState != esExit && m_syncState != esStop; } boolean isSyncing(){ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; } void stopSync(){ if (isContinueSync()){ setState(esStop); m_NetRequest.cancel(); } } + void stopSyncByUser(){ m_bStopByUser = true; stopSync(); } void exitSync(){ setState(esExit); m_NetRequest.cancel(); } + boolean isStoppedByUser(){ return m_bStopByUser; } + String getClientID(){ return m_clientID; } void setSession(String strSession){m_strSession=strSession;} public String getSession(){ return m_strSession; } boolean isSessionExist(){ return m_strSession != null && m_strSession.length() > 0; } DBAdapter getDB(){ return m_dbAdapter; } + SyncNotify getNotify(){ return m_oSyncNotify; } NetRequest getNet() { return m_NetRequest;} SyncEngine(DBAdapter db){ m_dbAdapter = db; - m_dbAdapter.setDbCallback(new DBCallback()); m_NetRequest = null; m_syncState = esNone; } + String SYNC_PAGE_SIZE(){ return Integer.toString(m_nSyncPageSize); } + int getSyncPageSize() { return m_nSyncPageSize; } + void setSyncPageSize(int nPageSize){ m_nSyncPageSize = nPageSize; } + void setFactory(RhoClassFactory factory)throws Exception{ m_NetRequest = RhoClassFactory.createNetRequest(); } void doSyncAllSources() { + LOG.INFO("Sync all sources started."); setState(esSyncAllSources); - + m_bStopByUser = false; + try { loadAllSources(); @@ -108,14 +101,36 @@ public class SyncEngine implements NetRequest.IRhoSession m_strSession = loadSession(); if ( isSessionExist() ) { m_clientID = loadClientID(); + getNotify().cleanLastSyncObjectCount(); + + PROF.CREATE_COUNTER("Net"); + PROF.CREATE_COUNTER("Parse"); + PROF.CREATE_COUNTER("DB"); + PROF.CREATE_COUNTER("Data"); + PROF.CREATE_COUNTER("Data1"); + PROF.CREATE_COUNTER("Pull"); + PROF.START("Sync"); syncAllSources(); + + PROF.DESTROY_COUNTER("Net"); + PROF.DESTROY_COUNTER("Parse"); + PROF.DESTROY_COUNTER("DB"); + PROF.DESTROY_COUNTER("Data"); + PROF.DESTROY_COUNTER("Data1"); + PROF.DESTROY_COUNTER("Pull"); + PROF.STOP("Sync"); - if ( getState() != esStop ) - fireNotification(null, true, RhoRuby.ERR_NONE, "Sync completed."); } else { - fireNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, - "Sync failed. Details: Client is not logged in. No sync will be performed." ); + if ( m_sources.size() > 0 ) + { + SyncSource src = (SyncSource)m_sources.elementAt(getStartSource()); + src.m_strError = "Client is not logged in. No sync will be performed."; + src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN; + + getNotify().fireSyncNotification(src, true, src.m_nErrCode, ""); + }else + getNotify().fireSyncNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, ""); } }catch(Exception exc) @@ -126,7 +141,8 @@ public class SyncEngine implements NetRequest.IRhoSession setState(esNone); } - void doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction) + void doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction, boolean bSearchSyncChanges, + int nProgressStep) { if ( strSrcUrl != null && strSrcUrl.length()>0 ) LOG.INFO( "Started synchronization of the data source url: " + strSrcUrl ); @@ -134,6 +150,7 @@ public class SyncEngine implements NetRequest.IRhoSession LOG.INFO( "Started synchronization of the data source #" + nSrcId ); setState(esSyncSource); + m_bStopByUser = false; SyncSource src = null; try @@ -148,21 +165,26 @@ public class SyncEngine implements NetRequest.IRhoSession { src.m_strParams = strParams; src.m_strAction = strAction; + src.m_bSearchSyncChanges = bSearchSyncChanges; + src.m_nProgressStep = nProgressStep; m_strSession = loadSession(); if ( isSessionExist() ) { m_clientID = loadClientID(); if ( getState() != esStop ) + { + getNotify().cleanLastSyncObjectCount(); src.sync(); + } } else { src.m_strError = "Client is not logged in. No sync will be performed."; src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN; } - fireNotification(src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? "Sync completed." : ""); + getNotify().fireSyncNotification(src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? "Sync completed." : ""); } else { src = new SyncSource(this); - src.m_strError = "Unknown sync source."; + //src.m_strError = "Unknown sync source."; src.m_nErrCode = RhoRuby.ERR_RUNTIME; if ( strSrcUrl != null && strSrcUrl.length()>0 ) @@ -179,9 +201,10 @@ public class SyncEngine implements NetRequest.IRhoSession if ( src.m_nErrCode == RhoRuby.ERR_NONE ) src.m_nErrCode = RhoRuby.ERR_RUNTIME; - fireNotification(src, true, src.m_nErrCode, "" ); + getNotify().fireSyncNotification(src, true, src.m_nErrCode, "" ); } + getNotify().cleanCreateObjectErrors(); setState(esNone); if ( strSrcUrl != null && strSrcUrl.length()>0 ) @@ -213,11 +236,23 @@ public class SyncEngine implements NetRequest.IRhoSession return null; } + + SyncSource findSourceByName(String strSrcName) + { + for( int i = 0; i < m_sources.size(); i++ ) + { + SyncSource src = (SyncSource)m_sources.elementAt(i); + if ( src.getName().equals(strSrcName) ) + return src; + } + + return null; + } void loadAllSources()throws DBException { m_sources.removeAllElements(); - IDBResult res = getDB().executeSQL("SELECT source_id,source_url,token,name from sources order by source_id"); + IDBResult res = getDB().executeSQL("SELECT source_id,source_url,token,name from sources ORDER BY source_id"); for ( ; !res.isEnd(); res.next() ) { @@ -225,7 +260,13 @@ public class SyncEngine implements NetRequest.IRhoSession if ( strDbUrl.length() == 0 ) continue; - String strUrl = strDbUrl.startsWith("http") ? strDbUrl : (RhoConf.getInstance().getString("syncserver") + strDbUrl); + if ( strDbUrl.charAt(0) == '/' || strDbUrl.charAt(0) == '\\' ) + strDbUrl = strDbUrl.substring(1); + + String strUrl = strDbUrl.startsWith("http") ? strDbUrl : (RhoConf.getInstance().getPath("syncserver") + strDbUrl); + if ( strUrl.charAt(strUrl.length()-1) == '/' || strUrl.charAt(strUrl.length()-1) == '\\' ) + strUrl = strUrl.substring(0, strUrl.length()-1); + String name = res.getStringByIdx(3); if ( strUrl.length() > 0 ) m_sources.addElement( new SyncSource( res.getIntByIdx(0), strUrl, name, res.getUInt64ByIdx(2), this) ); @@ -266,7 +307,7 @@ public class SyncEngine implements NetRequest.IRhoSession boolean resetClientIDByNet(String strClientID)throws Exception { - String serverUrl = RhoConf.getInstance().getString("syncserver"); + String serverUrl = RhoConf.getInstance().getPath("syncserver"); String strUrl = serverUrl + "clientreset"; String strQuery = "?client_id=" + strClientID; @@ -276,7 +317,9 @@ public class SyncEngine implements NetRequest.IRhoSession String requestClientIDByNet()throws Exception { - String serverUrl = RhoConf.getInstance().getString("syncserver"); + LOG.INFO("Request clientID by Net."); + + String serverUrl = RhoConf.getInstance().getPath("syncserver"); String strUrl = serverUrl + "clientcreate"; String strQuery = SYNC_SOURCE_FORMAT(); @@ -308,7 +351,8 @@ public class SyncEngine implements NetRequest.IRhoSession void syncAllSources()throws Exception { - for( int i = getStartSource(); i < m_sources.size() && getState() != esExit; i++ ) + boolean bError = false; + for( int i = getStartSource(); i < m_sources.size() && isContinueSync(); i++ ) { SyncSource src = null; try{ @@ -316,16 +360,21 @@ public class SyncEngine implements NetRequest.IRhoSession if ( isSessionExist() && getState() != esStop ) src.sync(); - fireNotification(src, true, src.m_nErrCode, "" ); }catch(Exception exc) { if ( src.m_nErrCode == RhoRuby.ERR_NONE ) src.m_nErrCode = RhoRuby.ERR_RUNTIME; - fireNotification(src, true, src.m_nErrCode, "" ); + setState(esStop); throw exc; + }finally{ + getNotify().onSyncSourceEnd( i, m_sources ); + bError = src.m_nErrCode != RhoRuby.ERR_NONE; } } + + if ( !bError) + getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, "Sync completed."); } void callLoginCallback(String callback, int nErrCode, String strMessage) @@ -380,11 +429,18 @@ public class SyncEngine implements NetRequest.IRhoSession try{ - String serverUrl = RhoConf.getInstance().getString("syncserver"); + String serverUrl = RhoConf.getInstance().getPath("syncserver"); String strBody = "login=" + name + "&password=" + password + "&remember_me=1&"; strBody += ClientRegister.getInstance().getRegisterBody(this); resp = getNet().pullCookies( serverUrl+"client_login", strBody, this); + + if ( resp.isUnathorized() ) + { + callLoginCallback(callback, RhoRuby.ERR_UNATHORIZED, resp.getCharData()); + return; + } + if ( !resp.isOK() ) { callLoginCallback(callback, RhoRuby.ERR_REMOTESERVER, resp.getCharData()); @@ -407,8 +463,8 @@ public class SyncEngine implements NetRequest.IRhoSession getDB().executeSQL( "UPDATE sources SET session=?", strSession ); - if ( ClientRegister.getInstance() != null ) - ClientRegister.getInstance().stopWait(); + //if ( ClientRegister.getInstance() != null ) + // ClientRegister.getInstance().stopWait(); callLoginCallback(callback, RhoRuby.ERR_NONE, "" ); @@ -456,167 +512,10 @@ public class SyncEngine implements NetRequest.IRhoSession } - void setNotification(int source_id, String strUrl, String strParams )throws Exception - { - LOG.INFO( "Set notification. Source ID: " + source_id + "; Url :" + strUrl + "; Params: " + strParams ); - String strFullUrl = getNet().resolveUrl(strUrl); - - if ( source_id == -1 ) - { - synchronized(m_mxNotifications){ - m_mapNotifications.clear(); - - if ( strFullUrl.length() > 0 ) - { - loadAllSources(); - - for( int i = 0; i < m_sources.size(); i++ ) - { - SyncSource src = (SyncSource)m_sources.elementAt(i); - m_mapNotifications.put( src.getID(),new SyncNotification( strFullUrl, strParams ) ); - } - } - } - LOG.INFO( " Done Set notification for all sources; Url :" + strFullUrl + "; Params: " + strParams ); - }else - { - clearNotification(source_id); - if ( strFullUrl.length() > 0 ) - { - synchronized(m_mxNotifications){ - m_mapNotifications.put(new Integer(source_id),new SyncNotification( strFullUrl, strParams ) ); - } - LOG.INFO( " Done Set notification. Source ID: " + source_id + "; Url :" + strFullUrl + "; Params: " + strParams ); - } - } - } - - void fireNotification( SyncSource src, boolean bFinish, int nErrCode, String strMessage ) - { - if ( getState() == esExit ) - return; - - if( strMessage.length() > 0 || nErrCode != RhoRuby.ERR_NONE) - { - if ( !( src != null && src.m_strParams.length()>0) ) - { - if ( src != null && (strMessage==null || strMessage.length() == 0) ) - strMessage = "Sync failed for " + src.getName() + "."; - - reportStatus(strMessage,nErrCode,src!= null?src.m_strError:""); - } - } - - if ( src == null ) - return; //TODO: implement all sources callback - - try{ - String strBody = "", strUrl; - { - synchronized(m_mxNotifications){ - SyncNotification sn = (SyncNotification)m_mapNotifications.get(src.getID()); - if ( sn == null ) - return; - - strUrl = sn.m_strUrl; - strBody += "total_count=" + src.getTotalCount(); - strBody += "&processed_count=" + src.getCurPageCount(); - - strBody += "&status="; - if ( bFinish ) - { - if ( nErrCode == RhoRuby.ERR_NONE ) - strBody += "ok"; - else - { - strBody += "error"; - strBody += "&error_code=" + nErrCode; - strBody += "&error_message=" + URI.urlEncode(src.m_strError); - } - } - else - strBody += "in_progress"; - - if ( sn.m_strParams.length() > 0 ) - strBody += "&" + sn.m_strParams; - } - } - LOG.INFO( "Fire notification. Source ID: " + src.getID() + "; Url :" + strUrl + "; Body: " + strBody ); - - NetResponse resp = getNet().pushData( strUrl, strBody, this ); - if ( !resp.isOK() ) - LOG.ERROR( "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() ); - - if ( bFinish ) - clearNotification(src.getID().intValue()); - }catch(Exception exc) - { - LOG.ERROR("Fire notification failed.", exc); - } - } - - void clearNotification(int source_id) - { - LOG.INFO( "Clear notification. Source ID: " + source_id ); - - synchronized(m_mxNotifications){ - m_mapNotifications.remove(new Integer(source_id)); - } - } - static String getServerFromUrl( String strUrl ) { URI uri = new URI(strUrl); return uri.getHost(); } - - public static class DBCallback implements IDBCallback{ - - public void OnDeleteAll() { - OnDeleteAllFromTable("object_values"); - } - - public void OnDeleteAllFromTable(String tableName) { - if ( !tableName.equals("object_values") ) - return; - - try{ - String fName = DBAdapter.makeBlobFolderName(); - RhoClassFactory.createFile().delete(fName); - DBAdapter.makeBlobFolderName(); //Create folder back - }catch(Exception exc){ - LOG.ERROR("DBCallback.OnDeleteAllFromTable: Error delete files from table: " + tableName, exc); - } - } - - public void OnDeleteFromTable(String tableName, IDBResult rows2Delete) - { - if ( !tableName.equalsIgnoreCase("object_values") ) - return; - - for( ; !rows2Delete.isEnd(); rows2Delete.next() ) - { - if ( !rows2Delete.getString("attrib_type").equals("blob.file") ) - continue; - - String url = rows2Delete.getString("value"); - if ( url == null || url.length() == 0 ) - continue; - - try{ - SimpleFile oFile = RhoClassFactory.createFile(); - - String strFilePath = oFile.getDirPath(""); - strFilePath += url; - - oFile.delete(strFilePath); - }catch(Exception exc){ - LOG.ERROR("DBCallback.OnDeleteFromTable: Error delete file: " + url, exc); - } - - } - } - - } } platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java @@ -20,7 +20,9 @@ package com.rho.sync; import com.rho.RhoClassFactory; import com.rho.RhoEmptyLogger; +import com.rho.RhoEmptyProfiler; import com.rho.RhoLogger; +import com.rho.RhoProfiler; import com.rho.net.*; import com.rho.db.*; import java.util.Vector; @@ -35,7 +37,12 @@ class SyncSource { private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : new RhoLogger("Sync"); + + private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : + new RhoProfiler(); + public static final int edpNone = 0, edpDeleteObjects = 2; + static class SyncBlob { String m_strBody; @@ -57,12 +64,15 @@ class SyncSource String m_token; boolean m_bTokenFromDB; - int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount; + int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount, m_nAttribCounter=0; boolean m_bGetAtLeastOnePage = false; + int m_eSyncServerDataPass = edpNone; int m_nErrCode = RhoRuby.ERR_NONE; String m_strError = ""; String m_strParams = ""; String m_strAction = ""; + boolean m_bSearchSyncChanges = false; + int m_nProgressStep = -1; String m_strPushBody = ""; Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector(); @@ -92,8 +102,13 @@ class SyncSource void setTotalCount(int nTotalCount){m_nTotalCount = nTotalCount;} int getCurPageCount(){return m_nCurPageCount;} int getTotalCount(){return m_nTotalCount;} + int getProgressStep(){ return m_nProgressStep; } + + void setSyncServerDataPass(int ePass){m_eSyncServerDataPass = ePass;} + boolean isDeleteObjectsPass(){ return m_eSyncServerDataPass == edpDeleteObjects; } SyncEngine getSync(){ return m_syncEngine; } + SyncNotify getNotify(){ return getSync().getNotify(); } DBAdapter getDB(){ return getSync().getDB(); } NetRequest getNet(){ return getSync().getNet(); } @@ -127,23 +142,52 @@ class SyncSource void sync() throws Exception { - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, "Synchronizing " + getName() + "..."); + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "Synchronizing " + getName() + "..."); TimeInterval startTime = TimeInterval.getCurrentTime(); - + try{ - if ( m_strParams.length() == 0 ) + PROF.START("Pull"); + if ( isEmptyToken() ) + processToken("1"); + + boolean bSyncedServer = false; + if ( m_strParams.length() == 0 || m_bSearchSyncChanges ) { - syncClientChanges(); - getAndremoveAsk(); + if ( isPendingClientChanges() ) + { + syncServerChanges(); + bSyncedServer = true; + } + + if ( bSyncedServer && isPendingClientChanges() ) + getSync().setState(SyncEngine.esStop); + else + { + boolean bSyncClient = false; + { + IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID()); + bSyncClient = !res.isEnd(); + } + if ( bSyncClient ) + { + syncClientChanges(); + getAndremoveAsk(); + bSyncedServer = false; + } + } } - syncServerChanges(); + PROF.STOP("Pull"); + + if ( !bSyncedServer ) + syncServerChanges(); + }catch(Exception exc) { getSync().stopSync(); throw exc; }finally{ - TimeInterval endTime = TimeInterval.getCurrentTime(); + TimeInterval endTime = TimeInterval.getCurrentTime(); getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, "+ "last_sync_duration=?,last_sync_success=? WHERE source_id=?", new Long(endTime.toULong()), new Integer(getInsertedCount()), new Integer(getDeletedCount()), new Long((endTime.minus(startTime)).toULong()), @@ -151,6 +195,12 @@ class SyncSource } } + boolean isPendingClientChanges()throws DBException + { + IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1 LIMIT 1 OFFSET 0", getID()); + return !res.isEnd(); + } + void syncClientBlobs(String strBaseQuery)throws Exception { String strQuery; @@ -185,145 +235,92 @@ class SyncSource void syncClientChanges()throws Exception { - LOG.INFO("Sync client changes source ID :" + getID() ); - - IDBResult res = getDB().executeSQL("SELECT attrib, object, value, attrib_type, update_type "+ - "FROM object_values where source_id=? and (update_type = 'update' or update_type = 'create' or update_type = 'delete') order by update_type", getID() ); - - String strUpdateType = ""; - m_arSyncBlobs.removeAllElements(); - m_strPushBody = ""; - - for( ; !res.isEnd()&& getSync().isContinueSync(); res.next() ) + String[] arUpdateTypes = {"create", "update", "delete"}; + for( int i = 0; i < 3 && getSync().isContinueSync(); i++ ) { - String strTemp = res.getStringByIdx(4); - if ( !strUpdateType.equals(strTemp) ) - { - if ( strUpdateType.length() > 0 ) - { - if ( !sendClientChanges(strUpdateType) ) - { - getSync().setState(SyncEngine.esStop); - continue; - } - } - - m_strPushBody = ""; - strUpdateType = strTemp; - } - - makePushBody1( res ); - } - - if ( getSync().isContinueSync() && strUpdateType.length() > 0 ) - sendClientChanges(strUpdateType); - } + String strUrl = getUrl() + "/" + arUpdateTypes[i]; + strUrl += "objects"; + String strQuery = SyncEngine.SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID(); - boolean sendClientChanges(String strUpdateType)throws Exception - { - String strUrl = getUrl() + "/" + strUpdateType; - strUrl += "objects"; - String strQuery = SyncEngine.SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID(); - - if ( m_strPushBody.length() > 0 ) - { - LOG.INFO("Push client changes to server. Source id: " + getID() + "Size :" + m_strPushBody.length()); - LOG.TRACE( "Push body: " + m_strPushBody ); - - try{ - NetResponse resp = getNet().pushData(strUrl+strQuery,m_strPushBody, getSync() ); - if ( !resp.isOK() ) - { - m_nErrCode = RhoRuby.ERR_REMOTESERVER; - //m_strError = resp.getCharData(); - - return false; - } - }catch(Exception exc) - { - m_nErrCode = RhoRuby.getNetErrorCode(exc); - throw exc; - } + m_arSyncBlobs.removeAllElements(); + String strBody = makePushBody(arUpdateTypes[i]); + if ( strBody.length() > 0 ) + { + LOG.INFO( "Push client changes to server. Source id: " + getID() + "Size :" + strBody.length() ); + LOG.TRACE("Push body: " + strBody); + + NetResponse resp = getNet().pushData(strUrl+strQuery,strBody, getSync()); + if ( !resp.isOK() ) + { + getSync().setState(SyncEngine.esStop); + m_nErrCode = RhoRuby.ERR_REMOTESERVER; + continue; + } + } + + if ( m_arSyncBlobs.size()>0 ) + { + LOG.INFO( "Push blobs to server. Source id: " + getID() + "Count :" + m_arSyncBlobs.size() ); + //oo conflicts + if ( i < 1 ) //create + getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", + getID(), arUpdateTypes[i], "blob.file" ); + else + // + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", + getID(), arUpdateTypes[i], "blob.file" ); + + syncClientBlobs(strUrl+strQuery); + }else if ( strBody.length() > 0 ) + { + //oo conflicts + if ( i < 1 ) //create + getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] ); + else + // + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] ); + } } - - if ( m_arSyncBlobs.size() > 0 ) - { - LOG.INFO( "Push blobs to server. Source id: " + getID() + "Count :" + m_arSyncBlobs.size() ); - - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?)", getID(), strUpdateType, "blob.file" ); - syncClientBlobs(strUrl+strQuery); - }else if ( m_strPushBody.length() > 0 ) - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=?", getID(), strUpdateType ); - - return true; } -/* - * Construct the body of the request by filtering - * the attr_filter string. The body format should - * look like the following: - * create: attrvals[][attrib]=<name|industry>&attrvals[][object]=<locallygeneratedid>&attrvals[][value]=<some value> - * update: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>&attrvals[][value]=<some new value> - * delete: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid> - */ - void makePushBody1( IDBResult res )throws DBException - { - String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0); - - if ( res.getStringByIdx(1).length() > 0 ) - strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1); - - String value = res.getStringByIdx(2); - String attribType = res.getStringByIdx(3); - - if ( value.length() > 0 ) - { - if ( attribType.equals("blob.file") ) - { - FilePath oBlobPath = new FilePath(value); - strSrcBody += "&attrvals[][value]="; - strSrcBody += oBlobPath.getBaseName(); - strSrcBody += "&attrvals[][attrib_type]=blob"; - - m_arSyncBlobs.addElement(new SyncBlob(strSrcBody,value)); - return; - }else - strSrcBody += "&attrvals[][value]=" + value; - } - - if ( m_strPushBody.length() > 0 ) - m_strPushBody += "&"; - - m_strPushBody += strSrcBody; - } + /* + * Construct the body of the request by filtering + * the attr_filter string. The body format should + * look like the following: + * create: attrvals[][attrib]=<name|industry>&attrvals[][object]=<locallygeneratedid>&attrvals[][value]=<some value> + * update: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>&attrvals[][value]=<some new value> + * delete: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid> + */ String makePushBody( String szUpdateType)throws DBException { String strBody = ""; - //boolean bFirst = true; - IDBResult res = getDB().executeSQL("SELECT attrib, object, value, attrib_type "+ - "FROM object_values where source_id=? and update_type =?", getID(), szUpdateType ); + getDB().Lock(); + + IDBResult res = getDB().executeSQL("SELECT attrib, object, value, attrib_type, main_id "+ + "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY sent DESC", getID(), szUpdateType ); + if ( res.isEnd() ) + { + getDB().Unlock(); + return strBody; + } + for( ; !res.isEnd(); res.next() ) { String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0); if ( res.getStringByIdx(1).length() > 0 ) strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1); - + + long main_id = res.getLongByIdx(4); + if ( main_id != 0 ) + strSrcBody += "&attrvals[][id]=" + main_id; + String value = res.getStringByIdx(2); String attribType = res.getStringByIdx(3); - /*if ( bFirst ) - { - try{ - value = DBAdapter.makeBlobFolderName() + "blobtest.png"; - }catch(Exception e){} - - attribType = "blob.file"; - bFirst = false; - }*/ - if ( value.length() > 0 ) + //if ( value.length() > 0 ) { if ( attribType.equals("blob.file") ) { @@ -332,7 +329,8 @@ class SyncSource strSrcBody += oBlobPath.getBaseName(); strSrcBody += "&attrvals[][attrib_type]=blob"; - m_arSyncBlobs.addElement(new SyncBlob(strSrcBody,value)); + if ( value.length() > 0 ) + m_arSyncBlobs.addElement(new SyncBlob(strSrcBody,value)); continue; }else strSrcBody += "&attrvals[][value]=" + value; @@ -344,6 +342,9 @@ class SyncSource strBody += strSrcBody; } + getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), szUpdateType ); + getDB().Unlock(); + return strBody; } @@ -351,16 +352,22 @@ class SyncSource { String askParams = ""; { - IDBResult res = getDB().executeSQL("SELECT value from object_values where source_id=? and update_type=?", - getID(), "ask" ); - askParams = res.isEnd() ? "" : res.getStringByIdx(0); + IDBResult res = getDB().executeSQL("SELECT object, attrib, value "+ + "FROM changed_values WHERE source_id=? and update_type =?", getID(), "ask" ); + if ( !res.isEnd() ) + { + askParams = res.getStringByIdx(2); + + getDB().executeSQL("DELETE FROM object_values WHERE object=? and attrib=? and source_id=?", + res.getStringByIdx(0), res.getStringByIdx(1), getID() ); + } + + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=?", getID(), "ask" ); } - - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=?", getID(), "ask" ); - + setAskParams(askParams); } - + void syncServerChanges()throws Exception { LOG.INFO("Sync server changes source ID :" + getID() ); @@ -373,7 +380,7 @@ class SyncSource strUrl += '/' + m_strAction; String strQuery = SyncEngine.SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID() + - "&p_size=" + SyncEngine.SYNC_PAGE_SIZE(); + "&p_size=" + getSync().SYNC_PAGE_SIZE() + "&version=" + getSync().SYNC_VERSION(); if ( m_strParams.length() > 0 ) strQuery += m_strParams; @@ -384,16 +391,17 @@ class SyncSource strQuery += "&question=" + getAskParams(); } - if ( isEmptyToken() ) - processToken("1"); - else if ( !m_bTokenFromDB && isTokenMoreThanOne() ) + if ( !m_bTokenFromDB && isTokenMoreThanOne() ) strQuery += "&ack_token=" + getToken(); LOG.INFO( "Pull changes from server. Url: " + (strUrl+strQuery) ); NetResponse resp = null; try{ + PROF.START("Net"); resp = getNet().pullData(strUrl+strQuery, "", getSync()); + PROF.STOP("Net"); + if ( !resp.isOK() ) { getSync().stopSync(); @@ -409,14 +417,29 @@ class SyncSource } processServerData(resp.getCharData()); -/* String strData = - "[{count: 124},{total_count: 5425},{token: 123},{version: 1}," + - "{o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:[" + - "{i:26478681,d:1}," + - "{a:\"first_name\",i:47354289,v:\"Lars\",t:\"blob\",d:0}]}]"; - //u:\"query\", - processServerData(strData);*/ - + + //String strData = + //"[{count:10},{version:1},{total_count: 5425},{token: 123},{s:\"RhoDeleteSource\",ol:[{o:\"rho_del_obj\",av:[{i:55550425},{i:75665819},{i:338165272},{i:402396629},{i:521753981},{i:664143530},{i:678116186},{i:831092394},{i:956041217},{i:970452458}]}]}]"; + /*"[{count: 124},{version: 1},{total_count: 5425},{token: 123}," + "{s:\"Product\",ol:[" + "{oo:\"123\",o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:[" + "{a:\"first_name\",i:47354289,v:\"Lars. \n\n Burgess\", t:\"blob\"}," + "{a:\"second_name\",i:55555,v:\"Burgess\"}]}," + "{oo:\"456\", e:\"Something went wrong creating this record on the backend: code 7\"}" + "]}]"; */ + /*"[{count: 1},{version: 1},{total_count: 1},{token: 123}," + "{s:\"Product\",ol:[" + "{oo:\"94\", e:\"Something went wrong creating this record on the backend: code 7\"}" + "]}]";*/ + /*"[{count: 1},{version: 1},{total_count: 1},{token: 123}," + "{s:\"Product\",ol:[" + "{o:\"94\", av:[" + "{a:\"TEST\",i:55555,v:\"Geny\"}]}," + "]}]"; + + //u:\"query\", + processServerData(strData.c_str()); */ + if ( getAskParams().length() > 0 || getCurPageCount() == 0 ) break; } @@ -424,13 +447,16 @@ class SyncSource void processServerData(String szData)throws Exception { + LOG.TRACE("Server data: " + szData); + PROF.START("Parse"); JSONArrayIterator oJsonArr = new JSONArrayIterator(szData); + PROF.STOP("Parse"); + PROF.START("Data1"); if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("error") ) { m_strError = oJsonArr.getCurItem().getString("error"); m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER; - processToken("0"); getSync().stopSync(); return; } @@ -440,6 +466,13 @@ class SyncSource setCurPageCount(oJsonArr.getCurItem().getInt("count")); oJsonArr.next(); } + int nVersion = 0; + if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") ) + { + nVersion = oJsonArr.getCurItem().getInt("version"); + oJsonArr.next(); + } + if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("total_count") ) { setTotalCount(oJsonArr.getCurItem().getInt("total_count")); @@ -447,73 +480,223 @@ class SyncSource } if ( getServerObjectsCount() == 0 ) - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, ""); + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); if ( !oJsonArr.isEnd() ) { processToken(oJsonArr.getCurItem().getUInt64("token")); oJsonArr.next(); }else if ( getCurPageCount() == 0 ) - processToken("0"); - - int nVersion = 0; - if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") ) { - nVersion = oJsonArr.getCurItem().getInt("version"); - oJsonArr.next(); + //oo conflicts + getDB().executeSQL("DELETE FROM changed_values where source_id=? and sent>=3", getID() ); + // + processToken("0"); } - LOG.INFO( "Got " + getCurPageCount() + " records of " + getTotalCount() + " from server. Source ID: " + getID() + LOG.INFO( "Got " + getCurPageCount() + "(Processed: " + getServerObjectsCount() + ") records of " + getTotalCount() + " from server. Source ID: " + getID() + ". Version: " + nVersion ); + PROF.STOP("Data1"); if ( !oJsonArr.isEnd() && getSync().isContinueSync() ) { - //TODO: support DBExceptions + PROF.START("Data"); getDB().startTransaction(); + try{ - for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) - { - if ( getDB().isUnlockDB() ) - { - LOG.INFO( "Commit transaction because of UI request." ); - RhoRuby.RhomAttribManager_save(getID()); - getDB().endTransaction(); - getDB().startTransaction(); - } - - JSONEntry oJsonObject = oJsonArr.getCurItem(); - boolean bRes = nVersion == 0 ? processSyncObject(oJsonObject) : - processSyncObject_ver1(oJsonObject); - - if( !bRes) - { - getSync().stopSync(); - break; - } - - m_bGetAtLeastOnePage = true; - } - }finally{ - RhoRuby.RhomAttribManager_save(getID()); + int nSavedPos = oJsonArr.getCurPos(); + setSyncServerDataPass(edpNone); + processServerData_Ver1(oJsonArr); + + setSyncServerDataPass(edpDeleteObjects); + oJsonArr.reset(nSavedPos); + processServerData_Ver1(oJsonArr); + + PROF.STOP("Data"); + + PROF.START("DB"); getDB().endTransaction(); + PROF.STOP("DB"); + + getNotify().fireObjectsNotification(); + + }catch(Exception exc){ + getDB().rollback(); + throw exc; } + + } + + PROF.START("Data1"); + if ( getCurPageCount() > 0 ) + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); + PROF.STOP("Data1"); + } + + boolean processSyncObject_ver1(JSONEntry oJsonObject, Integer nSrcID)throws Exception + { + String strOldObject = oJsonObject.getString("oo"); + if ( isDeleteObjectsPass() != (nSrcID.intValue() < 0) ) + return true; + + if ( oJsonObject.hasName("e") ) + { + String strError = oJsonObject.getString("e"); + getNotify().addCreateObjectError(nSrcID,strOldObject,strError); + return true; + } + + String strObject = oJsonObject.getString("o"); + JSONArrayIterator oJsonArr = new JSONArrayIterator(oJsonObject, "av"); + //oo conflicts + boolean bUpdatedOO = false; + // + for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); m_nAttribCounter++, oJsonArr.next() ) + { + JSONEntry oJsonEntry = oJsonArr.getCurItem(); + if ( oJsonEntry.isEmpty() ) + continue; + + if ( nSrcID.intValue() >= 0 ) //insert + { + CValue value = new CValue(oJsonEntry,1); + if ( !downloadBlob(value) ) + return false; + + String strAttrib = oJsonEntry.getString("a"); + //oo conflicts + if ( strOldObject != null ) + { + if ( !bUpdatedOO ) + { + getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID ); + + getNotify().onObjectChanged(nSrcID,strOldObject, SyncNotify.enCreate); + + bUpdatedOO = true; + } + + getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID ); + + getDB().executeSQL("UPDATE object_values SET id=? WHERE object=? and attrib=? and source_id=?", + value.m_nID, strObject, strAttrib, nSrcID ); + }else// + { + IDBResult resInsert = getDB().executeSQLReportNonUnique("INSERT INTO object_values "+ + "(id, attrib, source_id, object, value, attrib_type) VALUES(?,?,?,?,?,?)", + value.m_nID, strAttrib, nSrcID, strObject, + value.m_strValue, value.m_strAttrType ); + if ( resInsert.isNonUnique() ) + { + getDB().executeSQL("UPDATE object_values "+ + "SET id=?, value=?, attrib_type=? WHERE object=? and attrib=? and source_id=?", + value.m_nID, value.m_strValue, value.m_strAttrType, + strObject, strAttrib, nSrcID ); + + // oo conflicts + getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID ); + // + } + + getNotify().onObjectChanged(nSrcID,strObject, SyncNotify.enUpdate); + } + + m_nInserted++; + }else + { + long id = oJsonEntry.getLong("i"); + + IDBResult res = getDB().executeSQL("SELECT source_id, object FROM object_values where id=?", id ); + if ( !res.isEnd() ) + { + LOG.TRACE("Delete: " + id); + Integer nDelSrcID = new Integer(res.getIntByIdx(0)); + String strDelObject = res.getStringByIdx(1); + getDB().executeSQL("DELETE FROM object_values where id=?", id ); + getNotify().onObjectChanged(nDelSrcID, strDelObject, SyncNotify.enDelete); + } + // oo conflicts + getDB().executeSQL("UPDATE changed_values SET sent=3 where main_id=?", id ); + // + + m_nDeleted++; + } } - if ( getServerObjectsCount() < getTotalCount() ) - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, ""); + return true; } + + void processServerData_Ver1(JSONArrayIterator oJsonArr)throws Exception + { + for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) + { + JSONEntry oJsonSource = oJsonArr.getCurItem(); + String strSrcName = oJsonSource.getString("s"); + Integer nSrcID = getID(); + if ( strSrcName.compareTo("RhoDeleteSource") == 0 ) + nSrcID = new Integer(-1); + else if ( strSrcName.compareTo(getName()) != 0 ) + { + SyncSource pSrc = getSync().findSourceByName(strSrcName); + if ( pSrc == null ) + { + LOG.ERROR("Sync server send data for unknown source name:" + strSrcName); + getSync().stopSync(); + m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE; + break; + } + nSrcID = pSrc.getID(); + } + JSONArrayIterator oJsonObjList = new JSONArrayIterator(oJsonSource, "ol"); + m_nAttribCounter = 0; + for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() ) + { + if ( getDB().isUnlockDB() )//|| m_nAttribCounter >= 200 ) + { + if ( getDB().isUnlockDB() ) + LOG.INFO( "Commit transaction because of UI request." ); + + getDB().endTransaction(); + getDB().startTransaction(); + + m_nAttribCounter = 0; + } + + JSONEntry oJsonObject = oJsonObjList.getCurItem(); + if( !processSyncObject_ver1(oJsonObject,nSrcID)) + { + getSync().stopSync(); + break; + } + + if ( !isDeleteObjectsPass() && nSrcID.intValue() >=0 ) + { + int nSyncObjectCount = getNotify().incLastSyncObjectCount(nSrcID); + + if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) ) + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); + } + + m_bGetAtLeastOnePage = true; + } + } + } + class CValue { String m_strValue; String m_strAttrType; - long m_nID; + Long m_nID; CValue(JSONEntry oJsonEntry)throws JSONException { m_strValue = oJsonEntry.getString("value"); m_strAttrType = oJsonEntry.getString("attrib_type"); - m_nID = oJsonEntry.getLong("id"); + m_nID = new Long(oJsonEntry.getLong("id")); } CValue(JSONEntry oJsonEntry, int nVer)throws JSONException { @@ -521,7 +704,7 @@ class SyncSource { m_strValue = oJsonEntry.getString("v"); m_strAttrType = oJsonEntry.getString("t"); - m_nID = oJsonEntry.getLong("i"); + m_nID = new Long(oJsonEntry.getLong("i")); } } @@ -547,7 +730,7 @@ class SyncSource } } - fName += "/id_" + Long.toString(value.m_nID) + strExt; + fName += "/id_" + value.m_nID.toString() + strExt; return fName; } @@ -589,98 +772,14 @@ class SyncSource return true; } - boolean processSyncObject_ver1(JSONEntry oJsonObject)throws Exception - { - String strObject = oJsonObject.getString("o"); - JSONArrayIterator oJsonArr = new JSONArrayIterator(oJsonObject, "av"); - - for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) - { - JSONEntry oJsonEntry = oJsonArr.getCurItem(); - if ( oJsonEntry.isEmpty() ) - continue; - - int nDbOp = oJsonEntry.getInt("d"); - if ( nDbOp == 0 ) //insert - { - CValue value = new CValue(oJsonEntry,1); - if ( !downloadBlob(value) ) - return false; - - String strAttrib = oJsonEntry.getString("a"); - String strUpdateType = "query"; - if( oJsonEntry.hasName("u") ) - strUpdateType = oJsonEntry.getString("u"); - - getDB().executeSQL("INSERT INTO object_values " + - "(id, attrib, source_id, object, value, update_type,attrib_type) VALUES(?,?,?,?,?,?,?)", - new Long(value.m_nID), strAttrib, getID(), strObject, - value.m_strValue, strUpdateType, value.m_strAttrType ); - - RhoRuby.RhomAttribManager_add_attrib(getID(),strAttrib); - m_nInserted++; - }else if ( nDbOp == 1 ) //delete - { - long id = oJsonEntry.getLong("i"); - getDB().executeSQL("DELETE FROM object_values where id=?", id ); - - RhoRuby.RhomAttribManager_delete_attribs(getID(),id); - m_nDeleted++; - }else{ - LOG.ERROR("Unknown DB operation: " + nDbOp ); - } - } - - return true; - } - - boolean processSyncObject(JSONEntry oJsonObject)throws Exception - { - JSONEntry oJsonEntry = oJsonObject.getEntry("object_value"); - - if ( oJsonEntry.isEmpty() ) - return true; - - String szDbOp = oJsonEntry.getString("db_operation"); - if ( szDbOp != null && szDbOp.equals("insert") ) - { - CValue value = new CValue(oJsonEntry); - // - //value.m_strAttrType = "blob.url"; - //value.m_strValue = "http://img.gazeta.ru/files3/661/3219661/ld.jpg"; - // - if ( !downloadBlob(value) ) - return false; - - String strAttrib = oJsonEntry.getString("attrib"); - getDB().executeSQL("INSERT INTO object_values " + - "(id, attrib, source_id, object, value, update_type,attrib_type) VALUES(?,?,?,?,?,?,?)", - new Long(value.m_nID), strAttrib, getID(), oJsonEntry.getString("object"), - value.m_strValue, oJsonEntry.getString("update_type"), value.m_strAttrType ); - - RhoRuby.RhomAttribManager_add_attrib(getID(),strAttrib); - m_nInserted++; - }else if ( szDbOp != null && szDbOp.equals("delete") ) - { - long id = oJsonEntry.getLong("id"); - getDB().executeSQL("DELETE FROM object_values where id=?", id ); - - RhoRuby.RhomAttribManager_delete_attribs(getID(),id); - m_nDeleted++; - }else{ - LOG.ERROR("Unknown DB operation: " + (szDbOp != null ? szDbOp : "") ); - } - - return true; - } - void processToken(String token)throws DBException { if ( this.isTokenMoreThanOne() && getToken().equals(token) ){ //Delete non-confirmed records setToken( token ); //For m_bTokenFromDB = false; - getDB().executeSQL("DELETE FROM object_values where source_id=? and token=?", getID(), token ); + //getDB().executeSQL("DELETE FROM object_values where source_id=? and token=?", getID(), token ); + //TODO: add special table for id,token }else { setToken( token ); @@ -688,4 +787,4 @@ class SyncSource } } -} \ No newline at end of file +} platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java @@ -40,6 +40,7 @@ import com.xruby.runtime.lang.RubyNoArgMethod; import com.xruby.runtime.lang.RubyNoOrOneArgMethod; import com.xruby.runtime.lang.RubyOneArgMethod; import com.xruby.runtime.lang.RubyOneOrTwoArgMethod; +import com.xruby.runtime.lang.RubyTwoArgMethod; import com.xruby.runtime.lang.RubyRuntime; import com.xruby.runtime.lang.RubyValue; import com.xruby.runtime.lang.RubyVarArgMethod; @@ -107,17 +108,21 @@ public class SyncThread extends RhoThread static class SyncSearchCommand extends SyncCommand { String m_strFrom; - public SyncSearchCommand(String from, String params, int source_id) + boolean m_bSyncChanges; + int m_nProgressStep; + public SyncSearchCommand(String from, String params, int source_id, boolean sync_changes, int nProgressStep) { super(scSearchOne,params,source_id); m_strFrom = from; + m_bSyncChanges = sync_changes; + m_nProgressStep = nProgressStep; } }; SyncEngine m_oSyncEngine; RhoClassFactory m_ptrFactory; int m_nPollInterval; - Mutex m_mxStackCommands = new Mutex(); + Object m_mxStackCommands;// = new Mutex(); LinkedList m_stackCommands = new LinkedList(); public static SyncThread Create(RhoClassFactory factory)throws Exception @@ -150,8 +155,10 @@ public class SyncThread extends RhoThread m_ptrFactory = factory; m_oSyncEngine.setFactory(factory); - + m_mxStackCommands = getSyncObject(); + ClientRegister.Create(factory); + start(epLow); } @@ -161,6 +168,7 @@ public class SyncThread extends RhoThread void addSyncCommand(SyncCommand oSyncCmd) { + LOG.INFO( "addSyncCommand: " + oSyncCmd.m_nCmdCode ); synchronized(m_mxStackCommands) { boolean bExist = false; @@ -214,11 +222,15 @@ public class SyncThread extends RhoThread if ( m_nPollInterval > 0 && nLastSyncInterval > 0 ) nWait = (m_nPollInterval*1000 - nLastSyncInterval)/1000; - if ( nWait >= 0 ) - { - LOG.INFO( "Sync engine blocked for " + nWait + " seconds..." ); - wait(nWait); - } + synchronized(m_mxStackCommands) + { + if ( nWait >= 0 && m_oSyncEngine.getState() != SyncEngine.esExit && + isNoCommands() ) + { + LOG.INFO( "Sync engine blocked for " + nWait + " seconds..." ); + wait(nWait); + } + } nLastSyncInterval = 0; if ( m_oSyncEngine.getState() != SyncEngine.esExit ) @@ -233,12 +245,23 @@ public class SyncThread extends RhoThread } } + boolean isNoCommands() + { + boolean bEmpty = false; + synchronized(m_mxStackCommands) + { + bEmpty = m_stackCommands.isEmpty(); + } + + return bEmpty; + } + void processCommands()throws Exception { - if ( m_stackCommands.isEmpty() ) + if ( isNoCommands() ) addSyncCommand(new SyncCommand(scNone)); - - while(!m_stackCommands.isEmpty()) + + while(!isNoCommands()) { SyncCommand oSyncCmd = null; synchronized(m_mxStackCommands) @@ -264,11 +287,12 @@ public class SyncThread extends RhoThread case scChangePollInterval: break; case scSyncOne: - m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam,"","" ); + m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam,"","", false, -1 ); break; case scSearchOne: m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,"",oSyncCmd.m_strCmdParam, - ((SyncSearchCommand)oSyncCmd).m_strFrom); + ((SyncSearchCommand)oSyncCmd).m_strFrom, ((SyncSearchCommand)oSyncCmd).m_bSyncChanges, + ((SyncSearchCommand)oSyncCmd).m_nProgressStep); break; case scLogin: @@ -285,7 +309,7 @@ public class SyncThread extends RhoThread public boolean setStatusListener(ISyncStatusListener listener) { m_statusListener = listener; if (m_oSyncEngine != null) { - m_oSyncEngine.setStatusListener(listener); + m_oSyncEngine.getNotify().setSyncStatusListener(listener); return true; } return false; @@ -303,8 +327,10 @@ public class SyncThread extends RhoThread public static void doSyncAllSources(boolean bShowStatus) { if (bShowStatus&&(m_statusListener != null)) { + getInstance().m_oSyncEngine.getNotify().setSyncStatusListener(m_statusListener); m_statusListener.createStatusPopup(); - } + }else + getInstance().m_oSyncEngine.getNotify().setSyncStatusListener(null); getInstance().addSyncCommand(new SyncCommand(SyncThread.scSyncAll)); } @@ -331,9 +357,10 @@ public class SyncThread extends RhoThread { if ( getSyncEngine().isSyncing() ) { - getSyncEngine().stopSync(); + getSyncEngine().stopSyncByUser(); int nWait = 0; - while( nWait < 30000 && getSyncEngine().getState() != SyncEngine.esNone ) + //while( nWait < 30000 && getSyncEngine().getState() != SyncEngine.esNone ) + while( nWait < 30000 && getSyncEngine().getDB().isInsideTransaction() ) try{ Thread.sleep(100); nWait += 100; }catch(Exception e){} if (getSyncEngine().getState() != SyncEngine.esNone) @@ -348,6 +375,11 @@ public class SyncThread extends RhoThread } } + public void addobjectnotify_bysrcname(String strSrcName, String strObject) + { + getSyncEngine().getNotify().addObjectNotify(strSrcName, strObject); + } + public static void initMethods(RubyClass klass) { klass.getSingletonClass().defineMethod("dosync", new RubyNoOrOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyBlock block ) @@ -401,18 +433,21 @@ public class SyncThread extends RhoThread klass.getSingletonClass().defineMethod("dosearch_source", new RubyVarArgMethod() { protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) { - if ( args.size() != 3 ) + if ( args.size() != 5 ) throw new RubyException(RubyRuntime.ArgumentErrorClass, - "in SyncEngine.dosearch_source: wrong number of arguments ( " + args.size() + " for " + 3 + " )"); + "in SyncEngine.dosearch_source: wrong number of arguments ( " + args.size() + " for " + 5 + " )"); try{ int source_id = args.get(0).toInt(); String from = args.get(1).toStr(); String params = args.get(2).toStr(); + String str = args.get(3).asString(); + int nProgressStep = args.get(4).toInt(); + boolean bSearchSyncChanges = args.get(3).equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str); stopSync(); - getInstance().addSyncCommand(new SyncSearchCommand(from,params,source_id) ); + getInstance().addSyncCommand(new SyncSearchCommand(from,params,source_id,bSearchSyncChanges, nProgressStep) ); }catch(Exception e) { LOG.ERROR("SyncEngine.login", e); @@ -547,7 +582,7 @@ public class SyncThread extends RhoThread int source_id = args.get(0).toInt(); String url = args.get(1).toStr(); String params = args.get(2).toStr(); - getSyncEngine().setNotification(source_id, url, params); + getSyncEngine().getNotify().setSyncNotification(source_id, url, params); }catch(Exception e) { LOG.ERROR("set_notification failed", e); @@ -561,7 +596,7 @@ public class SyncThread extends RhoThread protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) { try{ int source_id = arg1.toInt(); - getSyncEngine().clearNotification(source_id); + getSyncEngine().getNotify().clearSyncNotification(source_id); }catch(Exception e) { LOG.ERROR("clear_notification failed", e); @@ -605,6 +640,112 @@ public class SyncThread extends RhoThread return RubyConstant.QNIL; } }); + + klass.getSingletonClass().defineMethod("get_src_attrs", + new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) { + try{ + int nSrcID = arg1.toInt(); + return getDBAdapter().getAttrMgr().getAttrsBySrc(nSrcID); + }catch(Exception e) + { + LOG.ERROR("get_src_attrs failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + } + }); + + klass.getSingletonClass().defineMethod("set_objectnotify_url", + new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) { + try{ + String url = arg1.toStr(); + SyncNotify.setObjectNotifyUrl(url); + }catch(Exception e) + { + LOG.ERROR("set_objectnotify_url failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + + return RubyConstant.QNIL; + } + }); + + klass.getSingletonClass().defineMethod("add_objectnotify", + new RubyTwoArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block) { + try{ + Integer nSrcID = new Integer(arg1.toInt()); + String strObject = arg2.toStr(); + + getSyncEngine().getNotify().addObjectNotify(nSrcID, strObject); + }catch(Exception e) + { + LOG.ERROR("add_objectnotify failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + + return RubyConstant.QNIL; + } + }); + klass.getSingletonClass().defineMethod("clean_objectnotify", + new RubyNoArgMethod() { + protected RubyValue run(RubyValue receiver, RubyBlock block) { + try{ + getSyncEngine().getNotify().cleanObjectNotifications(); + }catch(Exception e) + { + LOG.ERROR("clean_objectnotify failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + + return RubyConstant.QNIL; + } + }); + + klass.getSingletonClass().defineMethod("get_lastsync_objectcount", + new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) { + try{ + Integer nSrcID = new Integer(arg1.toInt()); + int nCount = getSyncEngine().getNotify().getLastSyncObjectCount(nSrcID); + + return ObjectFactory.createInteger(nCount); + }catch(Exception e) + { + LOG.ERROR("get_lastsync_objectcount failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + } + }); + klass.getSingletonClass().defineMethod("get_pagesize", + new RubyNoArgMethod() { + protected RubyValue run(RubyValue receiver, RubyBlock block) { + try{ + return ObjectFactory.createInteger(getSyncEngine().getSyncPageSize()); + }catch(Exception e) + { + LOG.ERROR("get_pagesize failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + } + }); + + klass.getSingletonClass().defineMethod("set_pagesize", + new RubyOneArgMethod() { + protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) { + try{ + getSyncEngine().setSyncPageSize(arg1.toInt()); + }catch(Exception e) + { + LOG.ERROR("set_pagesize failed", e); + throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage())); + } + + return RubyConstant.QNIL; + } + }); + } } platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java @@ -29,5 +29,9 @@ klass.defineMethod( "instance_variables", new RubyNoArgMethod(){ protected RubyValue run(RubyValue receiver, RubyBlock block ){ return ((RubyObject)receiver).instance_variables();} }); +klass.defineMethod( "rhom_init", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return ((RubyObject)receiver).rhom_init( arg);} +}); }} platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubyObject_Methods.java @@ -17,8 +17,8 @@ import com.xruby.runtime.lang.*; ////@RubyLevelClass(name="Bignum", superclass="Integer") public class RubyBignum extends RubyInteger { - private static final HugeInt FIXNUM_MAX = HugeInt.valueOf(Integer.MAX_VALUE); - private static final HugeInt FIXNUM_MIN = HugeInt.valueOf(Integer.MIN_VALUE); + private static final HugeInt FIXNUM_MAX = HugeInt.valueOf(Long.MAX_VALUE); + private static final HugeInt FIXNUM_MIN = HugeInt.valueOf(Long.MIN_VALUE); private HugeInt value_; private RubyClass klass; @@ -451,7 +451,7 @@ public class RubyBignum extends RubyInteger { } public static RubyInteger bignorm(long value) { - if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) + if (value > Long.MAX_VALUE || value < Long.MIN_VALUE) return ObjectFactory.createBignum(HugeInt.valueOf(value)); return ObjectFactory.createFixnum(value); } platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyBignum.java @@ -215,7 +215,7 @@ public class RubyFloat extends RubyNumeric { } private RubyInteger createRubyInteger(double value) { - if (value <= Integer.MAX_VALUE && value >= Integer.MIN_VALUE) { + if (value <= Long.MAX_VALUE && value >= Long.MIN_VALUE) { return ObjectFactory.createFixnum((long) value); } return ObjectFactory.createBignum(HugeDigit.valueOf(value).toBigInteger()); platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyFloat.java @@ -87,6 +87,10 @@ public class RubyHash extends RubyBasic { private static RubyID defaultID = RubyID.intern("default"); + public RubyValue getRaw(RubyValue k) { + return (RubyValue)map_.get(k); + } + public RubyValue get(RubyValue k) { RubyValue v = (RubyValue)map_.get(k); if (null != v) { platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyHash.java @@ -113,7 +113,7 @@ public class RubyRandom { max = -max; } val = random.nextInt((int)max); - if (val >= Integer.MIN_VALUE && val <= Integer.MAX_VALUE) { + if (val >= Long.MIN_VALUE && val <= Long.MAX_VALUE) { return new RubyFixnum((int)val); } else { return RubyBignum.bignorm(val); platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyRandom.java @@ -251,6 +251,10 @@ public class RubyAPI { public static RubyValue callPublicNoArgMethod(RubyValue receiver, RubyBlock block, RubyID mid) { try{ + RubyValue res = receiver.rhom_processProperty(mid); + if ( res != null ) + return res; + RubyMethod m = receiver.findPublicMethod(mid); if (null != m && !UndefMethod.isUndef(m)) { return m.invoke(receiver, block); platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyAPI.java @@ -1,10 +1,11 @@ package com.xruby.runtime.lang; -import com.xruby.runtime.lang.RubyValue; +//import com.xruby.runtime.lang.RubyValue; //import com.xruby.runtime.lang.annotation.RubyLevelMethod; //import com.xruby.runtime.lang.annotation.RubyLevelModule; import j2me.lang.MathEx; +import com.xruby.runtime.builtin.RubyArray; //import com.xruby.runtime.lang.RubyOneArgMethod; //import com.xruby.runtime.lang.RubyTwoArgMethod; //import com.xruby.runtime.lang.RubyModule; @@ -18,6 +19,10 @@ public class RubyMathModule { public static RubyValue sqrt(RubyValue receiver, RubyValue arg) { return ObjectFactory.createFloat(Math.sqrt(arg.toFloat())); } + //@RubyLevelMethod(name="cbrt", module=true) + public static RubyValue cbrt(RubyValue receiver, RubyValue arg) { + return ObjectFactory.createFloat(MathEx.cbrt(arg.toFloat())); + } //@RubyLevelMethod(name="log", module=true) public static RubyValue log(RubyValue receiver, RubyValue arg) { @@ -28,6 +33,44 @@ public class RubyMathModule { public static RubyValue log10(RubyValue receiver, RubyValue arg) { return ObjectFactory.createFloat(MathEx.log10(arg.toFloat())); } + + //@RubyLevelMethod(name="log2", module=true) + public static RubyValue log2(RubyValue receiver, RubyValue arg) { + return ObjectFactory.createFloat(MathEx.log2(arg.toFloat())); + } + + //@RubyLevelMethod(name="frexp", module=true) + public static RubyValue frexp(RubyValue receiver, RubyValue arg) + { + double mantissa = arg.toFloat(); + short sign = 1; + long exponent = 0; + + if (!Double.isInfinite(mantissa) && mantissa != 0.0) { + // Make mantissa same sign so we only have one code path. + if (mantissa < 0) { + mantissa = -mantissa; + sign = -1; + } + + // Increase value to hit lower range. + for (; mantissa < 0.5; mantissa *= 2.0, exponent -=1) { } + + // Decrease value to hit upper range. + for (; mantissa >= 1.0; mantissa *= 0.5, exponent +=1) { } + } + RubyArray res = new RubyArray(); + res.add(ObjectFactory.createFloat(sign * mantissa)); + res.add(ObjectFactory.createInteger(exponent)); + + return res; + } + //@RubyLevelMethod(name="ldexp", module=true) + public static RubyValue ldexp(RubyValue receiver, RubyValue mantissa, RubyValue exponent) + { + double mantissaValue = mantissa.toFloat(); + return ObjectFactory.createFloat(mantissaValue * MathEx.pow(2.0, exponent.toInt())); + } //@RubyLevelMethod(name="exp", module=true) public static RubyValue exp(RubyValue receiver, RubyValue arg) { @@ -107,4 +150,24 @@ public class RubyMathModule { return ObjectFactory.createFloat(MathEx.atan(MathEx.hypot(arg1.toFloat(), arg2.toFloat()))); } + //@RubyLevelMethod(name="erf", module=true) + public static RubyValue erf(RubyValue receiver, RubyValue arg) { + double x = arg.toFloat(); + return ObjectFactory.createFloat(MathEx.erf(x)); + } + //@RubyLevelMethod(name="erfc", module=true) + public static RubyValue erfc(RubyValue receiver, RubyValue arg) { + double x = arg.toFloat(); + return ObjectFactory.createFloat(MathEx.erfc(x)); + } + + //@RubyLevelMethod(name="gamma", module=true) + public static RubyValue gamma(RubyValue receiver, RubyValue arg) { + throw new RubyException("Not implemented: gamma"); + } + //@RubyLevelMethod(name="lgamma", module=true) + public static RubyValue lgamma(RubyValue receiver, RubyValue arg) { + throw new RubyException("Not implemented: lgamma"); + } + } platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyMathModule.java @@ -29,6 +29,10 @@ klass.defineModuleMethod( "sqrt", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.sqrt(receiver, arg);} }); +klass.defineModuleMethod( "cbrt", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.cbrt(receiver, arg);} +}); klass.defineModuleMethod( "sinh", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.sinh(receiver, arg);} @@ -45,6 +49,11 @@ klass.defineModuleMethod( "log10", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.log10(receiver, arg);} }); +klass.defineModuleMethod( "log2", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.log2(receiver, arg);} +}); + klass.defineModuleMethod( "tanh", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.tanh(receiver, arg);} @@ -53,6 +62,15 @@ klass.defineModuleMethod( "exp", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.exp(receiver, arg);} }); +klass.defineModuleMethod( "frexp", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.frexp(receiver, arg);} +}); +klass.defineModuleMethod( "ldexp", new RubyTwoArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyValue arg1, RubyBlock block ){ + return RubyMathModule.ldexp(receiver, arg0, arg1);} +}); + klass.defineModuleMethod( "atan2", new RubyTwoArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyValue arg1, RubyBlock block ){ return RubyMathModule.atan2(receiver, arg0, arg1);} @@ -77,4 +95,22 @@ klass.defineModuleMethod( "acos", new RubyOneArgMethod(){ protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ return RubyMathModule.acos(receiver, arg);} }); + +klass.defineModuleMethod( "erf", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.erf(receiver, arg);} +}); +klass.defineModuleMethod( "erfc", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.erfc(receiver, arg);} +}); +klass.defineModuleMethod( "gamma", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.gamma(receiver, arg);} +}); +klass.defineModuleMethod( "lgamma", new RubyOneArgMethod(){ + protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){ + return RubyMathModule.lgamma(receiver, arg);} +}); + }} platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyMathModule_Methods.java @@ -10,13 +10,14 @@ import j2me.util.Iterator; import j2me.util.Map; import com.xruby.runtime.builtin.RubyArray; import com.xruby.runtime.builtin.ObjectFactory; - +import com.xruby.runtime.builtin.RubyHash; //import com.xruby.runtime.lang.annotation.RubyAllocMethod; //import com.xruby.runtime.lang.annotation.RubyLevelClass; //@RubyLevelClass(name="Object", superclass="", modules="Kernel") public class RubyObject extends RubyBasic { protected Map/*<RubyID, RubyValue>*/ instance_varibles_ = null; + protected RubyHash m_rhomProps; public RubyObject(RubyClass c) { super(c); @@ -127,5 +128,18 @@ public class RubyObject extends RubyBasic { return ar; } + + //@RubyLevelMethod(name="rhom_init") + public RubyValue rhom_init(RubyValue arg1){ + m_rhomProps = (RubyHash)arg1; + return RubyConstant.QNIL; + } + public RubyValue rhom_processProperty(RubyID mid) + { + if ( m_rhomProps == null ) + return null; + + return m_rhomProps.getRaw(mid.toSymbol()); + } } platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyObject.java @@ -81,6 +81,10 @@ public abstract class RubyValue extends BlockCallStatus implements Cloneable { taint_ = orig.taint_; super.doClone(orig); } + public RubyValue rhom_processProperty(RubyID mid) + { + return null; + } //RHO_COMMENT: clone /* public RubyValue clone() { platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyValue.java @@ -1,11 +1,11 @@ package j2me.lang; +import javolution.lang.MathLib; + public class MathEx { public static double pow(double a, double b) { - //TODO: pow - throw new RuntimeException("Not Implemented"); - //return 0; + return MathLib.pow(a,b); } public static long round(double a) { @@ -13,60 +13,60 @@ public class MathEx { } public static double log(double a) { - //TODO: log - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.log(a); + } + public static double cbrt(double x) { + if (x < 0) + return -pow(-x, 1/3.0); + else + return pow(x, 1/3.0); } public static double log10(double a) { - //TODO: log10 - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.log10(a); } + public static double log2(double a) { + return log10(a)/log10(2.0); + } + public static double exp(double a) { - //TODO: exp - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.exp(a); } public static double cosh(double x) { - //TODO: cosh - throw new RuntimeException("Not Implemented"); - //return x; + return MathLib.cosh(x); } public static double sinh(double x) { - //TODO: sinh - throw new RuntimeException("Not Implemented"); - //return x; + return MathLib.sinh(x); } public static double tanh(double x) { - //TODO: tanh - throw new RuntimeException("Not Implemented"); - //return x; + return MathLib.tanh(x); } public static double acos(double a) { - //TODO: acos - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.acos(a); } public static double asin(double a) { - //TODO: asin - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.asin(a); } public static double atan(double a) { - //TODO: atan - throw new RuntimeException("Not Implemented"); - //return a; + return MathLib.atan(a); } public static double atan2(double y, double x) { - //TODO: atan2 - throw new RuntimeException("Not Implemented"); - //return y; + return MathLib.atan2(y,x); } - public static double hypot(double x, double y) { - //TODO: hypot - throw new RuntimeException("Not Implemented"); - //return x; + public static double hypot(double a, double b) + { + double result; + if (Math.abs(a) > Math.abs(b)) { + result = b / a; + result = Math.abs(a) * Math.sqrt(1 + result * result); + } else if (b != 0) { + result = a / b; + result = Math.abs(b) * Math.sqrt(1 + result * result); + } else { + result = 0; + } + + return result; } public static int min(int a, int b) { @@ -77,5 +77,147 @@ public class MathEx { return (a >= b) ? a : b; } + private static double sign(double x, double y) { + double abs = ((x < 0) ? -x : x); + return (y < 0.0) ? -abs : abs; + } + + private static final double ERFC_COEF[] = { + -.490461212346918080399845440334e-1, + -.142261205103713642378247418996e0, + .100355821875997955757546767129e-1, + -.576876469976748476508270255092e-3, + .274199312521960610344221607915e-4, + -.110431755073445076041353812959e-5, + .384887554203450369499613114982e-7, + -.118085825338754669696317518016e-8, + .323342158260509096464029309534e-10, + -.799101594700454875816073747086e-12, + .179907251139614556119672454866e-13, + -.371863548781869263823168282095e-15, + .710359900371425297116899083947e-17, + -.126124551191552258324954248533e-18 + }; + + public static double erf(double value) { + double result; + double y = Math.abs(value); + + if (y <= 1.49012e-08) { + result = 2 * value / 1.77245385090551602729816748334; + } else if (y <= 1) { + result = value * (1 + chebylevSerie(2 * value * value - 1, ERFC_COEF)); + } else if (y < 6.013687357) { + result = sign(1 - erfc(y), value); + } else { + result = sign(1, value); + } + + return result; + } + + private static final double ERFC2_COEF[] = { + -.69601346602309501127391508262e-1, + -.411013393626208934898221208467e-1, + .391449586668962688156114370524e-2, + -.490639565054897916128093545077e-3, + .715747900137703638076089414183e-4, + -.115307163413123283380823284791e-4, + .199467059020199763505231486771e-5, + -.364266647159922287393611843071e-6, + .694437261000501258993127721463e-7, + -.137122090210436601953460514121e-7, + .278838966100713713196386034809e-8, + -.581416472433116155186479105032e-9, + .123892049175275318118016881795e-9, + -.269063914530674343239042493789e-10, + .594261435084791098244470968384e-11, + -.133238673575811957928775442057e-11, + .30280468061771320171736972433e-12, + -.696664881494103258879586758895e-13, + .162085454105392296981289322763e-13, + -.380993446525049199987691305773e-14, + .904048781597883114936897101298e-15, + -.2164006195089607347809812047e-15, + .522210223399585498460798024417e-16, + -.126972960236455533637241552778e-16, + .310914550427619758383622741295e-17, + -.766376292032038552400956671481e-18, + .190081925136274520253692973329e-18 + }; + + private static final double ERFCC_COEF[] = { + .715179310202924774503697709496e-1, + -.265324343376067157558893386681e-1, + .171115397792085588332699194606e-2, + -.163751663458517884163746404749e-3, + .198712935005520364995974806758e-4, + -.284371241276655508750175183152e-5, + .460616130896313036969379968464e-6, + -.822775302587920842057766536366e-7, + .159214187277090112989358340826e-7, + -.329507136225284321486631665072e-8, + .72234397604005554658126115389e-9, + -.166485581339872959344695966886e-9, + .401039258823766482077671768814e-10, + -.100481621442573113272170176283e-10, + .260827591330033380859341009439e-11, + -.699111056040402486557697812476e-12, + .192949233326170708624205749803e-12, + -.547013118875433106490125085271e-13, + .158966330976269744839084032762e-13, + -.47268939801975548392036958429e-14, + .14358733767849847867287399784e-14, + -.444951056181735839417250062829e-15, + .140481088476823343737305537466e-15, + -.451381838776421089625963281623e-16, + .147452154104513307787018713262e-16, + -.489262140694577615436841552532e-17, + .164761214141064673895301522827e-17, + -.562681717632940809299928521323e-18, + .194744338223207851429197867821e-18 + }; + + public static double erfc(double value) + { + double result; + double y = Math.abs(value); + + if (value <= -6.013687357) { + result = 2; + } else if (y < 1.49012e-08) { + result = 1 - 2 * value / 1.77245385090551602729816748334; + } else { + double ysq = y*y; + if (y < 1) { + result = 1 - value * (1 + chebylevSerie(2 * ysq - 1, ERFC_COEF)); + } else if (y <= 4.0) { + result = MathEx.exp(-ysq)/y*(0.5+chebylevSerie((8.0 / ysq - 5.0) / 3.0, ERFC2_COEF)); + if (value < 0) result = 2.0 - result; + if (value < 0) result = 2.0 - result; + if (value < 0) result = 2.0 - result; + } else { + result = MathEx.exp(-ysq) / y * (0.5 + chebylevSerie(8.0 / ysq - 1, ERFCC_COEF)); + if (value < 0) result = 2.0 - result; + } + } + + return result; + } + + private static double chebylevSerie(double x, double coef[]) { + double b0, b1, b2, twox; + int i; + b1 = 0.0; + b0 = 0.0; + b2 = 0.0; + twox = 2.0 * x; + for (i = coef.length-1; i >= 0; i--) { + b2 = b1; + b1 = b0; + b0 = twox * b1 - b2 + coef[i]; + } + return 0.5*(b0 - b2); + } } platform/shared/rubyJVM/src/j2me/lang/MathEx.java @@ -109,8 +109,11 @@ class StringParser implements Enumeration { delimsChanged = false; newPosition = -1; - if (currentPosition >= maxPosition) + if (currentPosition > maxPosition) throw new NoSuchElementException(); + if (currentPosition == maxPosition) + return ""; + int start = currentPosition; currentPosition = parseTokens(currentPosition); return str.substring(start, currentPosition); @@ -139,8 +142,8 @@ class StringParser implements Enumeration { int currpos = currentPosition; while (currpos < maxPosition) { currpos = skipDelimiters(currpos); - if (currpos >= maxPosition) - break; + //if (currpos >= maxPosition) + // break; currpos = parseTokens(currpos); count++; } platform/shared/rubyJVM/src/j2me/util/StringParser.java @@ -574,17 +574,17 @@ public final class MathLib { /** * The ratio of the circumference of a circle to its diameter. - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static final double PI = 3.1415926535897932384626433832795; /** * Half the ratio of the circumference of a circle to its diameter. - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static final double HALF_PI = 1.5707963267948966192313216916398; /** * Twice the ratio of the circumference of a circle to its diameter. - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static final double TWO_PI = 6.283185307179586476925286766559; /** @@ -614,7 +614,7 @@ public final class MathLib { /** * Not-A-Number. - * @JVM-1.1+@ + * @JVM-1.1+@ */ public static final double NaN = 0.0 / 0.0; /** @@ -651,7 +651,7 @@ public final class MathLib { * * @param x the value. * @return <code>java.lang.Math.sqrt(x)</code> - * @JVM-1.1+@ + * @JVM-1.1+@ */ public static double sqrt(double x) { return Math.sqrt(x); // CLDC 1.1 } @@ -739,14 +739,13 @@ public final class MathLib { * * @param x the value whose arc sine is to be returned. * @return the arc sine in radians for the specified value. - * @JVM-1.1+@ + * @JVM-1.1+@ */ public static double asin(double x) { - if (x < -1.0 || x > 1.0) return MathLib.NaN; - if (x == -1.0) return - HALF_PI; - if (x == 1.0) return HALF_PI; - return MathLib.atan(x / MathLib.sqrt(1.0 - x * x)); + if (x < -1.0 || x > 1.0) return MathLib.NaN; + if (x == -1.0) return - HALF_PI; + if (x == 1.0) return HALF_PI; + return MathLib.atan(x / MathLib.sqrt(1.0 - x * x)); } - /**/ /** * Returns the arc cosine of the specified value, @@ -754,7 +753,7 @@ public final class MathLib { * * @param x the value whose arc cosine is to be returned. * @return the arc cosine in radians for the specified value. - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double acos(double x) { return HALF_PI - MathLib.asin(x); } @@ -768,7 +767,7 @@ public final class MathLib { * @return the arc tangent in radians for the specified value. * @see <a href="http://mathworld.wolfram.com/InverseTangent.html"> * Inverse Tangent -- from MathWorld</a> - * @JVM-1.1+@ + * @JVM-1.1+@ */ public static double atan(double x) { return MathLib._atan(x); } @@ -781,7 +780,7 @@ public final class MathLib { * @param y the y value. * @param x the x value. * @return the angle theta in radians. - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double atan2(double y, double x) { final double epsilon = 1E-128; if (MathLib.abs(x) > epsilon) { @@ -804,7 +803,7 @@ public final class MathLib { * * @param x the value for which the hyperbolic sine is calculated. * @return <code>(exp(x) - exp(-x)) / 2</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double sinh(double x) { return (MathLib.exp(x) - MathLib.exp(-x)) * 0.5; } @@ -815,7 +814,7 @@ public final class MathLib { * * @param x the value for which the hyperbolic cosine is calculated. * @return <code>(exp(x) + exp(-x)) / 2</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double cosh(double x) { return (MathLib.exp(x) + MathLib.exp(-x)) * 0.5; } @@ -826,7 +825,7 @@ public final class MathLib { * * @param x the value for which the hyperbolic tangent is calculated. * @return <code>(exp(2 * x) - 1) / (exp(2 * x) + 1)</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double tanh(double x) { return (MathLib.exp(2 * x) - 1) / (MathLib.exp(2 * x) + 1); } @@ -839,7 +838,7 @@ public final class MathLib { * @return <code><i>e</i>^x</code> * @see <a href="http://mathworld.wolfram.com/ExponentialFunction.html"> * Exponential Function -- from MathWorld</a> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double exp(double x) { return MathLib._ieee754_exp(x); } @@ -851,7 +850,7 @@ public final class MathLib { * * @param x the value greater than <code>0.0</code>. * @return the value y such as <code><i>e</i>^y == x</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double log(double x) { return MathLib._ieee754_log(x); } @@ -862,7 +861,7 @@ public final class MathLib { * * @param x the value greater than <code>0.0</code>. * @return the value y such as <code>10^y == x</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double log10(double x) { return log(x) * INV_LOG10; } @@ -876,13 +875,13 @@ public final class MathLib { * @param x the base. * @param y the exponent. * @return <code>x^y</code> - * @JVM-1.1+@ + * @JVM-1.1+@*/ public static double pow(double x, double y) { /**/ /* @JVM-1.4+@ // Use java.lang.Math value. if (true) return Math.pow(x, y); /**/ - /* @JVM-1.1+@ // Else (J2ME) use close approximation (+/- LSB) + /* @JVM-1.1+@ // Else (J2ME) use close approximation (+/- LSB)*/ if ((x < 0) && (y == (int)y)) return (((int)y) & 1) == 0 ? pow(-x, y) : -pow(-x, y); return MathLib.exp(y * MathLib.log(x)); @@ -960,7 +959,7 @@ public final class MathLib { * * @param d the <code>double</code> value. * @return <code>d</code> or <code>-d</code> - * @JVM-1.1+@ + * @JVM-1.1+@ */ public static double abs(double d) { return (d < 0) ? -d : d; } @@ -1090,7 +1089,7 @@ public final class MathLib { * constants. The decimal values may be used, provided that the * compiler will convert from decimal to binary accurately enough * to produce the hexadecimal values shown. - @JVM-1.1+@ + @JVM-1.1+@ */ static final double atanhi[] = { 4.63647609000806093515e-01, // atan(0.5)hi 0x3FDDAC67, 0x0561BB4F 7.85398163397448278999e-01, // atan(1.0)hi 0x3FE921FB, 0x54442D18 @@ -1231,7 +1230,7 @@ public final class MathLib { * constants. The decimal values may be used, provided that the * compiler will convert from decimal to binary accurately enough * to produce the hexadecimal values shown. - @JVM-1.1+@ + @JVM-1.1+@*/ static final double ln2_hi = 6.93147180369123816490e-01, // 3fe62e42 fee00000 ln2_lo = 1.90821492927058770002e-10, // 3dea39ef 35793c76 @@ -1374,7 +1373,7 @@ public final class MathLib { * constants. The decimal values may be used, provided that the * compiler will convert from decimal to binary accurately enough * to produce the hexadecimal values shown. - @JVM-1.1+@ + @JVM-1.1+@*/ static final double halF[] = {0.5,-0.5,}, twom1000= 9.33263618503218878990e-302, // 2**-1000=0x01700000,0 platform/shared/rubyJVM/src/javolution/lang/MathLib.java @@ -213,10 +213,10 @@ public class JSONTokener { for (;;) { c = next(); switch (c) { - case 0: - case '\n': - case '\r': - throw syntaxError("Unterminated string"); + //case 0: + //case '\n': + //case '\r': + // throw syntaxError("Unterminated string"); case '\\': c = next(); switch (c) { platform/shared/rubyJVM/src/org/json/me/JSONTokener.java @@ -289,6 +289,7 @@ char* rho_resolve_url(char* url, const char* root,const char *index_names) { return ret; } +extern void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char* szObject); void* rho_dispatch(struct conn *c, const char* path) { RouteRef route; @@ -303,6 +304,7 @@ void* rho_dispatch(struct conn *c, const char* path) { if ((route = _alloc_route(c->uri)) != NULL) { if (_parse_route(route)) { struct stat st; + //is this an actual file or folder if (_shttpd_stat(path, &st) != 0) return route; @@ -484,12 +486,24 @@ void rho_serve(struct shttpd_arg *arg) { #endif //shttpd_printf(arg, "%s", callFramework(req)); +// _free_route(arg->user_data); +// arg->user_data = NULL; +// free(state); + //arg->flags |= SHTTPD_END_OF_OUTPUT; + + rho_create_write_state(arg,callFramework(req)); + { + RouteRef route = arg->user_data; + if ( _isid(route->_id) ) + { + rho_sync_addobjectnotify_bysrcname(route->_model, route->_id); + } + } + _free_route(arg->user_data); arg->user_data = NULL; free(state); - //arg->flags |= SHTTPD_END_OF_OUTPUT; - rho_create_write_state(arg,callFramework(req)); rho_write_data(arg); } } platform/shared/shttpd/src/rdispatcher.c @@ -90,7 +90,7 @@ boolean CClientRegister::doRegister(CSyncEngine& oSync) } int port = RHOCONF().getInt("push_port"); - String serverUrl = RHOCONF().getString("syncserver"); + String serverUrl = RHOCONF().getPath("syncserver"); if (serverUrl.length()>0) { String strBody = "client_id=" + client_id + platform/shared/sync/ClientRegister.cpp @@ -1,11 +1,11 @@ #include "SyncEngine.h" #include "SyncSource.h" -#include "common/AutoPointer.h" #include "json/JSONIterator.h" #include "common/RhoConf.h" #include "common/StringConverter.h" #include "sync/ClientRegister.h" +#include "net/URI.h" namespace rho { const _CRhoRuby& RhoRuby = _CRhoRuby(); @@ -17,32 +17,44 @@ using namespace rho::net; using namespace rho::common; using namespace rho::json; +CSyncEngine::CSyncEngine(db::CDBAdapter& db): m_dbAdapter(db), m_NetRequest(0), m_syncState(esNone), m_oSyncNotify(*this) +{ + m_bStopByUser = false; + m_nSyncPageSize = 2000; +} + +String CSyncEngine::SYNC_PAGE_SIZE() { return convertToStringA(m_nSyncPageSize); } + void CSyncEngine::doSyncAllSources() { setState(esSyncAllSources); - + m_bStopByUser = false; loadAllSources(); m_strSession = loadSession(); if ( isSessionExist() ) { m_clientID = loadClientID(); + getNotify().cleanLastSyncObjectCount(); syncAllSources(); - - if ( getState() != esStop ) - fireNotification(null, true, RhoRuby.ERR_NONE, "Sync completed."); } else { - LOG(INFO) + "Client is not logged in. No sync will be performed."; - fireNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, - "Sync failed. Details: Client is not logged in. No sync will be performed." ); + if ( m_sources.size() > 0 ) + { + CSyncSource& src = *m_sources.elementAt(getStartSource()); + src.m_strError = "Client is not logged in. No sync will be performed."; + src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN; + + getNotify().fireSyncNotification(&src, true, src.m_nErrCode, ""); + }else + getNotify().fireSyncNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, "Client is not logged in. No sync will be performed."); } setState(esNone); } -void CSyncEngine::doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction) +void CSyncEngine::doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep) { if ( strSrcUrl.length()>0 ) LOG(INFO) +"Started synchronization of the data source url: " + strSrcUrl; @@ -50,7 +62,7 @@ void CSyncEngine::doSyncSource(int nSrcId, String strSrcUrl, String strParams, S LOG(INFO)+ "Started synchronization of the data source #" + nSrcId; setState(esSyncSource); - + m_bStopByUser = false; loadAllSources(); CSyncSource* pSrc = null; @@ -65,18 +77,23 @@ void CSyncEngine::doSyncSource(int nSrcId, String strSrcUrl, String strParams, S src.m_strParams = strParams; src.m_strAction = strAction; - + src.m_bSearchSyncChanges = bSearchSyncChanges; + src.m_nProgressStep = nProgressStep; + m_strSession = loadSession(); if ( isSessionExist() ) { m_clientID = loadClientID(); if ( getState() != esStop ) + { + getNotify().cleanLastSyncObjectCount(); src.sync(); + } } else { src.m_strError = "Client is not logged in. No sync will be performed."; src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN; } - fireNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? "Sync completed." : ""); + getNotify().fireSyncNotification(&src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? "Sync completed." : ""); }else { if ( strSrcUrl.length()>0 ) @@ -88,9 +105,10 @@ void CSyncEngine::doSyncSource(int nSrcId, String strSrcUrl, String strParams, S //src.m_strError = "Unknown sync source."; src.m_nErrCode = RhoRuby.ERR_RUNTIME; - fireNotification(&src, true, src.m_nErrCode, ""); + getNotify().fireSyncNotification(&src, true, src.m_nErrCode, ""); } + getNotify().cleanCreateObjectErrors(); setState(esNone); if ( strSrcUrl.length()>0 ) @@ -123,15 +141,36 @@ CSyncSource* CSyncEngine::findSourceByUrl(const String& strSrcUrl) return null; } +CSyncSource* CSyncEngine::findSourceByName(const String& strSrcName) +{ + for( int i = 0; i < (int)m_sources.size(); i++ ) + { + CSyncSource& src = *m_sources.elementAt(i); + if ( src.getName().compare(strSrcName)==0 ) + return &src; + } + + return null; +} + void CSyncEngine::loadAllSources() { m_sources.clear(); - DBResult( res, getDB().executeSQL("SELECT source_id,source_url,token,name from sources order by source_id") ); + DBResult( res, getDB().executeSQL("SELECT source_id,source_url,token,name from sources ORDER BY source_id") ); for ( ; !res.isEnd(); res.next() ) { String strDbUrl = res.getStringByIdx(1); - String strUrl = strDbUrl.find("http") == 0 ? strDbUrl : (RHOCONF().getString("syncserver") + strDbUrl); + if ( strDbUrl.length() == 0 ) + continue; + + if ( strDbUrl.at(0) == '/' || strDbUrl.at(0) == '\\' ) + strDbUrl.erase(strDbUrl.begin()); + + String strUrl = strDbUrl.find("http") == 0 ? strDbUrl : (RHOCONF().getPath("syncserver") + strDbUrl); + if ( strUrl.at(strUrl.length()-1) == '/' || strUrl.at(strUrl.length()-1) == '\\' ) + strUrl.erase(strUrl.end()-1); + String strName = res.getStringByIdx(3); if ( strUrl.length() > 0 ) m_sources.addElement( new CSyncSource( res.getIntByIdx(0), strUrl, strName, res.getUInt64ByIdx(2), *this) ); @@ -141,37 +180,38 @@ void CSyncEngine::loadAllSources() String CSyncEngine::loadClientID() { String clientID = ""; - CMutexLock lockNotify(m_mxLoadClientID); - boolean bResetClient = false; + synchronized(m_mxLoadClientID) { - DBResult( res, getDB().executeSQL("SELECT client_id,reset from client_info limit 1") ); - if ( !res.isEnd() ) + boolean bResetClient = false; { - clientID = res.getStringByIdx(0); - bResetClient = res.getIntByIdx(1) > 0; + DBResult( res, getDB().executeSQL("SELECT client_id,reset from client_info limit 1") ); + if ( !res.isEnd() ) + { + clientID = res.getStringByIdx(0); + bResetClient = res.getIntByIdx(1) > 0; + } } - } - if ( clientID.length() == 0 ) - { - clientID = requestClientIDByNet(); + if ( clientID.length() == 0 ) + { + clientID = requestClientIDByNet(); - getDB().executeSQL("DELETE FROM client_info"); - getDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID); - }else if ( bResetClient ) - { - if ( !resetClientIDByNet(clientID) ) - stopSync(); - else - getDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", 0, clientID ); + getDB().executeSQL("DELETE FROM client_info"); + getDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID); + }else if ( bResetClient ) + { + if ( !resetClientIDByNet(clientID) ) + stopSync(); + else + getDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", 0, clientID ); + } } - return clientID; } boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Exception { - String serverUrl = RHOCONF().getString("syncserver"); + String serverUrl = RHOCONF().getPath("syncserver"); String strUrl = serverUrl + "clientreset"; String strQuery = "?client_id=" + strClientID; @@ -181,7 +221,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep String CSyncEngine::requestClientIDByNet() { - String serverUrl = RHOCONF().getString("syncserver"); + String serverUrl = RHOCONF().getPath("syncserver"); String strUrl = serverUrl + "clientcreate"; String strQuery = SYNC_SOURCE_FORMAT(); @@ -213,21 +253,28 @@ int CSyncEngine::getStartSource() void CSyncEngine::syncAllSources() { - for( int i = getStartSource(); i < (int)m_sources.size() && getState() != esExit; i++ ) + boolean bError = false; + for( int i = getStartSource(); i < (int)m_sources.size() && isContinueSync(); i++ ) { CSyncSource& src = *m_sources.elementAt(i); if ( isSessionExist() && getState() != esStop ) src.sync(); - fireNotification(&src, true, src.m_nErrCode, ""); + getNotify().onSyncSourceEnd(i, m_sources); + bError = src.m_nErrCode != RhoRuby.ERR_NONE; } + + if ( !bError) + getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, "Sync completed."); } void CSyncEngine::callLoginCallback(String callback, int nErrCode, String strMessage) { //try{ String strBody = "error_code=" + convertToStringA(nErrCode); - strBody += "&error_message=" + strMessage; //TODO: URI.urlEncode + strBody += "&error_message="; + URI::urlEncode(strMessage, strBody); + String strUrl = getNet().resolveUrl(callback); LOG(INFO) + "Login callback: " + callback + ". Body: "+ strBody; @@ -272,7 +319,7 @@ void CSyncEngine::login(String name, String password, String callback) return; } - String serverUrl = RHOCONF().getString("syncserver"); + String serverUrl = RHOCONF().getPath("syncserver"); String strBody = "login=" + name + "&password=" + password + "&remember_me=1"; NetResponse( resp, getNet().pullCookies( serverUrl+"client_login", strBody ) ); @@ -283,6 +330,12 @@ void CSyncEngine::login(String name, String password, String callback) return; } + if ( resp.isUnathorized() ) + { + callLoginCallback(callback, RhoRuby.ERR_UNATHORIZED, resp.getCharData()); + return; + } + if ( !resp.isOK() ) { callLoginCallback(callback, RhoRuby.ERR_REMOTESERVER, resp.getCharData()); @@ -351,123 +404,6 @@ void CSyncEngine::logout() } } - -void CSyncEngine::setNotification(int source_id, String strUrl, String strParams ) -{ - LOG(INFO) + "Set notification. Source ID: " + source_id + "; Url :" + strUrl + "; Params: " + strParams; - String strFullUrl = getNet().resolveUrl(strUrl); - - if ( source_id == -1 ) - { - CMutexLock lockNotify(m_mxNotifications); - m_mapNotifications.clear(); - - if ( strFullUrl.length() > 0 ) - { - loadAllSources(); - - for( int i = 0; i < (int)m_sources.size(); i++ ) - { - CSyncSource& src = *m_sources.elementAt(i); - m_mapNotifications.put( src.getID(),new CSyncNotification( strFullUrl, strParams ) ); - } - } - LOG(INFO) + " Done Set notification for all sources; Url :" + strFullUrl + "; Params: " + strParams; - }else - { - clearNotification(source_id); - if ( strFullUrl.length() > 0 ) - { - CMutexLock lockNotify(m_mxNotifications); - m_mapNotifications.put(source_id,new CSyncNotification( strFullUrl, strParams ) ); - - LOG(INFO) + " Done Set notification. Source ID: " + source_id + "; Url :" + strFullUrl + "; Params: " + strParams; - } - } -} - -void CSyncEngine::reportStatus(String status, int error, String strDetails) { - //TODO: reportStatus - /*if (m_statusListener != null) { - if ( strDetails.length() == 0 ) - strDetails = RhoRuby.getErrorText(error); - status += (strDetails.length() > 0 ? " Details: " + strDetails: ""); - m_statusListener.reportStatus( status, error); - }*/ - LOG(INFO) + "Status: "+status; -} - -void CSyncEngine::fireNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage) -{ - if ( getState() == esExit ) - return; - - if( strMessage.length() > 0 || nErrCode != RhoRuby.ERR_NONE) - { - if ( !( psrc != null && psrc->m_strParams.length()>0) ) - { - if ( psrc != null && strMessage.length() == 0 ) - strMessage = "Sync failed for " + psrc->getName() + "."; - - reportStatus(strMessage,nErrCode,psrc?psrc->m_strError:""); - } - } - - if ( psrc == null ) - return; //TODO: implement all sources callback - - CSyncSource& src = *psrc; - String strBody, strUrl; - { - CMutexLock lockNotify(m_mxNotifications); - - CSyncNotification* pSN = m_mapNotifications.get(src.getID()); - if ( pSN == 0 ) - return; - CSyncNotification& sn = *pSN; - - strUrl = sn.m_strUrl; - strBody = ""; - strBody = "total_count=" + convertToStringA(src.getTotalCount()); - strBody += "&processed_count=" + convertToStringA(src.getCurPageCount()); - - strBody += "&status="; - - if ( bFinish ) - { - if ( nErrCode == RhoRuby.ERR_NONE ) - strBody += "ok"; - else - { - strBody += "error"; - strBody += "&error_code=" + convertToStringA(nErrCode); - strBody += "&error_message=" + src.m_strError; //TODO: URI.urlEncode - //URI.urlEncode(strErrMessage != null? strErrMessage : ""); - } - } - else - strBody += "in_progress"; - - if ( sn.m_strParams.length() > 0 ) - strBody += "&" + sn.m_strParams; - } - LOG(INFO) + "Fire notification. Source ID: " + src.getID() + "; Url :" + strUrl + "; Body: " + strBody; - - NetResponse(resp,getNet().pushData( strUrl, strBody )); - if ( !resp.isOK() ) - LOG(ERROR) + "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData(); - - if ( bFinish ) - clearNotification(src.getID()); -} - -void CSyncEngine::clearNotification(int source_id) -{ - LOG(INFO) + "Clear notification. Source ID: " + source_id; - - CMutexLock lockNotify(m_mxNotifications); - m_mapNotifications.remove(source_id); -} void CSyncEngine::setSyncServer(char* syncserver) { platform/shared/sync/SyncEngine.cpp @@ -6,6 +6,7 @@ #include "net/INetRequest.h" #include "SyncSource.h" +#include "SyncNotify.h" #include "db/DBAdapter.h" #include "logging/RhoLog.h" @@ -20,6 +21,8 @@ static const int ERR_DIFFDOMAINSINSYNCSRC = 5; static const int ERR_NOSERVERRESPONSE = 6; static const int ERR_CLIENTISNOTLOGGEDIN = 7; static const int ERR_CUSTOMSYNCSERVER = 8; +static const int ERR_UNATHORIZED = 9; +static const int ERR_CANCELBYUSER = 10; }; extern const _CRhoRuby& RhoRuby; @@ -28,23 +31,14 @@ namespace sync { class CSyncEngine { DEFINE_LOGCLASS; - struct CSyncNotification - { - String m_strUrl, m_strParams; - CSyncNotification(String strUrl, String strParams) : m_strUrl(strUrl), m_strParams(strParams){} - }; - public: enum ESyncState{ esNone, esSyncAllSources, esSyncSource, esStop, esExit }; static String SYNC_SOURCE_FORMAT() { return "?format=json"; } + static int SYNC_VERSION() { return 2; } + static String SYNC_ASK_ACTION() { return "/ask"; } // static int MAX_SYNC_TRY_COUNT() { return 2; } -#ifdef OS_SYMBIAN - static String SYNC_PAGE_SIZE() { return "200"; } -#else - static String SYNC_PAGE_SIZE() { return "1000"; } -#endif private: VectorPtr<CSyncSource*> m_sources; @@ -52,13 +46,14 @@ private: common::CAutoPtr<net::INetRequest> m_NetRequest; ESyncState m_syncState; String m_clientID; - HashtablePtr<int,CSyncNotification*> m_mapNotifications; - common::CMutex m_mxNotifications; common::CMutex m_mxLoadClientID; String m_strSession; + CSyncNotify m_oSyncNotify; + boolean m_bStopByUser; + int m_nSyncPageSize; public: - CSyncEngine(db::CDBAdapter& db): m_dbAdapter(db), m_NetRequest(0), m_syncState(esNone){} + CSyncEngine(db::CDBAdapter& db); ~CSyncEngine(void){} void setFactory(common::IRhoClassFactory* factory){ @@ -66,13 +61,11 @@ public: } void doSyncAllSources(); - void doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction); + void doSyncSource(int nSrcId, String strSrcUrl, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep); void login(String name, String password, String callback); boolean isLoggedIn(); String loadSession(); void logout(); - void setNotification(int source_id, String strUrl, String strParams ); - void clearNotification(int source_id); void setSyncServer(char* syncserver); void setState(ESyncState eState){ m_syncState = eState; } @@ -80,7 +73,9 @@ public: boolean isContinueSync()const{ return m_syncState != esExit && m_syncState != esStop; } boolean isSyncing()const{ return m_syncState == esSyncAllSources || m_syncState == esSyncSource; } void stopSync(){ if (isContinueSync()){ setState(esStop); m_NetRequest->cancel();} } + void stopSyncByUser(){ m_bStopByUser = true; stopSync(); } void exitSync(){ setState(esExit); m_NetRequest->cancel(); } + boolean isStoppedByUser(){ return m_bStopByUser; } //private: String getClientID()const{ return m_clientID; } void setSession(String strSession){m_strSession=strSession;} @@ -97,19 +92,22 @@ public: String requestClientIDByNet(); boolean resetClientIDByNet(const String& strClientID);//throws Exception - void fireNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage ); - db::CDBAdapter& getDB(){ return m_dbAdapter; } - -private: + CSyncNotify& getNotify(){ return m_oSyncNotify; } net::INetRequest& getNet(){ return *m_NetRequest; } + CSyncSource* findSourceByName(const String& strSrcName); + + String SYNC_PAGE_SIZE(); + int getSyncPageSize() { return m_nSyncPageSize; } + void setSyncPageSize(int nPageSize){ m_nSyncPageSize = nPageSize; } +private: + CSyncSource* findSourceByID(int nSrcId); CSyncSource* findSourceByUrl(const String& strSrcUrl); void callLoginCallback(String callback, int nErrCode, String strMessage); boolean checkAllSourcesFromOneDomain(); - void reportStatus(String status, int error, String strDetails); friend class CSyncSource; }; platform/shared/sync/SyncEngine.h @@ -27,8 +27,11 @@ CSyncSource::CSyncSource() : m_syncEngine( *new CSyncEngine(*new db::CDBAdapter( m_nDeleted = 0; m_nTotalCount = 0; m_bGetAtLeastOnePage = false; + m_eSyncServerDataPass = edpNone; m_nErrCode = RhoRuby.ERR_NONE; + m_bSearchSyncChanges = false; + m_nProgressStep = -1; } CSyncSource::CSyncSource(CSyncEngine& syncEngine ) : m_syncEngine(syncEngine) @@ -40,8 +43,11 @@ CSyncSource::CSyncSource(CSyncEngine& syncEngine ) : m_syncEngine(syncEngine) m_nDeleted = 0; m_nTotalCount = 0; m_bGetAtLeastOnePage = false; + m_eSyncServerDataPass = edpNone; m_nErrCode = RhoRuby.ERR_NONE; + m_bSearchSyncChanges = false; + m_nProgressStep = -1; } CSyncSource::CSyncSource(int id, const String& strUrl, const String& strName, uint64 token, CSyncEngine& syncEngine ) : m_syncEngine(syncEngine) @@ -57,25 +63,55 @@ CSyncSource::CSyncSource(int id, const String& strUrl, const String& strName, ui m_nDeleted = 0; m_nTotalCount = 0; m_bGetAtLeastOnePage = false; + m_eSyncServerDataPass = edpNone; m_nErrCode = RhoRuby.ERR_NONE; + m_bSearchSyncChanges = false; + m_nProgressStep = -1; } CDBAdapter& CSyncSource::getDB(){ return getSync().getDB(); } INetRequest& CSyncSource::getNet(){ return getSync().getNet(); } +CSyncNotify& CSyncSource::getNotify(){ return getSync().getNotify(); } void CSyncSource::sync() { - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, "Synchronizing " + getName() + "..."); + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "Synchronizing " + getName() + "..."); CTimeInterval startTime = CTimeInterval::getCurrentTime(); - - if ( m_strParams.length() == 0 ) + + if ( isEmptyToken() ) + processToken(1); + + boolean bSyncedServer = false; + if ( m_strParams.length() == 0 || m_bSearchSyncChanges ) { - syncClientChanges(); - getAndremoveAsk(); + if ( isPendingClientChanges() ) + { + syncServerChanges(); + bSyncedServer = true; + } + + if ( bSyncedServer && isPendingClientChanges() ) + getSync().setState(CSyncEngine::esStop); + else + { + boolean bSyncClient = false; + { + DBResult( res, getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? LIMIT 1 OFFSET 0", getID()) ); + bSyncClient = !res.isEnd(); + } + if ( bSyncClient ) + { + syncClientChanges(); + getAndremoveAsk(); + bSyncedServer = false; + } + } } - syncServerChanges(); + + if ( !bSyncedServer ) + syncServerChanges(); CTimeInterval endTime = CTimeInterval::getCurrentTime(); getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, \ @@ -83,6 +119,12 @@ void CSyncSource::sync() endTime.toULong(), getInsertedCount(), getDeletedCount(), (endTime-startTime).toULong(), m_bGetAtLeastOnePage, getID() ); } +boolean CSyncSource::isPendingClientChanges() +{ + DBResult( res, getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1 LIMIT 1 OFFSET 0", getID()) ); + return !res.isEnd(); +} + void CSyncSource::syncClientBlobs(const String& strBaseQuery) { String strQuery; @@ -90,10 +132,6 @@ void CSyncSource::syncClientBlobs(const String& strBaseQuery) { CSyncBlob& blob = *m_arSyncBlobs.elementAt(i); - //CRhoFile oFile; - //if ( !oFile.open(blob.getFilePath().c_str(),CRhoFile::OpenReadOnly) ) - // continue; - String strFilePath = RhoGetRootPath(); strFilePath += "apps" + blob.getFilePath() ; @@ -102,8 +140,10 @@ void CSyncSource::syncClientBlobs(const String& strBaseQuery) if ( !resp.isOK() ) { getSync().setState(CSyncEngine::esStop); - m_nErrCode = RhoRuby.ERR_REMOTESERVER; - //m_strError = resp.getCharData(); + if (resp.isResponseRecieved()) + m_nErrCode = RhoRuby.ERR_REMOTESERVER; + else + m_nErrCode = RhoRuby.ERR_NETWORK; return; } @@ -115,70 +155,53 @@ void CSyncSource::syncClientBlobs(const String& strBaseQuery) void CSyncSource::syncClientChanges() { - LOG(INFO) + "Sync client changes source ID :" + getID(); - - DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type, update_type " - "FROM object_values where source_id=? and (update_type = 'update' or update_type = 'create' or update_type = 'delete') order by update_type", getID() ) ); - - String strUpdateType = ""; - m_arSyncBlobs.removeAllElements(); - m_strPushBody = ""; - - for( ; !res.isEnd()&& getSync().isContinueSync(); res.next() ) + const char* arUpdateTypes[] = {"create", "update", "delete"}; + for( int i = 0; i < 3 && getSync().isContinueSync(); i++ ) { - String strTemp = res.getStringByIdx(4); - if ( strUpdateType != strTemp ) - { - if ( strUpdateType.length() > 0 ) - { - if ( !sendClientChanges(strUpdateType) ) - { - getSync().setState(CSyncEngine::esStop); - continue; - } - } - - m_strPushBody = ""; - strUpdateType = strTemp; - } - - makePushBody1( res ); - } - - if ( getSync().isContinueSync() && strUpdateType.length() > 0 ) - sendClientChanges(strUpdateType); -} + String strUrl = getUrl() + "/" + arUpdateTypes[i]; + strUrl += "objects"; + String strQuery = CSyncEngine::SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID(); -boolean CSyncSource::sendClientChanges(String strUpdateType)//throws Exception -{ - String strUrl = getUrl() + "/" + strUpdateType; - strUrl += "objects"; - String strQuery = CSyncEngine::SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID(); - - if ( m_strPushBody.length() > 0 ) - { - LOG(INFO)+"Push client changes to server. Source id: " + getID() + "Size :" + m_strPushBody.length(); - LOG(TRACE) + "Push body: " + m_strPushBody; + m_arSyncBlobs.removeAllElements(); + String strBody; + makePushBody(strBody, arUpdateTypes[i]); + if ( strBody.length() > 0 ) + { + LOG(INFO) + "Push client changes to server. Source id: " + getID() + "Size :" + strBody.length(); + LOG(TRACE) + "Push body: " + strBody; + + NetResponse( resp, getNet().pushData(strUrl+strQuery,strBody) ); + if ( !resp.isOK() ) + { + getSync().setState(CSyncEngine::esStop); + m_nErrCode = RhoRuby.ERR_REMOTESERVER; + continue; + } + } + + if ( m_arSyncBlobs.size() > 0 ) + { + LOG(INFO) + "Push blobs to server. Source id: " + getID() + "Count :" + m_arSyncBlobs.size(); + //oo conflicts + if ( i < 1 ) //create + getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", + getID(), arUpdateTypes[i], "blob.file" ); + else + // + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=? and sent=1)", + getID(), arUpdateTypes[i], "blob.file" ); - NetResponse( resp, getNet().pushData(strUrl+strQuery,m_strPushBody) ); - if ( !resp.isOK() ) + syncClientBlobs(strUrl+strQuery); + }else if ( strBody.length() > 0 ) { - m_nErrCode = RhoRuby.ERR_REMOTESERVER; - //m_strError = resp.getCharData(); - return false; + //oo conflicts + if ( i < 1 ) //create + getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] ); + else + // + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] ); } } - - if ( m_arSyncBlobs.size() > 0 ) - { - LOG(INFO) + "Push blobs to server. Source id: " + getID() + "Count :" + m_arSyncBlobs.size(); - - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?)", getID(), strUpdateType, "blob.file" ); - syncClientBlobs(strUrl+strQuery); - }else if ( m_strPushBody.length() > 0 ) - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=?", getID(), strUpdateType ); - - return true; } /* @@ -189,42 +212,18 @@ boolean CSyncSource::sendClientChanges(String strUpdateType)//throws Exception * update: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>&attrvals[][value]=<some new value> * delete: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid> */ -void CSyncSource::makePushBody1( rho::db::CDBResult& res )//throws DBException +void CSyncSource::makePushBody(String& strBody, const char* szUpdateType) { - String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0); + getDB().Lock(); + DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type, main_id " + "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY sent DESC", getID(), szUpdateType ) ); - if ( res.getStringByIdx(1).length() > 0 ) - strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1); - - String value = res.getStringByIdx(2); - String attribType = res.getStringByIdx(3); - - if ( value.length() > 0 ) + if ( res.isEnd() ) { - if ( attribType == "blob.file" ) - { - common::CFilePath oBlobPath(value); - strSrcBody += "&attrvals[][value]="; - strSrcBody += oBlobPath.getBaseName(); - strSrcBody += "&attrvals[][attrib_type]=blob"; - - m_arSyncBlobs.addElement(new CSyncBlob(strSrcBody,value)); - return; - }else - strSrcBody += "&attrvals[][value]=" + value; + getDB().Unlock(); + return; } - if ( m_strPushBody.length() > 0 ) - m_strPushBody += "&"; - - m_strPushBody += strSrcBody; -} - -void CSyncSource::makePushBody(String& strBody, const char* szUpdateType) -{ - //boolean bFirst = true; - DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type " - "FROM object_values where source_id=? and update_type =?", getID(), szUpdateType ) ); for( ; !res.isEnd(); res.next() ) { String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0); @@ -232,17 +231,14 @@ void CSyncSource::makePushBody(String& strBody, const char* szUpdateType) if ( res.getStringByIdx(1).length() > 0 ) strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1); + uint64 main_id = res.getUInt64ByIdx(4); + if ( main_id != 0 ) + strSrcBody += "&attrvals[][id]=" + convertToStringA(main_id); + String value = res.getStringByIdx(2); String attribType = res.getStringByIdx(3); - /*if ( bFirst ) - { - value = "d:\\work\\blobtest.png"; - attribType = "blob.file"; - bFirst = false; - }*/ - - if ( value.length() > 0 ) + //if ( value.length() > 0 ) { if ( attribType == "blob.file" ) { @@ -250,11 +246,9 @@ void CSyncSource::makePushBody(String& strBody, const char* szUpdateType) strSrcBody += "&attrvals[][value]="; strSrcBody += oBlobPath.getBaseName(); strSrcBody += "&attrvals[][attrib_type]=blob"; -//#ifdef __APPLE__ -// value = String(RhoGetRootPath()) + "apps" + value; -//#endif - - m_arSyncBlobs.addElement(new CSyncBlob(strSrcBody,value)); + + if ( value.length() > 0 ) + m_arSyncBlobs.addElement(new CSyncBlob(strSrcBody,value)); continue; }else strSrcBody += "&attrvals[][value]=" + value; @@ -265,18 +259,27 @@ void CSyncSource::makePushBody(String& strBody, const char* szUpdateType) strBody += strSrcBody; } + + getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), szUpdateType ); + getDB().Unlock(); } void CSyncSource::getAndremoveAsk() { String askParams = ""; { - DBResult( res , getDB().executeSQL("SELECT value from object_values where source_id=? and update_type=?", - getID(), "ask" ) ); - askParams = res.isEnd() ? "" : res.getStringByIdx(0); + DBResult( res , getDB().executeSQL("SELECT object, attrib, value " + "FROM changed_values WHERE source_id=? and update_type =?", getID(), "ask" ) ); + if ( !res.isEnd() ) + { + askParams = res.getStringByIdx(2); + + getDB().executeSQL("DELETE FROM object_values WHERE object=? and attrib=? and source_id=?", + res.getStringByIdx(0), res.getStringByIdx(1), getID() ); + } } - getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and update_type=?", getID(), "ask" ); + getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=?", getID(), "ask" ); setAskParams(askParams); } @@ -293,7 +296,7 @@ void CSyncSource::syncServerChanges() strUrl += '/' + m_strAction; String strQuery = getSync().SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID() + - "&p_size=" + getSync().SYNC_PAGE_SIZE(); + "&p_size=" + getSync().SYNC_PAGE_SIZE() + "&version=" + convertToStringA(getSync().SYNC_VERSION()); if ( m_strParams.length() > 0 ) strQuery += m_strParams; @@ -303,9 +306,7 @@ void CSyncSource::syncServerChanges() strQuery += "&question=" + getAskParams(); } - if ( isEmptyToken() ) - processToken(1); - else if ( !m_bTokenFromDB && getToken() > 1 ) + if ( !m_bTokenFromDB && getToken() > 1 ) strQuery += "&ack_token=" + convertToStringA(getToken()); LOG(INFO) + "Pull changes from server. Url: " + (strUrl+strQuery); @@ -314,20 +315,36 @@ void CSyncSource::syncServerChanges() if ( !resp.isOK() ) { getSync().stopSync(); - m_nErrCode = RhoRuby.ERR_REMOTESERVER; - //m_strError = resp.getCharData(); - + if (resp.isResponseRecieved()) + m_nErrCode = RhoRuby.ERR_REMOTESERVER; + else + m_nErrCode = RhoRuby.ERR_NETWORK; continue; } processServerData(resp.getCharData()); -/* String strData = - "[{count: 124},{total_count: 5425},{token: 123},{version: 1}," - "{o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:[" - "{i:26478681,d:1}," - "{a:\"first_name\",i:47354289,v:\"Lars\",t:\"blob\",u:\"query\",d:0}]}]"; - //u:\"query\", - processServerData(strData.c_str());*/ + + //String strData = + //"[{count:10},{version:1},{total_count: 5425},{token: 123},{s:\"RhoDeleteSource\",ol:[{o:\"rho_del_obj\",av:[{i:55550425},{i:75665819},{i:338165272},{i:402396629},{i:521753981},{i:664143530},{i:678116186},{i:831092394},{i:956041217},{i:970452458}]}]}]"; + /*"[{count: 124},{version: 1},{total_count: 5425},{token: 123}," + "{s:\"Product\",ol:[" + "{oo:\"123\",o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:[" + "{a:\"first_name\",i:47354289,v:\"Lars. \n\n Burgess\", t:\"blob\"}," + "{a:\"second_name\",i:55555,v:\"Burgess\"}]}," + "{oo:\"456\", e:\"Something went wrong creating this record on the backend: code 7\"}" + "]}]"; */ + /*"[{count: 1},{version: 1},{total_count: 1},{token: 123}," + "{s:\"Product\",ol:[" + "{oo:\"94\", e:\"Something went wrong creating this record on the backend: code 7\"}" + "]}]";*/ + /*"[{count: 1},{version: 1},{total_count: 1},{token: 123}," + "{s:\"Product\",ol:[" + "{o:\"94\", av:[" + "{a:\"TEST\",i:55555,v:\"Geny\"}]}," + "]}]"; + + //u:\"query\", + processServerData(strData.c_str()); */ if ( getAskParams().length() > 0 || getCurPageCount() == 0 ) break; @@ -341,7 +358,6 @@ void CSyncSource::processServerData(const char* szData) { m_strError = oJsonArr.getCurItem().getString("error"); m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER; - processToken(0); getSync().stopSync(); return; } @@ -351,63 +367,202 @@ void CSyncSource::processServerData(const char* szData) setCurPageCount(oJsonArr.getCurItem().getInt("count")); oJsonArr.next(); } + int nVersion = 0; + if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") ) + { + nVersion = oJsonArr.getCurItem().getInt("version"); + oJsonArr.next(); + } + if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("total_count") ) { setTotalCount(oJsonArr.getCurItem().getInt("total_count")); oJsonArr.next(); } if ( getServerObjectsCount() == 0 ) - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, ""); + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); if ( !oJsonArr.isEnd() ) { processToken(oJsonArr.getCurItem().getUInt64("token")); oJsonArr.next(); }else if ( getCurPageCount() == 0 ) - processToken(0); - - int nVersion = 0; - if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") ) { - nVersion = oJsonArr.getCurItem().getInt("version"); - oJsonArr.next(); + //oo conflicts + getDB().executeSQL("DELETE FROM changed_values where source_id=? and sent>=3", getID() ); + // + processToken(0); } - LOG(INFO) + "Got " + getCurPageCount() + " records of " + getTotalCount() + " from server. Source ID: " + getID() + LOG(INFO) + "Got " + getCurPageCount() + "(Processed: " + getServerObjectsCount() + ") records of " + getTotalCount() + " from server. Source ID: " + getID() + ". Version: " + nVersion; if ( !oJsonArr.isEnd() && getSync().isContinueSync() ) { //TODO: support DBExceptions getDB().startTransaction(); - for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) + + int nSavedPos = oJsonArr.getCurPos(); + setSyncServerDataPass(edpNone); + processServerData_Ver1(oJsonArr); + + setSyncServerDataPass(edpDeleteObjects); + oJsonArr.reset(nSavedPos); + processServerData_Ver1(oJsonArr); + + getDB().endTransaction(); + + getNotify().fireObjectsNotification(); + } + + if ( getCurPageCount() > 0 ) + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); +} + +boolean CSyncSource::processSyncObject_ver1(CJSONEntry oJsonObject, int nSrcID)//throws Exception +{ + const char* strOldObject = oJsonObject.getString("oo"); + if ( isDeleteObjectsPass() != (nSrcID < 0) ) + return true; + + if ( oJsonObject.hasName("e") ) + { + const char* strError = oJsonObject.getString("e"); + getNotify().addCreateObjectError(nSrcID,strOldObject,strError); + return true; + } + + const char* strObject = oJsonObject.getString("o"); + CJSONArrayIterator oJsonArr(oJsonObject, "av"); + //oo conflicts + boolean bUpdatedOO = false; + // + for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) + { + CJSONEntry oJsonEntry = oJsonArr.getCurItem(); + if ( oJsonEntry.isEmpty() ) + continue; + + if ( nSrcID >= 0 ) //insert + { + CValue value(oJsonEntry,1); + if ( !downloadBlob(value) ) + return false; + + String strAttrib = oJsonEntry.getString("a"); + //oo conflicts + if ( strOldObject != null ) + { + if ( !bUpdatedOO ) + { + getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID ); + + getNotify().onObjectChanged(nSrcID,strOldObject, CSyncNotify::enCreate); + + bUpdatedOO = true; + } + + getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID ); + + getDB().executeSQL("UPDATE object_values SET id=? WHERE object=? and attrib=? and source_id=?", + value.m_nID, strObject, strAttrib, nSrcID ); + }else// + { + DBResult(resInsert, getDB().executeSQLReportNonUnique("INSERT INTO object_values \ + (id, attrib, source_id, object, value, attrib_type) VALUES(?,?,?,?,?,?)", + value.m_nID, strAttrib, nSrcID, strObject, + value.m_strValue, value.m_strAttrType ) ); + if ( resInsert.isNonUnique() ) + { + getDB().executeSQL("UPDATE object_values \ + SET id=?, value=?, attrib_type=? WHERE object=? and attrib=? and source_id=?", + value.m_nID, value.m_strValue, value.m_strAttrType, + strObject, strAttrib, nSrcID ); + + // oo conflicts + getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID ); + getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID ); + // + } + + getNotify().onObjectChanged(nSrcID,strObject, CSyncNotify::enUpdate); + } + + m_nInserted++; + }else + { + uint64 id = oJsonEntry.getUInt64("i"); + DBResult( res , getDB().executeSQL("SELECT source_id, object FROM object_values where id=?", id )); + if ( !res.isEnd() ) + { + int nDelSrcID = res.getIntByIdx(0); + String strDelObject = res.getStringByIdx(1); + getDB().executeSQL("DELETE FROM object_values where id=?", id ); + getNotify().onObjectChanged(nDelSrcID, strDelObject, CSyncNotify::enDelete); + } + // oo conflicts + getDB().executeSQL("UPDATE changed_values SET sent=3 where main_id=?", id ); + // + + m_nDeleted++; + } + } + + return true; +} + +void CSyncSource::processServerData_Ver1(CJSONArrayIterator& oJsonArr) +{ + for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) + { + CJSONEntry oJsonSource = oJsonArr.getCurItem(); + String strSrcName = oJsonSource.getString("s"); + int nSrcID = getID(); + if ( strSrcName.compare("RhoDeleteSource") == 0 ) + nSrcID = -1; + else if ( strSrcName.compare(getName()) != 0 ) + { + CSyncSource* pSrc = getSync().findSourceByName(strSrcName); + if ( pSrc == null ) + { + LOG(ERROR) + "Sync server send data for unknown source name:" + strSrcName; + getSync().stopSync(); + m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE; + break; + } + nSrcID = pSrc->getID(); + } + + CJSONArrayIterator oJsonObjList(oJsonSource, "ol"); + for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() ) { if ( getDB().isUnlockDB() ) { - LOG(INFO) + "Commit transaction because of UI request."; - RhoRuby_RhomAttribManager_save(getID()); + LOG(INFO) + "Commit transaction because of UI request."; getDB().endTransaction(); getDB().startTransaction(); } - CJSONEntry oJsonObject = oJsonArr.getCurItem(); - boolean bRes = nVersion == 0 ? processSyncObject(oJsonObject) : - processSyncObject_ver1(oJsonObject); - - if( !bRes) + CJSONEntry oJsonObject = oJsonObjList.getCurItem(); + if( !processSyncObject_ver1(oJsonObject,nSrcID)) { - getSync().stopSync(); - break; + getSync().stopSync(); + break; + } + + if ( !isDeleteObjectsPass() && nSrcID >=0 ) + { + int nSyncObjectCount = getNotify().incLastSyncObjectCount(nSrcID); + + if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) ) + getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, ""); } m_bGetAtLeastOnePage = true; } - RhoRuby_RhomAttribManager_save(getID()); - getDB().endTransaction(); } - - if ( getServerObjectsCount() < getTotalCount() ) - m_syncEngine.fireNotification(this, false, RhoRuby.ERR_NONE, ""); } CValue::CValue(json::CJSONEntry& oJsonEntry)//throws JSONException @@ -493,7 +648,10 @@ boolean CSyncSource::downloadBlob(CValue& value)//throws Exception NetResponse(resp, getNet().pullFile(url, fName)); if ( !resp.isOK() ) { - m_nErrCode = RhoRuby.ERR_REMOTESERVER; + if (resp.isResponseRecieved()) + m_nErrCode = RhoRuby.ERR_REMOTESERVER; + else + m_nErrCode = RhoRuby.ERR_NETWORK; //m_strError = resp.getCharData(); return false; @@ -508,97 +666,14 @@ boolean CSyncSource::downloadBlob(CValue& value)//throws Exception return true; } -boolean CSyncSource::processSyncObject_ver1(CJSONEntry oJsonObject)//throws Exception -{ - const char* strObject = oJsonObject.getString("o"); - CJSONArrayIterator oJsonArr(oJsonObject, "av"); - - for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() ) - { - CJSONEntry oJsonEntry = oJsonArr.getCurItem(); - if ( oJsonEntry.isEmpty() ) - continue; - - int nDbOp = oJsonEntry.getInt("d"); - if ( nDbOp == 0 ) //insert - { - CValue value(oJsonEntry,1); - if ( !downloadBlob(value) ) - return false; - - String strAttrib = oJsonEntry.getString("a"); - String strUpdateType = "query"; - if( oJsonEntry.hasName("u") ) - strUpdateType = oJsonEntry.getString("u"); - - getDB().executeSQL("INSERT INTO object_values \ - (id, attrib, source_id, object, value, update_type,attrib_type) VALUES(?,?,?,?,?,?,?)", - value.m_nID, strAttrib, getID(), strObject, - value.m_strValue,strUpdateType, value.m_strAttrType ); - - RhoRuby_RhomAttribManager_add_attrib(getID(),strAttrib.c_str()); - m_nInserted++; - }else if ( nDbOp == 1 ) //delete - { - uint64 id = oJsonEntry.getUInt64("i"); - getDB().executeSQL("DELETE FROM object_values where id=?", id ); - - RhoRuby_RhomAttribManager_delete_attribs(getID(),id); - m_nDeleted++; - }else{ - LOG(ERROR) + "Unknown DB operation: " + nDbOp; - } - } - - return true; -} - -boolean CSyncSource::processSyncObject(CJSONEntry& oJsonObject) -{ - CJSONEntry oJsonEntry = oJsonObject.getEntry("object_value"); - if ( oJsonEntry.isEmpty() ) - return true; - - const char* szDbOp = oJsonEntry.getString("db_operation"); - if ( szDbOp && strcmp(szDbOp,"insert")==0 ) - { - CValue value(oJsonEntry); - // - //value.m_strAttrType = "blob.url"; - //value.m_strValue = "http://img.gazeta.ru/files3/661/3219661/ld.jpg"; - // - if ( !downloadBlob(value) ) - return false; - - String strAttrib = oJsonEntry.getString("attrib"); - getDB().executeSQL("INSERT INTO object_values \ - (id, attrib, source_id, object, value, update_type,attrib_type) VALUES(?,?,?,?,?,?,?)", - value.m_nID, strAttrib, getID(), oJsonEntry.getString("object"), - value.m_strValue, oJsonEntry.getString("update_type"), value.m_strAttrType ); - - RhoRuby_RhomAttribManager_add_attrib(getID(),strAttrib.c_str()); - m_nInserted++; - }else if ( szDbOp && strcmp(szDbOp,"delete")==0 ) - { - uint64 id = oJsonEntry.getUInt64("id"); - getDB().executeSQL("DELETE FROM object_values where id=?", id ); - - RhoRuby_RhomAttribManager_delete_attribs(getID(),id); - m_nDeleted++; - }else{ - LOG(ERROR) + "Unknown DB operation: " + (szDbOp ? szDbOp : ""); - } - - return true; -} - void CSyncSource::processToken(uint64 token) { if ( token > 1 && getToken() == token ){ //Delete non-confirmed records setToken( token ); //For m_bTokenFromDB = false; - getDB().executeSQL("DELETE FROM object_values where source_id=? and token=?", getID(), token ); + //getDB().executeSQL("DELETE FROM object_values where source_id=? and token=?", getID(), token ); + //TODO: add special table for id,token }else { setToken( token ); @@ -608,4 +683,4 @@ void CSyncSource::processToken(uint64 token) } } -} \ No newline at end of file +} platform/shared/sync/SyncSource.cpp @@ -14,6 +14,7 @@ namespace net { } namespace json { class CJSONEntry; + class CJSONArrayIterator; } namespace sync { @@ -43,10 +44,13 @@ public: }; class CSyncEngine; +class CSyncNotify; class CSyncSource { DEFINE_LOGCLASS; + enum ESyncServerDataPass{ edpNone, edpDeleteObjects }; + CSyncEngine& m_syncEngine; int m_nID; @@ -57,13 +61,15 @@ class CSyncSource int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount; boolean m_bGetAtLeastOnePage; + ESyncServerDataPass m_eSyncServerDataPass; public: int m_nErrCode; String m_strError; String m_strParams; String m_strAction; + boolean m_bSearchSyncChanges; + int m_nProgressStep; private: - String m_strPushBody; VectorPtr<CSyncBlob*> m_arSyncBlobs; String m_strAskParams; @@ -88,9 +94,10 @@ public: CSyncSource(CSyncEngine& syncEngine ); void syncClientChanges(); + boolean isPendingClientChanges(); + void syncServerChanges(); void makePushBody(String& strBody, const char* szUpdateType); - void makePushBody1( rho::db::CDBResult& res );//throws DBException void getAndremoveAsk(); void setAskParams(const String& ask){ m_strAskParams = ask;} String getAskParams()const{ return m_strAskParams;} @@ -102,19 +109,23 @@ public: void setTotalCount(int nTotalCount){m_nTotalCount = nTotalCount;} int getCurPageCount(){return m_nCurPageCount;} int getTotalCount(){return m_nTotalCount;} + int getProgressStep(){ return m_nProgressStep; } void processServerData(const char* szData); - boolean processSyncObject(json::CJSONEntry& oJsonEntry); - boolean processSyncObject_ver1(json::CJSONEntry oJsonObject);//throws Exception + boolean processSyncObject_ver1(json::CJSONEntry oJsonObject, int nSrcID);//throws Exception + void processServerData_Ver1(json::CJSONArrayIterator& oJsonArr); + + void setSyncServerDataPass(ESyncServerDataPass ePass){m_eSyncServerDataPass = ePass;} + boolean isDeleteObjectsPass(){ return m_eSyncServerDataPass == edpDeleteObjects; } VectorPtr<CSyncBlob*>& getSyncBlobs(){ return m_arSyncBlobs; } void syncClientBlobs(const String& strBaseQuery); - boolean sendClientChanges(String strUpdateType);//throws Exception String makeFileName(const CValue& value);//throws Exception boolean downloadBlob(CValue& value);//throws Exception private: CSyncEngine& getSync(){ return m_syncEngine; } + CSyncNotify& getNotify(); db::CDBAdapter& getDB(); net::INetRequest& getNet(); platform/shared/sync/SyncSource.h @@ -53,7 +53,7 @@ CSyncThread::~CSyncThread(void) void CSyncThread::addSyncCommand(CSyncCommand* pSyncCmd) { { - CMutexLock lockNotify(m_mxStackCommands); + synchronized(m_mxStackCommands); boolean bExist = false; for ( int i = 0; i < (int)m_stackCommands.size(); i++ ) @@ -91,8 +91,6 @@ void CSyncThread::run() { LOG(INFO) + "Starting sync engine main routine..."; - RhoRubyThreadStart(); - int nLastSyncInterval = getLastSyncInterval(); while( m_oSyncEngine.getState() != CSyncEngine::esExit ) { @@ -107,7 +105,8 @@ void CSyncThread::run() nWait = nWait2; } - if ( nWait >= 0 ) + if ( nWait >= 0 && m_oSyncEngine.getState() != CSyncEngine::esExit && + isNoCommands() ) { LOG(INFO) + "Sync engine blocked for " + nWait + " seconds..."; wait(nWait); @@ -117,20 +116,29 @@ void CSyncThread::run() if ( m_oSyncEngine.getState() != CSyncEngine::esExit ) processCommands(); } +} + +boolean CSyncThread::isNoCommands() +{ + boolean bEmpty = false; + synchronized(m_mxStackCommands) + { + bEmpty = m_stackCommands.isEmpty(); + } - RhoRubyThreadStop(); + return bEmpty; } void CSyncThread::processCommands()//throws Exception { - if ( m_stackCommands.isEmpty() ) - addSyncCommand(new CSyncCommand(scNone)); - - while(!m_stackCommands.isEmpty()) + if ( isNoCommands() ) + addSyncCommand(new CSyncCommand(scNone)); + + while(!isNoCommands()) { common::CAutoPtr<CSyncCommand> pSyncCmd = null; { - CMutexLock lockNotify(m_mxStackCommands); + synchronized(m_mxStackCommands); pSyncCmd = (CSyncCommand*)m_stackCommands.removeFirst(); } @@ -152,11 +160,12 @@ void CSyncThread::processCommand(CSyncCommand& oSyncCmd) case scChangePollInterval: break; case scSyncOne: - m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam,"","" ); + m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam,"","",false, -1 ); break; case scSearchOne: m_oSyncEngine.doSyncSource(oSyncCmd.m_nCmdParam,"",oSyncCmd.m_strCmdParam, - ((CSyncSearchCommand&)oSyncCmd).m_strFrom); + ((CSyncSearchCommand&)oSyncCmd).m_strFrom, ((CSyncSearchCommand&)oSyncCmd).m_bSyncChanges, + ((CSyncSearchCommand&)oSyncCmd).m_nProgressStep); break; case scLogin: { @@ -202,16 +211,17 @@ void rho_sync_stop() { if (CSyncThread::getSyncEngine().isSyncing() ) { - CSyncThread::getSyncEngine().stopSync(); - while( CSyncThread::getSyncEngine().getState() != CSyncEngine::esNone ) + CSyncThread::getSyncEngine().stopSyncByUser(); +// while( CSyncThread::getSyncEngine().getState() != CSyncEngine::esNone ) + while( CSyncThread::getDBAdapter().isInsideTransaction() ) CSyncThread::getInstance()->sleep(100); } } -void rho_sync_doSearchSource(int source_id, const char *from, const char *params) +void rho_sync_doSearchSource(int source_id, const char *from, const char *params, bool sync_changes, int nProgressStep) { rho_sync_stop(); - CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncSearchCommand(from,params,source_id) ); + CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncSearchCommand(from,params,source_id,sync_changes,nProgressStep) ); } void rho_sync_doSyncSourceByUrl(const char* szSrcID) @@ -256,19 +266,19 @@ void rho_sync_logout() void rho_sync_set_notification(int source_id, const char *url, char* params) { - return CSyncThread::getSyncEngine().setNotification(source_id, url, params ? params : ""); + return CSyncThread::getSyncEngine().getNotify().setSyncNotification(source_id, url, params ? params : ""); } void rho_sync_clear_notification(int source_id) { - return CSyncThread::getSyncEngine().clearNotification(source_id); + return CSyncThread::getSyncEngine().getNotify().clearSyncNotification(source_id); } int rho_sync_openDB(const char* szDBPath) { rho::db::CDBAdapter& db = CSyncThread::getDBAdapter(); - rho::String strVer = "";//TODO: get version from rhodes - db.open(szDBPath,strVer); + rho::String strVer = RhoRuby_getRhoDBVersion(); + db.open(szDBPath,strVer, false); return 0; } @@ -313,6 +323,11 @@ void* rho_db_get_handle() return CSyncThread::getDBAdapter().getDbHandle(); } +unsigned long rho_sync_get_attrs(int nSrcID) +{ + return (VALUE)CSyncThread::getDBAdapter().getAttrMgr().getAttrsBySrc(nSrcID); +} + void rho_sync_lock() { rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter(); @@ -326,4 +341,39 @@ void rho_sync_unlock() db.Unlock(); } +void rho_sync_setobjectnotify_url(const char* szUrl) +{ + CSyncNotify::setObjectNotifyUrl(szUrl); +} + +void rho_sync_addobjectnotify(int nSrcID, const char* szObject) +{ + CSyncThread::getSyncEngine().getNotify().addObjectNotify(nSrcID, szObject); +} + +void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char* szObject) +{ + CSyncThread::getSyncEngine().getNotify().addObjectNotify(szSrcName, szObject); +} + +void rho_sync_cleanobjectnotify() +{ + CSyncThread::getSyncEngine().getNotify().cleanObjectNotifications(); +} + +int rho_sync_get_lastsync_objectcount(int nSrcID) +{ + return CSyncThread::getSyncEngine().getNotify().getLastSyncObjectCount(nSrcID); +} + +int rho_sync_get_pagesize() +{ + return CSyncThread::getSyncEngine().getSyncPageSize(); +} + +void rho_sync_set_pagesize(int nPageSize) +{ + return CSyncThread::getSyncEngine().setSyncPageSize(nPageSize); +} + } \ No newline at end of file platform/shared/sync/syncthread.cpp @@ -76,9 +76,14 @@ public: { public: String m_strFrom; - CSyncSearchCommand(String from, String params, int source_id) : CSyncCommand(CSyncThread::scSearchOne,params,source_id) + boolean m_bSyncChanges; + int m_nProgressStep; + + CSyncSearchCommand(String from, String params, int source_id, boolean sync_changes, int nProgressStep) : CSyncCommand(CSyncThread::scSearchOne,params,source_id) { m_strFrom = from; + m_bSyncChanges = sync_changes; + m_nProgressStep = nProgressStep; } }; @@ -111,6 +116,7 @@ private: void processCommands(); void processCommand(CSyncCommand& oSyncCmd); + boolean isNoCommands(); }; } @@ -126,7 +132,7 @@ void rho_sync_destroy(); void rho_sync_doSyncAllSources(int show_status_popup); void rho_sync_doSyncSource(int nSrcID,int show_status_popup); -void rho_sync_doSearchSource(int source_id, const char *from, const char *params); +void rho_sync_doSearchSource(int source_id, const char *from, const char *params, bool sync_changes, int nProgressStep); void rho_sync_doSyncSourceByUrl(const char* szSrcID); void rho_sync_lock(); void rho_sync_unlock(); @@ -137,6 +143,11 @@ void rho_sync_set_notification(int source_id, const char *url, char* params); void rho_sync_clear_notification(int source_id); void rho_sync_set_pollinterval(int nInterval); void rho_sync_set_syncserver(char* syncserver); +void rho_sync_setobjectnotify_url(const char* szUrl); +void rho_sync_addobjectnotify(int nSrcID, const char* szObject); +void rho_sync_cleanobjectnotify(); +int rho_sync_get_pagesize(); +void rho_sync_set_pagesize(int nPageSize); //struct sqlite3; int rho_sync_openDB(const char* szDBPath); @@ -146,6 +157,8 @@ int rho_db_commitUITransaction(); int rho_db_rollbackUITransaction(); int rho_db_destroy_table(const char* szTableName); void* rho_db_get_handle(); +unsigned long rho_sync_get_attrs(int nSrcID); +int rho_sync_get_lastsync_objectcount(int nSrcID); #ifdef __cplusplus }; platform/shared/sync/syncthread.h @@ -51,8 +51,20 @@ // One day, we may use __attribute__ stuff on gcc to annotate these functions #define LOCKABLE #define SCOPED_LOCKABLE + +#ifdef EXCLUSIVE_LOCK_FUNCTION +#undef EXCLUSIVE_LOCK_FUNCTION +#endif #define EXCLUSIVE_LOCK_FUNCTION(...) + +#ifdef EXCLUSIVE_TRYLOCK_FUNCTION +#undef EXCLUSIVE_TRYLOCK_FUNCTION +#endif #define EXCLUSIVE_TRYLOCK_FUNCTION(...) + +#ifdef UNLOCK_FUNCTION +#undef UNLOCK_FUNCTION +#endif #define UNLOCK_FUNCTION(...) platform/shared/tcmalloc/base/spinlock.h @@ -133,11 +133,26 @@ #define LOCK_RETURNED(x) // no-op #define LOCKABLE // no-op #define SCOPED_LOCKABLE // no-op + +#ifdef EXCLUSIVE_LOCK_FUNCTION +#undef EXCLUSIVE_LOCK_FUNCTION +#endif #define EXCLUSIVE_LOCK_FUNCTION(x) // no-op + #define SHARED_LOCK_FUNCTION(x) // no-op + +#ifdef EXCLUSIVE_TRYLOCK_FUNCTION +#undef EXCLUSIVE_TRYLOCK_FUNCTION +#endif #define EXCLUSIVE_TRYLOCK_FUNCTION(x) // no-op + #define SHARED_TRYLOCK_FUNCTION(x) // no-op + +#ifdef UNLOCK_FUNCTION +#undef UNLOCK_FUNCTION +#endif #define UNLOCK_FUNCTION(x) // no-op + #define NO_THREAD_SAFETY_ANALYSIS // no-op #endif // defined(__GNUC__) && defined(__SUPPORT_TS_ANNOTATION__) platform/shared/tcmalloc/base/thread_annotations.h @@ -841,6 +841,14 @@ RelativePath="..\..\shared\common\StringConverter.h" > </File> + <File + RelativePath="..\..\shared\common\Tokenizer.cpp" + > + </File> + <File + RelativePath="..\..\shared\common\Tokenizer.h" + > + </File> </Filter> <Filter Name="logging" @@ -894,6 +902,22 @@ > </File> </Filter> + <Filter + Name="net" + > + <File + RelativePath="..\..\shared\net\inetrequest.h" + > + </File> + <File + RelativePath="..\..\shared\net\URI.cpp" + > + </File> + <File + RelativePath="..\..\shared\net\URI.h" + > + </File> + </Filter> </Files> <Globals> </Globals> platform/wm/RhoLib/RhoLib.vcproj @@ -3,7 +3,7 @@ var fso,output_file; //TBD need to move sources and settings to a separate config files var sources = new Object(); -sources['db'] = ["db","..\\..\\..\\rhodes\\rhodes-build\\res\\prebuilt\\common\\db"]; +sources['db'] = ["db","..\\..\\..\\res\\build-tools\\db"]; //sources['sqlite3']= ["sqlite3","..\\..\\shared\\sqlite3"]; sources['lib']= ["lib","..\\bin\\RhoBundle\\lib"]; sources['apps']= ["apps","..\\bin\\RhoBundle\\apps"]; platform/wm/build/build_inf.js @@ -1,22 +1,99 @@ namespace "config" do task :wm => ["config:common"] do - #TODO: Implement + $config["platform"] = "wm" + $rubypath = "res/build-tools/RhoRuby.exe" #path to RubyMac + wmpath = $config["build"]["wmpath"] + wmpath = $app_path + $builddir = $config["build"]["wmpath"] + "/build" + $bindir = wmpath + "/bin" + $srcdir = Jake.get_absolute($config["build"]["wmpath"] + "/bin/RhoBundle") + $targetdir = $bindir + "/target/wm6p" + $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb'] + $tmpdir = $bindir +"/tmp" + $vcbuild = "vcbuild" end end namespace "build" do namespace "wm" do - desc "Build wm rhobundle" +# desc "Build wm rhobundle" task :rhobundle => ["config:wm"] do - currentdir = pwd - chdir 'platform/wm/build' - puts `ant.bat RhoBundle -Dapps.dir="#{$config["env"]["app"]}"` + Rake::Task["build:bundle:noxruby"].execute + end + + task :rhodes => ["config:wm", "build:wm:rhobundle"] do + chdir $config["build"]["wmpath"] + + args = ['/M4', 'rhodes.sln', '"Release|Windows Mobile 6 Professional SDK (ARMV4I)"'] + puts Jake.run($vcbuild,args) unless $? == 0 - puts "Error building wm" + puts "Error building" exit 1 end + chdir $startdir + end + end + + namespace "win32" do + task :devrhobundle => ["wm:rhobundle"] do + win32rhopath = 'platform/wm/bin/win32/rhodes/Debug/rho/' + rm_rf win32rhopath + 'lib' + rm_rf win32rhopath + 'apps' + + cp_r $srcdir + '/lib', win32rhopath + cp_r $srcdir + '/apps', win32rhopath + end + end +end + +namespace "device" do + namespace "wm" do + desc "Build production for device or emulator" + task :production => ["config:wm","build:wm:rhobundle","build:wm:rhodes"] do + + chdir $builddir + + args = ['build_inf.js', 'rhodes.inf', 'wm6'] + puts Jake.run('cscript',args) + unless $? == 0 + puts "Error running build_inf" + exit 1 + end + + args = ['rhodes.inf'] + puts Jake.run($config["env"]["paths"]["cabwiz"] + "/cabwiz.exe",args) + unless $? == 0 + puts "Error running cabwiz" + exit 1 + end + + args = ['cleanup.js'] + puts Jake.run('cscript',args) + unless $? == 0 + puts "Error running cleanup.js" + exit 1 + end + + mkdir_p $bindir if not File.exists? $bindir + mkdir_p $targetdir if not File.exists? $targetdir + mv "rhodes.inf", $targetdir + mv "rhodes.cab", $targetdir + + rm_f "cleanup.js" + + chdir $startdir - chdir currentdir end end -end \ No newline at end of file +end + +namespace "clean" do + desc "Clean wm" + task :wm => "clean:wm:all" + namespace "wm" do + task :rhodes do + rm_rf $bindir + "/Windows Mobile 6 Professional SDK (ARMV4I)" + end + task :all => "clean:wm:rhodes" + end +end platform/wm/build/wm.rake @@ -123,6 +123,7 @@ HRESULT CHttpServer::Execute(DWORD_PTR dwParam, HANDLE hObject) } rho_sync_create(); + RhoRubyInitApp(); //rho_clientregister_create("PIN_1"); // if (logged_in()){ platform/wm/rhodes/HttpServer.cpp @@ -213,7 +213,7 @@ extern "C" void perform_webview_refresh() { webview_refresh(); } -extern "C" void webview_navigate(char* url) { +extern "C" void webview_navigate(char* url, int index) { _AtlModule.DoViewNavigate(url); } @@ -226,6 +226,10 @@ extern "C" void webview_set_menu_items(VALUE argv) { //TODO: Implement me! } +extern "C" int webview_active_tab() { + return 0; +} + extern "C" char* get_current_location() { return _AtlModule.GetCurrentLocation(); } @@ -246,6 +250,10 @@ extern "C" void create_nativebar(int bar_type, int nparams, char** params) { //TODO: Implement me! } +extern "C" void mapview_create(int nparams, char** params, int nannotations, char** annotation) { + //TODO: mapview_create +} + /*BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam) { char buf[255] = {0}; platform/wm/rhodes/Rhodes.cpp @@ -295,8 +295,8 @@ CNetRequestImpl::~CNetRequestImpl() void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetResp, common::CRhoFile* pFile /*=NULL*/ ) { - if ( pNetResp->getRespCode() == 500 || pNetResp->getRespCode() == 422 ) - return; + //if ( pNetResp->getRespCode() == 500 || pNetResp->getRespCode() == 422 ) + // return; DWORD dwBufSize = 4096; char* pBuf = (char*)malloc(dwBufSize); @@ -323,6 +323,9 @@ void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetRe }while(bRead && dwBytesRead > 0); + if ( !pNetResp->isOK() ) + LOG(TRACE) + "Server response: " + pNetResp->getCharData(); + free(pBuf); } platform/wm/rhodes/rho/net/NetRequestImpl.cpp @@ -43,6 +43,11 @@ public: return m_nRespCode == 200; } + boolean isUnathorized() + { + return m_nRespCode == 401; + } + }; class CNetRequest; platform/wm/rhodes/rho/net/NetRequestImpl.h @@ -1612,6 +1612,14 @@ > </File> </Filter> + <Filter + Name="mapview" + > + <File + RelativePath="..\..\shared\ruby\ext\mapview\mapview_wrap.c" + > + </File> + </Filter> </Filter> <Filter Name="generated" platform/wm/rubylib/rubylib.vcproj @@ -1160,6 +1160,14 @@ > </File> <File + RelativePath="..\..\shared\sync\SyncNotify.cpp" + > + </File> + <File + RelativePath="..\..\shared\sync\SyncNotify.h" + > + </File> + <File RelativePath="..\..\shared\sync\SyncSource.cpp" > </File> @@ -1188,6 +1196,14 @@ > </File> <File + RelativePath="..\..\shared\db\DBAttrManager.cpp" + > + </File> + <File + RelativePath="..\..\shared\db\DBAttrManager.h" + > + </File> + <File RelativePath="..\..\shared\db\DBResult.cpp" > </File> platform/wm/syncengine/syncengine.vcproj @@ -1,13 +1,9 @@ env: app: C:/rhodes-app - appname: Rhodes - version: 1.2.0 - vendor: rhomobile - bbver: 4.6 - applog: rholog.txt paths: java: C:/Program Files/Java/jdk1.6.0_11/bin android: C:/android-sdk-windows-1.5_r2 + cabwiz: C:/Program Files/Windows Mobile 6 SDK/Tools/CabWiz 4.6: jde: C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0 mds: C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0/MDS @@ -16,9 +12,6 @@ env: jde: C:/Program Files/Research In Motion/BlackBerry JDE 4.2.0 mds: C:/Program Files/Research In Motion/BlackBerry Email and MDS Services Simulators 4.1.2/MDS sim: 8100 - iphone: - configuration: Debug - sdk: iphonesimulator2.2.1 build: bbpath: platform/bb wmpath: platform/wm @@ -27,5 +20,9 @@ build: symbianpath: platform/symbian bb: bbsignpwd: "somepasswordhere" - +excludedirs: + bb: + - public/js/iui + - public/js/jquery* + - public/js/prototype* rhobuild.yml.example apps/config.rb apps/index.erb apps/layout.erb apps/loading.html platform/android/RhoBundle/.classpath platform/android/RhoBundle/.project platform/android/build/build.properties platform/android/build/build.xml platform/android/build/build.yml platform/bb/Hsqldb/src/com/rho/db/file/Jsr75RAFileImpl.java platform/bb/Hsqldb/src/com/rho/db/file/PersistRAFileImpl.java platform/bb/Hsqldb/src/com/rho/db/file/RAFileImpl.java platform/iphone/JSString.h platform/iphone/JSString.m platform/iphone/rbuild/build.properties platform/iphone/rbuild/build.xml platform/wm/build/Rakefile platform/wm/build/build.properties platform/wm/build/build.xml platform/wm/build/build.yml rhodes/README.rdoc rhodes/Rakefile rhodes/rhodes-build/History.txt rhodes/rhodes-build/Manifest.txt rhodes/rhodes-build/README.txt rhodes/rhodes-build/Rakefile rhodes/rhodes-build/lib/compileERB/bb.rb rhodes/rhodes-build/lib/compileERB/default.rb rhodes/rhodes-build/lib/compileRB/compileRB.rb rhodes/rhodes-build/lib/jake.rb rhodes/rhodes-build/lib/manifest/createAppManifest.rb rhodes/rhodes-build/lib/rhodes-build.rb rhodes/rhodes-build/lib/tasks/android.rake rhodes/rhodes-build/lib/tasks/blackberry.rake rhodes/rhodes-build/lib/tasks/common.rake rhodes/rhodes-build/lib/tasks/iphone.rake rhodes/rhodes-build/lib/tasks/linux.rake rhodes/rhodes-build/lib/tasks/rhodes-build.rb rhodes/rhodes-build/lib/tasks/rspec.rake rhodes/rhodes-build/lib/tasks/symbian.rake rhodes/rhodes-build/lib/tasks/wm.rake rhodes/rhodes-build/lib/version.rb rhodes/rhodes-build/res/7z.exe rhodes/rhodes-build/res/RhoRuby.exe rhodes/rhodes-build/res/RubyMac rhodes/rhodes-build/res/build_inf.js rhodes/rhodes-build/res/insertRhoBundle2pkg.rb rhodes/rhodes-build/res/prebuilt/android/AndroidManifest.xml rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/DateTimeTokenizer.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/FilePath.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/IFile.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/IRhoLogSink.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/IRhoRubyHelper.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/Mutex.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/Properties.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoClassFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoConf$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoConf$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoConf$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoConf.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoEmptyLogger.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoEmptyProfiler.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoLogConf.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoLogFileSink.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoLogOutputSink.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoLogger.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoProfiler$CCounter.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoProfiler$CGlobalCounter.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoProfiler.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoRuby.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/RhoThread.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/SimpleFile.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/StringScanner.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/TestProfiler.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/TestRhoLog.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/TimeInterval.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/Tokenizer.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter$DBVersion.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBAdapter.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/DBException.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/IDBCallback.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/IDBResult.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/db/IDBStorage.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/location/GeoLocation$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/location/GeoLocation$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/location/GeoLocation$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/location/GeoLocation.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/location/IGeoLocationImpl.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/IHttpConnection.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/INetworkAccess.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/NetRequest$IRhoSession.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/NetRequest$ParsedCookie.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/NetRequest.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/NetResponse.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/RhoConnection$UrlParser.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/RhoConnection.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/URI$MalformedURIException.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/net/URI.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/ClientRegister.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/ISyncStatusListener.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/JSONArrayIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/JSONEntry.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncEngine$DBCallback.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncEngine$SyncNotification.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncEngine.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncSource$CValue.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncSource$SyncBlob.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncSource.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$SyncCommand.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread$SyncLoginCommand.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rho/sync/SyncThread.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidFile.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidHttpConnection.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$attr.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$drawable.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$id.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$layout.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$menu.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR$string.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/AndroidR.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/HttpLog.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkAccessImpl.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkConnectivityListener$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkConnectivityListener$ConnectivityBroadcastReceiver.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkConnectivityListener$State.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkConnectivityListener.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkStateTracker$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NetworkStateTracker.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/NotImplementedException.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Platform.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$attr.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$drawable.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$id.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$layout.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$menu.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R$string.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/R.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/ResourceFetchThread.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RhoHttpHandler.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RhoHttpService.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RhoRubyHelper.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RhoSyncService.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/Rhodes.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RhodesInstance.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RingtoneManager$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RingtoneManager$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RingtoneManager$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/RingtoneManager.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/WebView$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/WebView$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/WebView$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/WebView$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/WebView.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/Camera$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/Camera$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/Camera.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/CameraRunnable.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/FileList$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/FileList.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCapture.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/camera/ImageCaptureCallback.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePicker$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePicker.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePickerScreen$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePickerScreen$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePickerScreen$ResultSender.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/datetime/DateTimePickerScreen.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/db/DBStorage.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/db/RWLock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/db/RhoDB.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/db/SqliteDBResult.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/geolocation/GeoLocation.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/geolocation/GeoLocationImpl.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpHeader.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpInputStream$CharBuffer.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpInputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpListener.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpOutputStream$SwitchOutputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpOutputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpRequest.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpResponse.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/HttpServer.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/IHttpHandler.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/InetAddrPort.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/ThreadedServer.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/util/URI.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/http/util/UrlEncoded.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/nativebar/NativeBar$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/nativebar/NativeBar.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/Contact.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/ContactList.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook$PBRecord.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/phonebook/RhoPhonebook.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/ui/AboutDialog.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/ui/LogOptionsDialog.class rhodes/rhodes-build/res/prebuilt/android/classes/com/rhomobile/rhodes/ui/LogViewDialog.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/ObjectSpace_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/ObjectSpace_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$26.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$27.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$28.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$29.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$30.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$31.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$32.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$33.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$34.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$35.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$36.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$37.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$38.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$39.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$40.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$41.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$42.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$43.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$44.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$45.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$46.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$47.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$48.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$49.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$50.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$51.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$52.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$53.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$54.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyArray_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyBignum_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyDir_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyENV_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyENV_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyENV_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyExceptionValue_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyExceptionValue_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyExceptionValue_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyExceptionValue_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyExceptionValue_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFileTestModule_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFileTestModule_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFile_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFixnum_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyFloat_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyGC_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyGC_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyHash_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyIO_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyInteger_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyInteger_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyInteger_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMatchData_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMatchData_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMatchData_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyMethodValue_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyNumeric_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyNumeric_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyNumeric_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyNumeric_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyNumeric_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyObject_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyProc_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyProc_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyProc_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyProc_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRandom_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRange_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyRegexp_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStringIO_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStringIO_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStringIO_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStringIO_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStringIO_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$26.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$27.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$28.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$29.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$30.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$31.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$32.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$33.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$34.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$35.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$36.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$37.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$38.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$39.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$40.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$41.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$42.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$43.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$44.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$45.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$46.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$47.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$48.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$49.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$50.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$51.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$52.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$53.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$54.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$55.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$56.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$57.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$58.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$59.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$60.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyString_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStruct_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyStruct_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubySymbol_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThreadGroup_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyThread_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$26.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$27.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTime_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTopSelf_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/GeneratedMethods/RubyTopSelf_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/ArrayPacker.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/AttrReader.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/AttrWriter.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/ErrnoModuleBuilder.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/IErrno.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/InputStreamExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/ObjectFactory$FixnumCache.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/ObjectFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/OutputStreamExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyArray$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyArray$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyArray.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyBignum.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyData.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyDir.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyENV.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyFile.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyFileTestModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyFixnum.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyFloat.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyGC.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyHash.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyIO.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyIOExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyIOFileExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyIOPipeSinkExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyIOPipeSourceExecutor.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyInteger.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMatchData.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMethodValue.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyMutex.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyNumeric.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyProc$Invoke.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyProc.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyRandom.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyRange.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyRegexp$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyRegexp.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyString.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyStruct$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyStruct$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyStruct$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyStruct$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyStruct.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyThread$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyThread$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyThread.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyThreadGroup.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyTime.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyTopSelf.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/builtin/RubyTypesUtil.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/AtExitBlocks.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/BlockCallStatus.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/ClassFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/DefaultGlobalVariable.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/GlobalVariable.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/GlobalVariables$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/GlobalVariables$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/GlobalVariables$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/GlobalVariables.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MarshalDumper.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MarshalLoader.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MethodBlockBase.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MethodCache$CacheEntry.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MethodCache.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/MultipleMap.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/ObjectSpace.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RhoSupport.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyAPI.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyBasic.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyBinding.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyBlock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyClass_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyConstant$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyConstant$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyConstant$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyConstant.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyException.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyExceptionValue.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyExceptionValueForThrow.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyID.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyIncludeClass.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$26.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$27.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$28.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$29.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$30.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$31.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$32.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$33.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$34.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$35.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$36.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$37.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$38.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$39.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$40.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$41.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$42.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$43.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$44.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$45.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$46.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$47.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$48.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$49.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$50.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$51.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$52.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$53.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$54.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$55.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyKernelModule_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMarshalModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMarshalModule_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMarshalModule_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMarshalModule_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMarshalModule_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMathModule_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMethod$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule$RubyVarArgMethodImpl.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$1.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$10.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$11.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$12.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$13.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$14.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$15.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$16.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$17.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$18.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$19.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$2.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$20.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$21.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$22.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$23.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$24.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$25.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$26.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$27.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$28.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$29.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$3.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$30.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$31.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$32.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$33.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$34.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$35.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$4.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$5.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$6.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$7.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$8.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods$9.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyModule_Methods.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyNoArgBlock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyNoArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyNoOrOneArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyObject.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyOneArgBlock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyOneArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyOneOrTwoArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyProgram.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyRuntime.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubySingletonClass.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubySpecialValue.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubySymbol.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyTwoArgBlock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyTwoArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyValue.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyVarArgBlock.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/RubyVarArgMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/UndefMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/DummyMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyAllocMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyLevelClass.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyLevelConstant.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyLevelMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyLevelModule.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/RubyLevelObject.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/annotation/UndefMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/util/DummyMethod.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/util/RubyClassBuilder.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/util/RubyModuleBuilder.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/lang/util/RubyObjectBuilder.class rhodes/rhodes-build/res/prebuilt/android/classes/com/xruby/runtime/stdlib/RubyStringIO.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/CharConversionException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/Closeable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/DataInput.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/DataOutput.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/File.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/FileFilter.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/FileInputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/FileNotFoundException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/FileOutputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/FilenameFilter.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/Flushable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/InvalidClassException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/InvalidObjectException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/NotActiveException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/NotSerializableException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectInput.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectInputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectInputValidation.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectOutput.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectOutputStream.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/ObjectStreamException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/OptionalDataException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/RandomAccessFile.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/Serializable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/StreamCorruptedException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/SyncFailedException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/io/WriteAbortedException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/ArrayMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/AssertMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CalendarMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CharSequence.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CharacterDataLatin1$Character.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CharacterDataLatin1.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CharacterMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/CloneNotSupportedException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/Cloneable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/Comparable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/EnumConstantNotPresentException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/IllegalStateException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/Iterable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/MathEx.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/NoSuchFieldException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/NoSuchMethodException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/Number.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/PrintStreamMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/Readable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/SecurityException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/StringBufferMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/StringMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/SystemMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/ThreadLocal.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/TimeZoneMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/TypeNotPresentException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/lang/UnsupportedOperationException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/math/HugeDigit.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/math/HugeInt.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/math/HugeIntHelper.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/Buffer.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/BufferUnderflowException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/ByteBuffer.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/ByteOrder.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/CharBuffer.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/InvalidMarkException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/channels/FileChannel.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/channels/Pipe$SinkChannel.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/channels/Pipe$SourceChannel.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/nio/channels/Pipe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/text/ParsePosition.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/ArrayList.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Collection.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Collections.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Comparator.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/ConcurrentModificationException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/DuplicateFormatFlagsException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/EventListener.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/FormatFlagsConversionMismatchException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Formattable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Formatter.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/FormatterClosedException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/HashMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/HashSet.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatCodePointException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatConversionException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatFlagsException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatPrecisionException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/IllegalFormatWidthException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/InputMismatchException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/InvalidPropertiesFormatException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Iterator.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/LinkedHashMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/LinkedHashSet.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/LinkedList.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/List.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/ListIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Locale.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Map$Entry.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Map.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/MissingFormatArgumentException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/MissingFormatWidthException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/MissingResourceException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/NavigableMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/NavigableSet.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/NoSuchElementException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Observable.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Observer.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Queue.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/RandomAccess.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/RandomMe.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/Set.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/SortedMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/SortedSet.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/StringParser.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/TooManyListenersException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/UnknownFormatConversionException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/UnknownFormatFlagsException.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/WeakHashMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/concurrent/ConcurrentHashMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/concurrent/ConcurrentMap.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/concurrent/atomic/AtomicLong.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/concurrent/locks/ReentrantLock.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/logging/Level.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/logging/LogRecord.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/logging/Logger.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/zip/ZipEntry.class rhodes/rhodes-build/res/prebuilt/android/classes/j2me/util/zip/ZipFile.class rhodes/rhodes-build/res/prebuilt/android/classes/j2mex/realtime/MemoryArea.class rhodes/rhodes-build/res/prebuilt/android/classes/j2mex/realtime/NoHeapRealtimeThread.class rhodes/rhodes-build/res/prebuilt/android/classes/j2mex/realtime/RealtimeThread.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/Javolution.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/JavolutionError.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/Allocator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/AllocatorContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/AllocatorContext$Reference$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/AllocatorContext$Reference.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/AllocatorContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$10.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$11.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$12.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$13.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$14.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$15.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$16.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$17.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$18.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$19.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$20.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$21.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$22.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$5.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$6.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$7.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$8.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory$9.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ArrayFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentContext$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentContext$Default$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentContext$Default.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentException.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ConcurrentThread.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/Context$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/Context$Root.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/Context.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/HeapContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/HeapContext$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/HeapContext$HeapAllocator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/HeapContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$ImmortalAllocator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$ImmortalAllocator$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext$ImmortalAllocator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ImmortalContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LocalContext$Reference.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LocalContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$ConsoleLog.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$NullLog.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext$SystemOut.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/LogContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ObjectFactory$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ObjectFactory$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ObjectFactory$Generic.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/ObjectFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/PersistentContext$Reference.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/PersistentContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/SecurityContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/SecurityContext$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/SecurityContext$Default.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/SecurityContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext$Default$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext$Default$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext$Default.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext$StackAllocator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/context/StackContext.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/AppendableWriter$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/AppendableWriter.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/CharSequenceReader.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/UTF8ByteBufferReader.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/UTF8ByteBufferWriter.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/UTF8StreamReader.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/io/UTF8StreamWriter.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/ClassInitializer.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Configurable$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Configurable$Logic.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Configurable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Enum$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Enum.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Immutable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/MathLib.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Realtime.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reference.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$Constructor.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$DefaultConstructor.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection$Method.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reflection.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/Reusable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/lang/ValueType.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Appendable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/CharArray.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/CharSet.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Text$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Text$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Text$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Text$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/Text.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextBuilder$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextBuilder$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextBuilder.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$5.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$6.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$7.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$Cursor$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat$Cursor.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TextFormat.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/text/TypeFormat.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastCollection$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastCollection$Record.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastCollection$Unmodifiable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastCollection.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$Default.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$Direct.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$Identity.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$Lexical.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$Rehash.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator$StringComparator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastComparator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$FastListIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$FastListIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$Node.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$SubList$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList$SubList.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastList.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$5.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$6.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$7.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$8.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$9.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$Entry.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$EntryIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$EntryIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$EntrySet$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$EntrySet.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$KeyIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$KeyIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$KeySet.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$Unmodifiable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$ValueIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$ValueIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap$Values.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastMap.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastSet$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastSet.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$FastTableIterator$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$FastTableIterator.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$SubTable$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable$SubTable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/FastTable.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/Index$1.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/Index$2.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/Index$3.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/Index$4.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/Index.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/LocalMap.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/ReentrantLock.class rhodes/rhodes-build/res/prebuilt/android/classes/javolution/util/StandardLog.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/io/GlobFilenameFilter.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/io/RegexFilenameFilter.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/GenericPatternCache.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/GlobCompiler.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/MalformedCachePatternException.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/PatternCache.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/PatternCacheLRU.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/PatternMatchingEngineFactory.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/perl/MalformedPerl5PatternException.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/perl/ParsedSubstitutionEntry.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/perl/Perl5Util$1.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/perl/Perl5Util$ThreadState.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/perl/Perl5Util.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/CharStringPointer.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/MalformedPatternException.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/MatchResult.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/OpCode.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Pattern.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/PatternCompiler.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/PatternCompilerOptions.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/PatternMatcher.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/PatternMatcherInput.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/PatternMatchingEngine.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5Compiler.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5MatchResult.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5Matcher.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5Pattern.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5Repetition.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Perl5Substitution.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/StringSubstitution.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Substitution.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/text/regex/Util.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/util/Cache.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/util/CacheLRU.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/util/GenericCache.class rhodes/rhodes-build/res/prebuilt/android/classes/org/apache/oro/util/GenericCacheEntry.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Convert.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Sprintf$Args.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Sprintf$Buffer.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Sprintf$ID.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Sprintf$Ruby.class rhodes/rhodes-build/res/prebuilt/android/classes/org/jruby/util/Sprintf.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONArray.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONException.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONObject$1.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONObject$Null.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONObject.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONString.class rhodes/rhodes-build/res/prebuilt/android/classes/org/json/me/JSONTokener.class rhodes/rhodes-build/res/prebuilt/android/loading.html rhodes/rhodes-build/res/prebuilt/android/res/drawable/back.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/exit.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/home.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/icon.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/info.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/next.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/options.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/refresh.png rhodes/rhodes-build/res/prebuilt/android/res/drawable/sync.png rhodes/rhodes-build/res/prebuilt/android/res/layout/camera.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/datetime.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/dialog_activity.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/directory_list.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/file_row.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/logoptions.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/logview.xml rhodes/rhodes-build/res/prebuilt/android/res/layout/main.xml rhodes/rhodes-build/res/prebuilt/android/res/menu/options.xml rhodes/rhodes-build/res/prebuilt/android/res/values/strings.xml rhodes/rhodes-build/res/prebuilt/android/src/com/rhomobile/rhodes/AndroidR.java rhodes/rhodes-build/res/prebuilt/bb/MANIFEST.MF rhodes/rhodes-build/res/prebuilt/bb/RubyVM.jar rhodes/rhodes-build/res/prebuilt/bb/rhodes.jar rhodes/rhodes-build/res/prebuilt/bb/rhodesApp.alx rhodes/rhodes-build/res/prebuilt/common/db/syncdb.schema rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/Entitlements.plist rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/Info.plist rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/MainWindow.nib rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/PkgInfo rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/Settings.bundle/Root.plist rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/Settings.bundle/en.lproj/Root.strings rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/back_btn.png rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/db/syncdb.schema rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/forward_btn.png rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/gears.png rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/home_btn.png rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/icon.png rhodes/rhodes-build/res/prebuilt/iphone/sim/rhorunner.app/rhorunner rhodes/rhodes-build/res/prebuilt/wm/wm6.7z rhodes/rhodes-build/res/rhodes_pid.key rhodes/rhodes-build/res/xruby-0.3.3.jar rhodes/rhodes-build/spec/spec.opts rhodes/rhodes-framework/.gitignore rhodes/rhodes-framework/History.txt rhodes/rhodes-framework/Manifest.txt rhodes/rhodes-framework/README.txt rhodes/rhodes-framework/Rakefile rhodes/rhodes-framework/lib/ServeME.rb rhodes/rhodes-framework/lib/bsearch.rb rhodes/rhodes-framework/lib/builtinME.rb rhodes/rhodes-framework/lib/date.rb rhodes/rhodes-framework/lib/date/format.rb rhodes/rhodes-framework/lib/dateME.rb rhodes/rhodes-framework/lib/erb.rb rhodes/rhodes-framework/lib/find.rb rhodes/rhodes-framework/lib/rational.rb rhodes/rhodes-framework/lib/rationalME.rb rhodes/rhodes-framework/lib/rho.rb rhodes/rhodes-framework/lib/rho/render.rb rhodes/rhodes-framework/lib/rho/rho.rb rhodes/rhodes-framework/lib/rho/rhoapplication.rb rhodes/rhodes-framework/lib/rho/rhocontact.rb rhodes/rhodes-framework/lib/rho/rhocontroller.rb rhodes/rhodes-framework/lib/rho/rhoerror.rb rhodes/rhodes-framework/lib/rho/rhofsconnector.rb rhodes/rhodes-framework/lib/rho/rhosupport.rb rhodes/rhodes-framework/lib/rho/rhoutils.rb rhodes/rhodes-framework/lib/rho/rhoviewhelpers.rb rhodes/rhodes-framework/lib/rhodes-framework.rb rhodes/rhodes-framework/lib/rhodes.rb rhodes/rhodes-framework/lib/rhoframework.rb rhodes/rhodes-framework/lib/rhofsconnector.rb rhodes/rhodes-framework/lib/rhom.rb rhodes/rhodes-framework/lib/rhom/rhom.rb rhodes/rhodes-framework/lib/rhom/rhom_db_adapter.rb rhodes/rhodes-framework/lib/rhom/rhom_object.rb rhodes/rhodes-framework/lib/rhom/rhom_object_factory.rb rhodes/rhodes-framework/lib/rhom/rhom_source.rb rhodes/rhodes-framework/lib/singleton.rb rhodes/rhodes-framework/lib/time.rb rhodes/rhodes-framework/lib/version.rb rhodes/rhodes-framework/spec/README rhodes/rhodes-framework/spec/Rakefile rhodes/rhodes-framework/spec/app/Account/config.rb rhodes/rhodes-framework/spec/app/Case/config.rb rhodes/rhodes-framework/spec/app/Question/config.rb rhodes/rhodes-framework/spec/app/Settings/controller.rb rhodes/rhodes-framework/spec/app/Settings/index.erb rhodes/rhodes-framework/spec/app/SpecRunner/controller.rb rhodes/rhodes-framework/spec/app/SpecRunner/index.erb rhodes/rhodes-framework/spec/app/application.rb rhodes/rhodes-framework/spec/app/index.erb rhodes/rhodes-framework/spec/app/layout.erb rhodes/rhodes-framework/spec/app/loading.html rhodes/rhodes-framework/spec/app/mspec.rb rhodes/rhodes-framework/spec/app/mspec/expectations.rb rhodes/rhodes-framework/spec/app/mspec/expectations/expectations.rb rhodes/rhodes-framework/spec/app/mspec/expectations/should.rb rhodes/rhodes-framework/spec/app/mspec/fileutils.rb rhodes/rhodes-framework/spec/app/mspec/guards.rb rhodes/rhodes-framework/spec/app/mspec/guards/background.rb rhodes/rhodes-framework/spec/app/mspec/guards/bug.rb rhodes/rhodes-framework/spec/app/mspec/guards/compliance.rb rhodes/rhodes-framework/spec/app/mspec/guards/conflict.rb rhodes/rhodes-framework/spec/app/mspec/guards/endian.rb rhodes/rhodes-framework/spec/app/mspec/guards/extensions.rb rhodes/rhodes-framework/spec/app/mspec/guards/guard.rb rhodes/rhodes-framework/spec/app/mspec/guards/noncompliance.rb rhodes/rhodes-framework/spec/app/mspec/guards/platform.rb rhodes/rhodes-framework/spec/app/mspec/guards/quarantine.rb rhodes/rhodes-framework/spec/app/mspec/guards/runner.rb rhodes/rhodes-framework/spec/app/mspec/guards/superuser.rb rhodes/rhodes-framework/spec/app/mspec/guards/support.rb rhodes/rhodes-framework/spec/app/mspec/guards/tty.rb rhodes/rhodes-framework/spec/app/mspec/guards/version.rb rhodes/rhodes-framework/spec/app/mspec/helpers.rb rhodes/rhodes-framework/spec/app/mspec/helpers/argv.rb rhodes/rhodes-framework/spec/app/mspec/helpers/bignum.rb rhodes/rhodes-framework/spec/app/mspec/helpers/const_lookup.rb rhodes/rhodes-framework/spec/app/mspec/helpers/environment.rb rhodes/rhodes-framework/spec/app/mspec/helpers/fixture.rb rhodes/rhodes-framework/spec/app/mspec/helpers/flunk.rb rhodes/rhodes-framework/spec/app/mspec/helpers/io.rb rhodes/rhodes-framework/spec/app/mspec/helpers/language_version.rb rhodes/rhodes-framework/spec/app/mspec/helpers/ruby_exe.rb rhodes/rhodes-framework/spec/app/mspec/helpers/scratch.rb rhodes/rhodes-framework/spec/app/mspec/helpers/tmp.rb rhodes/rhodes-framework/spec/app/mspec/matchers.rb rhodes/rhodes-framework/spec/app/mspec/matchers/base.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_an_instance_of.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_ancestor_of.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_close.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_empty.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_false.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_kind_of.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_nil.rb rhodes/rhodes-framework/spec/app/mspec/matchers/be_true.rb rhodes/rhodes-framework/spec/app/mspec/matchers/complain.rb rhodes/rhodes-framework/spec/app/mspec/matchers/eql.rb rhodes/rhodes-framework/spec/app/mspec/matchers/equal.rb rhodes/rhodes-framework/spec/app/mspec/matchers/equal_element.rb rhodes/rhodes-framework/spec/app/mspec/matchers/equal_utf16.rb rhodes/rhodes-framework/spec/app/mspec/matchers/have_constant.rb rhodes/rhodes-framework/spec/app/mspec/matchers/have_instance_method.rb rhodes/rhodes-framework/spec/app/mspec/matchers/have_method.rb rhodes/rhodes-framework/spec/app/mspec/matchers/have_private_instance_method.rb rhodes/rhodes-framework/spec/app/mspec/matchers/include.rb rhodes/rhodes-framework/spec/app/mspec/matchers/match_yaml.rb rhodes/rhodes-framework/spec/app/mspec/matchers/method.rb rhodes/rhodes-framework/spec/app/mspec/matchers/output.rb rhodes/rhodes-framework/spec/app/mspec/matchers/output_to_fd.rb rhodes/rhodes-framework/spec/app/mspec/matchers/raise_error.rb rhodes/rhodes-framework/spec/app/mspec/matchers/respond_to.rb rhodes/rhodes-framework/spec/app/mspec/matchers/stringsymboladapter.rb rhodes/rhodes-framework/spec/app/mspec/mocks.rb rhodes/rhodes-framework/spec/app/mspec/mocks/mock.rb rhodes/rhodes-framework/spec/app/mspec/mocks/object.rb rhodes/rhodes-framework/spec/app/mspec/mocks/proxy.rb rhodes/rhodes-framework/spec/app/mspec/pp.rb rhodes/rhodes-framework/spec/app/mspec/runner.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/debug.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/filter.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/gdb.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/tag.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/taglist.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/tagpurge.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/tally.rb rhodes/rhodes-framework/spec/app/mspec/runner/actions/timer.rb rhodes/rhodes-framework/spec/app/mspec/runner/context.rb rhodes/rhodes-framework/spec/app/mspec/runner/example.rb rhodes/rhodes-framework/spec/app/mspec/runner/exception.rb rhodes/rhodes-framework/spec/app/mspec/runner/filters.rb rhodes/rhodes-framework/spec/app/mspec/runner/filters/match.rb rhodes/rhodes-framework/spec/app/mspec/runner/filters/profile.rb rhodes/rhodes-framework/spec/app/mspec/runner/filters/regexp.rb rhodes/rhodes-framework/spec/app/mspec/runner/filters/tag.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/describe.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/dotted.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/file.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/html.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/method.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/specdoc.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/spinner.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/summary.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/unit.rb rhodes/rhodes-framework/spec/app/mspec/runner/formatters/yaml.rb rhodes/rhodes-framework/spec/app/mspec/runner/mspec.rb rhodes/rhodes-framework/spec/app/mspec/runner/object.rb rhodes/rhodes-framework/spec/app/mspec/runner/shared.rb rhodes/rhodes-framework/spec/app/mspec/runner/tag.rb rhodes/rhodes-framework/spec/app/mspec/utils/name_map.rb rhodes/rhodes-framework/spec/app/mspec/utils/options.rb rhodes/rhodes-framework/spec/app/mspec/utils/ruby_name.rb rhodes/rhodes-framework/spec/app/mspec/utils/script.rb rhodes/rhodes-framework/spec/app/mspec/utils/version.rb rhodes/rhodes-framework/spec/app/mspec/version.rb rhodes/rhodes-framework/spec/app/spec/fixtures/client_info.txt rhodes/rhodes-framework/spec/app/spec/fixtures/object_values.txt rhodes/rhodes-framework/spec/app/spec/pagination/fixtures/object_values.txt rhodes/rhodes-framework/spec/app/spec/rho_controller_spec.rb rhodes/rhodes-framework/spec/app/spec/rho_spec.rb rhodes/rhodes-framework/spec/app/spec/rhom_db_adapter_spec.rb rhodes/rhodes-framework/spec/app/spec/rhom_object_spec.rb rhodes/rhodes-framework/spec/app/spec/rhom_spec.rb rhodes/rhodes-framework/spec/app/spec/rhoruby_spec.rb rhodes/rhodes-framework/spec/app/spec/spec_helper.rb rhodes/rhodes-framework/spec/app/spec/syncengine_spec.rb rhodes/rhodes-framework/spec/app/spec/webview_spec.rb rhodes/rhodes-framework/spec/app/spec_runner.rb rhodes/rhodes-framework/spec/build.yml rhodes/rhodes-framework/spec/public/css/base.css rhodes/rhodes-framework/spec/public/css/blackberry.css rhodes/rhodes-framework/spec/public/css/iphone.css rhodes/rhodes-framework/spec/public/css/rho.css rhodes/rhodes-framework/spec/public/css/xhtml.css rhodes/rhodes-framework/spec/public/images/IUI_LICENSE.txt rhodes/rhodes-framework/spec/public/images/backButton.png rhodes/rhodes-framework/spec/public/images/blueButton.png rhodes/rhodes-framework/spec/public/images/cancel.png rhodes/rhodes-framework/spec/public/images/grayButton.png rhodes/rhodes-framework/spec/public/images/iui-logo-touch-icon.png rhodes/rhodes-framework/spec/public/images/listArrow.png rhodes/rhodes-framework/spec/public/images/listArrowSel.png rhodes/rhodes-framework/spec/public/images/listGroup.png rhodes/rhodes-framework/spec/public/images/loading.gif rhodes/rhodes-framework/spec/public/images/pinstripes.png rhodes/rhodes-framework/spec/public/images/right_button.png rhodes/rhodes-framework/spec/public/images/selection.png rhodes/rhodes-framework/spec/public/images/thumb.png rhodes/rhodes-framework/spec/public/images/toggle.png rhodes/rhodes-framework/spec/public/images/toggleOn.png rhodes/rhodes-framework/spec/public/images/toolButton.png rhodes/rhodes-framework/spec/public/images/toolButton_new.png rhodes/rhodes-framework/spec/public/images/toolbar.png rhodes/rhodes-framework/spec/public/images/whiteButton.png rhodes/rhodes-framework/spec/public/js/application.js rhodes/rhodes-framework/spec/public/js/jquery-1.2.6.min.js rhodes/rhodes-framework/spec/public/js/rho.js rhodes/rhodes-framework/spec/public/js/rhogeolocation-wm.js rhodes/rhodes-framework/spec/public/js/rhogeolocation.js rhodes/rhodes-framework/spec/rhoconfig.txt rhodes/rhodes-generator/History.txt rhodes/rhodes-generator/Manifest.txt rhodes/rhodes-generator/README.txt rhodes/rhodes-generator/Rakefile rhodes/rhodes-generator/bin/rhogen rhodes/rhodes-generator/generators/rhogen.rb rhodes/rhodes-generator/generators/templates/application/Rakefile rhodes/rhodes-generator/generators/templates/application/app/Settings/controller.rb rhodes/rhodes-generator/generators/templates/application/app/Settings/index.erb rhodes/rhodes-generator/generators/templates/application/app/Settings/login.erb rhodes/rhodes-generator/generators/templates/application/app/Settings/reset.erb rhodes/rhodes-generator/generators/templates/application/app/Settings/wait.erb rhodes/rhodes-generator/generators/templates/application/app/application.rb rhodes/rhodes-generator/generators/templates/application/app/helpers/application_helper.rb rhodes/rhodes-generator/generators/templates/application/app/index.erb rhodes/rhodes-generator/generators/templates/application/app/layout.erb rhodes/rhodes-generator/generators/templates/application/app/loading.html rhodes/rhodes-generator/generators/templates/application/build.yml rhodes/rhodes-generator/generators/templates/application/icon/icon.ico rhodes/rhodes-generator/generators/templates/application/icon/icon.png rhodes/rhodes-generator/generators/templates/application/public/css/base.css rhodes/rhodes-generator/generators/templates/application/public/css/blackberry.css rhodes/rhodes-generator/generators/templates/application/public/css/iphone.css rhodes/rhodes-generator/generators/templates/application/public/css/rho.css rhodes/rhodes-generator/generators/templates/application/public/css/xhtml.css rhodes/rhodes-generator/generators/templates/application/public/images/IUI_LICENSE.txt rhodes/rhodes-generator/generators/templates/application/public/images/backButton.png rhodes/rhodes-generator/generators/templates/application/public/images/blueButton.png rhodes/rhodes-generator/generators/templates/application/public/images/cancel.png rhodes/rhodes-generator/generators/templates/application/public/images/grayButton.png rhodes/rhodes-generator/generators/templates/application/public/images/iui-logo-touch-icon.png rhodes/rhodes-generator/generators/templates/application/public/images/listArrow.png rhodes/rhodes-generator/generators/templates/application/public/images/listArrowSel.png rhodes/rhodes-generator/generators/templates/application/public/images/listGroup.png rhodes/rhodes-generator/generators/templates/application/public/images/loading.gif rhodes/rhodes-generator/generators/templates/application/public/images/pinstripes.png rhodes/rhodes-generator/generators/templates/application/public/images/right_button.png rhodes/rhodes-generator/generators/templates/application/public/images/selection.png rhodes/rhodes-generator/generators/templates/application/public/images/thumb.png rhodes/rhodes-generator/generators/templates/application/public/images/toggle.png rhodes/rhodes-generator/generators/templates/application/public/images/toggleOn.png rhodes/rhodes-generator/generators/templates/application/public/images/toolButton.png rhodes/rhodes-generator/generators/templates/application/public/images/toolButton_new.png rhodes/rhodes-generator/generators/templates/application/public/images/toolbar.png rhodes/rhodes-generator/generators/templates/application/public/images/whiteButton.png rhodes/rhodes-generator/generators/templates/application/public/js/application.js rhodes/rhodes-generator/generators/templates/application/public/js/jquery-1.2.6.min.js rhodes/rhodes-generator/generators/templates/application/public/js/rho.js rhodes/rhodes-generator/generators/templates/application/public/js/rhogeolocation-wm.js rhodes/rhodes-generator/generators/templates/application/public/js/rhogeolocation.js rhodes/rhodes-generator/generators/templates/application/rhoconfig.txt rhodes/rhodes-generator/generators/templates/bundle/db/syncdb.sqlite rhodes/rhodes-generator/generators/templates/model/config.rb rhodes/rhodes-generator/generators/templates/model/controller.rb rhodes/rhodes-generator/generators/templates/model/edit.erb rhodes/rhodes-generator/generators/templates/model/index.erb rhodes/rhodes-generator/generators/templates/model/new.erb rhodes/rhodes-generator/generators/templates/model/show.erb rhodes/rhodes-generator/generators/templates/source/source_adapter.rb rhodes/rhodes-generator/lib/rhodes-generator.rb rhodes/rhodes-generator/lib/version.rb rhodes/rhodes-generator/spec/app_generator_spec.rb rhodes/rhodes-generator/spec/generator_spec_helper.rb rhodes/rhodes-generator/spec/model_generator_spec.rb rhodes/rhodes-generator/spec/source_generator_spec.rb rhodes/rhodes-generator/spec/spec.opts rhodes/rhodes-generator/spec/spec_helper.rb rhodes/rhodes/.gitignore rhodes/rhodes/History.txt rhodes/rhodes/Manifest.txt rhodes/rhodes/README.txt rhodes/rhodes/Rakefile rhodes/rhodes/lib/rhodes.rb rhodes/rhodes/spec/spec.opts 979c38671b48679e47e1f03817066dee478b022c e4b744b004ffcc0f79d5bf7d4de0ecf417bec87e lars larsburgess@gmail.com http://github.com/rhomobile/rhodes/commit/9580e07570fd68f05015d9ea8b2e9af5ce995279 9580e07570fd68f05015d9ea8b2e9af5ce995279 2009-10-30T13:48:53-07:00 2009-10-30T13:48:53-07:00 Merge branch '1-2-stable' of github.com:rhomobile/rhodes into 1-2-stable Conflicts: platform/linux/tasks/linux.rake 1f48fd3da918d009c82b65798df341cb797f7ba2 lars larsburgess@gmail.com