rhodes 2.1.0 → 2.2.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +7 -0
- data/README.textile +4 -5
- data/Rakefile +8 -1
- data/lib/build/jake.rb +22 -16
- data/lib/extensions/rhoxml/rexml/cdata.rb +67 -0
- data/lib/extensions/rhoxml/rexml/document.rb +2 -116
- data/lib/extensions/rhoxml/rexml/element.rb +1 -1
- data/lib/extensions/rhoxml/rexml/text.rb +117 -0
- data/lib/framework/rho/render.rb +19 -11
- data/lib/framework/rho/rho.rb +17 -10
- data/lib/framework/rho/rhobluetooth.rb +103 -0
- data/lib/framework/rho/rhocontroller.rb +2 -0
- data/lib/framework/rho/rhoevent.rb +43 -0
- data/lib/framework/rho/rhoevent_bb.rb +80 -0
- data/lib/framework/rho/rhoevent_c.rb +47 -0
- data/lib/framework/rhodes.rb +2 -2
- data/lib/framework/rhom/rhom_db_adapter.rb +2 -1
- data/lib/framework/rhom/rhom_model.rb +9 -3
- data/lib/framework/rhom/rhom_object_factory.rb +46 -22
- data/lib/framework/rhom/rhom_source.rb +12 -10
- data/lib/framework/version.rb +2 -2
- data/lib/rhodes.rb +2 -2
- data/platform/android/Rhodes/AndroidManifest.xml +23 -2
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +54 -38
- data/platform/android/Rhodes/jni/include/rhodes.h +3 -0
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +2 -2
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +4 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +16 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_bluetooth_RhoBluetoothManager.h +21 -0
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +169 -0
- data/platform/android/Rhodes/jni/src/callbacks.cpp +10 -0
- data/platform/android/Rhodes/jni/src/event.cpp +429 -0
- data/platform/android/Rhodes/jni/src/fileapi.cpp +51 -1
- data/platform/android/Rhodes/jni/src/rhodes.cpp +16 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +3 -0
- data/platform/android/Rhodes/res/layout/bt_device_list.xml +42 -0
- data/platform/android/Rhodes/res/layout/bt_device_name.xml +7 -0
- data/platform/android/Rhodes/res/values/strings.xml +8 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +14 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +2 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Push.java +7 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +53 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +8 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +144 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +66 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java +201 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +139 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +401 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +136 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +457 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java +71 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +12 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java +19 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +261 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +10 -2
- data/platform/android/build/RhodesSRC_build.files +33 -22
- data/platform/android/build/android.rake +198 -27
- data/platform/android/build/librhodes_build.files +3 -1
- data/platform/android/build/libruby_build.files +4 -1
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +2 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +7 -4
- data/platform/bb/Hsqldb/src/org/hsqldb/Like.java +3 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/Table.java +3 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java +1 -1
- data/platform/bb/RubyVM/RubyVM.jdp +1 -0
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +108 -1
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +7 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +7 -4
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +7 -1
- data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +21 -23
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +19 -10
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +8 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +3 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +14 -17
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFile.java +7 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +2 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyRuntime.java +10 -1
- data/platform/bb/RubyVM/src/j2me/io/File.java +7 -6
- data/platform/bb/build/RubyVM_build.files +412 -412
- data/platform/bb/build/bb.rake +42 -18
- data/platform/bb/build/hsqldb_build.files +151 -151
- data/platform/bb/build/rhodes_build.files +44 -40
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +2 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +237 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java +14 -0
- data/platform/bb/rhodes/rhodes.jdp +6 -1
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +7 -1
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +14 -0
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +62 -76
- data/platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java +660 -0
- data/platform/bb/rhodes/src/{rhomobile → com/rho/rubyext}/RhoPhonebook.java +95 -38
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +22 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +26 -6
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +21 -7
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothManager.java +528 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java +281 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java +119 -0
- data/platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java +2 -2
- data/platform/iphone/Classes/AppManager/AppManager.m +70 -7
- data/platform/iphone/Classes/Bluetooth/Bluetooth.h +72 -0
- data/platform/iphone/Classes/Bluetooth/Bluetooth.m +414 -0
- data/platform/iphone/Classes/Event/Event.h +12 -0
- data/platform/iphone/Classes/Event/Event.m +300 -0
- data/platform/iphone/Classes/LogOptionsController.h +2 -1
- data/platform/iphone/Classes/LogOptionsController.m +1 -1
- data/platform/iphone/Classes/LogViewController.h +2 -1
- data/platform/iphone/Classes/MapView/MapViewController.h +2 -1
- data/platform/iphone/Classes/RhoViewController.h +16 -0
- data/platform/iphone/Classes/RhoViewController.m +20 -0
- data/platform/iphone/Classes/Rhodes.h +12 -0
- data/platform/iphone/Classes/Rhodes.m +34 -6
- data/platform/iphone/Classes/Signature/SignatureViewController.h +2 -2
- data/platform/iphone/Classes/Signature/SignatureViewController.m +0 -10
- data/platform/iphone/Classes/SimpleMainView.h +2 -2
- data/platform/iphone/Classes/SimpleMainView.m +5 -14
- data/platform/iphone/Classes/SplashViewController.h +2 -2
- data/platform/iphone/Classes/TabbedMainView.h +2 -2
- data/platform/iphone/Classes/TabbedMainView.m +5 -10
- data/platform/iphone/Info.plist +5 -5
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +39 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +47 -4
- data/platform/osx/Rhodes Debugger/NoodleLineNumberView.m +3 -2
- data/platform/shared/common/AutoPointer.h +3 -0
- data/platform/shared/common/RhoConf.cpp +2 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhoTime.h +3 -3
- data/platform/shared/common/RhodesApp.cpp +75 -23
- data/platform/shared/common/RhodesApp.h +4 -0
- data/platform/shared/common/RhodesAppBase.h +2 -0
- data/platform/shared/common/ThreadQueue.cpp +23 -18
- data/platform/shared/common/ThreadQueue.h +2 -0
- data/platform/shared/db/res/db/syncdb.schema +39 -39
- data/platform/shared/logging/RhoLogConf.cpp +58 -3
- data/platform/shared/logging/RhoLogConf.h +3 -1
- data/platform/shared/net/CURLNetRequest.cpp +17 -6
- data/platform/shared/net/HttpServer.cpp +125 -25
- data/platform/shared/net/HttpServer.h +4 -3
- data/platform/shared/ruby/ext/bluetooth/bluetooth.i +56 -0
- data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c +2563 -0
- data/platform/shared/ruby/ext/calendar/calendar.i +28 -0
- data/platform/shared/ruby/ext/calendar/calendar_wrap.c +2251 -0
- data/platform/shared/ruby/ext/calendar/event.h +41 -0
- data/platform/shared/ruby/ext/calendar/event.i +28 -0
- data/platform/shared/ruby/ext/calendar/event_wrap.c +2151 -0
- data/platform/shared/ruby/ext/rho/rhoruby.c +103 -3
- data/platform/shared/ruby/ext/rho/rhoruby.h +16 -2
- data/platform/shared/ruby/ext/rhoconf/rhoconf.i +12 -0
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +101 -0
- data/platform/shared/ruby/ext/system/system.i +14 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +2568 -2208
- data/platform/shared/ruby/main.c +8 -0
- data/platform/shared/rubyext/GeoLocation.cpp +6 -3
- data/platform/shared/rubyext/System.cpp +14 -0
- data/platform/shared/sync/SyncEngine.cpp +9 -1
- data/platform/shared/sync/SyncNotify.cpp +16 -8
- data/platform/shared/sync/SyncNotify.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +7 -12
- data/platform/shared/sync/SyncThread.h +5 -3
- data/platform/wm/build/wm.rake +7 -1
- data/platform/wm/rhodes/Alert.cpp +1 -1
- data/platform/wm/rhodes/MainWindow.cpp +28 -0
- data/platform/wm/rhodes/MainWindow.h +9 -0
- data/platform/wm/rhodes/OutlookApp.cpp +72 -0
- data/platform/wm/rhodes/OutlookApp.h +22 -0
- data/platform/wm/rhodes/Rhodes.cpp +8 -0
- data/platform/wm/rhodes/Rhodes.rc +31 -0
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +1274 -0
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +321 -0
- data/platform/wm/rhodes/phonebook/NativeAddressBook.cpp +37 -70
- data/platform/wm/rhodes/phonebook/NativeAddressBook.h +0 -4
- data/platform/wm/rhodes/resource.h +8 -1
- data/platform/wm/rhodes/rho/net/NetRequest.cpp +4 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +6 -4
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +487 -0
- data/platform/wm/rhodes/rhodes.vcproj +28 -11
- data/platform/wm/rhodes/stdafx.h +1 -0
- data/platform/wm/rubylib/rubylib.vcproj +32 -0
- data/rakefile.rb +8 -1
- data/res/generators/templates/application/Rakefile +1 -1
- data/res/generators/templates/application/app/layout.erb +4 -1
- data/res/generators/templates/application/build.yml +0 -1
- data/res/generators/templates/application/public/css/iphone.css +2 -2
- data/res/generators/templates/application/public/jqtouch/jqtouch-iphone.css +9 -0
- data/res/generators/templates/application/public/jqtouch/jqtouch.css +1 -5
- data/res/generators/templates/application/public/jqtouch/jqtouch.js +3 -2
- data/rhodes.gemspec +1 -1
- data/spec/perfomance_spec/app/Benchmark/benchmark.rb +4 -0
- data/spec/perfomance_spec/app/Benchmark/bulk_results.erb +13 -0
- data/spec/perfomance_spec/app/Benchmark/controller.rb +178 -0
- data/spec/perfomance_spec/app/Benchmark/create_results.erb +13 -0
- data/spec/perfomance_spec/app/Benchmark/customers.erb +35 -0
- data/spec/perfomance_spec/app/Benchmark/index.erb +9 -0
- data/spec/perfomance_spec/app/Benchmark/products.erb +25 -0
- data/spec/perfomance_spec/app/Benchmark/search_results.erb +13 -0
- data/spec/perfomance_spec/app/Customer/customer.rb +6 -0
- data/spec/perfomance_spec/app/Perftest/index.erb +5 -0
- data/spec/perfomance_spec/app/Product/index.erb +25 -0
- data/spec/perfomance_spec/app/Product/product.rb +6 -0
- data/spec/perfomance_spec/app/helpers/application_helper.rb +126 -0
- data/spec/perfomance_spec/app/helpers/browser_helper.rb +18 -0
- data/spec/perfomance_spec/rhoconfig.txt +1 -1
- data/spec/phone_spec/app/Account_s/account_s.rb +5 -2
- data/spec/phone_spec/app/Case/case.rb +1 -0
- data/spec/phone_spec/app/Case_s/case_s.rb +2 -0
- data/spec/phone_spec/app/Data/perftest.json +35 -0
- data/spec/phone_spec/app/Data/testCDATA.xml +11 -0
- data/spec/phone_spec/app/Product/product.rb +1 -1
- data/spec/phone_spec/app/{Spec → spec}/asynchttp_spec.rb +66 -17
- data/spec/phone_spec/app/{Spec → spec}/barcode_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/blobsync_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/bsearch_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/bulksync_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/contacts_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/crypt_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/date_spec.rb +0 -0
- data/spec/phone_spec/app/spec/events_spec.rb +199 -0
- data/spec/phone_spec/app/{Spec → spec}/fixtures/client_info.txt +0 -0
- data/spec/phone_spec/app/{Spec → spec}/fixtures/object_values.txt +0 -0
- data/spec/phone_spec/app/{Spec → spec}/json_spec.rb +11 -2
- data/spec/phone_spec/app/{Spec → spec}/mapview_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/nativebar_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/navbar_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/pagination/fixtures/object_values.txt +0 -0
- data/spec/phone_spec/app/{Spec → spec}/rho_controller_spec.rb +5 -0
- data/spec/phone_spec/app/{Spec → spec}/rho_spec.rb +48 -0
- data/spec/phone_spec/app/{Spec → spec}/rhofile_spec.rb +9 -6
- data/spec/phone_spec/app/{Spec → spec}/rhom_object_spec.rb +188 -9
- data/spec/phone_spec/app/{Spec → spec}/syncengine_spec.rb +0 -0
- data/spec/phone_spec/app/{Spec → spec}/xml_spec.rb +15 -0
- data/spec/phone_spec/app/{Spec → spec}/xruby_spec.rb +0 -0
- data/spec/phone_spec/app/spec_runner.rb +4 -1
- data/spec/phone_spec/build.yml +2 -1
- metadata +95 -31
- data/platform/bb/rhodes/platform/5.0/com/rho/RhoMainScreen.java +0 -36
- data/platform/bb/rhodes/platform/6.0/com/rho/BrowserAdapter5.java +0 -155
- data/platform/bb/rhodes/platform/6.0/com/rho/RhoMainScreen.java +0 -36
data/platform/bb/build/bb.rake
CHANGED
@@ -96,7 +96,8 @@ def stopsim
|
|
96
96
|
end
|
97
97
|
|
98
98
|
def manualsign
|
99
|
-
|
99
|
+
jpath = $config["env"]["paths"]["java"]
|
100
|
+
java = jpath && jpath.length() > 0 ? File.join(jpath, "java" ) : "java"
|
100
101
|
jde = $config["env"]["paths"][$bbver]["jde"]
|
101
102
|
|
102
103
|
args = []
|
@@ -111,7 +112,8 @@ def manualsign
|
|
111
112
|
end
|
112
113
|
|
113
114
|
def autosign
|
114
|
-
|
115
|
+
jpath = $config["env"]["paths"]["java"]
|
116
|
+
java = jpath && jpath.length() > 0 ? File.join(jpath, "java" ) : "java"
|
115
117
|
jde = $config["env"]["paths"][$bbver]["jde"]
|
116
118
|
|
117
119
|
args = []
|
@@ -144,7 +146,7 @@ namespace "config" do
|
|
144
146
|
|
145
147
|
task :bb => [:set_bb_platform, "config:common"] do
|
146
148
|
|
147
|
-
|
149
|
+
#$rubypath = "res/build-tools/RhoRuby.exe" #path to RhoRuby
|
148
150
|
|
149
151
|
$bbver = $app_config["bbver"].to_s
|
150
152
|
$bb6 = true if $bbver == "6.0"
|
@@ -202,7 +204,7 @@ namespace "build" do
|
|
202
204
|
|
203
205
|
startdir = pwd
|
204
206
|
chdir $tmpdir
|
205
|
-
puts Jake.run(jdehome
|
207
|
+
puts Jake.run(File.join(jdehome,"bin/preverify"),args)
|
206
208
|
chdir startdir
|
207
209
|
|
208
210
|
unless $? == 0
|
@@ -216,9 +218,10 @@ namespace "build" do
|
|
216
218
|
# desc "Build rhoBundle"
|
217
219
|
#XXX change to ns build, rhobundle
|
218
220
|
task :rhobundle => :rubyvm do
|
219
|
-
|
221
|
+
jpath = $config["env"]["paths"]["java"]
|
222
|
+
java = jpath && jpath.length()>0 ? File.join( jpath, "java") : "jar"
|
220
223
|
jdehome = $config["env"]["paths"][$bbver]["jde"]
|
221
|
-
jarexe =
|
224
|
+
jarexe = jpath && jpath.length()>0 ? File.join( jpath, "jar" ) : "jar"
|
222
225
|
|
223
226
|
#common bundle task goes here#
|
224
227
|
Rake::Task["build:bundle:xruby"].execute
|
@@ -237,8 +240,8 @@ namespace "build" do
|
|
237
240
|
|
238
241
|
ENV["RHO_ROOT"] = $startdir
|
239
242
|
|
240
|
-
ENV["JAVA_EXE"] =
|
241
|
-
ENV["JAVAC_EXE"] =
|
243
|
+
ENV["JAVA_EXE"] = java
|
244
|
+
ENV["JAVAC_EXE"] = jpath && jpath.length()>0 ? File.join( jpath, "javac") : "javac"
|
242
245
|
ENV["JDE_HOME"] = jdehome
|
243
246
|
ENV["JAR_EXE"] = jarexe
|
244
247
|
|
@@ -444,11 +447,17 @@ namespace "build" do
|
|
444
447
|
|
445
448
|
# desc "Build RubyVM"
|
446
449
|
task :rubyvm => [:gensources, "config:bb"] do
|
447
|
-
|
450
|
+
jpath = $config["env"]["paths"]["java"]
|
451
|
+
javac = jpath && jpath.length() > 0 ? File.join(jpath, "javac" ) : "javac"
|
448
452
|
jdehome = $config["env"]["paths"][$bbver]["jde"]
|
449
453
|
|
450
|
-
|
454
|
+
#java -jar /Users/evgeny/Desktop/BBEclipse/plugins/net.rim.ejde.componentpack6.0.0_6.0.0.29/components/bin/rapc.jar -convertpng -quiet library=deliverables/Standard/6.0.0/RubyVM deliverables/Standard/6.0.0/RubyVM.rapc -exepath=/Users/evgeny/Desktop/BBEclipse/plugins/net.rim.ejde.componentpack6.0.0_6.0.0.29/components/bin/ -sourceroot=/Users/evgeny/Projects/rhodes/platform/bb/RubyVM/src:/Users/evgeny/Projects/rhodes/platform/bb/RubyVM/res -import=/Users/evgeny/Desktop/BBEclipse/plugins/net.rim.ejde.componentpack6.0.0_6.0.0.29/components/lib/net_rim_api.jar /Users/evgeny/Projects/rhodes/platform/bb/RubyVM/bin
|
455
|
+
rubyvmfiles = File.readlines($builddir + '/RubyVM_build.files').map { |l| l.strip! }
|
456
|
+
#f = File.new($builddir + '/RubyVM_build.files', "wb")
|
457
|
+
#f.write(rubyvmfiles)
|
458
|
+
#f.close
|
451
459
|
|
460
|
+
|
452
461
|
if not uptodate?($preverified + '/RubyVM.jar',rubyvmfiles)
|
453
462
|
|
454
463
|
mkdir_p $tmpdir + "/RubyVM" if not FileTest.exists? $tmpdir + "/RubyVM"
|
@@ -466,6 +475,8 @@ namespace "build" do
|
|
466
475
|
args << "-target"
|
467
476
|
args << "1.3"
|
468
477
|
args << "-nowarn"
|
478
|
+
args << "-sourcepath"
|
479
|
+
args << "#{$startdir}"
|
469
480
|
args << "@#{$builddir}/RubyVM_build.files"
|
470
481
|
puts Jake.run(javac,args)
|
471
482
|
unless $? == 0
|
@@ -493,15 +504,16 @@ namespace "build" do
|
|
493
504
|
mkdir_p $tmpdir
|
494
505
|
end
|
495
506
|
|
507
|
+
|
496
508
|
# desc "Build rhodes"
|
497
509
|
task :rhodes => [ :rubyvm, :rhobundle ] do
|
498
|
-
|
499
|
-
|
510
|
+
jpath = $config["env"]["paths"]["java"]
|
511
|
+
javac = jpath && jpath.length() > 0 ? File.join(jpath, "javac" ) : "javac"
|
500
512
|
jdehome = $config["env"]["paths"][$bbver]["jde"]
|
501
513
|
|
502
514
|
sources = Dir.glob($builddir + "/../rhodes/resources/**/*") |
|
503
|
-
File.readlines($builddir + '/hsqldb_build.files').map { |l| l.
|
504
|
-
File.readlines($builddir +'/rhodes_build.files').map { |l| l.
|
515
|
+
File.readlines($builddir + '/hsqldb_build.files').map { |l| l.strip! } |
|
516
|
+
File.readlines($builddir +'/rhodes_build.files').map { |l| l.strip! }
|
505
517
|
|
506
518
|
sources.delete(nil)
|
507
519
|
|
@@ -516,6 +528,15 @@ namespace "build" do
|
|
516
528
|
vsrcdir = $tmpdir + "/vsrc"
|
517
529
|
mkdir_p vsrcdir
|
518
530
|
cp_r $builddir + "/../rhodes/platform/common/.", vsrcdir
|
531
|
+
#ar_bbver = $bbver.split('.')
|
532
|
+
[ "4.7", "5.0" ].each do |ver|
|
533
|
+
if $bbver > ver
|
534
|
+
if File.exist?( $builddir + "/../rhodes/platform/" + ver )
|
535
|
+
cp_r $builddir + "/../rhodes/platform/" + ver + "/.", vsrcdir, :remove_destination => true
|
536
|
+
end
|
537
|
+
end
|
538
|
+
end
|
539
|
+
|
519
540
|
if File.exist?( $builddir + "/../rhodes/platform/" + $bbver )
|
520
541
|
cp_r $builddir + "/../rhodes/platform/" + $bbver + "/.", vsrcdir, :remove_destination => true
|
521
542
|
end
|
@@ -542,7 +563,7 @@ namespace "build" do
|
|
542
563
|
args << "-classpath"
|
543
564
|
args << $bindir + "/RhoBundle.jar;"+$preverified+"/RubyVM.jar"
|
544
565
|
args << "-bootclasspath"
|
545
|
-
args <<
|
566
|
+
args << jdehome + "/lib/net_rim_api.jar"
|
546
567
|
args << "-source"
|
547
568
|
args << "1.3"
|
548
569
|
args << "-target"
|
@@ -656,9 +677,10 @@ namespace "package" do
|
|
656
677
|
end
|
657
678
|
|
658
679
|
def runProGuard(target_jar, lib_jar)
|
680
|
+
jpath = $config["env"]["paths"]["java"]
|
681
|
+
javac = jpath && jpath.length() > 0 ? File.join(jpath, "javac" ) : "javac"
|
659
682
|
jdehome = $config["env"]["paths"][$bbver]["jde"]
|
660
|
-
|
661
|
-
jde = $config["env"]["paths"][$bbver]["jde"]
|
683
|
+
|
662
684
|
proguard = File.join( $startdir, '/res/build-tools/proguard-4.5.1.jar' )
|
663
685
|
out_jar = File.join( File.dirname(target_jar), File.basename(target_jar, File.extname(target_jar) ) + "_out.jar" )
|
664
686
|
puts "****out jar: #{out_jar}"
|
@@ -931,8 +953,10 @@ namespace "run" do
|
|
931
953
|
end
|
932
954
|
|
933
955
|
task :phone_spec do
|
934
|
-
Jake.run_spec_app('bb',
|
956
|
+
exit 1 if Jake.run_spec_app('bb','phone_spec')
|
957
|
+
exit 0
|
935
958
|
end
|
959
|
+
|
936
960
|
end
|
937
961
|
|
938
962
|
desc "Builds everything, loads and starts bb sim and mds"
|
@@ -1,151 +1,151 @@
|
|
1
|
-
platform
|
2
|
-
platform
|
3
|
-
platform
|
4
|
-
platform
|
5
|
-
platform
|
6
|
-
platform
|
7
|
-
platform
|
8
|
-
platform
|
9
|
-
platform
|
10
|
-
platform
|
11
|
-
platform
|
12
|
-
platform
|
13
|
-
platform
|
14
|
-
platform
|
15
|
-
platform
|
16
|
-
platform
|
17
|
-
platform
|
18
|
-
platform
|
19
|
-
platform
|
20
|
-
platform
|
21
|
-
platform
|
22
|
-
platform
|
23
|
-
platform
|
24
|
-
platform
|
25
|
-
platform
|
26
|
-
platform
|
27
|
-
platform
|
28
|
-
platform
|
29
|
-
platform
|
30
|
-
platform
|
31
|
-
platform
|
32
|
-
platform
|
33
|
-
platform
|
34
|
-
platform
|
35
|
-
platform
|
36
|
-
platform
|
37
|
-
platform
|
38
|
-
platform
|
39
|
-
platform
|
40
|
-
platform
|
41
|
-
platform
|
42
|
-
platform
|
43
|
-
platform
|
44
|
-
platform
|
45
|
-
platform
|
46
|
-
platform
|
47
|
-
platform
|
48
|
-
platform
|
49
|
-
platform
|
50
|
-
platform
|
51
|
-
platform
|
52
|
-
platform
|
53
|
-
platform
|
54
|
-
platform
|
55
|
-
platform
|
56
|
-
platform
|
57
|
-
platform
|
58
|
-
platform
|
59
|
-
platform
|
60
|
-
platform
|
61
|
-
platform
|
62
|
-
platform
|
63
|
-
platform
|
64
|
-
platform
|
65
|
-
platform
|
66
|
-
platform
|
67
|
-
platform
|
68
|
-
platform
|
69
|
-
platform
|
70
|
-
platform
|
71
|
-
platform
|
72
|
-
platform
|
73
|
-
platform
|
74
|
-
platform
|
75
|
-
platform
|
76
|
-
platform
|
77
|
-
platform
|
78
|
-
platform
|
79
|
-
platform
|
80
|
-
platform
|
81
|
-
platform
|
82
|
-
platform
|
83
|
-
platform
|
84
|
-
platform
|
85
|
-
platform
|
86
|
-
platform
|
87
|
-
platform
|
88
|
-
platform
|
89
|
-
platform
|
90
|
-
platform
|
91
|
-
platform
|
92
|
-
platform
|
93
|
-
platform
|
94
|
-
platform
|
95
|
-
platform
|
96
|
-
platform
|
97
|
-
platform
|
98
|
-
platform
|
99
|
-
platform
|
100
|
-
platform
|
101
|
-
platform
|
102
|
-
platform
|
103
|
-
platform
|
104
|
-
platform
|
105
|
-
platform
|
106
|
-
platform
|
107
|
-
platform
|
108
|
-
platform
|
109
|
-
platform
|
110
|
-
platform
|
111
|
-
platform
|
112
|
-
platform
|
113
|
-
platform
|
114
|
-
platform
|
115
|
-
platform
|
116
|
-
platform
|
117
|
-
platform
|
118
|
-
platform
|
119
|
-
platform
|
120
|
-
platform
|
121
|
-
platform
|
122
|
-
platform
|
123
|
-
platform
|
124
|
-
platform
|
125
|
-
platform
|
126
|
-
platform
|
127
|
-
platform
|
128
|
-
platform
|
129
|
-
platform
|
130
|
-
platform
|
131
|
-
platform
|
132
|
-
platform
|
133
|
-
platform
|
134
|
-
platform
|
135
|
-
platform
|
136
|
-
platform
|
137
|
-
platform
|
138
|
-
platform
|
139
|
-
platform
|
140
|
-
platform
|
141
|
-
platform
|
142
|
-
platform
|
143
|
-
platform
|
144
|
-
platform
|
145
|
-
platform
|
146
|
-
platform
|
147
|
-
platform
|
148
|
-
platform
|
149
|
-
platform
|
150
|
-
platform
|
151
|
-
platform
|
1
|
+
platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java
|
2
|
+
platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java
|
3
|
+
platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java
|
4
|
+
platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java
|
5
|
+
platform/bb/Hsqldb/src/com/rho/db/Journal.java
|
6
|
+
platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java
|
7
|
+
platform/bb/Hsqldb/src/j2me/io/BufferedOutputStream.java
|
8
|
+
platform/bb/Hsqldb/src/j2me/io/FilterOutputStream.java
|
9
|
+
platform/bb/Hsqldb/src/j2me/math/BigDecimal.java
|
10
|
+
platform/bb/Hsqldb/src/j2me/math/BigInteger.java
|
11
|
+
platform/bb/Hsqldb/src/j2me/math/Number.java
|
12
|
+
platform/bb/Hsqldb/src/j2me/sql/Date.java
|
13
|
+
platform/bb/Hsqldb/src/j2me/sql/Time.java
|
14
|
+
platform/bb/Hsqldb/src/j2me/sql/Timestamp.java
|
15
|
+
platform/bb/Hsqldb/src/org/hsqldb/BaseMemoryNode.java
|
16
|
+
platform/bb/Hsqldb/src/org/hsqldb/BaseTable.java
|
17
|
+
platform/bb/Hsqldb/src/org/hsqldb/CachedDataRow.java
|
18
|
+
platform/bb/Hsqldb/src/org/hsqldb/CachedRow.java
|
19
|
+
platform/bb/Hsqldb/src/org/hsqldb/Collation.java
|
20
|
+
platform/bb/Hsqldb/src/org/hsqldb/Column.java
|
21
|
+
platform/bb/Hsqldb/src/org/hsqldb/CompiledStatement.java
|
22
|
+
platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java
|
23
|
+
platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementManager.java
|
24
|
+
platform/bb/Hsqldb/src/org/hsqldb/Constraint.java
|
25
|
+
platform/bb/Hsqldb/src/org/hsqldb/ConstraintCore.java
|
26
|
+
platform/bb/Hsqldb/src/org/hsqldb/Database.java
|
27
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java
|
28
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseInformation.java
|
29
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseManager.java
|
30
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseObjectNames.java
|
31
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseScript.java
|
32
|
+
platform/bb/Hsqldb/src/org/hsqldb/DatabaseURL.java
|
33
|
+
platform/bb/Hsqldb/src/org/hsqldb/DiskNode.java
|
34
|
+
platform/bb/Hsqldb/src/org/hsqldb/Expression.java
|
35
|
+
platform/bb/Hsqldb/src/org/hsqldb/Function.java
|
36
|
+
platform/bb/Hsqldb/src/org/hsqldb/GrantConstants.java
|
37
|
+
platform/bb/Hsqldb/src/org/hsqldb/Grantee.java
|
38
|
+
platform/bb/Hsqldb/src/org/hsqldb/GranteeManager.java
|
39
|
+
platform/bb/Hsqldb/src/org/hsqldb/GroupedResult.java
|
40
|
+
platform/bb/Hsqldb/src/org/hsqldb/HsqlDateTime.java
|
41
|
+
platform/bb/Hsqldb/src/org/hsqldb/HsqlException.java
|
42
|
+
platform/bb/Hsqldb/src/org/hsqldb/HsqlInternalException.java
|
43
|
+
platform/bb/Hsqldb/src/org/hsqldb/HsqlNameManager.java
|
44
|
+
platform/bb/Hsqldb/src/org/hsqldb/Index.java
|
45
|
+
platform/bb/Hsqldb/src/org/hsqldb/index/RowIterator.java
|
46
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/ArrayCounter.java
|
47
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/ArrayUtil.java
|
48
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/AsciiStringInputStream.java
|
49
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/BaseList.java
|
50
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/Collection.java
|
51
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/DoubleIntIndex.java
|
52
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/FileAccess.java
|
53
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HashMap.java
|
54
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HashMappedList.java
|
55
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HashSet.java
|
56
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlArrayHeap.java
|
57
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlArrayList.java
|
58
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlByteArrayInputStream.java
|
59
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlByteArrayOutputStream.java
|
60
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlDeque.java
|
61
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlHeap.java
|
62
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlLinkedList.java
|
63
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlList.java
|
64
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/HsqlTimer.java
|
65
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/IntKeyHashMap.java
|
66
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/IntKeyIntValueHashMap.java
|
67
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/IntLookup.java
|
68
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/IntValueHashMap.java
|
69
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/Iterator.java
|
70
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/java/JavaSystem.java
|
71
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/LongKeyIntValueHashMap.java
|
72
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/ObjectComparator.java
|
73
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/Set.java
|
74
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/SimpleLog.java
|
75
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/Sort.java
|
76
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/StopWatch.java
|
77
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/Storage.java
|
78
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/StringConverter.java
|
79
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/StringInputStream.java
|
80
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/StringUtil.java
|
81
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/ThreadFactory.java
|
82
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/WrapperIterator.java
|
83
|
+
platform/bb/Hsqldb/src/org/hsqldb/lib/ZipUnzipFile.java
|
84
|
+
platform/bb/Hsqldb/src/org/hsqldb/Library.java
|
85
|
+
platform/bb/Hsqldb/src/org/hsqldb/Like.java
|
86
|
+
platform/bb/Hsqldb/src/org/hsqldb/MemoryNode.java
|
87
|
+
platform/bb/Hsqldb/src/org/hsqldb/Node.java
|
88
|
+
platform/bb/Hsqldb/src/org/hsqldb/NumberSequence.java
|
89
|
+
platform/bb/Hsqldb/src/org/hsqldb/Parser.java
|
90
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/Cache.java
|
91
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/CachedObject.java
|
92
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/DataFileBlockManager.java
|
93
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/DataFileCache.java
|
94
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/DataFileDefrag.java
|
95
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java
|
96
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/HsqlProperties.java
|
97
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/Log.java
|
98
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/Logger.java
|
99
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/PersistentStore.java
|
100
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFile.java
|
101
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAFileInJar.java
|
102
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/ScaledRAInterface.java
|
103
|
+
platform/bb/Hsqldb/src/org/hsqldb/persist/ScriptRunner.java
|
104
|
+
platform/bb/Hsqldb/src/org/hsqldb/PointerNode.java
|
105
|
+
platform/bb/Hsqldb/src/org/hsqldb/Record.java
|
106
|
+
platform/bb/Hsqldb/src/org/hsqldb/Result.java
|
107
|
+
platform/bb/Hsqldb/src/org/hsqldb/ResultBase.java
|
108
|
+
platform/bb/Hsqldb/src/org/hsqldb/ResultConstants.java
|
109
|
+
platform/bb/Hsqldb/src/org/hsqldb/Row.java
|
110
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputBase.java
|
111
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputBinary.java
|
112
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputInterface.java
|
113
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowInputTextLog.java
|
114
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBase.java
|
115
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBinary.java
|
116
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputInterface.java
|
117
|
+
platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputTextLog.java
|
118
|
+
platform/bb/Hsqldb/src/org/hsqldb/SchemaManager.java
|
119
|
+
platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptReaderBase.java
|
120
|
+
platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptReaderText.java
|
121
|
+
platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterBase.java
|
122
|
+
platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterText.java
|
123
|
+
platform/bb/Hsqldb/src/org/hsqldb/Select.java
|
124
|
+
platform/bb/Hsqldb/src/org/hsqldb/SequenceManager.java
|
125
|
+
platform/bb/Hsqldb/src/org/hsqldb/Session.java
|
126
|
+
platform/bb/Hsqldb/src/org/hsqldb/SessionInterface.java
|
127
|
+
platform/bb/Hsqldb/src/org/hsqldb/SessionManager.java
|
128
|
+
platform/bb/Hsqldb/src/org/hsqldb/SetFunction.java
|
129
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/BaseHashMap.java
|
130
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/BitMap.java
|
131
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/HashIndex.java
|
132
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/ObjectCacheHashMap.java
|
133
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/ValuePool.java
|
134
|
+
platform/bb/Hsqldb/src/org/hsqldb/store/ValuePoolHashMap.java
|
135
|
+
platform/bb/Hsqldb/src/org/hsqldb/SubQuery.java
|
136
|
+
platform/bb/Hsqldb/src/org/hsqldb/Table.java
|
137
|
+
platform/bb/Hsqldb/src/org/hsqldb/TableFilter.java
|
138
|
+
platform/bb/Hsqldb/src/org/hsqldb/TableWorks.java
|
139
|
+
platform/bb/Hsqldb/src/org/hsqldb/Token.java
|
140
|
+
platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java
|
141
|
+
platform/bb/Hsqldb/src/org/hsqldb/Trace.java
|
142
|
+
platform/bb/Hsqldb/src/org/hsqldb/Transaction.java
|
143
|
+
platform/bb/Hsqldb/src/org/hsqldb/TransactionManager.java
|
144
|
+
platform/bb/Hsqldb/src/org/hsqldb/Trigger.java
|
145
|
+
platform/bb/Hsqldb/src/org/hsqldb/TriggerDef.java
|
146
|
+
platform/bb/Hsqldb/src/org/hsqldb/Types.java
|
147
|
+
platform/bb/Hsqldb/src/org/hsqldb/types/Binary.java
|
148
|
+
platform/bb/Hsqldb/src/org/hsqldb/types/JavaObject.java
|
149
|
+
platform/bb/Hsqldb/src/org/hsqldb/User.java
|
150
|
+
platform/bb/Hsqldb/src/org/hsqldb/UserManager.java
|
151
|
+
platform/bb/Hsqldb/src/org/hsqldb/View.java
|