rhodes 5.5.15 → 5.5.17

data/platform/shared/unzip/deflate.cpp

@@ -1315,7 +1315,12 @@ local void check_match(deflate_state *s, IPos start,IPos match, int length)
         do {
             fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
         } while (--length != 0);
+#ifdef RHODES_VERSION_2
+        char ch [] = "invalid match";
+        z_error(ch);
+#else
         z_error("invalid match");
+#endif
     }
     if (z_verbose > 1) {
         fprintf(stderr,"\\[%d,%d]", start-match, length);
@@ -1904,4 +1909,4 @@ local block_state deflate_huff(deflate_state* s, int flush)
     return block_done;
 }
 
-}
+}

data/platform/shared/unzip/gunzip.cpp

@@ -64,4 +64,4 @@ namespace gunzip
     return status;
    
   }
-}
+}

data/platform/shared/unzip/unzip.cpp

@@ -4254,10 +4254,6 @@ ZRESULT TUnzip::Close()
   return ZR_OK;
 }
 
-
-
-
-
 ZRESULT lasterrorU=ZR_OK;
 
 unsigned int FormatZipMessageU(ZRESULT code, TCHAR *buf,unsigned int len)
@@ -4296,7 +4292,8 @@ unsigned int FormatZipMessageU(ZRESULT code, TCHAR *buf,unsigned int len)
 
 
 typedef struct
-{ DWORD flag;
+{
+  DWORD flag;
   TUnzip *unz;
 } TUnzipHandleData;
 
@@ -4304,7 +4301,7 @@ HZIP OpenZipInternal(void *z,unsigned int len,DWORD flags, const char *password)
 { TUnzip *unz = new TUnzip(password);
   lasterrorU = unz->Open(z,len,flags);
   if (lasterrorU!=ZR_OK) {delete unz; return 0;}
-  TUnzipHandleData *han = new TUnzipHandleData;
+  TUnzipHandleData *han;// = new TUnzipHandleData;
   han->flag=1; han->unz=unz; return (HZIP)han;
 }
 HZIP OpenZipHandle(HANDLE h, const char *password) {return OpenZipInternal((void*)h,0,ZIP_HANDLE,password);}

data/platform/shared/unzip/zip.cpp

@@ -1,6 +1,7 @@
 #include "zip.h"
 #include <vector>
 #include <memory>
+#include <stdio.h>
 
 // THIS FILE is almost entirely based upon code by info-zip.
 // It has been modified by Lucian Wischik. The modifications
@@ -2091,17 +2092,6 @@ ulg deflate(TState &state)
     return FLUSH_BLOCK(state,1); /* eof */
 }
 
-
-
-
-
-
-
-
-
-
-
-
 int putlocal(struct zlist *z, WRITEFUNC wfunc,void *param)
 { // Write a local header described by *z to file *f.  Return a ZE_ error code.
   PUTLG(LOCSIG, f);
@@ -2264,12 +2254,6 @@ char zencode(unsigned long *keys, char c)
   return (char)(t^c);
 }
 
-
-
-
-
-
-
 int lustricmp(const TCHAR *sa, const TCHAR *sb)
 { for (const TCHAR *ca=sa, *cb=sb; ; ca++, cb++)
   { int ia=tolower(*ca), ib=tolower(*cb);
@@ -2280,7 +2264,6 @@ int lustricmp(const TCHAR *sa, const TCHAR *sb)
   }
 }
 
-
 bool HasZipSuffix(const TCHAR *fn)
 { const TCHAR *ext = fn+_tcslen(fn);
   while (ext>fn && *ext!='.') ext--;
@@ -2296,13 +2279,6 @@ bool HasZipSuffix(const TCHAR *fn)
   return false;
 }
 
-
-
-
-
-
-
-
 class TZip
 { public:
   TZip(const char *pwd) : hfout(0),mustclosehfout(false),hmapout(0),zfis(0),obuf(0),hfin(0),writ(0),oerr(false),hasputcen(false),ooffset(0),encwriting(false),encbuf(0),password(0), state(0) {if (pwd!=0 && *pwd!=0) {password=new char[strlen(pwd)+1]; strcpy(password,pwd);}}

data/platform/shared/unzip/zutil.cpp

@@ -319,4 +319,4 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 
 #endif /* !Z_SOLO */
 
-}//namespace zlib
+}//namespace zlib

data/platform/shared/unzip/zutil.h

