rhodes 3.3.3.beta.4 → 3.3.3
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +7 -5
- data/CREDITS +2215 -0
- data/Rakefile +225 -59
- data/bin/c2dm.rb +0 -0
- data/bin/get-rhodes-info.bat +0 -0
- data/bin/migrate-rhodes-app +0 -0
- data/bin/migrate-rhodes-app.bat +0 -0
- data/bin/rhodes +0 -0
- data/bin/rhodes-setup +0 -0
- data/bin/rhodes-setup.bat +0 -0
- data/bin/rhogen +0 -0
- data/bin/rhogen.bat +0 -0
- data/bin/set-rhodes-sdk +0 -0
- data/bin/set-rhodes-sdk.bat +0 -0
- data/bin/upgrade-rhodes-app +0 -0
- data/bin/upgrade-rhodes-app.bat +0 -0
- data/doc/build.txt +20 -9
- data/doc/configuration.txt +8 -8
- data/doc/connect-to-web-services.txt +1 -1
- data/doc/device-caps.txt +63 -26
- data/doc/extensions.txt +14 -2
- data/doc/install.txt +28 -19
- data/doc/introduction.txt +6 -3
- data/doc/jqt-jqm-transition.txt +10 -9
- data/doc/release.txt +5 -1
- data/doc/rhodes-command-line.txt +130 -0
- data/doc/rhom.txt +16 -11
- data/doc/rhostudio-eclipse.txt +3 -3
- data/doc/simulator.txt +28 -31
- data/doc/syncengine-ajax-api.txt +246 -0
- data/doc/synchronization.txt +21 -3
- data/doc/test-log-debug.txt +3 -1
- data/doc/ui.txt +16 -16
- data/ext/extconf.rb +8 -0
- data/lib/build/jake.rb +5 -5
- data/lib/extensions/barcode/ext/barcode/platform/android/Rakefile +9 -9
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp +81 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivityHandler.java +6 -13
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeHandler.java +2 -6
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +12 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/run.bat +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.h +2 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.mm +36 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.h +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.m +15 -5
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m +64 -1
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i +35 -1
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c +126 -2
- data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c +18 -1
- data/lib/extensions/barcode/ext/build +0 -0
- data/lib/extensions/barcode/ext/build.bat +0 -0
- data/lib/extensions/digest-md5/ext/Rakefile +12 -10
- data/lib/extensions/digest-md5/ext/build +0 -0
- data/lib/extensions/digest-md5/ext/build.bat +0 -0
- data/lib/extensions/digest-md5/ext/digest-md5.sln +2 -2
- data/lib/extensions/digest-md5/ext/digest-md5.vcproj +41 -28
- data/lib/extensions/digest-sha1/ext/Rakefile +11 -10
- data/lib/extensions/digest-sha1/ext/build +0 -0
- data/lib/extensions/digest-sha1/ext/build.bat +0 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.sln +2 -2
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +41 -28
- data/lib/extensions/digest/ext/Rakefile +12 -11
- data/lib/extensions/digest/ext/build +0 -0
- data/lib/extensions/digest/ext/build.bat +0 -0
- data/lib/extensions/digest/ext/digest.sln +44 -0
- data/lib/extensions/digest/ext/digest.vcproj +40 -27
- data/lib/extensions/esri/ext/build +0 -0
- data/lib/extensions/esri/ext/build.bat +0 -0
- data/lib/extensions/fcntl/ext/Rakefile +10 -9
- data/lib/extensions/fcntl/ext/build +0 -0
- data/lib/extensions/fcntl/ext/build.bat +0 -0
- data/lib/extensions/fcntl/ext/fcntl.vcproj +1 -1
- data/lib/extensions/nfc/ext/build +0 -0
- data/lib/extensions/nfc/ext/build.bat +0 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/Rakefile +11 -11
- data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp +0 -0
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java +12 -10
- data/lib/extensions/nfc/ext/nfc/shared/ruby/nfc_wrap.c +16 -9
- data/lib/extensions/pdf-writer/color.rb +145 -0
- data/lib/extensions/pdf-writer/color/cmyk.rb +279 -0
- data/lib/extensions/pdf-writer/color/css.rb +28 -0
- data/lib/extensions/pdf-writer/color/grayscale.rb +212 -0
- data/lib/extensions/pdf-writer/color/hsl.rb +221 -0
- data/lib/extensions/pdf-writer/color/palette.rb +16 -0
- data/lib/extensions/pdf-writer/color/palette/adobecolor.rb +272 -0
- data/lib/extensions/pdf-writer/color/palette/gimp.rb +116 -0
- data/lib/extensions/pdf-writer/color/palette/monocontrast.rb +180 -0
- data/lib/extensions/pdf-writer/color/rgb-colors.rb +355 -0
- data/lib/extensions/pdf-writer/color/rgb.rb +453 -0
- data/lib/extensions/pdf-writer/color/rgb/metallic.rb +43 -0
- data/lib/extensions/pdf-writer/color/yiq.rb +84 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/color/Licence.txt +27 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/color/README.txt +32 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/pdf-writer/LICENCE +131 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/pdf-writer/README +33 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/transaction-simple/Licence.txt +25 -0
- data/lib/extensions/pdf-writer/ext/LICENSES/transaction-simple/Readme.txt +204 -0
- data/lib/extensions/pdf-writer/pdf/charts.rb +13 -0
- data/lib/extensions/pdf-writer/pdf/charts/stddev.rb +430 -0
- data/lib/extensions/pdf-writer/pdf/math.rb +108 -0
- data/lib/extensions/pdf-writer/pdf/quickref.rb +332 -0
- data/lib/extensions/pdf-writer/pdf/simpletable.rb +947 -0
- data/lib/extensions/pdf-writer/pdf/techbook.rb +901 -0
- data/lib/extensions/pdf-writer/pdf/writer.rb +2729 -0
- data/lib/extensions/pdf-writer/pdf/writer/arc4.rb +63 -0
- data/lib/extensions/pdf-writer/pdf/writer/fontmetrics.rb +203 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-Bold.afm +342 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-BoldOblique.afm +342 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-Oblique.afm +342 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier.afm +342 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-Bold.afm +2827 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-BoldOblique.afm +2827 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-Oblique.afm +3051 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica.afm +3051 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/MustRead.html +19 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Symbol.afm +213 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Bold.afm +2588 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-BoldItalic.afm +2384 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Italic.afm +2667 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Roman.afm +2419 -0
- data/lib/extensions/pdf-writer/pdf/writer/fonts/ZapfDingbats.afm +225 -0
- data/lib/extensions/pdf-writer/pdf/writer/graphics.rb +813 -0
- data/lib/extensions/pdf-writer/pdf/writer/graphics/imageinfo.rb +365 -0
- data/lib/extensions/pdf-writer/pdf/writer/lang.rb +43 -0
- data/lib/extensions/pdf-writer/pdf/writer/lang/en.rb +99 -0
- data/lib/extensions/pdf-writer/pdf/writer/object.rb +23 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/action.rb +35 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/annotation.rb +42 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/catalog.rb +39 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/contents.rb +65 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/destination.rb +40 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/encryption.rb +53 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/font.rb +72 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/fontdescriptor.rb +34 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/fontencoding.rb +40 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/image.rb +304 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/info.rb +51 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/outline.rb +30 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/outlines.rb +30 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/page.rb +195 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/pages.rb +115 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/procset.rb +46 -0
- data/lib/extensions/pdf-writer/pdf/writer/object/viewerpreferences.rb +74 -0
- data/lib/extensions/pdf-writer/pdf/writer/ohash.rb +58 -0
- data/lib/extensions/pdf-writer/pdf/writer/oreader.rb +25 -0
- data/lib/extensions/pdf-writer/pdf/writer/state.rb +48 -0
- data/lib/extensions/pdf-writer/pdf/writer/strokestyle.rb +138 -0
- data/lib/extensions/pdf-writer/transaction/simple.rb +486 -0
- data/lib/extensions/pdf-writer/transaction/simple/group.rb +146 -0
- data/lib/extensions/pdf-writer/transaction/simple/threadsafe.rb +68 -0
- data/lib/extensions/pdf-writer/transaction/simple/threadsafe/group.rb +36 -0
- data/lib/framework/builtinME.rb +0 -0
- data/lib/framework/dateOrig.rb +8 -2
- data/lib/framework/rational.rb +0 -0
- data/lib/framework/res/esri.wm.png +0 -0
- data/lib/framework/rho/rho.rb +6 -0
- data/lib/framework/rho/rhobluetooth.rb +0 -0
- data/lib/framework/rho/rhofsconnector.rb +0 -0
- data/lib/framework/rho/rhonativeviewmanager.rb +0 -0
- data/lib/framework/rhofsconnector.rb +0 -0
- data/lib/framework/rhom/rhom_object_factory.rb +8 -0
- data/lib/framework/rhomotoapi.rb +3 -2
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +9 -1
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +1 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h +26 -2
- data/platform/android/Rhodes/jni/src/callbacks.cpp +0 -5
- data/platform/android/Rhodes/jni/src/camera.cpp +1 -1
- data/platform/android/Rhodes/jni/src/fileapi.cpp +39 -19
- data/platform/android/Rhodes/jni/src/geolocation.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +206 -64
- data/platform/android/Rhodes/jni/src/nativeview.cpp +1 -1
- data/platform/android/Rhodes/jni/src/rhodes.cpp +13 -0
- data/platform/android/Rhodes/jni/src/rhodesapp.cpp +20 -0
- data/platform/android/Rhodes/jni/src/rhodessystem.cpp +36 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +22 -2
- data/platform/android/Rhodes/res/drawable/alert_info.png +0 -0
- data/platform/android/Rhodes/res/drawable/esri.png +0 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +17 -16
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java +4 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/MemoryInfoCollector.java +67 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +139 -114
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +106 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +11 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +71 -16
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java +4 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java +4 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java +22 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/Config.java +243 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java +19 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java +9 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{RhodesActivityListener.java → extmanager/IRhoListener.java} +16 -12
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java +63 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java +239 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhodesStartupListeners.java +9 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/WebkitExtension.java +53 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +27 -12
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +124 -62
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +49 -137
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +84 -114
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SplashScreen.java +75 -82
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +3 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Callout.java +4 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapBitmapManager.java +124 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +232 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Request.java +193 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/IRhoCustomView.java +13 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +32 -23
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoVideoView.java +74 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java +6 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java +37 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality03.java +14 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality05.java +51 -38
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality07.java +9 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java +48 -31
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java +15 -16
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +52 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +20 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java +77 -34
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java +9 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebChromeClient.java +105 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java +1 -1
- data/platform/android/build/RhodesSRC_build.files +8 -7
- data/platform/android/build/android.rake +326 -216
- data/platform/android/build/androidcommon.rb +27 -13
- data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java +27 -1
- data/platform/bb/RubyVM/src/j2me/io/File.java +104 -38
- data/platform/bb/build/bb.rake +1 -0
- data/platform/bb/build/runRAPC.bat +0 -0
- data/platform/bb/rhodes/resources/background.png +0 -0
- data/platform/bb/rhodes/resources/esri.png +0 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +5 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +2 -2
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +0 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +0 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +0 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +0 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +0 -0
- data/platform/iphone/Classes/AppManager/AppManager.m +7 -1
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +9 -0
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +75 -4
- data/platform/iphone/Classes/GeoLocation/LocationController.h +8 -2
- data/platform/iphone/Classes/GeoLocation/LocationController.m +74 -76
- data/platform/iphone/Classes/InitMemoryInfoCollector.h +33 -0
- data/platform/iphone/Classes/InitMemoryInfoCollector.mm +52 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +0 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +34 -2
- data/platform/iphone/Classes/Rhodes.m +22 -2
- data/platform/iphone/Classes/Signature/SignatureDelegate.m +19 -0
- data/platform/iphone/Classes/Signature/SignatureViewController.h +0 -0
- data/platform/iphone/Classes/Signature/SignatureViewController.m +0 -0
- data/platform/iphone/Classes/SimpleMainView.h +0 -0
- data/platform/iphone/Classes/SimpleMainView.m +3 -3
- 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/rbuild/iphone.rake +75 -7
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +13 -4
- data/platform/linux/target/compiler/rubylinux +0 -0
- data/platform/mac/target/compiler/RubyMac +0 -0
- data/platform/osx/Rhodes Launcher/rhorunner.app/rhorunner b/data/platform/osx/Rhodes → Launcher/rhorunner.app/rhorunner +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/keyedobjects.nib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +1 -1
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqcorewlanbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtga.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_inspector.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_tcp.dylib +0 -0
- data/platform/osx/build/osx.rake +6 -8
- data/platform/shared/RhoConnectClient/RhoConnectClient.cpp +165 -33
- data/platform/shared/RhoConnectClient/RhoConnectClient.h +10 -1
- data/platform/shared/common/BundleManager.cpp +27 -16
- data/platform/shared/common/ExtManager.h +15 -2
- data/platform/shared/common/RhoConf.cpp +17 -2
- data/platform/shared/common/RhoConf.h +3 -1
- data/platform/shared/common/RhoDefs.h +6 -6
- data/platform/shared/common/RhoFatalError.h +1 -1
- data/platform/shared/common/RhoFile.cpp +9 -9
- data/platform/shared/common/RhoFilePath.h +7 -3
- data/platform/shared/common/RhoPort.h +3 -3
- data/platform/shared/common/RhoSystem.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +426 -26
- data/platform/shared/common/RhodesApp.h +11 -3
- data/platform/shared/common/RhodesAppBase.cpp +4 -1
- data/platform/shared/common/StringConverter.h +3 -3
- data/platform/shared/common/app_build_capabilities.h +8 -0
- data/platform/shared/common/map/BaseMapEngine.cpp +302 -21
- data/platform/shared/common/map/BaseMapEngine.h +132 -6
- data/platform/shared/common/map/ESRIMapEngine.cpp +2 -1
- data/platform/shared/common/map/GeocodingMapEngine.cpp +22 -4
- data/platform/shared/common/map/GeocodingMapEngine.h +40 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +13 -1
- data/platform/shared/common/map/MapEngine.h +7 -0
- data/platform/shared/common/map/OSMMapEngine.cpp +12 -1
- data/platform/shared/json/JSONIterator.cpp +1 -1
- data/platform/shared/json/RJSONTokener.c +2 -0
- data/platform/shared/json/config.h +3 -3
- data/platform/shared/logging/RhoLog.cpp +12 -3
- data/platform/shared/logging/RhoLog.h +2 -1
- data/platform/shared/logging/RhoLogConf.cpp +147 -11
- data/platform/shared/logging/RhoLogConf.h +39 -1
- data/platform/shared/logging/RhoLogSink.cpp +1 -1
- data/platform/shared/net/HttpServer.cpp +8 -4
- data/platform/shared/net/INetRequest.cpp +7 -0
- data/platform/shared/net/INetRequest.h +2 -0
- data/platform/shared/net/RawSocket.cpp +1 -1
- data/platform/shared/qt/pbxproj2pro.pl +0 -0
- data/platform/shared/qt/pro_vcproj_diff.pl +0 -0
- data/platform/shared/qt/rhodes/QtMainWindow.cpp +1 -1
- data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h +2 -2
- data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp +2 -2
- data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +11 -1
- data/platform/shared/qt/rhodes/main.cpp +5 -5
- data/platform/shared/ruby/ext/alert/alert_wrap.c +8 -8
- data/platform/shared/ruby/ext/bluetooth/bluetooth.i +0 -0
- data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c +16 -9
- data/platform/shared/ruby/ext/camera/camera.i +2 -2
- data/platform/shared/ruby/ext/camera/camera_wrap.c +18 -3
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +37 -8
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +8 -8
- data/platform/shared/ruby/ext/mapview/mapview_wrap.c +16 -9
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +16 -9
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +0 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +16 -9
- data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +8 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +7 -1
- data/platform/shared/ruby/ext/rho/rhoruby.h +1 -0
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +16 -9
- data/platform/shared/ruby/ext/signature/signature.i +0 -0
- data/platform/shared/ruby/ext/signature/signature_wrap.c +9 -9
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +16 -9
- data/platform/shared/ruby/ext/system/system_wrap.c +16 -9
- data/platform/shared/ruby/ext/webview/webview_wrap.c +16 -9
- data/platform/shared/ruby/gc.c +1 -0
- data/platform/shared/ruby/regint.h +6 -4
- data/platform/shared/ruby/vm.c +1 -0
- data/platform/shared/ruby/wince/wince.h +1 -1
- data/platform/shared/rubyext/System.cpp +1 -1
- data/platform/shared/shttpd/src/rdispatcher.c +3 -3
- data/platform/shared/shttpd/src/std_includes.h +1 -1
- data/platform/shared/sqlite/sqlite3.c +1 -0
- data/platform/shared/statistic/test/TestProfiling.cpp +1 -1
- data/platform/shared/stlport/build/lib/configure +0 -0
- data/platform/shared/stlport/build/lib/configure.bat +0 -0
- data/platform/shared/sync/SyncEngine.cpp +9 -12
- data/platform/shared/sync/SyncNotify.cpp +36 -3
- data/platform/shared/sync/SyncNotify.h +11 -4
- data/platform/shared/sync/SyncSource.cpp +32 -16
- data/platform/shared/sync/SyncSource.h +2 -3
- data/platform/shared/sync/SyncThread.cpp +13 -4
- data/platform/shared/sync/SyncThread.h +4 -0
- data/platform/shared/tcmalloc/page_heap.h +1 -1
- data/platform/shared/tcmalloc/rhomem.h +1 -1
- data/platform/shared/tcmalloc/windows/port.cpp +12 -3
- data/platform/shared/test/Tests.cpp +4 -4
- data/platform/shared/test/test_helper.cpp +4 -4
- data/platform/symbian/sqlite3/src/sqlite3.h +1 -1
- data/platform/win32/RhoSimulator/Microsoft.VC90.CRT.manifest +6 -0
- data/platform/win32/RhoSimulator/Microsoft.VC90.OpenMP.manifest +6 -0
- data/platform/win32/RhoSimulator/QtCore4.dll +0 -0
- data/platform/win32/RhoSimulator/QtGui4.dll +0 -0
- data/platform/win32/RhoSimulator/QtNetwork4.dll +0 -0
- data/platform/win32/RhoSimulator/QtWebKit4.dll +0 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/RhoSimulator/imageformats/qgif4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qico4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qjpeg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qmng4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qsvg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qtiff4.dll +0 -0
- data/platform/win32/RhoSimulator/libeay32.dll +0 -0
- data/platform/win32/RhoSimulator/msvcm90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcp90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcr90.dll +0 -0
- data/platform/win32/RhoSimulator/phonon4.dll +0 -0
- data/platform/win32/RhoSimulator/ssleay32.dll +0 -0
- data/platform/win32/RhoSimulator/vcomp90.dll +0 -0
- data/platform/win32/target/replaceicon/replaceicon.exe +0 -0
- data/platform/win32/target/updateresstring/updateresstring.exe +0 -0
- data/platform/wm/RhoLib/RhoLib.vcproj +394 -69
- data/platform/wm/build/build_inf.js +83 -23
- data/platform/wm/build/wm.rake +127 -81
- data/platform/wm/rhodes.sln +6 -6
- data/platform/wm/rhodes/DateTimePicker.h +2 -2
- data/platform/wm/rhodes/IBrowserEngine.h +3 -0
- data/platform/wm/rhodes/IEBrowserEngine.cpp +34 -2
- data/platform/wm/rhodes/IEBrowserEngine.h +4 -1
- data/platform/wm/rhodes/LicenseStub.cpp +73 -0
- data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java → wm/rhodes/LogMemory.cpp} +32 -20
- data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java → wm/rhodes/LogMemory.h} +11 -8
- data/platform/wm/rhodes/LogOptionsDlg.h +1 -1
- data/platform/wm/rhodes/LogView.cpp +10 -10
- data/platform/wm/rhodes/LogView.h +10 -10
- data/platform/wm/rhodes/MainWindow.cpp +431 -173
- data/platform/wm/rhodes/MainWindow.h +37 -19
- data/platform/wm/rhodes/MapView/MapViewManager.h +1 -1
- data/platform/wm/rhodes/OkCancelModalDialog.h +1 -1
- data/platform/wm/rhodes/Rhodes.cpp +210 -47
- data/platform/wm/rhodes/Rhodes.rc +38 -0
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +2 -2
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +3 -3
- data/platform/wm/rhodes/camera/Camera.cpp +2 -1
- data/platform/wm/rhodes/camera/Camera.h +1 -1
- data/platform/wm/rhodes/resource.h +1 -1
- data/platform/wm/rhodes/rho/common/ExtManager.cpp +93 -5
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +2 -2
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +2 -2
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +13 -7
- data/platform/wm/rhodes/rhodes.vcproj +1409 -1008
- data/platform/wm/rhodes/simulator/MainWindowQt.h +1 -1
- data/platform/wm/rhodes/stdafx.h +2 -2
- data/platform/wm/rhoelements.sln +7 -9
- data/platform/wm/rubylib/rubylib.vcproj +62 -1
- data/platform/wm/sqlite3/sqlite3.vcproj +62 -1
- data/platform/wm/syncengine/syncengine.vcproj +62 -1
- data/platform/wm/tcmalloc/tcmalloc.vcproj +72 -53
- data/platform/wm/tools/detool/detool.cpp +1435 -1357
- data/platform/wp7/RhoRubyExtGen/GenerateInitializers.cmd +0 -0
- data/platform/wp7/RhoRubyLib/common/RhoLicense.cs +105 -0
- data/platform/wp7/RhoRubyLib/common/RhodesApp.cs +23 -5
- data/platform/wp7/RhoRubyLib/sync/SyncNotify.cs +5 -0
- data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs +22 -3
- data/platform/wp7/build/wp.rake +1 -0
- data/platform/wp7/rhodes/MainPage.xaml.cs +11 -0
- data/rakefile.rb +225 -59
- data/res/build-tools/7za.exe +0 -0
- data/res/build-tools/RhoAppRunner.exe +0 -0
- data/res/build-tools/RhoLogServer.exe +0 -0
- data/res/build-tools/RhoRuby.exe +0 -0
- data/res/build-tools/RubyMac +0 -0
- data/res/build-tools/detool.exe +0 -0
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +1 -1
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/build/Release/iphonesim_43 +0 -0
- data/res/build-tools/license_rc.dll +0 -0
- data/res/build-tools/make.exe +0 -0
- data/res/build-tools/rubylinux +0 -0
- data/res/build-tools/swig_patch/Lib/typemaps/fragments.swg +235 -0
- data/res/build-tools/wmdc_connect.exe +0 -0
- data/res/build-tools/wp7explorer.exe +0 -0
- data/res/generators/rhogen.rb +2 -2
- data/res/generators/templates/application/app/Settings/controller.rb +1 -1
- data/res/generators/templates/application/app/layout.erb +1 -1
- data/res/generators/templates/application/app/loading.png +0 -0
- data/res/generators/templates/application/public/css/re_webkit.css +736 -0
- data/res/generators/templates/application/public/css/windows_mobile.css +0 -0
- data/res/generators/templates/application/public/images/listArrow.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/ajax-loader.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-white.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-white.png +0 -0
- data/res/generators/templates/application/public/js/syncengine.js +409 -52
- data/res/generators/templates/extension/extensions/montana/ext/build +0 -0
- data/res/generators/templates/extension/extensions/montana/ext/build.bat +0 -0
- data/res/generators/templates/extension/extensions/montana/ext/montana/platform/android/Rakefile +10 -10
- data/res/generators/templates/spec/app/SpecRunner/controller.rb +2 -0
- data/res/libs/motorolalicence/android/MotorolaLicence.h +13 -0
- data/res/libs/motorolalicence/android/libMotorolaLicence.a +0 -0
- data/res/libs/motorolalicence/iphone/MotorolaLicence.h +13 -0
- data/res/libs/motorolalicence/iphone/libMotorolaLicence.a +0 -0
- data/rhodes.gemspec +1 -1
- data/spec/framework_spec/app/SpecRunner/controller.rb +2 -0
- data/spec/phone_spec/app/SpecRunner/controller.rb +2 -0
- data/version +1 -1
- metadata +487 -412
- data/Manifest.txt +0 -7960
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java +0 -12
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +0 -52
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java +0 -62
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/phonon.framework/Versions/4/phonon +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/phonon_backend/libphonon_qt7.dylib +0 -0
- data/platform/win32/RhoSimulator/Microsoft.VC80.CRT.manifest +0 -8
- data/platform/win32/RhoSimulator/Microsoft.VC80.OpenMP.manifest +0 -7
- data/platform/win32/RhoSimulator/msvcm80.dll +0 -0
- data/platform/win32/RhoSimulator/msvcp80.dll +0 -0
- data/platform/win32/RhoSimulator/msvcr80.dll +0 -0
- data/platform/win32/RhoSimulator/vcomp.dll +0 -0
- data/rhomobile-debug-1.0.6.gem +0 -0
File without changes
|
@@ -0,0 +1,105 @@
|
|
1
|
+
using System;
|
2
|
+
using System.Net;
|
3
|
+
using System.Windows;
|
4
|
+
using System.Windows.Controls;
|
5
|
+
using System.Windows.Documents;
|
6
|
+
using System.Windows.Ink;
|
7
|
+
using System.Windows.Input;
|
8
|
+
using System.Windows.Media;
|
9
|
+
using System.Windows.Media.Animation;
|
10
|
+
using System.Windows.Shapes;
|
11
|
+
using System.Text;
|
12
|
+
using System.Runtime.InteropServices;
|
13
|
+
|
14
|
+
|
15
|
+
namespace rho.common
|
16
|
+
{
|
17
|
+
public class RhoLicense
|
18
|
+
{
|
19
|
+
[DllImport("user32.dll", CallingConvention = CallingConvention.Cdecl)]
|
20
|
+
static extern int wsprintf(
|
21
|
+
[Out] char[] buffer,
|
22
|
+
string format,
|
23
|
+
params object[] args);
|
24
|
+
|
25
|
+
[DllImport("user32.dll", CallingConvention = CallingConvention.Cdecl)]
|
26
|
+
static extern int wcsncmp(
|
27
|
+
char[] string1,
|
28
|
+
char[] string2,
|
29
|
+
int count);
|
30
|
+
|
31
|
+
[DllImport("user32.dll", CallingConvention = CallingConvention.Cdecl)]
|
32
|
+
static extern int wcscmp(
|
33
|
+
char[] string1,
|
34
|
+
char[] string2);
|
35
|
+
|
36
|
+
|
37
|
+
private static String LIC_KEY = "MOTNEON";
|
38
|
+
private static ulong dwVer1 = 2;
|
39
|
+
private static ulong dwVer2 = 0;
|
40
|
+
private static ulong dwVer3 = 0;
|
41
|
+
private static ulong dwVer4 = 5;
|
42
|
+
private static String wtDIN;
|
43
|
+
|
44
|
+
public static void DecryptPwd(ref char[] pwtPwd, ref char[] pwtDecrypted)
|
45
|
+
{
|
46
|
+
int x;
|
47
|
+
char[] wtHex = new char[3];
|
48
|
+
char wtChar;
|
49
|
+
int x1 = 0;
|
50
|
+
|
51
|
+
int l = wtDIN.Length;
|
52
|
+
int l1 = pwtPwd.Length;
|
53
|
+
|
54
|
+
//decode
|
55
|
+
for(x=0; x < l1; x+=2){
|
56
|
+
wtHex[0] = pwtPwd[x];
|
57
|
+
wtHex[1] = pwtPwd[x+1];
|
58
|
+
pwtPwd[x1++] = Convert.ToChar(Convert.ToInt64(wtHex.ToString(), 16));
|
59
|
+
}
|
60
|
+
|
61
|
+
//decrypt
|
62
|
+
char[] wtTemp = new char[1000];
|
63
|
+
pwtDecrypted[0] = '\0';
|
64
|
+
for(x=0; x < x1; x++){
|
65
|
+
wtChar = wtDIN[(x % l) - l * Convert.ToInt32((x+1 % l)==0)];
|
66
|
+
wtTemp[x] = Convert.ToChar(pwtPwd[x] ^ wtChar);
|
67
|
+
pwtDecrypted = System.String.Concat(pwtDecrypted, wtTemp).ToCharArray() ;
|
68
|
+
}
|
69
|
+
}
|
70
|
+
|
71
|
+
int MotorolaLicence_check(String company, String licence)
|
72
|
+
{
|
73
|
+
char[] wtCoName = company.ToCharArray();
|
74
|
+
char[] wtReg = licence.ToCharArray();
|
75
|
+
|
76
|
+
|
77
|
+
int iChecksum = 0;
|
78
|
+
for(uint iCS=0; iCS<wtCoName.Length; iCS++)
|
79
|
+
iChecksum+=wtCoName[iCS];
|
80
|
+
|
81
|
+
if(iChecksum > 0xEE2)
|
82
|
+
return 0;
|
83
|
+
|
84
|
+
char[] wtDecrypted = new char[50];
|
85
|
+
|
86
|
+
char[] wtCS = new char[5];
|
87
|
+
char[] wtLicenseKey = new char[16];
|
88
|
+
|
89
|
+
wsprintf(wtCS, "%03X:", iChecksum);
|
90
|
+
wtDIN = "CORPERATELICENSE";
|
91
|
+
DecryptPwd(ref wtReg, ref wtDecrypted);
|
92
|
+
if(wcsncmp(wtCS, wtDecrypted, 4) != 0)
|
93
|
+
return 0;
|
94
|
+
|
95
|
+
wsprintf(wtLicenseKey, "%s%d_%dO0", LIC_KEY, dwVer1, dwVer2, dwVer3);
|
96
|
+
|
97
|
+
|
98
|
+
if(wcscmp(wtDecrypted,wtLicenseKey ) != 0)//todo!!!
|
99
|
+
return 0;
|
100
|
+
|
101
|
+
return 1;
|
102
|
+
}
|
103
|
+
|
104
|
+
}
|
105
|
+
}
|
@@ -71,7 +71,7 @@ namespace rho.common
|
|
71
71
|
private String m_strHomeUrl;
|
72
72
|
private String m_strAppBackUrl;
|
73
73
|
private RhoView m_rhoView;
|
74
|
-
private RhoView m_masterView = null;
|
74
|
+
private static RhoView m_masterView = null;
|
75
75
|
public bool m_transition = false;
|
76
76
|
ManualResetEvent m_UIWaitEvent = new ManualResetEvent(false);
|
77
77
|
Vector<Object> m_arCallbackObjects = new Vector<Object>();
|
@@ -553,6 +553,18 @@ namespace rho.common
|
|
553
553
|
m_currentUri = uri;
|
554
554
|
}
|
555
555
|
|
556
|
+
public void back()
|
557
|
+
{
|
558
|
+
if (m_strAppBackUrl.length() > 0)
|
559
|
+
processToolBarCommand(this, null, m_strAppBackUrl);
|
560
|
+
else if (m_backHistory.Count > 0)
|
561
|
+
{
|
562
|
+
Uri destination = m_backHistory.Peek();
|
563
|
+
m_webBrowser.Navigate(destination);
|
564
|
+
}
|
565
|
+
return;
|
566
|
+
}
|
567
|
+
|
556
568
|
private void processToolBarCommand(object sender, EventArgs e, String strAction)
|
557
569
|
{
|
558
570
|
|
@@ -707,8 +719,14 @@ namespace rho.common
|
|
707
719
|
//PivotItem PivotItem = new PivotItem();
|
708
720
|
PivotItem PivotItem = new PivotItem();
|
709
721
|
PivotItem.Header = new RhoTabHeader(label, icon);
|
710
|
-
|
711
|
-
|
722
|
+
if (i == 0)
|
723
|
+
{// && use_current_view_for_tab)
|
724
|
+
((Grid)m_masterView.Parent).Children.Remove(m_masterView);
|
725
|
+
m_masterView.Init(m_appMainPage, m_layoutRoot, action, reload, web_bkg_color, i);
|
726
|
+
PivotItem.Content = m_masterView;
|
727
|
+
}
|
728
|
+
else
|
729
|
+
PivotItem.Content = new RhoView(m_appMainPage, m_layoutRoot, action, reload, web_bkg_color, i);
|
712
730
|
if (values.TryGetValue(CRhoRuby.CreateSymbol("selected_color"), out val))
|
713
731
|
PivotItem.Background = new SolidColorBrush(getColorFromString(val.ToString()));
|
714
732
|
if (values.TryGetValue(CRhoRuby.CreateSymbol("disabled"), out val))
|
@@ -749,7 +767,7 @@ namespace rho.common
|
|
749
767
|
createTabBarButtons(tabBarType, hashArray);
|
750
768
|
m_tabControl.Margin = new Thickness(0, 70, 0, 0);
|
751
769
|
m_layoutRoot.Children.Add(m_tabControl);
|
752
|
-
|
770
|
+
m_masterView.removeBrowser();
|
753
771
|
});
|
754
772
|
}
|
755
773
|
|
@@ -760,8 +778,8 @@ namespace rho.common
|
|
760
778
|
if (m_tabControl != null)
|
761
779
|
{
|
762
780
|
m_tabControl.Items.Clear();
|
781
|
+
((Grid)m_masterView.Parent).Children.Add(m_masterView);
|
763
782
|
m_layoutRoot.Children.Remove(m_tabControl);
|
764
|
-
m_layoutRoot.Children.Add(m_masterView);
|
765
783
|
m_masterView.refresh();
|
766
784
|
}
|
767
785
|
});
|
@@ -658,6 +658,11 @@ namespace rho.sync
|
|
658
658
|
|
659
659
|
strBody += "&error_message=" + URI.urlEncode(strMessage != null? strMessage : "");
|
660
660
|
strBody += "&rho_callback=1";
|
661
|
+
if (oNotify.m_strUrl.indexOf("?") > 0)
|
662
|
+
{
|
663
|
+
strBody += "&" + oNotify.m_strUrl.substring(oNotify.m_strUrl.indexOf("?") + 1, oNotify.m_strUrl.length());
|
664
|
+
oNotify.m_strUrl = oNotify.m_strUrl.Remove(oNotify.m_strUrl.indexOf("?"));
|
665
|
+
}
|
661
666
|
|
662
667
|
LOG.INFO( "Login callback: " + oNotify.ToString() + ". Body: "+ strBody );
|
663
668
|
|
@@ -90,8 +90,26 @@ namespace rho.views
|
|
90
90
|
webBrowser1.Background = webBkgColor;
|
91
91
|
}
|
92
92
|
|
93
|
+
public void Init(PhoneApplicationPage mainPage, Grid layoutRoot, String strAction,
|
94
|
+
bool reload, Brush webBkgColor, int index)
|
95
|
+
{
|
96
|
+
m_mainPage = mainPage;
|
97
|
+
m_strAction = strAction;
|
98
|
+
m_layoutRoot = layoutRoot;
|
99
|
+
m_reload = reload;
|
100
|
+
m_index = index;
|
101
|
+
if (webBkgColor != null)
|
102
|
+
webBrowser1.Background = webBkgColor;
|
103
|
+
}
|
104
|
+
|
93
105
|
private CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
|
94
106
|
|
107
|
+
public void removeBrowser()
|
108
|
+
{
|
109
|
+
//webBrowser1.ScriptNotify -= WebBrowser_OnScriptNotify;
|
110
|
+
webBrowser1.IsScriptEnabled = false;
|
111
|
+
}
|
112
|
+
|
95
113
|
private void WebBrowser_OnLoaded(object sender, RoutedEventArgs e)
|
96
114
|
{
|
97
115
|
if (RHODESAPP().Tab != null && RHODESAPP().Tab.SelectedIndex != m_index) return;
|
@@ -116,8 +134,6 @@ namespace rho.views
|
|
116
134
|
RHODESAPP().CurrentUri = m_currentUri;
|
117
135
|
if (((!m_loadFirstTime && m_reload) || m_loadFirstTime) && m_strAction != null)
|
118
136
|
{
|
119
|
-
if (m_loadFirstTime)
|
120
|
-
m_loadFirstTime = false;
|
121
137
|
//bool callback = false;
|
122
138
|
if (m_strAction.startsWith("callback:"))
|
123
139
|
{
|
@@ -129,8 +145,11 @@ namespace rho.views
|
|
129
145
|
{
|
130
146
|
RhoClassFactory.createNetRequest().pushData(m_strAction, "rho_callback=1", null);
|
131
147
|
}
|
132
|
-
else
|
148
|
+
else if (!m_callback)
|
133
149
|
webBrowser1.Navigate(new Uri(m_strAction));
|
150
|
+
|
151
|
+
if (m_loadFirstTime)
|
152
|
+
m_loadFirstTime = false;
|
134
153
|
}
|
135
154
|
}
|
136
155
|
|
data/platform/wp7/build/wp.rake
CHANGED
@@ -376,6 +376,7 @@ namespace "run" do
|
|
376
376
|
puts "log_file=" + getLogPath
|
377
377
|
end
|
378
378
|
|
379
|
+
desc "Run application on RhoSimulator"
|
379
380
|
task :rhosimulator => ["config:set_wp_platform", "config:common"] do
|
380
381
|
$rhosim_config = "platform='wp'\r\n"
|
381
382
|
Rake::Task["run:rhosimulator"].invoke
|
@@ -152,5 +152,16 @@ namespace Rhodes
|
|
152
152
|
RHODESAPP().addToHistory(e.Uri);
|
153
153
|
}
|
154
154
|
|
155
|
+
protected override void OnBackKeyPress(System.ComponentModel.CancelEventArgs e)
|
156
|
+
{
|
157
|
+
//if (Browser.Visibility == Visibility.Visible)
|
158
|
+
//{
|
159
|
+
// Browser.Visibility = Visibility.Collapsed;
|
160
|
+
e.Cancel = true;
|
161
|
+
RHODESAPP().back();
|
162
|
+
// }
|
163
|
+
}
|
164
|
+
|
165
|
+
|
155
166
|
}
|
156
167
|
}
|
data/rakefile.rb
CHANGED
@@ -80,7 +80,7 @@ namespace "framework" do
|
|
80
80
|
end
|
81
81
|
|
82
82
|
|
83
|
-
$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot']
|
83
|
+
$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "motorola_license", "motorola_license_company"]
|
84
84
|
|
85
85
|
def make_application_build_config_header_file
|
86
86
|
f = StringIO.new("", "w+")
|
@@ -235,12 +235,18 @@ namespace "config" do
|
|
235
235
|
|
236
236
|
extpaths = []
|
237
237
|
|
238
|
-
|
238
|
+
if $app_config["paths"] and $app_config["paths"]["extensions"]
|
239
|
+
if $app_config["paths"]["extensions"].is_a? String
|
240
|
+
extpaths << $app_config["paths"]["extensions"]
|
241
|
+
elsif $app_config["paths"]["extensions"].is_a? Array
|
242
|
+
extpaths += $app_config["paths"]["extensions"]
|
243
|
+
end
|
244
|
+
end
|
239
245
|
extpaths << $config["env"]["paths"]["extensions"] if $config["env"]["paths"]["extensions"]
|
240
246
|
extpaths << File.join($app_path, "extensions")
|
241
247
|
extpaths << File.join($startdir, "lib","extensions")
|
242
248
|
$app_config["extpaths"] = extpaths
|
243
|
-
|
249
|
+
|
244
250
|
if $app_config["build"] and $app_config["build"] == "release"
|
245
251
|
$debug = false
|
246
252
|
else
|
@@ -264,40 +270,53 @@ namespace "config" do
|
|
264
270
|
application_build_configs = {}
|
265
271
|
|
266
272
|
#Process rhoelements settings
|
267
|
-
if $
|
268
|
-
$app_config["
|
269
|
-
$app_config["extensions"] += ["rhoelementsext"] if $current_platform == 'wm'
|
270
|
-
$app_config["extensions"] += ["motoapi"] #extension with plug-ins
|
271
|
-
$app_config["extensions"] += ['webkit-browser'] unless $app_config["extensions"].index("webkit-browser")
|
273
|
+
if $current_platform == "wm" || $current_platform == "android"
|
274
|
+
if $app_config["app_type"] == 'rhoelements'
|
272
275
|
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
276
|
+
if !$app_config["capabilities"].index('non_motorola_device')
|
277
|
+
$app_config["capabilities"] += ["motorola"] unless $app_config["capabilities"].index("motorola")
|
278
|
+
$app_config["extensions"] += ["rhoelementsext"]
|
279
|
+
$app_config["extensions"] += ["motoapi"] #extension with plug-ins
|
280
|
+
|
281
|
+
#check for RE2 plugins
|
282
|
+
plugins = ""
|
283
|
+
$app_config["extensions"].each do |ext|
|
284
|
+
if ( ext.start_with?('moto-') )
|
285
|
+
plugins += ',' if plugins.length() > 0
|
286
|
+
plugins += ext[5, ext.length()-5]
|
287
|
+
end
|
288
|
+
end
|
289
|
+
|
290
|
+
if plugins.length() == 0
|
291
|
+
plugins = "ALL"
|
292
|
+
end
|
293
|
+
|
294
|
+
application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
|
295
|
+
|
296
|
+
end
|
297
|
+
|
298
|
+
if !$app_config["capabilities"].index('native_browser')
|
299
|
+
$app_config["capabilities"] += ["motorola_browser"] unless $app_config["capabilities"].index('motorola_browser')
|
279
300
|
end
|
280
301
|
end
|
281
|
-
|
282
|
-
if
|
283
|
-
|
302
|
+
|
303
|
+
application_build_configs['shared-runtime'] = '1' if $app_config["capabilities"].index('shared_runtime')
|
304
|
+
|
305
|
+
if $app_config["capabilities"].index("motorola_browser")
|
306
|
+
$app_config['extensions'] += ['webkit-browser'] unless $app_config['extensions'].index('webkit-browser')
|
284
307
|
end
|
285
308
|
|
286
|
-
application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
|
287
|
-
|
288
|
-
end
|
289
|
-
|
290
|
-
if $app_config["capabilities"].index("motorola")
|
291
309
|
if $app_config["extensions"].index("webkit-browser")
|
292
310
|
$app_config["capabilities"] += ["webkit_browser"]
|
293
|
-
$app_config["extensions"].delete("webkit-browser")
|
294
|
-
end
|
295
|
-
|
311
|
+
$app_config["extensions"].delete("webkit-browser") unless $current_platform == 'android'
|
312
|
+
end
|
313
|
+
|
314
|
+
if $app_config["capabilities"].index("webkit_browser") || $app_config["capabilities"].index("motorola")
|
315
|
+
#contains wm code for webkit browser support
|
316
|
+
$app_config["extensions"] += ["rhoelements"] unless $app_config['extensions'].index('rhoelements')
|
317
|
+
end
|
296
318
|
end
|
297
319
|
|
298
|
-
puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"
|
299
|
-
puts "$app_config['capabilities'] : #{$app_config['capabilities'].inspect}"
|
300
|
-
|
301
320
|
$hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
|
302
321
|
|
303
322
|
#application build configs
|
@@ -314,7 +333,80 @@ namespace "config" do
|
|
314
333
|
end
|
315
334
|
end
|
316
335
|
$application_build_configs = application_build_configs
|
336
|
+
#check for rhoelements gem
|
337
|
+
$rhoelements_features = ""
|
338
|
+
if $app_config['extensions'].index('barcode')
|
339
|
+
#$app_config['extensions'].delete('barcode')
|
340
|
+
$rhoelements_features += "- Barcode extension\n"
|
341
|
+
end
|
342
|
+
if $app_config['extensions'].index('nfc')
|
343
|
+
#$app_config['extensions'].delete('nfc')
|
344
|
+
$rhoelements_features += "- NFC extension\n"
|
345
|
+
end
|
346
|
+
|
347
|
+
if $current_platform == "wm"
|
348
|
+
$rhoelements_features += "- Windows Mobile/Windows CE platform support\n"
|
349
|
+
end
|
350
|
+
|
351
|
+
if $application_build_configs['encrypt_database'] && $application_build_configs['encrypt_database'].to_s == '1'
|
352
|
+
#$application_build_configs.delete('encrypt_database')
|
353
|
+
$rhoelements_features += "- Database encryption\n"
|
354
|
+
end
|
355
|
+
|
356
|
+
if $app_config["capabilities"].index("motorola")
|
357
|
+
$rhoelements_features += "- Motorola device capabilities\n"
|
358
|
+
end
|
359
|
+
|
360
|
+
if $app_config['extensions'].index('webkit-browser')
|
361
|
+
$rhoelements_features += "- Motorola WebKit Browser\n"
|
362
|
+
end
|
363
|
+
|
364
|
+
$invalid_license = false
|
365
|
+
|
366
|
+
if $rhoelements_features.length() > 0
|
367
|
+
#check for RhoElements gem and license
|
368
|
+
begin
|
369
|
+
require "rhoelements"
|
370
|
+
|
371
|
+
$rhoelements_features = ""
|
372
|
+
|
373
|
+
# check license
|
374
|
+
is_ET1 = (($current_platform == "android") and ($app_config["capabilities"].index("motorola")))
|
375
|
+
is_win_platform = (($current_platform == "wm") or ($current_platform == "win32") or $is_rho_simulator )
|
376
|
+
|
377
|
+
if (!is_ET1) and (!is_win_platform)
|
378
|
+
# check the license parameter
|
379
|
+
if (!$application_build_configs["motorola_license"]) or (!$application_build_configs["motorola_license_company"])
|
380
|
+
$invalid_license = true
|
381
|
+
end
|
382
|
+
end
|
383
|
+
|
384
|
+
rescue Exception => e
|
385
|
+
if $app_config['extensions'].index('barcode')
|
386
|
+
$app_config['extensions'].delete('barcode')
|
387
|
+
end
|
388
|
+
if $app_config['extensions'].index('nfc')
|
389
|
+
$app_config['extensions'].delete('nfc')
|
390
|
+
end
|
391
|
+
|
392
|
+
if $application_build_configs['encrypt_database'] && $application_build_configs['encrypt_database'].to_s == '1'
|
393
|
+
$application_build_configs.delete('encrypt_database')
|
394
|
+
end
|
395
|
+
end
|
396
|
+
end
|
397
|
+
|
398
|
+
$app_config['extensions'].uniq!() if $app_config['extensions']
|
399
|
+
$app_config['capabilities'].uniq!() if $app_config['capabilities']
|
400
|
+
|
401
|
+
if $invalid_license
|
402
|
+
$application_build_configs["motorola_license"] = '123' if !$application_build_configs["motorola_license"]
|
403
|
+
$application_build_configs["motorola_license_company"] = 'WRONG' if !$application_build_configs["motorola_license_company"]
|
404
|
+
end
|
405
|
+
|
406
|
+
puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"
|
407
|
+
puts "$app_config['capabilities'] : #{$app_config['capabilities'].inspect}"
|
317
408
|
|
409
|
+
|
318
410
|
if $current_platform == "bb"
|
319
411
|
make_application_build_config_java_file
|
320
412
|
else
|
@@ -500,19 +592,19 @@ def init_extensions(startdir, dest)
|
|
500
592
|
puts "exts " + exts
|
501
593
|
|
502
594
|
if $config["platform"] != "bb"
|
503
|
-
exists = []
|
595
|
+
#exists = []
|
504
596
|
|
505
|
-
if ( File.exists?(exts) )
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
end
|
597
|
+
#if ( File.exists?(exts) )
|
598
|
+
# File.new(exts, "r").read.split("\n").each do |line|
|
599
|
+
# next if line !~ /^\s*extern\s+void\s+([A-Za-z_][A-Za-z0-9_]*)/
|
600
|
+
# exists << $1
|
601
|
+
# end
|
602
|
+
#end
|
511
603
|
|
512
604
|
#if (exists.sort! != extentries.sort! ) || (!File.exists?(exts))
|
513
|
-
File.open(exts, "w") do |f|
|
514
|
-
|
515
|
-
|
605
|
+
#File.open(exts, "w") do |f|
|
606
|
+
# puts "MODIFY : #{exts}"
|
607
|
+
f = StringIO.new("", "w+")
|
516
608
|
f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
|
517
609
|
#f.puts "// Generated #{Time.now.to_s}"
|
518
610
|
if $config["platform"] == "wm" || $config["platform"] == "win32"
|
@@ -535,15 +627,14 @@ def init_extensions(startdir, dest)
|
|
535
627
|
f.puts " #{entry}();"
|
536
628
|
end
|
537
629
|
f.puts "}"
|
538
|
-
end
|
630
|
+
#end
|
631
|
+
Jake.modify_file_if_content_changed( exts, f )
|
539
632
|
#end
|
540
633
|
|
541
634
|
extlibs.each { |lib| add_linker_library(lib) }
|
542
635
|
nativelib.each { |lib| add_linker_library(lib) }
|
543
636
|
|
544
|
-
set_linker_flags
|
545
|
-
|
546
|
-
#exit
|
637
|
+
set_linker_flags
|
547
638
|
end
|
548
639
|
|
549
640
|
unless $app_config["constants"].nil?
|
@@ -561,7 +652,8 @@ def init_extensions(startdir, dest)
|
|
561
652
|
chdir dest
|
562
653
|
$excludeextlib.each {|e| Dir.glob(e).each {|f| rm f}}
|
563
654
|
end
|
564
|
-
|
655
|
+
#puts "end of init extension"
|
656
|
+
#exit
|
565
657
|
end
|
566
658
|
|
567
659
|
def public_folder_cp_r(src_dir,dst_dir,level,obfuscate)
|
@@ -625,6 +717,20 @@ def common_bundle_start(startdir, dest)
|
|
625
717
|
end
|
626
718
|
cp app + '/rhoconfig.txt', File.join($srcdir,'apps'), :preserve => true
|
627
719
|
|
720
|
+
if $app_config["app_type"] == 'rhoelements'
|
721
|
+
$config_xml = nil
|
722
|
+
if $app_config[$config["platform"]] && $app_config[$config["platform"]]["rhoelements"] && $app_config[$config["platform"]]["rhoelements"]["config"] && (File.exists? File.join(app, $app_config[$config["platform"]]["rhoelements"]["config"]))
|
723
|
+
$config_xml = File.join(app, $app_config[$config["platform"]]["rhoelements"]["config"])
|
724
|
+
elsif $app_config["rhoelements"] && $app_config["rhoelements"]["config"] && (File.exists? File.join(app, $app_config["rhoelements"]["config"]))
|
725
|
+
$config_xml = File.join(app, $app_config["rhoelements"]["config"])
|
726
|
+
end
|
727
|
+
if $current_platform == "wm"
|
728
|
+
if !($config_xml.nil?)
|
729
|
+
cp $config_xml, File.join($srcdir,'apps/Config.xml'), :preserve => true
|
730
|
+
end
|
731
|
+
end
|
732
|
+
end
|
733
|
+
|
628
734
|
app_version = "\r\napp_version='#{$app_config["version"]}'"
|
629
735
|
File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write(app_version) }
|
630
736
|
File.open(File.join($srcdir,'apps/rhoconfig.txt.timestamp'), "w"){ |f| f.write(Time.now.to_f().to_s()) }
|
@@ -681,13 +787,13 @@ def process_exclude_folders
|
|
681
787
|
exclude_platform = "wm" if exclude_platform == 'win32'
|
682
788
|
|
683
789
|
if $app_config["excludedirs"]
|
684
|
-
excl
|
685
|
-
excl
|
790
|
+
excl += $app_config["excludedirs"]['all'] if $app_config["excludedirs"]['all']
|
791
|
+
excl += $app_config["excludedirs"][exclude_platform] if $app_config["excludedirs"][exclude_platform]
|
686
792
|
end
|
687
793
|
|
688
794
|
if $config["excludedirs"]
|
689
|
-
excl
|
690
|
-
excl
|
795
|
+
excl += $config["excludedirs"]['all'] if $config["excludedirs"]['all']
|
796
|
+
excl += $config["excludedirs"][exclude_platform] if $config["excludedirs"][exclude_platform]
|
691
797
|
end
|
692
798
|
|
693
799
|
if excl.size() > 0
|
@@ -696,6 +802,13 @@ def process_exclude_folders
|
|
696
802
|
excl.each do |mask|
|
697
803
|
Dir.glob(mask).each {|f| puts "f: #{f}"; rm_rf f}
|
698
804
|
end
|
805
|
+
|
806
|
+
chdir File.join($srcdir, 'apps')
|
807
|
+
|
808
|
+
excl.each do |mask|
|
809
|
+
Dir.glob(mask).each {|f| puts "f: #{f}"; rm_rf f}
|
810
|
+
end
|
811
|
+
|
699
812
|
end
|
700
813
|
|
701
814
|
end
|
@@ -715,7 +828,6 @@ namespace "build" do
|
|
715
828
|
common_bundle_start(startdir,dest)
|
716
829
|
|
717
830
|
process_exclude_folders()
|
718
|
-
|
719
831
|
cp_r File.join(startdir, "platform/shared/db/res/db"), File.join($srcdir, 'apps')
|
720
832
|
|
721
833
|
chdir startdir
|
@@ -738,7 +850,7 @@ namespace "build" do
|
|
738
850
|
cp compileERB, $srcdir
|
739
851
|
puts "Running bb.rb"
|
740
852
|
|
741
|
-
puts `#{$rubypath} -I#{rhodeslib} "#{$srcdir}/bb.rb"`
|
853
|
+
puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/bb.rb"`
|
742
854
|
unless $? == 0
|
743
855
|
puts "Error interpreting erb code"
|
744
856
|
exit 1
|
@@ -780,6 +892,27 @@ namespace "build" do
|
|
780
892
|
|
781
893
|
end
|
782
894
|
|
895
|
+
# its task for compiling ruby code in rhostudio
|
896
|
+
# TODO: temporary fix I hope. This code is copied from line 207 of this file
|
897
|
+
task :rhostudio => ["config:wm"] do
|
898
|
+
|
899
|
+
if RUBY_PLATFORM =~ /(win|w)32$/
|
900
|
+
$all_files_mask = "*.*"
|
901
|
+
$rubypath = "res/build-tools/RhoRuby.exe"
|
902
|
+
else
|
903
|
+
$all_files_mask = "*"
|
904
|
+
if RUBY_PLATFORM =~ /darwin/
|
905
|
+
$rubypath = "res/build-tools/RubyMac"
|
906
|
+
else
|
907
|
+
$rubypath = "res/build-tools/rubylinux"
|
908
|
+
end
|
909
|
+
end
|
910
|
+
|
911
|
+
Rake::Task["build:bundle:noxruby"].invoke
|
912
|
+
|
913
|
+
Jake.build_file_map( File.join($srcdir, "apps"), "rhofilelist.txt" )
|
914
|
+
end
|
915
|
+
|
783
916
|
task :noxruby do
|
784
917
|
app = $app_path
|
785
918
|
rhodeslib = File.dirname(__FILE__) + "/lib/framework"
|
@@ -797,7 +930,7 @@ namespace "build" do
|
|
797
930
|
cp compileERB, $srcdir
|
798
931
|
puts "Running default.rb"
|
799
932
|
|
800
|
-
puts `#{$rubypath} -I#{rhodeslib} "#{$srcdir}/default.rb"`
|
933
|
+
puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/default.rb"`
|
801
934
|
unless $? == 0
|
802
935
|
puts "Error interpreting erb code"
|
803
936
|
exit 1
|
@@ -807,7 +940,7 @@ namespace "build" do
|
|
807
940
|
|
808
941
|
cp compileRB, $srcdir
|
809
942
|
puts "Running compileRB"
|
810
|
-
puts `#{$rubypath} -I#{rhodeslib} "#{$srcdir}/compileRB.rb"`
|
943
|
+
puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/compileRB.rb"`
|
811
944
|
unless $? == 0
|
812
945
|
puts "Error interpreting ruby code"
|
813
946
|
exit 1
|
@@ -867,7 +1000,7 @@ namespace "build" do
|
|
867
1000
|
end
|
868
1001
|
end
|
869
1002
|
end
|
870
|
-
rescue
|
1003
|
+
rescue Exception => e
|
871
1004
|
puts 'ERROR !'
|
872
1005
|
puts 'Require "rubyzip" gem for make zip file !'
|
873
1006
|
puts 'Install gem by "gem install rubyzip"'
|
@@ -1237,8 +1370,11 @@ end
|
|
1237
1370
|
|
1238
1371
|
namespace "run" do
|
1239
1372
|
|
1240
|
-
|
1241
|
-
|
1373
|
+
task :set_rhosimulator_flag do
|
1374
|
+
$is_rho_simulator = true
|
1375
|
+
end
|
1376
|
+
|
1377
|
+
task :rhosimulator_base => [:set_rhosimulator_flag, "config:common"] do
|
1242
1378
|
puts "rho_reload_app_changes : #{ENV['rho_reload_app_changes']}"
|
1243
1379
|
$path = ""
|
1244
1380
|
$args = ["-approot='#{$app_path}'", "-rhodespath='#{$startdir}'"]
|
@@ -1353,6 +1489,7 @@ namespace "run" do
|
|
1353
1489
|
end
|
1354
1490
|
end
|
1355
1491
|
|
1492
|
+
#desc "Run application on RhoSimulator"
|
1356
1493
|
task :rhosimulator => "run:rhosimulator_base" do
|
1357
1494
|
puts 'start rhosimulator'
|
1358
1495
|
Jake.run2 $path, $args, {:nowait => true}
|
@@ -1371,11 +1508,7 @@ namespace "run" do
|
|
1371
1508
|
end
|
1372
1509
|
|
1373
1510
|
namespace "build" do
|
1374
|
-
task :rhosimulator
|
1375
|
-
$rhodes_version = File.read(File.join($startdir,'version')).chomp
|
1376
|
-
File.open(File.join($startdir, 'platform/shared/qt/rhodes/RhoSimulatorVersion.h'), "wb") do |fversion|
|
1377
|
-
fversion.write( "#define RHOSIMULATOR_VERSION \"#{$rhodes_version}\"\n" )
|
1378
|
-
end
|
1511
|
+
task :rhosimulator do
|
1379
1512
|
if RUBY_PLATFORM =~ /(win|w)32$/
|
1380
1513
|
Rake::Task["build:win32:rhosimulator"].invoke
|
1381
1514
|
elsif RUBY_PLATFORM =~ /darwin/
|
@@ -1385,4 +1518,37 @@ namespace "build" do
|
|
1385
1518
|
exit 1
|
1386
1519
|
end
|
1387
1520
|
end
|
1521
|
+
|
1522
|
+
task :rhosimulator_version do
|
1523
|
+
$rhodes_version = File.read(File.join($startdir,'version')).chomp
|
1524
|
+
File.open(File.join($startdir, 'platform/shared/qt/rhodes/RhoSimulatorVersion.h'), "wb") do |fversion|
|
1525
|
+
fversion.write( "#define RHOSIMULATOR_VERSION \"#{$rhodes_version}\"\n" )
|
1526
|
+
end
|
1527
|
+
end
|
1528
|
+
end
|
1529
|
+
|
1530
|
+
|
1531
|
+
at_exit do
|
1532
|
+
if $app_config && !$app_config["sdk"].nil?
|
1533
|
+
puts '********* NOTE: You use sdk parameter in build.yml !****************'
|
1534
|
+
puts 'To use latest Rhodes gem, run migrate-rhodes-app in application folder or comment sdk in build.yml.'
|
1535
|
+
puts '************************************************************************'
|
1536
|
+
end
|
1537
|
+
|
1538
|
+
if (!$rhoelements_features.nil?) && ($rhoelements_features.length() > 0)
|
1539
|
+
puts '********* WARNING ************************************************************************'
|
1540
|
+
puts ' The following features are only available in RhoElements v2 and above:'
|
1541
|
+
puts $rhoelements_features
|
1542
|
+
puts ' For more information go to http://www.motorolasolutions.com/rhoelements '
|
1543
|
+
puts '**************************************************************************************'
|
1544
|
+
end
|
1545
|
+
|
1546
|
+
if $invalid_license
|
1547
|
+
puts '********* WARNING ************************************************************************'
|
1548
|
+
puts ' License is required to run RhoElements application.'
|
1549
|
+
puts ' Please, provide "motorola_license" and "motorola_license_company" parameters in build.yml.'
|
1550
|
+
puts ' For more information go to http://www.motorolasolutions.com/rhoelements '
|
1551
|
+
puts '**************************************************************************************'
|
1552
|
+
end
|
1553
|
+
|
1388
1554
|
end
|