rhodes 5.5.15 → 5.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de39ae2813ad387575d40e304bb9696641b8e52e
-  data.tar.gz: eebd20c085d3e593c09a975378cd221731743776
+  metadata.gz: 84d373e61115da7a9862969d87e5eccb6b7b9057
+  data.tar.gz: 080bc1c3a675ebf6cc4d0edbfbdf1e3a9e65db8f
 SHA512:
-  metadata.gz: 803d56e2968beaaf18a0cc03ec469cc81e34fcb3cb7c75629b571b3d920bbb6019d553f24ce249445f1ffce1b15de507b6100e9c421da8dfd575aa5607610610
-  data.tar.gz: 74a4425fdd6002fea82c959c46a34ac9b9fb23b9170a914b04aa5153ff11f8ddb2bf6867c4830616fcd2cd48686f84b10633ab9a9e593e6cd73952af9fcfece7
+  metadata.gz: af163f255634d1fb7b7fc0f25e386dd811717c3bd81365649af53850af6717ce1b4c92f3fb08754847b535f0e88e71f25004bda29a0a149d6f0d4720b8086105
+  data.tar.gz: f0fb701099530641102a36031d8b8b07c34a4225322a4ce57cf2f2a586fd2b1289574baa0d77841aa6b06dbe4ae482830d2be9d2473a209e011760cdb416d3d4

data/Rakefile

