rhodes 2.2.6 → 2.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -0,0 +1,320 @@
|
|
1
|
+
// !$*UTF8*$!
|
2
|
+
{
|
3
|
+
archiveVersion = 1;
|
4
|
+
classes = {
|
5
|
+
};
|
6
|
+
objectVersion = 45;
|
7
|
+
objects = {
|
8
|
+
|
9
|
+
/* Begin PBXBuildFile section */
|
10
|
+
AA747D9F0F9514B9006C5449 /* ESRI_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ESRI_Prefix.pch */; };
|
11
|
+
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
|
12
|
+
FA42C1FB12EA6883007FB3FE /* ESRIViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = FA42C1F412EA6883007FB3FE /* ESRIViewFactory.h */; };
|
13
|
+
FA42C1FC12EA6883007FB3FE /* ESRIViewFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA42C1F512EA6883007FB3FE /* ESRIViewFactory.mm */; };
|
14
|
+
FA42C1FE12EA6883007FB3FE /* ESRIViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FA42C1F712EA6883007FB3FE /* ESRIViewManager.h */; };
|
15
|
+
FA42C1FF12EA6883007FB3FE /* ESRIViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA42C1F812EA6883007FB3FE /* ESRIViewManager.mm */; };
|
16
|
+
FA42C20012EA6883007FB3FE /* MapViewControllerESRI.h in Headers */ = {isa = PBXBuildFile; fileRef = FA42C1F912EA6883007FB3FE /* MapViewControllerESRI.h */; };
|
17
|
+
FA42C20112EA6883007FB3FE /* MapViewControllerESRI.m in Sources */ = {isa = PBXBuildFile; fileRef = FA42C1FA12EA6883007FB3FE /* MapViewControllerESRI.m */; };
|
18
|
+
FA42C20312EA68BE007FB3FE /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20212EA68BE007FB3FE /* CoreGraphics.framework */; };
|
19
|
+
FA42C20712EA68FA007FB3FE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20612EA68FA007FB3FE /* CoreFoundation.framework */; };
|
20
|
+
FA42C20912EA68FA007FB3FE /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20812EA68FA007FB3FE /* CoreLocation.framework */; };
|
21
|
+
FA42C20B12EA68FA007FB3FE /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20A12EA68FA007FB3FE /* MapKit.framework */; };
|
22
|
+
FA42C20D12EA68FA007FB3FE /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20C12EA68FA007FB3FE /* QuartzCore.framework */; };
|
23
|
+
FA42C20F12EA68FA007FB3FE /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C20E12EA68FA007FB3FE /* UIKit.framework */; };
|
24
|
+
FA42C21B12EA6928007FB3FE /* libArcGIS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA42C21A12EA6928007FB3FE /* libArcGIS.a */; };
|
25
|
+
FA42C2D212EA731E007FB3FE /* ESRIViewFactoryRegister.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA42C2D112EA731E007FB3FE /* ESRIViewFactoryRegister.mm */; };
|
26
|
+
/* End PBXBuildFile section */
|
27
|
+
|
28
|
+
/* Begin PBXFileReference section */
|
29
|
+
AA747D9E0F9514B9006C5449 /* ESRI_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESRI_Prefix.pch; sourceTree = SOURCE_ROOT; };
|
30
|
+
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
31
|
+
D2AAC07E0554694100DB518D /* libESRI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libESRI.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
32
|
+
FA42C1F412EA6883007FB3FE /* ESRIViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESRIViewFactory.h; path = Classes/ESRIViewFactory.h; sourceTree = "<group>"; };
|
33
|
+
FA42C1F512EA6883007FB3FE /* ESRIViewFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ESRIViewFactory.mm; path = Classes/ESRIViewFactory.mm; sourceTree = "<group>"; };
|
34
|
+
FA42C1F712EA6883007FB3FE /* ESRIViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESRIViewManager.h; path = Classes/ESRIViewManager.h; sourceTree = "<group>"; };
|
35
|
+
FA42C1F812EA6883007FB3FE /* ESRIViewManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ESRIViewManager.mm; path = Classes/ESRIViewManager.mm; sourceTree = "<group>"; };
|
36
|
+
FA42C1F912EA6883007FB3FE /* MapViewControllerESRI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapViewControllerESRI.h; path = Classes/MapViewControllerESRI.h; sourceTree = "<group>"; };
|
37
|
+
FA42C1FA12EA6883007FB3FE /* MapViewControllerESRI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapViewControllerESRI.m; path = Classes/MapViewControllerESRI.m; sourceTree = "<group>"; };
|
38
|
+
FA42C20212EA68BE007FB3FE /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
|
39
|
+
FA42C20612EA68FA007FB3FE /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
|
40
|
+
FA42C20812EA68FA007FB3FE /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
|
41
|
+
FA42C20A12EA68FA007FB3FE /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
|
42
|
+
FA42C20C12EA68FA007FB3FE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
43
|
+
FA42C20E12EA68FA007FB3FE /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
44
|
+
FA42C21A12EA6928007FB3FE /* libArcGIS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libArcGIS.a; path = ../../../../../../../../Library/SDKs/ArcGIS/iOS.sdk/usr/local/lib/libArcGIS.a; sourceTree = SOURCE_ROOT; };
|
45
|
+
FA42C2D112EA731E007FB3FE /* ESRIViewFactoryRegister.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ESRIViewFactoryRegister.mm; path = Classes/ESRIViewFactoryRegister.mm; sourceTree = "<group>"; };
|
46
|
+
/* End PBXFileReference section */
|
47
|
+
|
48
|
+
/* Begin PBXFrameworksBuildPhase section */
|
49
|
+
D2AAC07C0554694100DB518D /* Frameworks */ = {
|
50
|
+
isa = PBXFrameworksBuildPhase;
|
51
|
+
buildActionMask = 2147483647;
|
52
|
+
files = (
|
53
|
+
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
|
54
|
+
FA42C20312EA68BE007FB3FE /* CoreGraphics.framework in Frameworks */,
|
55
|
+
FA42C20712EA68FA007FB3FE /* CoreFoundation.framework in Frameworks */,
|
56
|
+
FA42C20912EA68FA007FB3FE /* CoreLocation.framework in Frameworks */,
|
57
|
+
FA42C20B12EA68FA007FB3FE /* MapKit.framework in Frameworks */,
|
58
|
+
FA42C20D12EA68FA007FB3FE /* QuartzCore.framework in Frameworks */,
|
59
|
+
FA42C20F12EA68FA007FB3FE /* UIKit.framework in Frameworks */,
|
60
|
+
FA42C21B12EA6928007FB3FE /* libArcGIS.a in Frameworks */,
|
61
|
+
);
|
62
|
+
runOnlyForDeploymentPostprocessing = 0;
|
63
|
+
};
|
64
|
+
/* End PBXFrameworksBuildPhase section */
|
65
|
+
|
66
|
+
/* Begin PBXGroup section */
|
67
|
+
034768DFFF38A50411DB9C8B /* Products */ = {
|
68
|
+
isa = PBXGroup;
|
69
|
+
children = (
|
70
|
+
D2AAC07E0554694100DB518D /* libESRI.a */,
|
71
|
+
);
|
72
|
+
name = Products;
|
73
|
+
sourceTree = "<group>";
|
74
|
+
};
|
75
|
+
0867D691FE84028FC02AAC07 /* ESRI */ = {
|
76
|
+
isa = PBXGroup;
|
77
|
+
children = (
|
78
|
+
FA42C21A12EA6928007FB3FE /* libArcGIS.a */,
|
79
|
+
08FB77AEFE84172EC02AAC07 /* Classes */,
|
80
|
+
32C88DFF0371C24200C91783 /* Other Sources */,
|
81
|
+
0867D69AFE84028FC02AAC07 /* Frameworks */,
|
82
|
+
034768DFFF38A50411DB9C8B /* Products */,
|
83
|
+
);
|
84
|
+
name = ESRI;
|
85
|
+
sourceTree = "<group>";
|
86
|
+
};
|
87
|
+
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
|
88
|
+
isa = PBXGroup;
|
89
|
+
children = (
|
90
|
+
AACBBE490F95108600F1A2B1 /* Foundation.framework */,
|
91
|
+
FA42C20212EA68BE007FB3FE /* CoreGraphics.framework */,
|
92
|
+
FA42C20612EA68FA007FB3FE /* CoreFoundation.framework */,
|
93
|
+
FA42C20812EA68FA007FB3FE /* CoreLocation.framework */,
|
94
|
+
FA42C20A12EA68FA007FB3FE /* MapKit.framework */,
|
95
|
+
FA42C20C12EA68FA007FB3FE /* QuartzCore.framework */,
|
96
|
+
FA42C20E12EA68FA007FB3FE /* UIKit.framework */,
|
97
|
+
);
|
98
|
+
name = Frameworks;
|
99
|
+
sourceTree = "<group>";
|
100
|
+
};
|
101
|
+
08FB77AEFE84172EC02AAC07 /* Classes */ = {
|
102
|
+
isa = PBXGroup;
|
103
|
+
children = (
|
104
|
+
FA42C2D112EA731E007FB3FE /* ESRIViewFactoryRegister.mm */,
|
105
|
+
FA42C1F412EA6883007FB3FE /* ESRIViewFactory.h */,
|
106
|
+
FA42C1F512EA6883007FB3FE /* ESRIViewFactory.mm */,
|
107
|
+
FA42C1F712EA6883007FB3FE /* ESRIViewManager.h */,
|
108
|
+
FA42C1F812EA6883007FB3FE /* ESRIViewManager.mm */,
|
109
|
+
FA42C1F912EA6883007FB3FE /* MapViewControllerESRI.h */,
|
110
|
+
FA42C1FA12EA6883007FB3FE /* MapViewControllerESRI.m */,
|
111
|
+
);
|
112
|
+
name = Classes;
|
113
|
+
sourceTree = "<group>";
|
114
|
+
};
|
115
|
+
32C88DFF0371C24200C91783 /* Other Sources */ = {
|
116
|
+
isa = PBXGroup;
|
117
|
+
children = (
|
118
|
+
AA747D9E0F9514B9006C5449 /* ESRI_Prefix.pch */,
|
119
|
+
);
|
120
|
+
name = "Other Sources";
|
121
|
+
sourceTree = "<group>";
|
122
|
+
};
|
123
|
+
/* End PBXGroup section */
|
124
|
+
|
125
|
+
/* Begin PBXHeadersBuildPhase section */
|
126
|
+
D2AAC07A0554694100DB518D /* Headers */ = {
|
127
|
+
isa = PBXHeadersBuildPhase;
|
128
|
+
buildActionMask = 2147483647;
|
129
|
+
files = (
|
130
|
+
AA747D9F0F9514B9006C5449 /* ESRI_Prefix.pch in Headers */,
|
131
|
+
FA42C1FB12EA6883007FB3FE /* ESRIViewFactory.h in Headers */,
|
132
|
+
FA42C1FE12EA6883007FB3FE /* ESRIViewManager.h in Headers */,
|
133
|
+
FA42C20012EA6883007FB3FE /* MapViewControllerESRI.h in Headers */,
|
134
|
+
);
|
135
|
+
runOnlyForDeploymentPostprocessing = 0;
|
136
|
+
};
|
137
|
+
/* End PBXHeadersBuildPhase section */
|
138
|
+
|
139
|
+
/* Begin PBXNativeTarget section */
|
140
|
+
D2AAC07D0554694100DB518D /* ESRI */ = {
|
141
|
+
isa = PBXNativeTarget;
|
142
|
+
buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "ESRI" */;
|
143
|
+
buildPhases = (
|
144
|
+
D2AAC07A0554694100DB518D /* Headers */,
|
145
|
+
D2AAC07B0554694100DB518D /* Sources */,
|
146
|
+
D2AAC07C0554694100DB518D /* Frameworks */,
|
147
|
+
);
|
148
|
+
buildRules = (
|
149
|
+
);
|
150
|
+
dependencies = (
|
151
|
+
);
|
152
|
+
name = ESRI;
|
153
|
+
productName = ESRI;
|
154
|
+
productReference = D2AAC07E0554694100DB518D /* libESRI.a */;
|
155
|
+
productType = "com.apple.product-type.library.static";
|
156
|
+
};
|
157
|
+
/* End PBXNativeTarget section */
|
158
|
+
|
159
|
+
/* Begin PBXProject section */
|
160
|
+
0867D690FE84028FC02AAC07 /* Project object */ = {
|
161
|
+
isa = PBXProject;
|
162
|
+
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ESRI" */;
|
163
|
+
compatibilityVersion = "Xcode 3.1";
|
164
|
+
developmentRegion = English;
|
165
|
+
hasScannedForEncodings = 1;
|
166
|
+
knownRegions = (
|
167
|
+
English,
|
168
|
+
Japanese,
|
169
|
+
French,
|
170
|
+
German,
|
171
|
+
);
|
172
|
+
mainGroup = 0867D691FE84028FC02AAC07 /* ESRI */;
|
173
|
+
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
|
174
|
+
projectDirPath = "";
|
175
|
+
projectRoot = "";
|
176
|
+
targets = (
|
177
|
+
D2AAC07D0554694100DB518D /* ESRI */,
|
178
|
+
);
|
179
|
+
};
|
180
|
+
/* End PBXProject section */
|
181
|
+
|
182
|
+
/* Begin PBXSourcesBuildPhase section */
|
183
|
+
D2AAC07B0554694100DB518D /* Sources */ = {
|
184
|
+
isa = PBXSourcesBuildPhase;
|
185
|
+
buildActionMask = 2147483647;
|
186
|
+
files = (
|
187
|
+
FA42C1FC12EA6883007FB3FE /* ESRIViewFactory.mm in Sources */,
|
188
|
+
FA42C1FF12EA6883007FB3FE /* ESRIViewManager.mm in Sources */,
|
189
|
+
FA42C20112EA6883007FB3FE /* MapViewControllerESRI.m in Sources */,
|
190
|
+
FA42C2D212EA731E007FB3FE /* ESRIViewFactoryRegister.mm in Sources */,
|
191
|
+
);
|
192
|
+
runOnlyForDeploymentPostprocessing = 0;
|
193
|
+
};
|
194
|
+
/* End PBXSourcesBuildPhase section */
|
195
|
+
|
196
|
+
/* Begin XCBuildConfiguration section */
|
197
|
+
1DEB921F08733DC00010E9CD /* Debug */ = {
|
198
|
+
isa = XCBuildConfiguration;
|
199
|
+
buildSettings = {
|
200
|
+
ALWAYS_SEARCH_USER_PATHS = NO;
|
201
|
+
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
202
|
+
COPY_PHASE_STRIP = NO;
|
203
|
+
DEAD_CODE_STRIPPING = NO;
|
204
|
+
DSTROOT = /tmp/ESRI.dst;
|
205
|
+
GCC_DYNAMIC_NO_PIC = NO;
|
206
|
+
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
207
|
+
GCC_MODEL_TUNING = G5;
|
208
|
+
GCC_OPTIMIZATION_LEVEL = 0;
|
209
|
+
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
210
|
+
GCC_PREFIX_HEADER = ESRI_Prefix.pch;
|
211
|
+
INSTALL_PATH = /usr/local/lib;
|
212
|
+
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
|
213
|
+
LIBRARY_SEARCH_PATHS = "${HOME}/Library/SDKs/ArcGIS/iOS.sdk/usr/local/lib";
|
214
|
+
OTHER_LDFLAGS = (
|
215
|
+
"-all_load",
|
216
|
+
"-ObjC",
|
217
|
+
);
|
218
|
+
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
|
219
|
+
PRODUCT_NAME = ESRI;
|
220
|
+
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
|
221
|
+
USER_HEADER_SEARCH_PATHS = "${HOME}/Library/SDKs/ArcGIS/iOS.sdk/usr/local/include/**";
|
222
|
+
};
|
223
|
+
name = Debug;
|
224
|
+
};
|
225
|
+
1DEB922008733DC00010E9CD /* Release */ = {
|
226
|
+
isa = XCBuildConfiguration;
|
227
|
+
buildSettings = {
|
228
|
+
ALWAYS_SEARCH_USER_PATHS = NO;
|
229
|
+
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
230
|
+
DEAD_CODE_STRIPPING = NO;
|
231
|
+
DSTROOT = /tmp/ESRI.dst;
|
232
|
+
GCC_MODEL_TUNING = G5;
|
233
|
+
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
234
|
+
GCC_PREFIX_HEADER = ESRI_Prefix.pch;
|
235
|
+
INSTALL_PATH = /usr/local/lib;
|
236
|
+
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
|
237
|
+
LIBRARY_SEARCH_PATHS = "${HOME}/Library/SDKs/ArcGIS/iOS.sdk/usr/local/lib";
|
238
|
+
OTHER_LDFLAGS = (
|
239
|
+
"-all_load",
|
240
|
+
"-ObjC",
|
241
|
+
);
|
242
|
+
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
|
243
|
+
PRODUCT_NAME = ESRI;
|
244
|
+
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
|
245
|
+
USER_HEADER_SEARCH_PATHS = "${HOME}/Library/SDKs/ArcGIS/iOS.sdk/usr/local/include/**";
|
246
|
+
};
|
247
|
+
name = Release;
|
248
|
+
};
|
249
|
+
1DEB922308733DC00010E9CD /* Debug */ = {
|
250
|
+
isa = XCBuildConfiguration;
|
251
|
+
buildSettings = {
|
252
|
+
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
253
|
+
GCC_C_LANGUAGE_STANDARD = c99;
|
254
|
+
GCC_OPTIMIZATION_LEVEL = 0;
|
255
|
+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
256
|
+
GCC_WARN_UNUSED_VARIABLE = YES;
|
257
|
+
HEADER_SEARCH_PATHS = (
|
258
|
+
"$(RHO_ROOT)/platform/shared/common",
|
259
|
+
"$(RHO_ROOT)/platform/shared/rubyext",
|
260
|
+
"$(RHO_ROOT)/platform/shared/ruby/include",
|
261
|
+
"$(RHO_ROOT)/platform/shared/ruby/iphone",
|
262
|
+
"$(RHO_ROOT)/platform/shared",
|
263
|
+
"$(RHO_ROOT)/platform/shared/ruby/ext/rho",
|
264
|
+
"$(RHO_ROOT)/platform/iphone/Classes/MapView",
|
265
|
+
);
|
266
|
+
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
|
267
|
+
OTHER_LDFLAGS = "-ObjC";
|
268
|
+
PREBINDING = NO;
|
269
|
+
SDKROOT = iphoneos;
|
270
|
+
};
|
271
|
+
name = Debug;
|
272
|
+
};
|
273
|
+
1DEB922408733DC00010E9CD /* Release */ = {
|
274
|
+
isa = XCBuildConfiguration;
|
275
|
+
buildSettings = {
|
276
|
+
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
277
|
+
GCC_C_LANGUAGE_STANDARD = c99;
|
278
|
+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
279
|
+
GCC_WARN_UNUSED_VARIABLE = YES;
|
280
|
+
HEADER_SEARCH_PATHS = (
|
281
|
+
"$(RHO_ROOT)/platform/shared/common",
|
282
|
+
"$(RHO_ROOT)/platform/shared/rubyext",
|
283
|
+
"$(RHO_ROOT)/platform/shared/ruby/include",
|
284
|
+
"$(RHO_ROOT)/platform/shared/ruby/iphone",
|
285
|
+
"$(RHO_ROOT)/platform/shared",
|
286
|
+
"$(RHO_ROOT)/platform/shared/ruby/ext/rho",
|
287
|
+
"$(RHO_ROOT)/platform/iphone/Classes/MapView",
|
288
|
+
);
|
289
|
+
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
|
290
|
+
OTHER_LDFLAGS = "-ObjC";
|
291
|
+
PREBINDING = NO;
|
292
|
+
SDKROOT = iphoneos;
|
293
|
+
};
|
294
|
+
name = Release;
|
295
|
+
};
|
296
|
+
/* End XCBuildConfiguration section */
|
297
|
+
|
298
|
+
/* Begin XCConfigurationList section */
|
299
|
+
1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "ESRI" */ = {
|
300
|
+
isa = XCConfigurationList;
|
301
|
+
buildConfigurations = (
|
302
|
+
1DEB921F08733DC00010E9CD /* Debug */,
|
303
|
+
1DEB922008733DC00010E9CD /* Release */,
|
304
|
+
);
|
305
|
+
defaultConfigurationIsVisible = 0;
|
306
|
+
defaultConfigurationName = Release;
|
307
|
+
};
|
308
|
+
1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ESRI" */ = {
|
309
|
+
isa = XCConfigurationList;
|
310
|
+
buildConfigurations = (
|
311
|
+
1DEB922308733DC00010E9CD /* Debug */,
|
312
|
+
1DEB922408733DC00010E9CD /* Release */,
|
313
|
+
);
|
314
|
+
defaultConfigurationIsVisible = 0;
|
315
|
+
defaultConfigurationName = Release;
|
316
|
+
};
|
317
|
+
/* End XCConfigurationList section */
|
318
|
+
};
|
319
|
+
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
|
320
|
+
}
|
@@ -0,0 +1,76 @@
|
|
1
|
+
require 'fileutils'
|
2
|
+
|
3
|
+
USE_STLPORT = true
|
4
|
+
|
5
|
+
|
6
|
+
puts "ESRI extension !"
|
7
|
+
|
8
|
+
namespace "build" do
|
9
|
+
task :config do
|
10
|
+
$targetdir = ENV['TARGET_TEMP_DIR']
|
11
|
+
raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
|
12
|
+
$tempdir = ENV['TEMP_FILES_DIR']
|
13
|
+
raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
|
14
|
+
$rootdir = ENV['RHO_ROOT']
|
15
|
+
raise "RHO_ROOT is not set" if $rootdir.nil?
|
16
|
+
|
17
|
+
$xcodebuild = ENV['XCODEBUILD']
|
18
|
+
raise "XCODEBUILD is not set" if $xcodebuild.nil?
|
19
|
+
|
20
|
+
$configuration = ENV['CONFIGURATION']
|
21
|
+
raise "CONFIGURATION is not set" if $configuration.nil?
|
22
|
+
|
23
|
+
$sdk = ENV['SDK_NAME']
|
24
|
+
raise "SDK_NAME is not set" if $sdk.nil?
|
25
|
+
|
26
|
+
$bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
|
27
|
+
raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
|
28
|
+
|
29
|
+
$sdkroot = ENV['SDKROOT']
|
30
|
+
raise "SDKROOT is not set" if $sdkroot.nil?
|
31
|
+
|
32
|
+
|
33
|
+
$arch = ENV['ARCHS']
|
34
|
+
raise "ARCHS is not set" if $arch.nil?
|
35
|
+
|
36
|
+
$gccbin = $bindir + '/gcc-4.2'
|
37
|
+
$arbin = $bindir + '/ar'
|
38
|
+
|
39
|
+
end
|
40
|
+
|
41
|
+
task :all => :config do
|
42
|
+
iphone_path = '.'
|
43
|
+
|
44
|
+
simulator = $sdk =~ /iphonesimulator/
|
45
|
+
|
46
|
+
if $configuration == 'Distribution'
|
47
|
+
$configuration = 'Release'
|
48
|
+
end
|
49
|
+
|
50
|
+
result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libESRI.a'
|
51
|
+
target_lib = $targetdir + '/libESRI.a'
|
52
|
+
|
53
|
+
rm_rf 'build'
|
54
|
+
rm_rf target_lib
|
55
|
+
|
56
|
+
args = ['build', '-target', 'ESRI', '-configuration', $configuration, '-sdk', $sdk]
|
57
|
+
|
58
|
+
include_dirs = ENV['USER_HEADER_SEARCH_PATHS']
|
59
|
+
include_dirs = '' if include_dirs.nil?
|
60
|
+
|
61
|
+
|
62
|
+
#include_dirs = include_dirs + ' ' + $rootdir + '/platform/iphone/Classes' + ' ' + $rootdir + '/platform/iphone/Classes/MapView' + ' ' +$rootdir + '/platform/shared/ruby/ext/rho' + ' ' + $rootdir + '/platform/shared/rubyext' + ' ' + $rootdir + '/platform/shared/ruby/include' + ' ' + $rootdir + '/platform/shared' + ' ' + $rootdir + '/platform/shared/ruby/iphone'+ ' ' + $rootdir + '/platform/shared/common'
|
63
|
+
#ENV['USER_HEADER_SEARCH_PATHS'] = include_dirs
|
64
|
+
|
65
|
+
require $rootdir + '/lib/build/jake.rb'
|
66
|
+
|
67
|
+
puts Jake.run($xcodebuild,args)
|
68
|
+
ret = $?
|
69
|
+
|
70
|
+
# copy result to $targetdir
|
71
|
+
cp result_lib,target_lib
|
72
|
+
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
76
|
+
task :default => "build:all"
|
@@ -0,0 +1,265 @@
|
|
1
|
+
=begin
|
2
|
+
|
3
|
+
= monitor.rb
|
4
|
+
|
5
|
+
Copyright (C) 2001 Shugo Maeda <shugo@ruby-lang.org>
|
6
|
+
|
7
|
+
This library is distributed under the terms of the Ruby license.
|
8
|
+
You can freely distribute/modify this library.
|
9
|
+
|
10
|
+
== example
|
11
|
+
|
12
|
+
This is a simple example.
|
13
|
+
|
14
|
+
require 'monitor.rb'
|
15
|
+
|
16
|
+
buf = []
|
17
|
+
buf.extend(MonitorMixin)
|
18
|
+
empty_cond = buf.new_cond
|
19
|
+
|
20
|
+
# consumer
|
21
|
+
Thread.start do
|
22
|
+
loop do
|
23
|
+
buf.synchronize do
|
24
|
+
empty_cond.wait_while { buf.empty? }
|
25
|
+
print buf.shift
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
# producer
|
31
|
+
while line = ARGF.gets
|
32
|
+
buf.synchronize do
|
33
|
+
buf.push(line)
|
34
|
+
empty_cond.signal
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
The consumer thread waits for the producer thread to push a line
|
39
|
+
to buf while buf.empty?, and the producer thread (main thread)
|
40
|
+
reads a line from ARGF and push it to buf, then call
|
41
|
+
empty_cond.signal.
|
42
|
+
|
43
|
+
=end
|
44
|
+
|
45
|
+
require 'thread'
|
46
|
+
|
47
|
+
#
|
48
|
+
# Adds monitor functionality to an arbitrary object by mixing the module with
|
49
|
+
# +include+. For example:
|
50
|
+
#
|
51
|
+
# require 'monitor'
|
52
|
+
#
|
53
|
+
# buf = []
|
54
|
+
# buf.extend(MonitorMixin)
|
55
|
+
# empty_cond = buf.new_cond
|
56
|
+
#
|
57
|
+
# # consumer
|
58
|
+
# Thread.start do
|
59
|
+
# loop do
|
60
|
+
# buf.synchronize do
|
61
|
+
# empty_cond.wait_while { buf.empty? }
|
62
|
+
# print buf.shift
|
63
|
+
# end
|
64
|
+
# end
|
65
|
+
# end
|
66
|
+
#
|
67
|
+
# # producer
|
68
|
+
# while line = ARGF.gets
|
69
|
+
# buf.synchronize do
|
70
|
+
# buf.push(line)
|
71
|
+
# empty_cond.signal
|
72
|
+
# end
|
73
|
+
# end
|
74
|
+
#
|
75
|
+
# The consumer thread waits for the producer thread to push a line
|
76
|
+
# to buf while buf.empty?, and the producer thread (main thread)
|
77
|
+
# reads a line from ARGF and push it to buf, then call
|
78
|
+
# empty_cond.signal.
|
79
|
+
#
|
80
|
+
module MonitorMixin
|
81
|
+
#
|
82
|
+
# FIXME: This isn't documented in Nutshell.
|
83
|
+
#
|
84
|
+
# Since MonitorMixin.new_cond returns a ConditionVariable, and the example
|
85
|
+
# above calls while_wait and signal, this class should be documented.
|
86
|
+
#
|
87
|
+
class ConditionVariable
|
88
|
+
class Timeout < Exception; end
|
89
|
+
|
90
|
+
def wait(timeout = nil)
|
91
|
+
if timeout
|
92
|
+
raise NotImplementedError, "timeout is not implemented yet"
|
93
|
+
end
|
94
|
+
@monitor.send(:mon_check_owner)
|
95
|
+
count = @monitor.send(:mon_exit_for_cond)
|
96
|
+
begin
|
97
|
+
@cond.wait(@monitor.instance_variable_get("@mon_mutex"))
|
98
|
+
return true
|
99
|
+
ensure
|
100
|
+
@monitor.send(:mon_enter_for_cond, count)
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
def wait_while
|
105
|
+
while yield
|
106
|
+
wait
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
110
|
+
def wait_until
|
111
|
+
until yield
|
112
|
+
wait
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
def signal
|
117
|
+
@monitor.send(:mon_check_owner)
|
118
|
+
@cond.signal
|
119
|
+
end
|
120
|
+
|
121
|
+
def broadcast
|
122
|
+
@monitor.send(:mon_check_owner)
|
123
|
+
@cond.broadcast
|
124
|
+
end
|
125
|
+
|
126
|
+
def count_waiters
|
127
|
+
raise NotImplementedError
|
128
|
+
end
|
129
|
+
|
130
|
+
private
|
131
|
+
|
132
|
+
def initialize(monitor)
|
133
|
+
@monitor = monitor
|
134
|
+
@cond = ::ConditionVariable.new
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
def self.extend_object(obj)
|
139
|
+
super(obj)
|
140
|
+
obj.send(:mon_initialize)
|
141
|
+
end
|
142
|
+
|
143
|
+
#
|
144
|
+
# Attempts to enter exclusive section. Returns +false+ if lock fails.
|
145
|
+
#
|
146
|
+
def mon_try_enter
|
147
|
+
if @mon_owner != Thread.current
|
148
|
+
unless @mon_mutex.try_lock
|
149
|
+
return false
|
150
|
+
end
|
151
|
+
@mon_owner = Thread.current
|
152
|
+
end
|
153
|
+
@mon_count += 1
|
154
|
+
return true
|
155
|
+
end
|
156
|
+
# For backward compatibility
|
157
|
+
alias try_mon_enter mon_try_enter
|
158
|
+
|
159
|
+
#
|
160
|
+
# Enters exclusive section.
|
161
|
+
#
|
162
|
+
def mon_enter
|
163
|
+
if @mon_owner != Thread.current
|
164
|
+
@mon_mutex.lock
|
165
|
+
@mon_owner = Thread.current
|
166
|
+
end
|
167
|
+
@mon_count += 1
|
168
|
+
end
|
169
|
+
|
170
|
+
#
|
171
|
+
# Leaves exclusive section.
|
172
|
+
#
|
173
|
+
def mon_exit
|
174
|
+
mon_check_owner
|
175
|
+
@mon_count -=1
|
176
|
+
if @mon_count == 0
|
177
|
+
@mon_owner = nil
|
178
|
+
@mon_mutex.unlock
|
179
|
+
end
|
180
|
+
end
|
181
|
+
|
182
|
+
#
|
183
|
+
# Enters exclusive section and executes the block. Leaves the exclusive
|
184
|
+
# section automatically when the block exits. See example under
|
185
|
+
# +MonitorMixin+.
|
186
|
+
#
|
187
|
+
def mon_synchronize
|
188
|
+
mon_enter
|
189
|
+
begin
|
190
|
+
yield
|
191
|
+
ensure
|
192
|
+
mon_exit
|
193
|
+
end
|
194
|
+
end
|
195
|
+
alias synchronize mon_synchronize
|
196
|
+
|
197
|
+
#
|
198
|
+
# FIXME: This isn't documented in Nutshell.
|
199
|
+
#
|
200
|
+
def new_cond
|
201
|
+
return ConditionVariable.new(self)
|
202
|
+
end
|
203
|
+
|
204
|
+
private
|
205
|
+
|
206
|
+
def initialize(*args)
|
207
|
+
super
|
208
|
+
mon_initialize
|
209
|
+
end
|
210
|
+
|
211
|
+
def mon_initialize
|
212
|
+
@mon_owner = nil
|
213
|
+
@mon_count = 0
|
214
|
+
@mon_mutex = Mutex.new
|
215
|
+
end
|
216
|
+
|
217
|
+
def mon_check_owner
|
218
|
+
if @mon_owner != Thread.current
|
219
|
+
raise ThreadError, "current thread not owner"
|
220
|
+
end
|
221
|
+
end
|
222
|
+
|
223
|
+
def mon_enter_for_cond(count)
|
224
|
+
@mon_owner = Thread.current
|
225
|
+
@mon_count = count
|
226
|
+
end
|
227
|
+
|
228
|
+
def mon_exit_for_cond
|
229
|
+
count = @mon_count
|
230
|
+
@mon_owner = nil
|
231
|
+
@mon_count = 0
|
232
|
+
return count
|
233
|
+
end
|
234
|
+
end
|
235
|
+
|
236
|
+
class Monitor
|
237
|
+
include MonitorMixin
|
238
|
+
alias try_enter try_mon_enter
|
239
|
+
alias enter mon_enter
|
240
|
+
alias exit mon_exit
|
241
|
+
end
|
242
|
+
|
243
|
+
|
244
|
+
# Documentation comments:
|
245
|
+
# - All documentation comes from Nutshell.
|
246
|
+
# - MonitorMixin.new_cond appears in the example, but is not documented in
|
247
|
+
# Nutshell.
|
248
|
+
# - All the internals (internal modules Accessible and Initializable, class
|
249
|
+
# ConditionVariable) appear in RDoc. It might be good to hide them, by
|
250
|
+
# making them private, or marking them :nodoc:, etc.
|
251
|
+
# - The entire example from the RD section at the top is replicated in the RDoc
|
252
|
+
# comment for MonitorMixin. Does the RD section need to remain?
|
253
|
+
# - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
|
254
|
+
# not synchronize.
|
255
|
+
# - mon_owner is in Nutshell, but appears as an accessor in a separate module
|
256
|
+
# here, so is hard/impossible to RDoc. Some other useful accessors
|
257
|
+
# (mon_count and some queue stuff) are also in this module, and don't appear
|
258
|
+
# directly in the RDoc output.
|
259
|
+
# - in short, it may be worth changing the code layout in this file to make the
|
260
|
+
# documentation easier
|
261
|
+
|
262
|
+
# Local variables:
|
263
|
+
# mode: Ruby
|
264
|
+
# tab-width: 8
|
265
|
+
# End:
|