rhodes 7.4.1 → 7.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG +319 -0
- data/CREDITS +3 -1
- data/LICENSE +1 -1
- data/README.md +6 -16
- data/Rakefile +55 -43
- data/SECURITY.md +19 -0
- data/appveyor.yml +66 -8
- data/azure-pipelines.yml +67 -0
- data/bin/rhodes-setup +22 -8
- data/extensions/emdk3-manager/ext/platform/android/src/com/rho/emdk3/EMDK3Extension.java +14 -5
- data/extensions/instrumentation/ext/platform/android/src/com/rho/instrumentation/Instrumentation.java +29 -15
- data/extensions/rhoconnect-push/ext/rhoconnect-push/platform/android/src/com/rhomobile/rhoelements/ans/ANSManager.java +3 -3
- data/extensions/rhoelementsext/ext/rhoelementsext/platform/android/rhoelements_temp/src/com/rho/rhoelements/ElementsCore.java +12 -9
- data/extensions/rhoelementsext/ext/rhoelementsext/platform/android/rhoelements_temp/src/com/rho/rhoelements/graphics/BatteryIndicator.java +2 -2
- data/lib/commonAPI/barcode/ext/platform/android/AndroidManifest.xml +3 -1
- data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/BarcodeCaptureActivity.java +11 -13
- data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/BarcodeGraphicTracker.java +1 -1
- data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/ui/camera/CameraSource.java +3 -3
- data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/ui/camera/CameraSourcePreview.java +1 -1
- data/lib/commonAPI/barcode/ext/platform/qt/Barcode.pro +1 -1
- data/lib/commonAPI/barcode/ext/platform/qt/Barcode.pro.erb +2 -2
- data/lib/commonAPI/barcode/ext/platform/qt/src/qzxing/QZXing.pri +9 -21
- data/lib/commonAPI/barcode/ext.yml +5 -8
- data/lib/commonAPI/bluetooth/ext/platform/qt/Bluetooth.pro +1 -1
- data/lib/commonAPI/bluetooth/ext/platform/qt/Bluetooth.pro.erb +1 -1
- data/lib/commonAPI/bluetooth/ext/platform/qt/src/bluetooth/bluetoothhelper.h +1 -1
- data/lib/commonAPI/coreapi/RhoSystemApi.rb +6 -0
- data/lib/commonAPI/coreapi/ext/Intent.xml +4 -0
- data/lib/commonAPI/coreapi/ext/platform/android/Rakefile +0 -12
- data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/intent/IntentSingleton.java +6 -0
- data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/Notification.java +5 -2
- data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationScheduler.java +4 -4
- data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationSingleton.java +1 -1
- data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/webview/WebViewSingleton.java +40 -27
- data/lib/commonAPI/coreapi/ext/platform/iphone/cpp_based_impl/SystemImpl.mm +5 -6
- data/lib/commonAPI/coreapi/ext/platform/iphone/impl/Intent.h +1 -1
- data/lib/commonAPI/coreapi/ext/platform/iphone/impl/Intent.m +3 -1
- data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NotificationSingleton.h +2 -1
- data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NotificationSingleton.m +10 -0
- data/lib/commonAPI/coreapi/ext/platform/wm/src/IntentImpl.cpp +3 -0
- data/lib/commonAPI/coreapi/ext/push.xml +5 -2
- data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp +13 -0
- data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.h +2 -0
- data/lib/commonAPI/coreapi/ext/system.xml +3 -0
- data/lib/commonAPI/mediacapture/ext/camera.xml +4 -9
- data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationCameraActivity.erb +2 -2
- data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationFileProvider.erb +1 -1
- data/lib/commonAPI/mediacapture/ext/platform/android/ext_java.files +2 -9
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraExtension.java +0 -2
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraFactory.java +19 -24
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraObject.java +322 -730
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraRhoListener.java +247 -433
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/{CameraSingletonObject.java → CameraSingleton.java} +68 -74
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/mediacapture/RhoCameraFileProvider.java +6 -0
- data/lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro.erb +1 -1
- data/lib/commonAPI/mediacapture/ext/platform/qt/Mediacapture.pro +1 -1
- data/lib/commonAPI/printing_zebra/ext/platform/android/src/com/rhomobile/printing/zebra/impl/ZebraPrintingProviderImpl.java +2 -1
- data/lib/commonAPI/signature/ext/platform/iphone/impl/readme.txt +7 -0
- data/lib/commonAPI/signature/ext/platform/qt/Signature.pro +3 -10
- data/lib/commonAPI/signature/ext/platform/qt/Signature.pro.erb +2 -2
- data/lib/extensions/fcm-push/ext/android/ApplicationManifestAdds.erb +15 -17
- data/lib/extensions/fcm-push/ext/android/Rakefile +59 -34
- data/lib/extensions/fcm-push/ext/android/ext_java.files +0 -1
- data/lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMFacade.java +13 -17
- data/lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMIntentService.java +81 -80
- data/lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMListener.java +0 -16
- data/lib/extensions/fcm-push/ext/iphone/Podfile +15 -2
- data/lib/extensions/fcm-push/ext/iphone/fcm-push.xcodeproj/project.pbxproj +6 -7
- data/lib/extensions/fcm-push/ext.yml +1 -1
- data/lib/extensions/gmaps/ext/platform/android/ApplicationManifestAdds.erb +1 -0
- data/lib/extensions/gmaps/ext/platform/android/src/com/rhomobile/rhodes/gmaps/GMapActivity.java +12 -4
- data/lib/extensions/gmaps/ext.yml +3 -1
- data/lib/extensions/nfc/ext/platform/android/src/com/rhomobile/nfc/Nfc.java +2 -1
- data/lib/extensions/serialport/ext/serialport.pro +1 -1
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +1 -0
- data/platform/android/Rhodes/jni/src/MethodResultJni.cpp +4 -0
- data/platform/android/Rhodes/jni/src/fileapi.cpp +4 -0
- data/platform/android/Rhodes/res/drawable/baseline_check_24.xml +5 -0
- data/platform/android/Rhodes/res/drawable/baseline_check_240.xml +5 -0
- data/platform/android/Rhodes/res/drawable/baseline_close_24.xml +5 -0
- data/platform/android/Rhodes/res/drawable/baseline_close_240.xml +5 -0
- data/platform/android/Rhodes/res/layout/overlay_layout.xml +39 -0
- data/platform/android/Rhodes/res/layout/perrmission_alert_dialog.xml +267 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +183 -66
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java +38 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoFileProvider.java +32 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +532 -92
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +26 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +259 -163
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/StatusNotification.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java +14 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java +4 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java +5 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java +79 -38
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +20 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +18 -9
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/CallReceiver.java +22 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/IKioskMode.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/KioskManager.java +18 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/MyAccessibilityService.java +230 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/MyNotificationListenerService.java +16 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/MyOverlayService.java +197 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/PermissionManager.java +232 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +34 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality26.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/permissioncheck/CheckDrawable.java +53 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/permissioncheck/PermissionListGenerate.java +366 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/rhodes.iml +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java +782 -41
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoInputConnectionWrapper.java +146 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoInputListener.java +21 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java +92 -32
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/TauWebViewOptions.java +118 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/WebSettingsProviderBase.java +18 -17
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/WebSettingsProviderEclairMR1.java +4 -4
- data/platform/android/build/RhodesSRC_build.files +13 -0
- data/platform/android/build/{aab_builder.rb → aapt2_helper.rb} +94 -37
- data/platform/android/build/android-repack.rake +8 -1
- data/platform/android/build/android.rake +238 -238
- data/platform/android/build/android_tools.rb +10 -10
- data/platform/android/build/androidcommon.rb +31 -14
- data/platform/android/build/build_tools_finder.rb +46 -0
- data/platform/android/build/config.yml +8 -0
- data/platform/android/build/dex_builder.rb +88 -0
- data/platform/android/build/hostplatform.rb +9 -0
- data/platform/android/build/manifest_generator.rb +15 -10
- data/platform/android/build/maven_deps_extractor.rb +29 -22
- data/platform/android/build/ndkwrapper.rb +92 -51
- data/platform/android/proguard/proguard-base-rules.pro +5 -0
- data/platform/android/proguard/proguard.jar +0 -0
- data/platform/iphone/Classes/AppManager/AppManager.m +3 -1
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +2 -0
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +45 -23
- data/platform/iphone/Classes/CocoaServer/CCocoaServer.h +27 -0
- data/platform/iphone/Classes/CocoaServer/CCocoaServer.m +107 -0
- data/platform/iphone/Classes/CocoaServer/RhoHTTPConnection.h +16 -0
- data/platform/iphone/Classes/CocoaServer/RhoHTTPConnection.m +226 -0
- data/platform/iphone/Classes/RhoAppBaseLib-Bridging-Header.h +4 -0
- data/platform/iphone/Classes/RhoAppBaseStandaloneLib-Bridging-Header.h +4 -0
- data/platform/iphone/Classes/RhoCryptAESGCM.swift +105 -0
- data/platform/iphone/Classes/RhoUIWebView.h +1 -1
- data/platform/iphone/Classes/RhoUIWebView.m +1 -1
- data/platform/iphone/Classes/RhoWKWebView.h +1 -1
- data/platform/iphone/Classes/RhoWKWebView.mm +110 -15
- data/platform/iphone/Classes/RhoWebView.h +1 -1
- data/platform/iphone/Classes/RhoWebViewFabrique.m +13 -2
- data/platform/iphone/Classes/Rhodes.m +3 -0
- data/platform/iphone/Classes/SimpleMainView.m +5 -5
- data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.m +21 -10
- data/platform/iphone/Classes/rho/net/IPhoneNetRequest.mm +4 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDData.h +14 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDData.m +158 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDNumber.h +12 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDNumber.m +88 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDRange.h +56 -0
- data/platform/iphone/CocoaHTTPServer/Core/Categories/DDRange.m +104 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPAuthenticationRequest.h +45 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPAuthenticationRequest.m +195 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPConnection.h +120 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPConnection.m +2708 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPLogging.h +136 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPMessage.h +48 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPMessage.m +113 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPResponse.h +149 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPServer.h +205 -0
- data/platform/iphone/CocoaHTTPServer/Core/HTTPServer.m +772 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.h +65 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.m +529 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.h +33 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.m +86 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.h +23 -0
- data/platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.m +211 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.h +75 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.m +405 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDataResponse.h +13 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDataResponse.m +79 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.h +52 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.m +292 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPErrorResponse.h +9 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPErrorResponse.m +38 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPFileResponse.h +25 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPFileResponse.m +237 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.h +12 -0
- data/platform/iphone/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.m +73 -0
- data/platform/iphone/CocoaHTTPServer/Core/WebSocket.h +105 -0
- data/platform/iphone/CocoaHTTPServer/Core/WebSocket.m +791 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.h +7 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.m +160 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.h +11 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.m +372 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.h +7 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.m +49 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.h +8 -0
- data/platform/iphone/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.m +69 -0
- data/platform/iphone/CocoaHTTPServer/LICENSE.txt +18 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/About.txt +4 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.h +1226 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m +8528 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/About.txt +33 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.h +41 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.m +99 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h +102 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m +727 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.h +334 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.m +1353 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.h +601 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.m +1083 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.h +167 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.m +1479 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h +65 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m +191 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h +116 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m +251 -0
- data/platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/README.txt +7 -0
- data/platform/iphone/Framework/RhoApplication/RhoApplication.xcodeproj/project.pbxproj +1 -1
- data/platform/iphone/Framework/Rhodes/Rhodes.xcodeproj/project.pbxproj +2 -2
- data/platform/iphone/RhoAppBaseLib/RhoAppBaseLib.xcodeproj/project.pbxproj +410 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +1 -1
- data/platform/iphone/curl/curl.xcodeproj/project.pbxproj +4 -1
- data/platform/iphone/rbuild/iphone.rake +13 -8
- data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj +4 -1
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +1 -1
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +1 -1
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app.zip +0 -0
- data/platform/sailfish/build/{harbour-SailfishRhodes.pro.erb → SailfishRhodes.pro.erb} +10 -17
- data/platform/sailfish/build/rhodes.pro.erb +7 -17
- data/platform/sailfish/build/rpm/SailfishRhodes.desktop.erb +12 -0
- data/platform/sailfish/build/rpm/SailfishRhodes.erb +2 -0
- data/platform/sailfish/build/rpm/SailfishRhodes.spec.erb +43 -0
- data/platform/sailfish/build/rubylib.pro.erb +29 -29
- data/platform/sailfish/build/sailfish.rake +188 -180
- data/platform/sailfish/keys/regular_cert.pem +14 -0
- data/platform/sailfish/keys/regular_key.pem +4 -0
- data/platform/shared/common/RhodesApp.cpp +59 -10
- data/platform/shared/common/iphone/RhoCryptImpl.mm +130 -54
- data/platform/shared/net/HttpServer.cpp +20 -0
- data/platform/shared/qt/RhoSimulator.pro +1 -1
- data/platform/shared/qt/rhodes/rhodes.pro +4 -11
- data/platform/shared/qt/sailfish/SailfishRhodes.desktop +3 -4
- data/platform/shared/qt/sailfish/SailfishRhodes.pro +9 -10
- data/platform/shared/qt/sailfish/icons/108x108/108x108.png +0 -0
- data/platform/shared/qt/sailfish/privileges/sailfishrhodes +2 -0
- data/platform/shared/qt/sailfish/qml/pages/FirstPageWK.qml +7 -11
- data/platform/shared/qt/sailfish/qml/{harbour-sailfishrhodes.qml → sailfishrhodes.qml} +1 -1
- data/platform/shared/qt/sailfish/rpm/sailfishrhodes.spec +80 -0
- data/platform/shared/qt/sailfish/rpm/{harbour-sailfishrhodes.yaml → sailfishrhodes.yaml} +2 -2
- data/platform/shared/qt/sailfish/src/QtMainWindow.cpp +1 -1
- data/platform/shared/qt/sailfish/src/QtMainWindow.h +1 -1
- data/platform/shared/qt/sailfish/src/main.cpp +6 -38
- data/platform/shared/qt/sailfish/src/rootdelegate.h +2 -14
- data/platform/shared/ruby/aurora/ruby/config.h +386 -0
- data/platform/shared/ruby/aurora/ruby/constdefs.c +5866 -0
- data/platform/shared/ruby/aurora/ruby/constdefs.h +1788 -0
- data/platform/shared/ruby/osx/ruby/config.h +2 -0
- data/platform/shared/ruby/win32/win32.c +10 -3
- data/platform/shared/sqlite/crypto.c +14 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/build/rhodes.nsi +3 -3
- data/platform/win32/build/win32.rake +1 -1
- data/rakefile.rb +55 -43
- data/res/build-tools/RhoRuby.exe +0 -0
- data/res/build-tools/aapt2/linux/aapt2 +0 -0
- data/res/build-tools/aapt2/osx/aapt2 +0 -0
- data/res/build-tools/iphonesim/build/Release/iphonesim_8 +4 -4
- data/res/generators/templates/application/AndroidManifest.erb +28 -6
- data/res/generators/templates/application/build.yml +18 -11
- data/res/generators/templates/application/resources/android/res/xml/provider_paths.xml +4 -0
- data/res/generators/templates/application/rhoconfig.txt +15 -1
- data/res/generators/templates/iphone_project/Bremen8.xcodeproj/project.pbxproj +24 -1
- data/res/generators/templates/iphone_project/Classes/SimpleSwiftClass.swift +20 -0
- data/res/generators/templates/iphone_project/Classes/rhorunner-Bridging-Header.h +4 -0
- data/rhobuild.yml.example +4 -4
- data/rhodes.gemspec +4 -3
- data/version +1 -1
- metadata +157 -57
- data/lib/commonAPI/mediacapture/ext/platform/android/adds/res/drawable/camera_btn.xml +0 -14
- data/lib/commonAPI/mediacapture/ext/platform/android/adds/res/layout/camera_land.xml +0 -23
- data/lib/commonAPI/mediacapture/ext/platform/android/adds/res/layout/camera_port.xml +0 -23
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraActivity.java +0 -156
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraEclair.java +0 -227
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraGingerbread.java +0 -152
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraPreview.java +0 -183
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingletonEclair.java +0 -14
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingletonGingerbread.java +0 -60
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/ICameraObject.java +0 -20
- data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/ICameraSingletonObject.java +0 -8
- data/lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMTokenRefresherService.java +0 -27
- data/platform/android/Rhodes/AndroidManifest.xml.erb +0 -89
- data/platform/sailfish/build/rho_build.cmd.erb +0 -14
- data/platform/sailfish/build/rho_clean.cmd.erb +0 -14
- data/platform/sailfish/build/rho_deploy.cmd.erb +0 -15
- data/platform/sailfish/build/rho_rpm.cmd.erb +0 -14
- data/platform/sailfish/build/rho_rpmvalidation.cmd.erb +0 -14
- data/platform/sailfish/build/rpm/harbour-SailfishRhodes.desktop.erb +0 -7
- data/platform/sailfish/build/rpm/harbour-SailfishRhodes.erb +0 -2
- data/platform/sailfish/build/rpm/harbour-SailfishRhodes.yaml.erb +0 -37
- data/platform/shared/qt/sailfish/harbour-sailfishrhodes.desktop +0 -6
- data/platform/shared/qt/sailfish/icons/108x108/harbour-sailfishrhodes.png +0 -0
- data/platform/shared/qt/sailfish/privileges/harbour-sailfishrhodes +0 -2
- data/platform/shared/qt/sailfish/qml/pages/FirstPageWE.qml +0 -236
- /data/platform/shared/qt/sailfish/icons/128x128/{harbour-sailfishrhodes.png → sailfishrhodes.png} +0 -0
- /data/platform/shared/qt/sailfish/icons/172x172/{harbour-sailfishrhodes.png → sailfishrhodes.png} +0 -0
- /data/platform/shared/qt/sailfish/icons/86x86/{harbour-sailfishrhodes.png → sailfishrhodes.png} +0 -0
@@ -40,6 +40,7 @@ class QtProjectGenerator
|
|
40
40
|
attr_accessor :rhoRoot
|
41
41
|
attr_accessor :extRoot
|
42
42
|
attr_accessor :nameApp
|
43
|
+
attr_accessor :organization
|
43
44
|
attr_accessor :desktopAppName
|
44
45
|
attr_accessor :enableQWebEngine
|
45
46
|
attr_accessor :versionApp
|
@@ -82,10 +83,101 @@ class BuildScriptGenerator < ScriptGenerator
|
|
82
83
|
attr_accessor :buildMode
|
83
84
|
attr_accessor :qmlMode
|
84
85
|
attr_accessor :makePath
|
85
|
-
attr_accessor :
|
86
|
+
attr_accessor :makeFile
|
87
|
+
attr_accessor :sfdkExe
|
86
88
|
attr_accessor :rpmvalPath
|
87
89
|
attr_accessor :deployPath
|
88
90
|
attr_accessor :nThreads
|
91
|
+
|
92
|
+
|
93
|
+
def build()
|
94
|
+
Dir.chdir(projectPath) do
|
95
|
+
qmakeCommand = "\"#{qmakePath}\" #{proPath} -spec linux-g++ \"CONFIG+=release\""
|
96
|
+
if system(qmakeCommand) != true
|
97
|
+
puts qmakeCommand
|
98
|
+
raise "Error: qmake command failed: #{qmakeCommand}"
|
99
|
+
end
|
100
|
+
|
101
|
+
makeCommand = "\"#{makePath}\" -f #{makeFile} qmake_all"
|
102
|
+
if system(makeCommand) != true
|
103
|
+
raise "Error: make command failed: #{makeCommand}"
|
104
|
+
end
|
105
|
+
|
106
|
+
if system("\"#{makePath}\"") != true
|
107
|
+
raise "Error: make command failed: \"#{makePath}\""
|
108
|
+
end
|
109
|
+
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
def clear()
|
114
|
+
FileUtils.rm_rf(File.join($app_path, "bin"))
|
115
|
+
FileUtils.rm_rf(File.join($app_path, "project"))
|
116
|
+
|
117
|
+
cleanTarget = "\"#{sfdkExe}\" engine exec sdk-manage target refresh #{$origin_target}"
|
118
|
+
if system(cleanTarget) != true
|
119
|
+
puts "Error: clean command failed: #{cleanTarget}"
|
120
|
+
end
|
121
|
+
end
|
122
|
+
|
123
|
+
def rpm()
|
124
|
+
#build()
|
125
|
+
|
126
|
+
Dir.chdir(projectPath) do
|
127
|
+
sfdkPackage = "\"#{sfdkExe}\" package"
|
128
|
+
if system(sfdkPackage) != true
|
129
|
+
raise "Error: build rpm command failed: #{sfdkPackage}"
|
130
|
+
end
|
131
|
+
end
|
132
|
+
|
133
|
+
#arm
|
134
|
+
#«C:\AuroraOS\bin\sfdk.exe» package
|
135
|
+
#«C:\AuroraOS\bin\sfdk.exe» tools exec AuroraOS-4.0.2.209-base-armv7hl.default.default rpm-validator --profile regular C:\Users\User\build-ru.orgtemplate.rhotemplate-AuroraOS_4_0_2_209_base_armv7hl_default_in_Aurora_Build_Engine-Release\RPMS\ru.orgtemplate.rhotemplate-0.1-1.armv7hl.rpm
|
136
|
+
|
137
|
+
#i486
|
138
|
+
#«C:\AuroraOS\bin\sfdk.exe» -c "device=Aurora OS эмулятор 4.0.2.209-base" package
|
139
|
+
#«C:\AuroraOS\bin\sfdk.exe» -c "device=Aurora OS эмулятор 4.0.2.209-base" tools exec AuroraOS-4.0.2.209-base-i486.default rpm-validator --profile regular C:\Users\User\build-ru.orgtemplate.rhotemplate-AuroraOS_4_0_2_209_base_i486_in_Aurora_Build_Engine-Release\RPMS\ru.orgtemplate.rhotemplate-0.1-1.i486.rpm
|
140
|
+
end
|
141
|
+
|
142
|
+
def validateRpm(rpmPath)
|
143
|
+
Dir.chdir(projectPath) do
|
144
|
+
sfdkValidate = "\"#{sfdkExe}\" tools exec #{$current_target} rpm-validator --profile regular \"#{rpmPath}\""
|
145
|
+
if system(sfdkValidate) != true
|
146
|
+
raise "Error: validate command failed: #{sfdkValidate}"
|
147
|
+
end
|
148
|
+
end
|
149
|
+
end
|
150
|
+
|
151
|
+
def signRpm(rpmPath)
|
152
|
+
Dir.chdir(projectPath) do
|
153
|
+
sfdkSign = "\"#{sfdkExe}\" engine exec -tt sb2 -t #{$origin_target} rpmsign-external sign -k \"#{$key}\" -c \"#{$certificate}\" \"#{rpmPath}\""
|
154
|
+
if system(sfdkSign) != true
|
155
|
+
raise "Error: sign command failed: #{sfdkSign}"
|
156
|
+
end
|
157
|
+
|
158
|
+
checkSign = "\"#{sfdkExe}\" engine exec -tt sb2 -t #{$origin_target} rpmsign-external verify \"#{rpmPath}\""
|
159
|
+
if system(checkSign) != true
|
160
|
+
raise "Error: sign verify command failed: #{checkSign}"
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|
164
|
+
|
165
|
+
def deployToEmulator()
|
166
|
+
#ENV["PWD"] = "C:\\Users\\User\\build-ru.auroraos.test_app-AuroraOS_4_0_2_249_base_i486_in_Aurora_Build_Engine-Release"#$target_path
|
167
|
+
if $dev_name.nil?
|
168
|
+
puts "Device name is nil"
|
169
|
+
exit 1
|
170
|
+
end
|
171
|
+
|
172
|
+
Dir.chdir(projectPath) do
|
173
|
+
deploy_command = "\"#{sfdkExe}\" -c \"device=#{$dev_name}\" deploy --sdk --all"
|
174
|
+
puts ENV["PWD"]
|
175
|
+
puts deploy_command
|
176
|
+
system(deploy_command)
|
177
|
+
end
|
178
|
+
end
|
179
|
+
|
180
|
+
|
89
181
|
end
|
90
182
|
|
91
183
|
def isWindows?
|
@@ -114,9 +206,20 @@ def clrfTOlf(path)
|
|
114
206
|
File.open(path, "w") { |f| f.write(text) }
|
115
207
|
end
|
116
208
|
|
209
|
+
def getAuroraEnginePath()
|
210
|
+
return File.join($sailfishdir, "settings", "AuroraOS-SDK", "libsfdk", "build-target-tools", "Aurora Build Engine")
|
211
|
+
end
|
212
|
+
|
213
|
+
def getTargetPath(target)
|
214
|
+
sdkDir = File.join(getAuroraEnginePath(), target)
|
215
|
+
return sdkDir.gsub("\\", "/")
|
216
|
+
end
|
217
|
+
|
117
218
|
namespace "config" do
|
118
219
|
task :set_sailfish_platform do
|
119
220
|
$current_platform = "sailfish"
|
221
|
+
puts `#{"chcp 65001"}`
|
222
|
+
|
120
223
|
end
|
121
224
|
|
122
225
|
task :early_init do
|
@@ -125,6 +228,10 @@ namespace "config" do
|
|
125
228
|
end
|
126
229
|
|
127
230
|
task :sailfish => [:set_sailfish_platform, "switch_app"] do
|
231
|
+
$homeDir = Dir.home.gsub(":", "").gsub("\\", "/")
|
232
|
+
$homeDir[0] = $homeDir[0].downcase
|
233
|
+
$homeDir = '/' + $homeDir
|
234
|
+
|
128
235
|
print_timestamp('config:sailfish START')
|
129
236
|
Rake::Task["config:common"].invoke()
|
130
237
|
|
@@ -133,6 +240,8 @@ namespace "config" do
|
|
133
240
|
end
|
134
241
|
$sailfishdir = $config["env"]["paths"]["sailfish"]
|
135
242
|
|
243
|
+
$certificate = File.join($startdir, "platform", "sailfish", "keys", "regular_cert.pem")
|
244
|
+
$key = File.join($startdir, "platform", "sailfish", "keys", "regular_key.pem")
|
136
245
|
|
137
246
|
if !$app_config.nil? && !$app_config["sailfish"].nil?
|
138
247
|
$connf_build = "Release"
|
@@ -145,6 +254,14 @@ namespace "config" do
|
|
145
254
|
$target_arch = $app_config["sailfish"]["target"]
|
146
255
|
end
|
147
256
|
|
257
|
+
if !$app_config["sailfish"]["certificate"].nil?
|
258
|
+
$certificate = $app_config["sailfish"]["certificate"]
|
259
|
+
end
|
260
|
+
|
261
|
+
if !$app_config["sailfish"]["key"].nil?
|
262
|
+
$key = $app_config["sailfish"]["key"]
|
263
|
+
end
|
264
|
+
|
148
265
|
puts "Target arch: " + $target_arch
|
149
266
|
puts "Target configuration: " + $connf_build
|
150
267
|
else
|
@@ -157,7 +274,7 @@ namespace "config" do
|
|
157
274
|
|
158
275
|
if !$app_config["name"].nil?
|
159
276
|
$appname = $app_config["name"]
|
160
|
-
$final_name_app = "
|
277
|
+
$final_name_app = "" + "#{$appname.downcase}"
|
161
278
|
else
|
162
279
|
raise "Name application is not found in build.yaml!"
|
163
280
|
end
|
@@ -178,8 +295,11 @@ namespace "config" do
|
|
178
295
|
$current_build_sdk_dir = ""
|
179
296
|
doc.xpath("//target").each do |t|
|
180
297
|
target = t.attr("name")
|
181
|
-
|
298
|
+
origin = t.attr("origin")
|
299
|
+
puts target
|
300
|
+
if target.include? $target_arch and Dir.exist?(getTargetPath(target))
|
182
301
|
$current_target = target
|
302
|
+
$origin_target = origin
|
183
303
|
break
|
184
304
|
end
|
185
305
|
end
|
@@ -187,42 +307,14 @@ namespace "config" do
|
|
187
307
|
$current_target = $app_config["sailfish"]["target_sdk"]
|
188
308
|
end
|
189
309
|
|
190
|
-
if
|
191
|
-
|
192
|
-
$auroraSDK = true
|
193
|
-
$current_build_sdk_dir = File.join($sailfishdir, "settings", "AuroraOS-SDK", "libsfdk", "build-target-tools", "Aurora OS Build Engine", $current_target)
|
194
|
-
elsif Dir.exist?(File.join($sailfishdir, "settings", "SailfishSDK"))
|
195
|
-
$auroraSDK = false
|
196
|
-
$current_build_sdk_dir = File.join($sailfishdir, "settings", "SailfishSDK", "libsfdk", "build-target-tools", "Sailfish OS Build Engine", $current_target)
|
197
|
-
elsif Dir.exist?(File.join($sailfishdir, "settings", "SailfishOS-SDK"))
|
198
|
-
$auroraSDK = false
|
199
|
-
$current_build_sdk_dir = File.join($sailfishdir, "settings", "SailfishOS-SDK", "mer-sdk-tools", "Sailfish OS Build Engine", $current_target)
|
200
|
-
else
|
201
|
-
puts "Can't recognize build SDK!"
|
202
|
-
exit 1
|
203
|
-
end
|
204
|
-
$current_build_sdk_dir = $current_build_sdk_dir.gsub("\\", "/")
|
310
|
+
if Dir.exist?(getAuroraEnginePath())
|
311
|
+
$current_build_sdk_dir = getTargetPath($current_target)
|
205
312
|
else
|
206
|
-
|
207
|
-
|
208
|
-
$current_build_sdk_dir = File.join(File.expand_path('~'), ".config", "AuroraOS-SDK", "libsfdk", "build-target-tools", "Aurora OS Build Engine", $current_target)
|
209
|
-
elsif Dir.exist?(File.join(File.expand_path('~'), ".config", "SailfishSDK"))
|
210
|
-
$auroraSDK = false
|
211
|
-
$current_build_sdk_dir = File.join(File.expand_path('~'), ".config", "SailfishSDK", "libsfdk", "build-target-tools", "Sailfish OS Build Engine", $current_target)
|
212
|
-
elsif Dir.exist?(File.join(File.expand_path('~'), ".config", "SailfishOS-SDK"))
|
213
|
-
$auroraSDK = false
|
214
|
-
$current_build_sdk_dir = File.join(File.expand_path('~'), ".config", "SailfishOS-SDK", "mer-sdk-tools", "Sailfish OS Build Engine", $current_target)
|
215
|
-
else
|
216
|
-
puts "Can't recognize build SDK!"
|
217
|
-
exit 1
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
|
-
if $auroraSDK
|
222
|
-
$sysName = "Aurora OS"
|
223
|
-
else
|
224
|
-
$sysName = "Sailfish OS"
|
313
|
+
puts "Can't recognize build SDK!"
|
314
|
+
exit 1
|
225
315
|
end
|
316
|
+
|
317
|
+
$sysName = "Aurora"
|
226
318
|
|
227
319
|
if !File.exists?($current_build_sdk_dir)
|
228
320
|
puts "No such target (" + $current_target + ") exists"
|
@@ -259,12 +351,6 @@ namespace "config" do
|
|
259
351
|
|
260
352
|
if !$app_config["sailfish"]["device"].nil? && !$app_config["sailfish"]["device"]["device_name"].nil?
|
261
353
|
$dev_name = $app_config["sailfish"]["device"]["device_name"]
|
262
|
-
elsif $dev_type == "real"
|
263
|
-
raise "Please set device name for real device in device section!\n" +
|
264
|
-
"Add device if required (sailfish:device:add_device) and set 'device_name' field in build.yml.\n" +
|
265
|
-
"For list device use: sailfish:device:list\n"
|
266
|
-
elsif $dev_type == "vbox"
|
267
|
-
$dev_name = "#{$sysName} Emulator"
|
268
354
|
end
|
269
355
|
|
270
356
|
if !$app_config["sailfish"]["device"].nil? && !$app_config["sailfish"]["device"]["host"].nil?
|
@@ -319,11 +405,8 @@ namespace "config" do
|
|
319
405
|
$build_threads = 1
|
320
406
|
end
|
321
407
|
|
322
|
-
|
323
|
-
|
324
|
-
if (($app_config["sailfish"]["enable_web_engine"] == true) || ($app_config["sailfish"]["enable_web_engine"] == "true"))
|
325
|
-
$enableQWebEngine = "ENABLE_Q_WEB_ENGINE"
|
326
|
-
end
|
408
|
+
if !$app_config["sailfish"]["organization"].nil?
|
409
|
+
$organization = $app_config["sailfish"]["organization"]
|
327
410
|
end
|
328
411
|
|
329
412
|
$enableDBUS = ""
|
@@ -335,8 +418,38 @@ namespace "config" do
|
|
335
418
|
$ymlSpdscanner = "- qt5-qtconnectivity-qtsdpscanner"
|
336
419
|
end
|
337
420
|
|
338
|
-
|
421
|
+
$buildEnv = BuildScriptGenerator.new
|
422
|
+
|
423
|
+
$buildEnv.isNixSystem = !isWindows?
|
424
|
+
$buildEnv.merAddress = "127.0.0.1"
|
425
|
+
$buildEnv.merPort = 2222
|
426
|
+
$buildEnv.merPkey = File.join $sailfishdir, "vmshare/ssh/private_keys/engine/mersdk"
|
427
|
+
$buildEnv.projectPath = QuotedStrNixWay(File.join($project_path, $final_name_app))
|
428
|
+
$buildEnv.merSdkTools = QuotedStrNixWay(PathToWindowsWay($current_build_sdk_dir))
|
429
|
+
$buildEnv.merSharedHome = QuotedStrNixWay(File.expand_path('~'))
|
430
|
+
$buildEnv.merSharedSrc = QuotedStrNixWay(File.expand_path('~'))
|
431
|
+
$buildEnv.merShTgtName = QuotedStrNixWay(File.join($sailfishdir, "mersdk", "targets"))
|
432
|
+
$buildEnv.merTgtName = QuotedStrNixWay($current_target)
|
433
|
+
$buildEnv.merUserName = "mersdk"
|
434
|
+
$buildEnv.merDevName = QuotedStrNixWay($dev_name)
|
435
|
+
|
436
|
+
cmd_suffix = isWindows? ? '.cmd' : ''
|
437
|
+
$buildEnv.qmakePath = PathToWindowsWay(File.join($current_build_sdk_dir, "qmake" + cmd_suffix))
|
438
|
+
$buildEnv.proPath = PathToWindowsWay(File.join($project_path, $final_name_app, "#{$final_name_app}.pro"))
|
439
|
+
$buildEnv.makeFile = PathToWindowsWay(File.join($project_path, $final_name_app, "Makefile"))
|
440
|
+
$buildEnv.buildMode = $connf_build.downcase
|
441
|
+
$buildEnv.qmlMode = "qml_#{$connf_build.downcase}"
|
442
|
+
$buildEnv.makePath = PathToWindowsWay(File.join($current_build_sdk_dir, "make" + cmd_suffix))
|
443
|
+
$buildEnv.rpmvalPath = PathToWindowsWay(File.join($current_build_sdk_dir, "rpmvalidation" + cmd_suffix))
|
444
|
+
$buildEnv.deployPath = PathToWindowsWay(File.join($current_build_sdk_dir, "deploy" + cmd_suffix))
|
445
|
+
$buildEnv.nThreads = $build_threads
|
446
|
+
$buildEnv.sfdkExe = QuotedStrNixWay(File.join($sailfishdir, "bin", "sfdk.exe"))
|
339
447
|
|
448
|
+
ENV["Path"] = $current_build_sdk_dir + ";" + ENV["Path"]
|
449
|
+
ENV["QTDIR"] = File.join($buildEnv.merShTgtName, $buildEnv.merTgtName, "usr", "share", "qt5")
|
450
|
+
ENV["SFDK_OPTIONS"] = "-c target=#{$origin_target}"
|
451
|
+
ENV["SFDK_NO_SESSION"] = "1"
|
452
|
+
|
340
453
|
|
341
454
|
Rake::Task["build:sailfish:startvm"].invoke()
|
342
455
|
end
|
@@ -374,8 +487,8 @@ end
|
|
374
487
|
namespace "run" do
|
375
488
|
task :sailfish => ["config:sailfish"] do
|
376
489
|
|
377
|
-
|
378
|
-
|
490
|
+
require 'net/ssh'
|
491
|
+
require 'net/scp'
|
379
492
|
|
380
493
|
session_ssh = nil
|
381
494
|
puts $ssh_key
|
@@ -464,12 +577,12 @@ namespace "device" do
|
|
464
577
|
|
465
578
|
puts "Enter password from device, to generate the ssh key: "
|
466
579
|
$pwd_host = STDIN.noecho(&:gets).chomp
|
467
|
-
$user_name = "
|
580
|
+
$user_name = "defaultuser"
|
468
581
|
|
469
582
|
mkdir_p File.join(ssh_dir, $dev_name)
|
470
583
|
|
471
584
|
yes = true
|
472
|
-
if(File.exists? File.join(ssh_dir, $dev_name, "
|
585
|
+
if(File.exists? File.join(ssh_dir, $dev_name, "defaultuser"))
|
473
586
|
puts "Key for this device exists, do you want to replace it? (yes/no)"
|
474
587
|
yes = STDIN.gets == "yes\n"
|
475
588
|
end
|
@@ -527,26 +640,8 @@ namespace "device" do
|
|
527
640
|
end
|
528
641
|
|
529
642
|
namespace "clean" do
|
530
|
-
task :sailfish => "
|
531
|
-
|
532
|
-
task :files => "config:sailfish" do
|
533
|
-
clean_path = File.join($app_path, "project", "qt", "clean.cmd")
|
534
|
-
system(clean_path)
|
535
|
-
if File.exists?($project_path)
|
536
|
-
Dir.glob(File.join($project_path, "*.*")) { |f| rm f, :force => true }
|
537
|
-
Dir.entries(File.join($project_path)).each do |d|
|
538
|
-
rm_rf File.join($project_path, d)
|
539
|
-
end
|
540
|
-
end
|
541
|
-
rm_rf $srcdir if File.exists?($srcdir)
|
542
|
-
#rm_rf $targetdir
|
543
|
-
#rm_rf $app_builddir
|
544
|
-
#rm_rf $tmpdir
|
545
|
-
end
|
546
|
-
task :build => "config:sailfish" do
|
547
|
-
clean_path = File.join($app_path, "project", "qt", "clean.cmd")
|
548
|
-
system(clean_path)
|
549
|
-
end
|
643
|
+
task :sailfish => ["project:sailfish:qt"] do
|
644
|
+
$buildEnv.clear()
|
550
645
|
end
|
551
646
|
end
|
552
647
|
|
@@ -681,8 +776,7 @@ namespace "build" do
|
|
681
776
|
end
|
682
777
|
|
683
778
|
task :deploy => ['config:sailfish'] do
|
684
|
-
|
685
|
-
system(deploy_path)
|
779
|
+
$buildEnv.deployToEmulator()
|
686
780
|
end
|
687
781
|
|
688
782
|
task :deploy_bundle => ['config:sailfish'] do
|
@@ -729,17 +823,12 @@ namespace "build" do
|
|
729
823
|
end
|
730
824
|
end
|
731
825
|
|
732
|
-
|
733
|
-
|
734
826
|
task :rhodes => ["project:sailfish:qt"] do
|
735
827
|
print_timestamp('build:sailfish:rhodes START')
|
736
|
-
build_path = File.join($app_path, "project", "qt", "build.cmd")
|
737
|
-
rpm_path = File.join($app_path, "project", "qt", "rpm.cmd")
|
738
828
|
|
739
|
-
|
740
|
-
|
741
|
-
|
742
|
-
system(rpm_path)
|
829
|
+
$buildEnv.build()
|
830
|
+
$buildEnv.rpm()
|
831
|
+
#exit 0
|
743
832
|
|
744
833
|
$target_rpm = ""
|
745
834
|
Dir[File.join($project_path, $final_name_app, "RPMS/**/*")].each do |file_name|
|
@@ -749,11 +838,10 @@ namespace "build" do
|
|
749
838
|
end
|
750
839
|
end
|
751
840
|
|
752
|
-
|
753
|
-
|
754
|
-
cp_r $target_rpm, $target_path
|
755
|
-
|
841
|
+
$buildEnv.signRpm($target_rpm)
|
842
|
+
$buildEnv.validateRpm($target_rpm)
|
756
843
|
|
844
|
+
cp_r $target_rpm, $target_path
|
757
845
|
end
|
758
846
|
|
759
847
|
task :extensions => ['project:sailfish:qt'] do
|
@@ -780,7 +868,7 @@ namespace "build" do
|
|
780
868
|
|
781
869
|
generator = QtProjectGenerator.new
|
782
870
|
generator.rhoRoot = $rhodes_path_build_engine
|
783
|
-
generator.extRoot = ext_path.gsub(File.expand_path('~'),
|
871
|
+
generator.extRoot = ext_path.gsub(File.expand_path('~'), $homeDir)
|
784
872
|
generator.desktopAppName = $appname
|
785
873
|
generator.nameApp = $final_name_app
|
786
874
|
generator.buildMode = $connf_build
|
@@ -808,7 +896,7 @@ namespace 'project' do
|
|
808
896
|
namespace 'sailfish' do
|
809
897
|
task :qt => ['config:sailfish'] do
|
810
898
|
$rhodes_path = File.absolute_path '.'
|
811
|
-
$rhodes_path_build_engine = $rhodes_path.gsub(File.expand_path('~'),
|
899
|
+
$rhodes_path_build_engine = $rhodes_path.gsub(File.expand_path('~'), $homeDir)
|
812
900
|
|
813
901
|
curl_erb_path = $rhodes_path + "/platform/sailfish/build/curl.pro.erb"
|
814
902
|
rubylib_erb_path = $rhodes_path + "/platform/sailfish/build/rubylib.pro.erb"
|
@@ -818,17 +906,10 @@ namespace 'project' do
|
|
818
906
|
sqlite3_erb_path = $rhodes_path + "/platform/sailfish/build/sqlite3.pro.erb"
|
819
907
|
syncengine_erb_path = $rhodes_path + "/platform/sailfish/build/syncengine.pro.erb"
|
820
908
|
rhodes_erb_path = $rhodes_path + "/platform/sailfish/build/rhodes.pro.erb"
|
821
|
-
app_erb_path = $rhodes_path + "/platform/sailfish/build/
|
909
|
+
app_erb_path = $rhodes_path + "/platform/sailfish/build/SailfishRhodes.pro.erb"
|
822
910
|
|
823
|
-
desktop_erb_path = $rhodes_path + "/platform/sailfish/build/rpm/
|
824
|
-
|
825
|
-
priv_erb_path = $rhodes_path + "/platform/sailfish/build/rpm/harbour-SailfishRhodes.erb"
|
826
|
-
|
827
|
-
build_erb_path = $rhodes_path + "/platform/sailfish/build/rho_build.cmd.erb"
|
828
|
-
clean_erb_path = $rhodes_path + "/platform/sailfish/build/rho_clean.cmd.erb"
|
829
|
-
rpm_erb_path = $rhodes_path + "/platform/sailfish/build/rho_rpm.cmd.erb"
|
830
|
-
rpmval_erb_path = $rhodes_path + "/platform/sailfish/build/rho_rpmvalidation.cmd.erb"
|
831
|
-
deploy_erb_path = $rhodes_path + "/platform/sailfish/build/rho_deploy.cmd.erb"
|
911
|
+
desktop_erb_path = $rhodes_path + "/platform/sailfish/build/rpm/SailfishRhodes.desktop.erb"
|
912
|
+
spec_erb_path = $rhodes_path + "/platform/sailfish/build/rpm/SailfishRhodes.spec.erb"
|
832
913
|
|
833
914
|
mkdir_p $project_path
|
834
915
|
mkdir_p File.join($project_path, "curl")
|
@@ -841,19 +922,18 @@ namespace 'project' do
|
|
841
922
|
mkdir_p File.join($project_path, "rhodes")
|
842
923
|
mkdir_p File.join($project_path, $final_name_app)
|
843
924
|
mkdir_p File.join($project_path, $final_name_app, "rpm")
|
844
|
-
mkdir_p File.join($project_path, $final_name_app, "privileges")
|
845
925
|
|
846
926
|
#if !File.exists?(File.join($project_path, $final_name_app, "qml"))
|
847
927
|
cp_r File.join($rhodes_path, "platform/shared/qt/sailfish/qml"), File.join($project_path, $final_name_app)
|
848
928
|
File.rename(
|
849
|
-
File.join($project_path, $final_name_app, "qml", "
|
850
|
-
File.join($project_path, $final_name_app, "qml", "#{$final_name_app}.qml"))
|
929
|
+
File.join($project_path, $final_name_app, "qml", "sailfishrhodes.qml"),
|
930
|
+
File.join($project_path, $final_name_app, "qml", "#{$organization}.#{$final_name_app}.qml"))
|
851
931
|
#end
|
852
932
|
|
853
933
|
if !File.exists?(File.join($project_path, $final_name_app, "icons"))
|
854
934
|
cp_r File.join($rhodes_path, "platform/shared/qt/sailfish/icons"), File.join($project_path, $final_name_app)
|
855
935
|
Dir[File.join($project_path, $final_name_app, "icons/**/*")].each do |file_name|
|
856
|
-
File.rename(file_name, File.join(File.dirname(file_name), "#{$final_name_app}.png")) if File.file? file_name
|
936
|
+
File.rename(file_name, File.join(File.dirname(file_name), "#{$organization}.#{$final_name_app}.png")) if File.file? file_name
|
857
937
|
end
|
858
938
|
end
|
859
939
|
|
@@ -861,6 +941,7 @@ namespace 'project' do
|
|
861
941
|
generator.rhoRoot = $rhodes_path_build_engine
|
862
942
|
generator.desktopAppName = $appname
|
863
943
|
generator.nameApp = $final_name_app
|
944
|
+
generator.organization = $organization
|
864
945
|
generator.enableQWebEngine = $enableQWebEngine
|
865
946
|
generator.versionApp = $version_app
|
866
947
|
generator.buildMode = $connf_build
|
@@ -887,9 +968,9 @@ namespace 'project' do
|
|
887
968
|
end
|
888
969
|
|
889
970
|
|
890
|
-
File.open(File.join($project_path, $final_name_app, "#{$final_name_app}.desktop"), 'w' ) { |f| f.write generator.render_profile( desktop_erb_path ) }
|
891
|
-
File.open(File.join($project_path, $final_name_app, "rpm", "#{$final_name_app}.
|
892
|
-
File.open(File.join($project_path, $final_name_app, "privileges", "#{$final_name_app}"), 'w' ) { |f| f.write generator.render_profile( priv_erb_path ) }
|
971
|
+
File.open(File.join($project_path, $final_name_app, "#{$organization}.#{$final_name_app}.desktop"), 'w' ) { |f| f.write generator.render_profile( desktop_erb_path ) }
|
972
|
+
File.open(File.join($project_path, $final_name_app, "rpm", "#{$final_name_app}.spec"), 'w' ) { |f| f.write generator.render_profile( spec_erb_path ) }
|
973
|
+
#File.open(File.join($project_path, $final_name_app, "privileges", "#{$final_name_app}"), 'w' ) { |f| f.write generator.render_profile( priv_erb_path ) }
|
893
974
|
|
894
975
|
rho_name_project = File.join($project_path, "rhodes", "rhodes.pro")
|
895
976
|
if !File.exists?(rho_name_project)
|
@@ -901,82 +982,9 @@ namespace 'project' do
|
|
901
982
|
File.open(app_name_project, 'w' ) { |f| f.write generator.render_profile( app_erb_path ) }
|
902
983
|
end
|
903
984
|
|
904
|
-
build_script_generator = BuildScriptGenerator.new
|
905
|
-
|
906
|
-
#if isWindows?
|
907
|
-
# build_script_generator.scriptHeader = "ECHO OFF"
|
908
|
-
# build_script_generator.platformExport = "set"
|
909
|
-
#else
|
910
|
-
# build_script_generator.scriptHeader = "#!/bin/sh"
|
911
|
-
# build_script_generator.platformExport = "export"
|
912
|
-
#end
|
913
|
-
|
914
|
-
build_script_generator.isNixSystem = !isWindows?
|
915
|
-
build_script_generator.merAddress = "127.0.0.1"
|
916
|
-
build_script_generator.merPort = 2222
|
917
|
-
build_script_generator.merPkey = File.join $sailfishdir, "vmshare/ssh/private_keys/engine/mersdk"
|
918
|
-
build_script_generator.projectPath = QuotedStrNixWay(File.join($project_path, $final_name_app))
|
919
|
-
build_script_generator.merSdkTools = QuotedStrNixWay(PathToWindowsWay($current_build_sdk_dir))
|
920
|
-
build_script_generator.merSharedHome = QuotedStrNixWay(File.expand_path('~'))
|
921
|
-
build_script_generator.merSharedSrc = QuotedStrNixWay(File.expand_path('~'))
|
922
|
-
build_script_generator.merShTgtName = QuotedStrNixWay(File.join($sailfishdir, "mersdk", "targets"))
|
923
|
-
build_script_generator.merTgtName = QuotedStrNixWay($current_target)
|
924
|
-
build_script_generator.merUserName = "mersdk"
|
925
|
-
build_script_generator.merDevName = QuotedStrNixWay($dev_name)
|
926
|
-
|
927
|
-
#TODO: windows paths way - temporary
|
928
|
-
cmd_suffix = isWindows? ? '.cmd' : ''
|
929
|
-
build_script_generator.qmakePath = PathToWindowsWay(File.join($current_build_sdk_dir, "qmake" + cmd_suffix))
|
930
|
-
build_script_generator.proPath = PathToWindowsWay(File.join($project_path, $final_name_app, "#{$final_name_app}.pro"))
|
931
|
-
build_script_generator.buildMode = $connf_build.downcase
|
932
|
-
build_script_generator.qmlMode = "qml_#{$connf_build.downcase}"
|
933
|
-
build_script_generator.makePath = PathToWindowsWay(File.join($current_build_sdk_dir, "make" + cmd_suffix))
|
934
|
-
build_script_generator.rpmPath = PathToWindowsWay(File.join($current_build_sdk_dir, "rpm" + cmd_suffix))
|
935
|
-
build_script_generator.rpmvalPath = PathToWindowsWay(File.join($current_build_sdk_dir, "rpmvalidation" + cmd_suffix))
|
936
|
-
build_script_generator.deployPath = PathToWindowsWay(File.join($current_build_sdk_dir, "deploy" + cmd_suffix))
|
937
|
-
build_script_generator.nThreads = $build_threads
|
938
|
-
|
939
|
-
File.open(File.join($project_path, "build.cmd"), 'w' ) { |f| f.write build_script_generator.render_script( build_erb_path ) }
|
940
|
-
File.open(File.join($project_path, "clean.cmd"), 'w' ) { |f| f.write build_script_generator.render_script( clean_erb_path ) }
|
941
|
-
File.open(File.join($project_path, "rpm.cmd"), 'w' ) { |f| f.write build_script_generator.render_script( rpm_erb_path ) }
|
942
|
-
File.open(File.join($project_path, "rpmvalidation.cmd"), 'w' ) { |f| f.write build_script_generator.render_script( rpmval_erb_path ) }
|
943
|
-
File.open(File.join($project_path, "deploy.cmd"), 'w' ) { |f| f.write build_script_generator.render_script( deploy_erb_path ) }
|
944
985
|
|
945
|
-
if !isWindows?
|
946
|
-
FileUtils.chmod('+x', File.join($project_path, "build.cmd"))
|
947
|
-
FileUtils.chmod('+x', File.join($project_path, "clean.cmd"))
|
948
|
-
FileUtils.chmod('+x', File.join($project_path, "rpm.cmd"))
|
949
|
-
FileUtils.chmod('+x', File.join($project_path, "rpmvalidation.cmd"))
|
950
|
-
FileUtils.chmod('+x', File.join($project_path, "deploy.cmd"))
|
951
|
-
clrfTOlf(File.join($project_path, "build.cmd"))
|
952
|
-
clrfTOlf(File.join($project_path, "clean.cmd"))
|
953
|
-
clrfTOlf(File.join($project_path, "rpm.cmd"))
|
954
|
-
clrfTOlf(File.join($project_path, "rpmvalidation.cmd"))
|
955
|
-
clrfTOlf(File.join($project_path, "deploy.cmd"))
|
956
|
-
end
|
957
986
|
end
|
958
987
|
end
|
959
988
|
end
|
960
|
-
|
961
|
-
#MER_SSH_HOST, 127.0.0.1
|
962
|
-
#MER_SSH_PORT, 2222
|
963
|
-
#MER_SSH_PRIVATE_KEY, C:/SailfishOS/vmshare/ssh/private_keys/engine/mersdk
|
964
|
-
#MER_SSH_PROJECT_PATH, C:/Users/n0men/Desktop/tau/testapp/project/qt/curl
|
965
|
-
#MER_SSH_SDK_TOOLS, C:\SailfishOS\settings\SailfishOS-SDK\mer-sdk-tools\Sailfish OS Build Engine\SailfishOS-2.1.3.7-armv7hl
|
966
|
-
#MER_SSH_SHARED_HOME, C:/Users/n0men
|
967
|
-
#MER_SSH_SHARED_SRC, C:/Users/n0men/
|
968
|
-
#MER_SSH_SHARED_TARGET, C:/SailfishOS/mersdk/targets
|
969
|
-
#MER_SSH_TARGET_NAME, SailfishOS-2.1.3.7-armv7hl
|
970
|
-
#MER_SSH_USERNAME, mersdk
|
971
|
-
|
972
|
-
#MER_SSH_USERNAME, mersdk
|
973
|
-
#MER_SSH_TARGET_NAME, SailfishOS-2.1.3.7-i486
|
974
|
-
#MER_SSH_SHARED_TARGET, C:/SailfishOS/mersdk/targets
|
975
|
-
#MER_SSH_SHARED_SRC, C:/Users/n0men/
|
976
|
-
#MER_SSH_SHARED_HOME, C:/Users/n0men
|
977
|
-
#MER_SSH_SDK_TOOLS, C:\SailfishOS\settings\SailfishOS-SDK\mer-sdk-tools\Sailfish OS Build Engine\SailfishOS-2.1.3.7-i486
|
978
|
-
#MER_SSH_PROJECT_PATH, C:/Users/n0men/Desktop/tau/kitchensinkRuby/project/qt/harbour-kitchensinkRuby
|
979
|
-
#MER_SSH_PRIVATE_KEY, C:/SailfishOS/vmshare/ssh/private_keys/engine/mersdk
|
980
|
-
#MER_SSH_PORT, 2222
|
981
|
-
#MER_SSH_DEVICE_NAME, INOI R7 (ARM)
|
989
|
+
|
982
990
|
|
@@ -0,0 +1,14 @@
|
|
1
|
+
-----BEGIN CERTIFICATE-----
|
2
|
+
MIICOTCCAeSgAwIBAgIUSpo5D97wLRZQs2Qi6bdM1hUDoRYwDAYIKoUDBwEBAwIF
|
3
|
+
ADA9MTswOQYDVQQDDDJPcGVuIE1vYmlsZSBQbGF0Zm9ybSBMTEMgUm9vdCBQYWNr
|
4
|
+
YWdlcyBDZXJ0aWZpY2F0ZTAeFw0yMTA5MDIxMzA1MzJaFw00NTA4MjcxMzA1MzJa
|
5
|
+
MEkxRzBFBgNVBAMMPk5vbmFtZSBkZXZlbG9wZXIgKGZvciB0ZXN0aW5nIG9ubHks
|
6
|
+
IGRvIG5vdCB1c2UgZm9yIHByb2R1Y3Rpb24pMGYwHwYIKoUDBwEBAQEwEwYHKoUD
|
7
|
+
AgIjAQYIKoUDBwEBAgIDQwAEQD7kJVoxNQMuCO3CtkC0L+0qnwkk7rnviRP/3k1A
|
8
|
+
17my58fs9yV4gLQ4I9zaR2xYyZLDx4XraJt4ujzsgC8YXaSjgaYwgaMwDgYDVR0P
|
9
|
+
AQH/BAQDAgeAMCkGA1UdDgQiBCAdhSHQtDMV4QTjDtKcSmaDQ9azQhQ44hoydROW
|
10
|
+
RLYeEDArBgNVHSMEJDAigCBMTzTvcJiRcOEK57IDKmKpiDMGNHn+r0gxKjswQANd
|
11
|
+
/jAgBgNVHSUBAf8EFjAUBggrBgEFBQcDBAYIKoUDAlEBAQEwFwYIKoUDAlEBAgEE
|
12
|
+
CxYJZGV2ZWxvcGVyMAwGCCqFAwcBAQMCBQADQQDTDD3PzUu8QIqnKNbwn8/M3IUV
|
13
|
+
4W+cAZ5Qj8PlvN5wjx6HmD69Gj3zIhM7Pw1TFRNZco4teApgvWePdOmuYzz/
|
14
|
+
-----END CERTIFICATE-----
|