@@ -157,7 +157,7 @@ namespace "framework" do
   end
 end
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine", "iphone_enable_startup_logging"]
+$application_build_configs_keys = ['nodejs_application', 'security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine", "iphone_enable_startup_logging"]
 
 $winxpe_build = false
 
@@ -245,7 +245,7 @@ def make_application_build_capabilities_header_file
 
   f.puts ''
 
-  if $js_application
+  if $js_application || $nodejs_application
     puts '#define RHO_NO_RUBY'
     f.puts '#define RHO_NO_RUBY'
     f.puts '#define RHO_NO_RUBY_API'
@@ -410,6 +410,7 @@ namespace :dev do
       updater = RhoDevelopment::AutoUpdater.new
       updater.add_directory(File.join($app_basedir, '/public'))
       updater.add_directory(File.join($app_basedir, '/app'))
+      updater.add_directory(File.join($app_basedir, '/nodejs')) if File.exists? File.join($app_basedir, '/nodejs')
       updater.run
     end
 
@@ -2188,10 +2189,12 @@ namespace "config" do
 
     $use_shared_runtime = Jake.getBuildBoolProp("use_shared_runtime")
     $js_application    = Jake.getBuildBoolProp("javascript_application")
+    $nodejs_application    = Jake.getBuildBoolProp("nodejs_application")
 
     puts '%%%_%%% $js_application = '+$js_application.to_s
+    puts '%%%_%%% $nodejs_application = '+$nodejs_application.to_s
 
-    if !$js_application && !Dir.exists?(File.join($app_path, "app"))
+    if !$js_application && !$nodejs_application && !Dir.exists?(File.join($app_path, "app"))
       BuildOutput.error([
                           "Add javascript_application:true to build.yml, since application does not contain app folder.",
                           "See: http://docs.rhomobile.com/guide/api_js#javascript-rhomobile-application-structure"
@@ -2329,7 +2332,7 @@ def add_extension(path,dest)
   chdir path if File.directory?(path)
   puts 'chdir path=' + path.to_s
 
-  if !$js_application
+  if !$js_application && !$nodejs_application
     Dir.glob("*").each do |f|
       cp_r f,dest unless f =~ /^ext(\/|(\.yml)?$)/ || f =~ /^app/  || f =~ /^public/
     end
@@ -2339,8 +2342,10 @@ def add_extension(path,dest)
     FileUtils.cp_r 'app', File.join( dest, "apps/app" ) if File.exist? 'app'
     FileUtils.cp_r 'public', File.join( dest, "apps/public" ) if File.exist? 'public'
   else
-    FileUtils.cp_r('app', File.join( File.dirname(dest), "apps/app" ).to_s) if File.exist? 'app'
-    FileUtils.cp_r('public', File.join( File.dirname(dest), "apps").to_s) if File.exist? 'public'
+    if !$nodejs_application
+      FileUtils.cp_r('app', File.join( File.dirname(dest), "apps/app" ).to_s) if File.exist? 'app'
+      FileUtils.cp_r('public', File.join( File.dirname(dest), "apps").to_s) if File.exist? 'public'
+    end
   end
 
   chdir start
@@ -2462,6 +2467,7 @@ def init_extensions(dest, mode = "")
   extjsmodulefiles = []
   extjsmodulefiles_opt = []
   startJSModules = []
+  startNodeJSModules = []
   startJSModules_opt = []
   endJSModules = []
   extcsharplibs = []
@@ -2474,10 +2480,21 @@ def init_extensions(dest, mode = "")
   extpaths = $app_config["extpaths"]
 
   rhoapi_js_folder = nil
+  rhoapi_nodejs_folder = nil
   if !dest.nil?
-    rhoapi_js_folder = File.join( File.dirname(dest), "apps/public/api" )
+    if $nodejs_application
+        rhoapi_js_folder = File.join( File.dirname(dest), "apps/nodejs/server/public/api" )
+    else
+        rhoapi_js_folder = File.join( File.dirname(dest), "apps/public/api" )
+    end
+    rhoapi_nodejs_folder = File.join( File.dirname(dest), "apps/nodejs/rhoapi" )
   elsif mode == "update_rho_modules_js"
-    rhoapi_js_folder = File.join( $app_path, "public/api" )
+      if $nodejs_application
+          rhoapi_js_folder = File.join( $app_path, "nodejs/server/public/api" )
+      else
+          rhoapi_js_folder = File.join( $app_path, "public/api" )
+      end
+    rhoapi_nodejs_folder = File.join( $app_path, "nodejs/rhoapi" )
   end
 
   do_separate_js_modules = Jake.getBuildBoolProp("separate_js_modules", $app_config, false)
@@ -2491,7 +2508,7 @@ def init_extensions(dest, mode = "")
 
   $app_config["extensions"].each do |extname|
     puts 'ext - ' + extname
-    
+
     if extname == "webkit"
 		$is_webkit_engine = true
     end
@@ -2570,7 +2587,7 @@ def init_extensions(dest, mode = "")
               if (("rhoelementsext" == extname || "dominjector" == extname) && ($config["platform"] == "wm"||$config["platform"] == "android"))
                 extentries << entry
                 extentries_init << entry
-              elsif !$js_application
+            elsif !$js_application && !$nodejs_application
                 extentries << entry
                 entry =  "if (rho_ruby_is_started()) #{entry}"
                 extentries_init << entry
@@ -2658,6 +2675,8 @@ def init_extensions(dest, mode = "")
                 startJSModules.unshift(f)
               elsif f.downcase().end_with?("rhoapi.js")
                 startJSModules << f
+            elsif f.downcase().end_with?("rhonodejsapi.js")
+                startNodeJSModules << f
               elsif f.downcase().end_with?("rho.application.js")
                 endJSModules << f
               elsif f.downcase().end_with?("rho.database.js")
@@ -2733,6 +2752,7 @@ def init_extensions(dest, mode = "")
   puts "exts " + exts
 
   # deploy Common API JS implementation
+  extnodejsmodulefiles = startNodeJSModules.concat( extjsmodulefiles )
   extjsmodulefiles = startJSModules.concat( extjsmodulefiles )
   extjsmodulefiles = extjsmodulefiles.concat(endJSModules)
   extjsmodulefiles_opt = startJSModules_opt.concat( extjsmodulefiles_opt )
@@ -2742,6 +2762,10 @@ def init_extensions(dest, mode = "")
       rm_rf rhoapi_js_folder if Dir.exist?(rhoapi_js_folder)
       mkdir_p rhoapi_js_folder
     end
+    if extnodejsmodulefiles.count > 0
+      rm_rf rhoapi_nodejs_folder if Dir.exist?(rhoapi_nodejs_folder)
+      mkdir_p rhoapi_nodejs_folder
+    end
     #
     if !$skip_build_js_api_files
       if extjsmodulefiles.count > 0
@@ -2762,6 +2786,10 @@ def init_extensions(dest, mode = "")
           chdir start_path
         end
       end
+      if extnodejsmodulefiles.count > 0
+        puts 'extnodejsmodulefiles=' + extnodejsmodulefiles.to_s
+        write_modules_js(rhoapi_nodejs_folder, "rhoapi.js", extnodejsmodulefiles, false)
+      end
       # make rhoapi-modules-ORM.js only if not shared-runtime (for WM) build
       if !$shared_rt_js_appliction
         if extjsmodulefiles_opt.count > 0
@@ -2929,7 +2957,7 @@ def common_bundle_start( startdir, dest)
 
   start = pwd
 
-  if !$js_application
+  if !$js_application && !$nodejs_application
     Dir.glob('lib/framework/*').each do |f|
       cp_r(f, dest, :preserve => true) unless f.to_s == 'lib/framework/autocomplete'
     end
@@ -2959,6 +2987,13 @@ def common_bundle_start( startdir, dest)
     public_folder_cp_r app + '/public', File.join($srcdir,'apps/public'), 0, file_map, app
   end
 
+  file_map = Jake.build_file_map(File.join($srcdir,'apps/nodejs'), $file_map_name, true)
+
+  if File.exists? app + '/nodejs'
+    public_folder_cp_r app + '/nodejs', File.join($srcdir,'apps/nodejs'), 0, file_map, app
+  end
+
+
   if $app_config["app_type"] == 'rhoelements'
     $config_xml = nil
     if $app_config[$config["platform"]] &&
@@ -3106,7 +3141,7 @@ namespace "build" do
 
     task :xruby do
 
-      if $js_application
+      if $js_application || $nodejs_application
         return
       end
 
@@ -3266,7 +3301,7 @@ namespace "build" do
       process_exclude_folders(excluded_dirs)
       chdir startdir
 
-      if !$js_application
+      if !$js_application && !$nodejs_application
 
         create_manifest
         cp compileERB, $srcdir

data/doc/oss/WM_CE_Installation_And_Build_Guidelines.md

@@ -1,4 +1,4 @@
-#**WM/CE Installation Guidelines:**
+# **WM/CE Installation Guidelines:**
 
 ## Note: It is recommended to install in this order only.
 

data/lib/commonAPI/barcode/ext.yml

@@ -17,8 +17,12 @@ wp8:
 project_paths:
   wp8: ext/platform/wp8/BarcodeLib.vcxproj
   wm: ext/platform/wm/Barcode.vcproj
-  win32: ext/platform/wm/Barcode.vcproj
+  #win32: ext/platform/wm/Barcode.vcproj
 
 xml_api_paths: ext/barcode.xml
 
-platforms: ["wm", "iphone", "android", "wp8"]
+platforms: ["wm", "iphone", "android", "wp8", "win32"]
+
+wm:
+  files:
+   common: ext\platform\wm\bin

data/lib/commonAPI/barcode/ext/barcode.xml

@@ -480,7 +480,7 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
             </PROPERTY>
             <PROPERTY name="scannerType" type="STRING" generateAccessors="true" readOnly="true">
                 <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
-                <PLATFORM>WM, CE, Android, WP8</PLATFORM>
+                <PLATFORM>WM, CE, Android, WP8, WIN32</PLATFORM>
                 <APPLIES msiOnly="false">All Scanners</APPLIES>
                 <DESC>The type of scanner in use, will be one of 'Camera', 'Imager' or 'Laser'. Camera scanners capture and process an image taken via the devices camera. Imager scanners rely on capturing and processing an image of the barcode via dedicated scanning hardware. Both camera and imager scanners are capable of decoding 1D and 2D barcodes. Laser scanners are only capable of decoding 1D barcodes and rely on a sweeping laser.</DESC>
             </PROPERTY>

data/lib/commonAPI/barcode/ext/build.bat

@@ -20,6 +20,14 @@ rake --trace
 
 )
 
+if "%RHO_PLATFORM%" == "win32" (
+
+call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+cd platform\qt
+rake --trace
+
+)
+
 if "%RHO_PLATFORM%" == "bb" (
 
 cd platform\bb

data/lib/commonAPI/barcode/ext/platform/qt/Barcode.pro

@@ -0,0 +1,90 @@
+QT += core gui widgets multimedia multimediawidgets network
+
+    lessThan(QT_VERSION, 5.6.0): {
+        QT += webkit widgets webkitwidgets
+        DEFINES += RHODES_VERSION_1
+    }
+    greaterThan(QT_VERSION, 5.6.0): {
+        QT += webengine webenginecore webenginewidgets
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2
+    }
+
+include(src/qzxing/QZXing.pri)
+
+TARGET = Barcode
+TEMPLATE = lib
+CONFIG += staticlib warn_on
+
+isEmpty(RHODES_ROOT) {
+   RHODES_ROOT = ../../../../../..
+}
+
+INCLUDEPATH += \
+$$RHODES_ROOT/lib/commonAPI/coreapi/ext/shared\
+$$RHODES_ROOT/platform/shared/common\
+$$RHODES_ROOT/platform/shared/rubyext\
+$$RHODES_ROOT/platform/shared/ruby/include\
+$$RHODES_ROOT/platform/shared\
+../../shared
+
+macx {
+  DESTDIR = $$RHODES_ROOT/platform/osx/bin/extensions
+  OBJECTS_DIR = $$RHODES_ROOT/platform/osx/bin/extensions/barcode
+  INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/iphone
+}
+win32 {
+  DESTDIR = $$RHODES_ROOT/platform/win32/bin/extensions
+  OBJECTS_DIR = $$RHODES_ROOT/platform/win32/bin/extensions/barcode 
+  DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE
+  debug {
+    DEFINES += _DEBUG DEBUG
+  }
+  release {
+    DEFINES += _NDEBUG NDEBUG
+    #DEFINES += _ITERATOR_DEBUG_LEVEL=2
+  }
+  INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/win32
+}
+
+DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
+
+!isEmpty(RHOSIMULATOR_BUILD) {
+  DEFINES += RHODES_EMULATOR
+}
+
+!win32 {
+  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+}
+win32 {
+  QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
+  QMAKE_CXXFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
+  QMAKE_CFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += /O2
+
+  QMAKE_CXXFLAGS_RELEASE += -MP9
+  QMAKE_CXXFLAGS_DEBUG += -MP9
+}
+
+HEADERS += \
+..\..\shared\generated\cpp\IBarcode.h\
+..\..\shared\generated\cpp\BarcodeBase.h \
+    src/BarcodeController.h \
+    src/BarcodeDialogBuilder.h \
+    src/BarcodeDialogView.h \
+    src/decoderthread.h
+
+SOURCES += \
+..\..\shared\generated\cpp\Barcode_js_wrap.cpp\
+..\..\shared\generated\cpp\Barcode_ruby_wrap.cpp\
+..\..\shared\generated\cpp\BarcodeBase.cpp\
+..\..\shared\generated\Barcode_api_init.cpp\
+..\..\shared\generated\Barcode_js_api.cpp\
+..\..\shared\generated\Barcode_ruby_api.c\
+src\Barcode_impl.cpp \
+    src/BarcodeController.cpp \
+    src/BarcodeDialogView.cpp \
+    src/decoderthread.cpp
+
+RESOURCES += $$RHODES_ROOT/lib/commonAPI/barcode/ext/platform/qt/resources/barcode.qrc

data/lib/commonAPI/barcode/ext/platform/qt/Rakefile

@@ -0,0 +1,35 @@
+def build_extension(name)
+  require File.join($rootdir, 'lib/build/jake.rb')
+  args = ['-o', 'Makefile', '-r', '-spec', $qmake_spec, "#{name}.pro", 'CONFIG-=debug', 'CONFIG+=release', 'CONFIG+=no_fixpath', "RHODES_ROOT='#{$rootdir}'", $qmakevars]
+  puts Jake.run($qmake,args)
+  fail "[qmake #{name}.pro]" unless $? == 0
+  #puts Jake.run($make, ['clean'])
+  fail "[make clean]" unless $? == 0
+  puts Jake.run($make, ['all'])
+  fail "[make all]" unless $? == 0
+end
+
+namespace "build" do
+  task :config do
+    $platform = ENV['RHO_PLATFORM']
+    raise "RHO_PLATFORM is not set" if $platform.nil?
+    $rootdir = ENV['RHO_ROOT']
+    raise "RHO_ROOT is not set" if $rootdir.nil?
+    $qmake = ENV['RHO_QMAKE']
+    raise "RHO_QMAKE is not set" if $qmake.nil?
+    $qmake_spec = ENV['RHO_QMAKE_SPEC']
+    raise "RHO_QMAKE_SPEC is not set" if $qmake_spec.nil?
+    $qmakevars = ENV['RHO_QMAKE_VARS']
+    if $platform == 'win32'
+      $make = 'nmake'
+    else
+      $make = 'make'
+    end
+  end
+
+  task :all => :config do
+    build_extension('Barcode')
+  end
+end
+
+task :default => "build:all"

data/lib/commonAPI/barcode/ext/platform/qt/resources/barcode.qrc

@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="barcodesounds">
+        <file>scanner_sound.wav</file>
+    </qresource>
+	<qresource prefix="barcodeimages">
+        <file>buttonBack.png</file>
+		<file>buttonSave.png</file>
+		<file>buttonRetry.png</file>
+    </qresource>
+</RCC>

data/lib/commonAPI/barcode/ext/platform/qt/src/BarcodeController.cpp

@@ -0,0 +1,40 @@
+#include "BarcodeController.h"
+
+QHash<QString, QCameraInfo> BarCodeController::camerasKeeper;
+QMutex BarCodeController::localMutex;
+
+BarCodeController::BarCodeController() : QObject(QApplication::instance())
+{
+    qRegisterMetaType<QList<QCameraInfo> >("QList<QCameraInfo>");
+    qRegisterMetaType<rho::apiGenerator::CMethodResult>("rho::apiGenerator::CMethodResult");
+}
+
+void BarCodeController::enumerate(rho::apiGenerator::CMethodResult& oResult) {
+    refresh();
+    rho::Vector<rho::String> arIDs = oResult.getStringArray();
+
+    if(!camerasKeeper.isEmpty()){
+        foreach (QString value, camerasKeeper.keys()) {
+            arIDs.addElement(value.toStdString());
+        }
+        oResult.set(arIDs);
+    }
+}
+
+void BarCodeController::openDialog(rho::apiGenerator::CMethodResult &oResult, QString cameraId)
+{
+    if (camerasKeeper.contains(cameraId)){
+        BarcodeDialogBuilder * builder = new BarcodeDialogBuilder(camerasKeeper.value(cameraId),
+                                                                  oResult, IExecutable::getMainWindow());
+        emit builder->run();
+    }
+}
+
+void BarCodeController::refresh(){
+    QMutexLocker locker(&localMutex);
+    static bool refreshed = false;
+    if (!refreshed) {
+        refreshed = true;
+        getInstance()->getCameraInfo();
+    }
+}

data/lib/commonAPI/barcode/ext/platform/qt/src/BarcodeController.h

@@ -0,0 +1,57 @@
+#ifndef BARCODECONTROLLER_H
+#define BARCODECONTROLLER_H
+
+#include <QObject>
+#include <QCameraInfo>
+#include <QString>
+#include <QList>
+#include <QEventLoop>
+#include <QtGui>
+#include <QApplication>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QHash>
+#include "BarcodeDialogBuilder.h"
+
+#include "../../../../../platform/shared/api_generator/MethodResult.h"
+#include "../../../../../platform/shared/common/RhoStd.h"
+#include "../../platform/shared/qt/rhodes/iexecutable.h"
+#include "../../platform/shared/qt/rhodes/guithreadfunchelper.h"
+
+class BarCodeController : public QObject
+{
+    Q_OBJECT
+private:
+    explicit BarCodeController();
+    QEventLoop loop;
+    static QMutex localMutex;
+public:
+    static BarCodeController * getInstance(){
+        static BarCodeController instance;
+        return &instance;
+    }
+    static void enumerate(rho::apiGenerator::CMethodResult &oResult);
+    static void openDialog(rho::apiGenerator::CMethodResult &oResult, QString cameraId);
+    static void refresh();
+    static QHash<QString, QCameraInfo> camerasKeeper;
+
+public slots:
+    void getCameraInfo(){
+        QMetaObject::invokeMethod(GuiThreadFuncHelper::getInstance(), "availableCameras",
+                                  Qt::QueuedConnection, Q_ARG(QObject *, this));
+        QTimer::singleShot(100, &(this->loop), SLOT(quit()));
+        loop.exec();
+    }
+
+    void availableCameras(QList<QCameraInfo> info){
+        if(camerasKeeper.isEmpty()){
+            int deviceCounter = 0;
+            foreach (QCameraInfo cameraInfo, info) {
+                camerasKeeper.insert(QString::number(++deviceCounter), cameraInfo);
+            }
+        }
+        loop.quit();
+    }
+};
+
+#endif // BARCODECONTROLLER_H