@@ -222,7 +222,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
    extern void ZLIB_INTERNAL z_error OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Assert(cond,msg) {if(!(cond)) fprintf(stderr, "%s\n", msg); exit(1);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
 #  define Tracevv(x) {if (z_verbose>1) fprintf x ;}

data/platform/wm/build/build_inf.js

@@ -358,17 +358,18 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit_m
     else 
     {
         p("2=,\"\",,\"..\\bin\\"+settings[platform][0]+"\\rhodes\\Release\\\"");
-        p("3=,\"\",," + rhogempath + "\"\\\"");
+        p("3=,\"\",," + rhogempath + "\"\\libs\\webkit\\ext\\wm\\lib\\\"");
         
         if (webkit_mode != 'none')
         {            
-            p("4=,\"\",," + rhogempath + "\"\\npapi\\\"");
+            p("4=,\"\",," + rhogempath + "\"\\libs\\webkit\\ext\\wm\\lib\\npapi\\\"");
             /*p("5=,\"\",," + rhogempath + "\"\\Config\\\"");*/
             p("5=,\"\",," + rhogempath);
         }
         else
         {
-            /*if(include_motocaps)
+            p("4=,\"\",," + rhogempath + "\"\\libs\\ie\\\"");
+	    /*if(include_motocaps)
             {
                 p("4=,\"\",," + rhogempath + "\"\\Config\\\"");
             }*/
@@ -417,6 +418,7 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit_m
         }
         else
         {
+            p("\"rhobrowser.dll\"=4");
             /*if(include_motocaps)
             {
                 if (!is_custom_config) 
@@ -575,6 +577,8 @@ function pinf(platform,es,exts,name,vendor,srcdir,show_shortcut,is_icon,webkit_m
         }
         else
         {
+
+            p("\"rhobrowser.dll\",\"rhobrowser.dll\",,0");   
             if(include_motocaps)
             {
                 p("");

data/platform/wm/build/wm.rake

@@ -79,6 +79,12 @@ def QTInfo(qtcurrentversion)
        if(eqstatus)
           value =3 # 5.5.0.0
       end
+
+      eqstatus = is_equal("5.8.0.0",qtcurrentversion)
+      puts "Checking for 5.8.0.0 - #{eqstatus}"
+       if(eqstatus)
+          value = 4 # 5.8.0.0
+      end
       return value
 end
 
@@ -554,17 +560,18 @@ def build_cab
     end
   end
 
-  if $comdll_files && $comdll_files.size > 0
+  if $comdll_files #&& $comdll_files.size > 0
     puts 'add com dlls names to file'
     reg_string = ""
      
     File.open(com_dlls_filename, 'w') do |f|
-      $comdll_files.each { |key| 
-        reg_string = reg_string + key[0..-1] + "," 
-      }
+    #  $comdll_files.each { |key| 
+    #    reg_string = reg_string + key[0..-1] + "," 
+    #  }
 
-      reg_string = reg_string[0..-2]
-      f.write(reg_string)
+    #  reg_string = reg_string[0..-2]
+    #  f.write(reg_string)
+    f.write("rhobrowser.dll")
     end
   end
   
@@ -588,7 +595,7 @@ def build_cab
     webkit = 'in_process'
   end
   
-  $wk_data_dir = File.join($startdir, "../rho-tau-extensions-"+ENV['rhodes_version']+"/libs/webkit/ext/wm/lib")
+  $wk_data_dir = File.join($startdir, "../rho-tau-extensions-"+ENV['rhodes_version'])
 
   dir = File.join($startdir, $builddir)
   
@@ -703,11 +710,11 @@ namespace "config" do
 
       $msvc_version = $app_config["win32"]["msvc"] if $app_config && $app_config["win32"] && $app_config["win32"]["msvc"]
 
-      # use Visual Studio 2012 by default
-      $vs_version = 2012
-      $vscommontools = ENV['VS110COMNTOOLS']
-      $qmake_makespec = 'win32-msvc2012'
-
+      # use Visual Studio 2015 by default
+      $vs_version = 2015
+      $vscommontools = ENV['VS140COMNTOOLS']
+      $qmake_makespec = 'win32-msvc2015'
+      
       # if win32:msvc is not defined in build.yml, then automatically detect installed Visual Studio
       if $msvc_version.nil?
         unless !$vscommontools.nil? && ($vscommontools !~ /^\s*$/) && File.directory?($vscommontools)
@@ -715,6 +722,12 @@ namespace "config" do
           $vscommontools = ENV['VS90COMNTOOLS']
           $qmake_makespec = 'win32-msvc2008'
         end
+        unless !$vscommontools.nil? && ($vscommontools !~ /^\s*$/) && File.directory?($vscommontools)
+          $vs_version = 2012
+          $vscommontools = ENV['VS110COMNTOOLS']
+          $qmake_makespec = 'win32-msvc2012'
+          
+        end
         unless !$vscommontools.nil? && ($vscommontools !~ /^\s*$/) && File.directory?($vscommontools)
           puts "\nPlease, set either VS110COMNTOOLS or VS90COMNTOOLS environment variable to Common7\\Tools directory path of Visual Studio 2012 or 2008 respectively."
           exit 1
@@ -728,12 +741,24 @@ namespace "config" do
           exit 1
         end
       elsif $msvc_version == "2012"
+        $vs_version = 2012
+        $vscommontools = ENV['VS110COMNTOOLS']
+        $qmake_makespec = 'win32-msvc2012'
         unless !$vscommontools.nil? && ($vscommontools !~ /^\s*$/) && File.directory?($vscommontools)
           puts "\nPlease, set VS110COMNTOOLS environment variable to Common7\\Tools directory path of Visual Studio 2012"
           exit 1
         end
+      elsif $msvc_version == "2015"
+        $vs_version = 2015
+        $vscommontools = ENV['VS140COMNTOOLS']
+        $qmake_makespec = 'win32-msvc2015'
+        
+        unless !$vscommontools.nil? && ($vscommontools !~ /^\s*$/) && File.directory?($vscommontools)
+          puts "\nPlease, set VS110COMNTOOLS environment variable to Common7\\Tools directory path of Visual Studio 2015"
+          exit 1
+        end
       else
-        puts "\nPlease, specify Visual Studio version as either 2008 or 2012 in win32:msvc section of build.yml"
+        puts "\nPlease, specify Visual Studio version as either 2008 or 2012 or 2015 in win32:msvc section of build.yml"
         exit 1
       end
 
@@ -748,8 +773,7 @@ namespace "config" do
         puts "\nPlease, set QTDIR environment variable to Qt root directory path"
         exit 1
       end
-       
-       
+
      # Search for QT 5 or QT 4 files
      qt5corefile =File.join($qtdir, "bin/Qt5Core.dll");
      qt4corefile =File.join($qtdir, "bin/QtCore4.dll");
@@ -776,6 +800,8 @@ namespace "config" do
                     format ="Found QT Version : #{$QVersion}"
                when 3
                     format ="Found QT Version : #{$QVersion}"
+               when 4
+                    format ="Found QT Version : #{$QVersion}"
                else
                     format ="Unknown QT Version : #{$QVersion}"
           end
@@ -785,7 +811,11 @@ namespace "config" do
          if $vs_version == 2008 &&  $qtversionindex == 3
                puts "\n Visual Studio 2008 is not currently supported for this QT version "
           exit 1
-       end
+        end
+          if $vs_version != 2015 &&  $qtversionindex == 4
+               puts "\n Visual Studio  #{$vs_version} is not currently supported for this QT version "
+          exit 1
+        end
        
       $qt_project_dir = File.join( $startdir, 'platform/shared/qt/' )
     end
@@ -1154,19 +1184,19 @@ namespace "build" do
       FileUtils.rm_rf(Dir.glob(File.join($target_path, 'vccorlib*0.dll')), {:secure => true})
       FileUtils.rm_rf(Dir.glob(File.join($target_path, 'D3Dcompiler*.dll')), {:secure => true})
       FileUtils.rm_rf(Dir.glob(File.join($target_path, 'Microsoft.VC*.manifest')), {:secure => true})
-
       deploymsvc = Jake.getBuildBoolProp('deploymsvc', $app_config, true)
-       if(deploymsvc)
-            puts "Microsoft Visual C++ Runtime Binaries for #{$vs_version} included in App Setup Bundle"
-       else
-          puts "Microsoft Visual C++ Runtime Binaries for #{$vs_version} Excluded in App Setup Bundle"
-       end 
-       if($rhosimulator_build)
-           puts "Build for Rhosimulator...msvc"
-            deploymsvc = true;
+      if(deploymsvc)
+        puts "Microsoft Visual C++ Runtime Binaries for #{$vs_version} included in App Setup Bundle"
+      else
+        puts "Microsoft Visual C++ Runtime Binaries for #{$vs_version} Excluded in App Setup Bundle"
+      end 
+      if($rhosimulator_build)
+        puts "Build for Rhosimulator...msvc"
+        deploymsvc = true;
       end
-      if $vs_version == 2008
+      if ($vs_version == 2008)
         # Visual Studio 2008
+        puts "Deploy libs from msvc #{$vs_version}"
         vsredistdir = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC90.CRT")
         vsredistdir2 = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC90.OPENMP")
         if deploymsvc
@@ -1179,8 +1209,9 @@ namespace "build" do
         end
         cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/msvc2008/bin/libeay32.dll"), $target_path
         cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/msvc2008/bin/ssleay32.dll"), $target_path
-      else
+      elsif ($vs_version == 2012)
         # Visual Studio 2012
+        puts "Deploy libs from msvc #{$vs_version}"
         vsredistdir = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC110.CRT")
         vsredistdir2 = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC110.OPENMP")
         if deploymsvc
@@ -1189,9 +1220,27 @@ namespace "build" do
           cp File.join(vsredistdir, "vccorlib110.dll"), $target_path
           cp File.join(vsredistdir2, "vcomp110.dll"), $target_path
           cp File.join($vscommontools, "../../VC/bin/D3Dcompiler_46.dll"), $target_path
+          puts "Joining msvc110 libs"
+        end
+        cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/bin/libeay32.dll"), $target_path
+        cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/bin/ssleay32.dll"), $target_path
+      elsif ($vs_version == 2015)
+        # Visual Studio 2015
+        puts "Deploy libs from msvc #{$vs_version}"
+        vsredistdir = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC140.CRT")
+        vsredistdir2 = File.join($vscommontools, "../../VC/redist/x86/Microsoft.VC140.OPENMP")
+        if deploymsvc
+          cp File.join(vsredistdir, "msvcp140.dll"), $target_path
+          cp File.join(vsredistdir, "concrt140.dll"), $target_path
+          cp File.join(vsredistdir, "vccorlib140.dll"), $target_path
+          cp File.join(vsredistdir, "vcruntime140.dll"), $target_path
+          cp File.join(vsredistdir2, "vcomp140.dll"), $target_path
+          cp File.join($vscommontools, "../../VC/bin/d3dcompiler_47.dll"), $target_path
         end
         cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/bin/libeay32.dll"), $target_path
         cp File.join($startdir, "lib/extensions/openssl.so/ext/win32/bin/ssleay32.dll"), $target_path
+      else
+        puts "Libs version not correct"
       end
 
       FileUtils.rm_rf(File.join($target_path, 'phonon4.dll'), {:secure => true})
@@ -1224,6 +1273,7 @@ namespace "build" do
      #1 - 4.7.4.0     
      #2- 5.1.1.0 
      #3 - 5.5.0.0
+     #4 - 5.8.0.0
        case $qtversionindex
                  when 1 # 4.7.4.0
                     format ="Found QT Version : #{$QVersion}"
@@ -1241,8 +1291,7 @@ namespace "build" do
                     cp File.join($qtdir, "plugins/imageformats/qmng4.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qsvg4.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qtiff4.dll"), target_if_path
-
-               when 2 # 5.1.1.0
+                 when 2 # 5.1.1.0
                     format= "Found QT Version : #{$QVersion}"
                     if File.exists?(File.join($qtdir, "bin/icudt53.dll"))
                       cp File.join($qtdir, "bin/icudt53.dll"), $target_path
@@ -1343,9 +1392,25 @@ namespace "build" do
                         end
                       end
                     end
+               when 4 #5.8.0.0
+                   format ="Found QT Version : #{$QVersion}" 
+                   targetFile = File.join($target_path, $appname + ".exe")
+                    if File.exists? targetFile
+                      Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                    else
+                      targetFile = File.join($target_path, "Rhodes.exe")
+                      if File.exists? targetFile
+                        Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                      else
+                        targetFile = File.join($target_path, "RhoLaunch.exe")
+                        if File.exists? targetFile
+                          Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                        end
+                      end
+                    end
                else
                     format ="Unknown QT Version : #{$QVersion}"
-          end
+              end
           puts format
     end
 
@@ -1865,6 +1930,7 @@ namespace "clean" do
     rm_rf $targetdir
     rm_rf File.join($startdir, 'platform/shared/qt/rhodes/GeneratedFiles')
     rm_rf File.join($startdir, 'platform/win32/bin')
+    rm_rf File.join($startdir, 'platform/wm/bin')
     
     rm_rf File.join($app_path, "bin/tmp") if File.exists? File.join($app_path, "bin/tmp")
     rm_rf File.join($app_path, "bin/RhoBundle") if File.exists? File.join($app_path, "bin/RhoBundle")

data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp

@@ -33,7 +33,9 @@
 #include "common/RhoStd.h"
 #undef null
 #include <qglobal.h>
-#if QT_VERSION >= 0x050000
+#if QT_VERSION > QT_VERSION_CHECK(5,6,0)
+#include <QtWebEngine/qtwebengineversion.h>
+#elif  QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 #include <QtWebKit/qtwebkitversion.h>
 #else
 #include <QtWebKit/qwebkitversion.h>

data/rakefile.rb

@@ -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