using node 6 for Spark 1.8 release (#1910)

* Revert "fix uncaught rejection in weather app (reverts a fix for instanceof) (#1903)"

This reverts commit 918fd25.

* Revert "changes for switching to node6.9.0 (#1867)"

This reverts commit c1205e3.

* Revert "node 8.15.1 and grpc-js [PoC] (#1735)"

This reverts commit 97c1b69.

* update to 1.8.0.2

Author: mfiess

CMakeLists.txt

@@ -17,7 +17,6 @@ option(DISABLE_DEBUG_MODE "Disable debugging mode." "OFF") # OFF for backward co
 option(SUPPORT_NODE "SUPPORT_NODE" ON)
 option(SUPPORT_V8 "SUPPORT_V8" OFF)
 option(SUPPORT_DUKTAPE "SUPPORT_DUKTAPE" ON)
-option(USE_NODE_8 "USE_NODE_8" OFF)
 
 option(SUPPORT_STORAGE "SUPPORT_STORAGE" ON)
 option(ENABLE_SQLITE_ENCRYPTION_EXTENSION "Toggle SQLite encryption extension support" OFF)

ci/leak.supp

@@ -235,21 +235,3 @@
    fun:_ZN9pxScene2d8onUpdateEd
    fun:_ZN12pxScriptView8onUpdateEd
 }
-{
-   rtScriptNodeDtorNeverCalled
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create@@GLIBC_2.2.5
-   fun:uv_thread_create
-   fun:_ZN4node12NodePlatformC1EiPN2v817TracingControllerE
-   fun:_ZN4node14CreatePlatformEiPN2v817TracingControllerE
-   fun:_ZN12rtScriptNode5init2Ev
-   fun:_ZN12rtScriptNode4initEv
-   fun:_ZN8rtScript4initEv
-   fun:_Z6pxMainiPPc
-   fun:main
-}

cmake/CommDeps.cmake

@@ -103,11 +103,7 @@ if (NOT WIN32)
         pkg_search_module(OPENSSL openssl)
     endif (PREFER_SYSTEM_LIBRARIES)
     if (NOT OPENSSL_FOUND)
-      if (USE_NODE_8)
-        set(OPENSSL_INCLUDE_DIRS "${EXTDIR}/libnode-v8.15.1/deps/openssl/openssl/include")
-      else ()
         set(OPENSSL_INCLUDE_DIRS "${EXTDIR}/libnode-v6.9.0/deps/openssl/openssl/include")
-      endif ()
     endif (NOT OPENSSL_FOUND)
 
     pkg_search_module(UV libuv)

cmake/NodeDeps.cmake

@@ -16,12 +16,14 @@ endif(PREFER_SYSTEM_LIBRARIES)
 if (NOT NODE_FOUND)
     message(STATUS "Using built-in nodejs library")
     if (USE_NODE_0_12_7)
-      set(NODEDIR "${EXTDIR}/libnode/")
-    elseif (USE_NODE_8)
-      set(NODEDIR "${EXTDIR}/libnode-v8.15.1/")
-    else ()
-      set(NODEDIR "${EXTDIR}/libnode-v6.9.0/")
-    endif ()
+          set(NODEDIR "${EXTDIR}/libnode/")
+    else (USE_NODE_0_12_7)
+      if (NOT WIN32)
+          set(NODEDIR "${EXTDIR}/node/")
+      else (NOT WIN32)
+          set(NODEDIR "${EXTDIR}/libnode-v6.9.0/")
+      endif (NOT WIN32)
+    endif (USE_NODE_0_12_7)
 
     set(NODE_INCLUDE_DIRS ${NODEDIR}/src ${NODEDIR}/deps/uv/include ${NODEDIR}/deps/v8/include ${NODEDIR}/deps/cares/include)
     if (USE_NODE_0_12_7)
@@ -36,44 +38,25 @@ if (NOT NODE_FOUND)
           set(NODE_LIBRARY_DIRS ${NODE_LIBRARY_DIRS} ${NODEDIR})
           set(NODE_LIBRARIES ${NODE_LIBRARIES} node)
       else (NOT WIN32)
-          if (USE_NODE_8)
-              set(NODE_INCLUDE_DIRS ${NODE_INCLUDE_DIRS}
-                  ${NODEDIR}/deps/openssl/openssl/include
-                  ${NODEDIR}/deps/http_parser
-                  ${NODEDIR}/deps/icu-small/source/common/unicode
-                  ${NODEDIR}/deps/icu-small/source/common
-                 )
-              set(NODE_LIBRARY_DIRS ${NODE_LIBRARY_DIRS} ${NODEDIR}build/Release/lib ${NODEDIR}Release/lib ${NODEDIR}Release)
-              set(NODE_LIBRARIES ${NODE_LIBRARIES}
-                  http_parser.lib cares.lib nghttp2.lib gtest.lib libuv.lib
-                  v8_builtins_setup.lib v8_libbase.lib v8_libplatform.lib v8_libsampler.lib
-                  v8_builtins_generators.lib v8_nosnapshot.lib v8_snapshot.lib
-                  v8_base_1.lib v8_base_2.lib v8_base_3.lib v8_base_0.lib
-                  icuucx.lib icui18n.lib icustubdata.lib icutools.lib icudata.lib
-                  openssl.lib node.lib
-                  dbghelp.lib
-                 )
-          else ()
-              set(NODE_INCLUDE_DIRS ${NODE_INCLUDE_DIRS}
-                  ${NODEDIR}/deps/openssl/openssl/include ${NODEDIR}/deps/http_parser
-                  ${NODEDIR}/deps/v8_inspector/third_party/v8_inspector/
-                  ${NODEDIR}/deps/icu-small/source/common/unicode
-                  ${NODEDIR}/Release/obj/global_intermediate/blink
-                  ${NODEDIR}/Release/obj/global_intermediate
-                  ${NODEDIR}/Release/obj/gen/blink
-                  ${NODEDIR}/deps/icu-small/source/common
-                  ${NODEDIR}/tools/msvs/genfiles
-                 )
-              set(NODE_LIBRARY_DIRS ${NODE_LIBRARY_DIRS} ${NODEDIR}build/Release/lib ${NODEDIR}Release/lib ${NODEDIR}Release)
-              set(NODE_LIBRARIES ${NODE_LIBRARIES}
-                  v8_libplatform.lib v8_libbase.lib v8_nosnapshot.lib v8_snapshot.lib v8_base_0.lib
-                  v8_base_1.lib v8_base_2.lib v8_base_3.lib
-                  gtest.lib cares.lib http_parser.lib
-                  icutools.lib icustubdata.lib icudata.lib icuucx.lib icui18n.lib
-                  libuv.lib openssl.lib v8_inspector_stl.lib
-                  node.lib cctest.lib
-                 )
-          endif ()
+          set(NODE_INCLUDE_DIRS ${NODE_INCLUDE_DIRS}
+              ${NODEDIR}/deps/openssl/openssl/include ${NODEDIR}/deps/http_parser
+              ${NODEDIR}/deps/v8_inspector/third_party/v8_inspector/
+              ${NODEDIR}/deps/icu-small/source/common/unicode
+              ${NODEDIR}/Release/obj/global_intermediate/blink
+              ${NODEDIR}/Release/obj/global_intermediate
+              ${NODEDIR}/Release/obj/gen/blink
+              ${NODEDIR}/deps/icu-small/source/common
+              ${NODEDIR}/tools/msvs/genfiles
+             )
+          set(NODE_LIBRARY_DIRS ${NODE_LIBRARY_DIRS} ${NODEDIR}build/Release/lib ${NODEDIR}Release/lib ${NODEDIR}Release)
+          set(NODE_LIBRARIES ${NODE_LIBRARIES}
+              v8_libplatform.lib v8_libbase.lib v8_nosnapshot.lib v8_snapshot.lib v8_base_0.lib
+              v8_base_1.lib v8_base_2.lib v8_base_3.lib
+              gtest.lib cares.lib http_parser.lib
+              icutools.lib icustubdata.lib icudata.lib icuucx.lib icui18n.lib
+              libuv.lib openssl.lib v8_inspector_stl.lib
+              node.lib cctest.lib
+             )
       endif (NOT WIN32)
   else (NOT BUILD_WITH_STATIC_NODE)
       set(NODE_LIBRARY_DIRS ${NODE_LIBRARY_DIRS}

cmake/V8Deps.cmake

@@ -37,11 +37,7 @@ if (PREFER_SYSTEM_LIBRARIES)
 endif (PREFER_SYSTEM_LIBRARIES)
 
 if (NOT V8_FOUND)
-if (USE_NODE_8)
-    set(NODEDIR "${EXTDIR}/libnode-v8.15.1/")
-else ()
-    set(NODEDIR "${EXTDIR}/libnode-v6.9.0/")
-endif ()
+set(NODEDIR "${EXTDIR}/libnode-v6.9.0/")
 set(V8DIR "${EXTDIR}/v8/")
 set(V8_INCLUDE_DIRS ${V8DIR}/include
         ${NODEDIR}/deps/uv/include 

examples/pxScene2d/README.md

@@ -107,10 +107,10 @@
       cd examples/pxScene2d/external/node
       ./configure --shared
       make -j1
-      ln -sf out/Release/obj.target/libnode.so.* ./
-      ln -sf libnode.so.* libnode.so
-      ln -sf out/Release/libnode.*.dylib ./
-      ln -sf libnode.*.dylib libnode.dylib
+      ln -sf out/Release/obj.target/libnode.so.48 libnode.so.48
+      ln -sf libnode.so.48 libnode.so
+      ln -sf out/Release/libnode.48.dylib libnode.48.dylib
+      ln -sf libnode.48.dylib libnode.dylib
       ~~~~
       Build breakpad
       ~~~~
@@ -132,7 +132,7 @@
       ~~~~
       Build node
       ~~~~
-      cd examples/pxScene2d/external/libnode-v8.15.1
+      cd examples/pxScene2d/external/libnode-v6.9.0
       CALL vcbuild.bat x86 nosign
       cd ..
       ~~~~

examples/pxScene2d/external/.gitignore

@@ -9,11 +9,6 @@ libnode-v6.9.0/config.gypi
 libnode-v6.9.0/config.mk
 libnode-v6.9.0/icu_config.gypi
 libnode-v6.9.0/node
-libnode-v8.15.1/out
-libnode-v8.15.1/config.gypi
-libnode-v8.15.1/config.mk
-libnode-v8.15.1/icu_config.gypi
-libnode-v8.15.1/node
 libpng-1.6.28/config.log
 libpng-1.6.28/Makefile
 libpng-1.6.28/config.status

examples/pxScene2d/external/build.sh

@@ -12,27 +12,6 @@ banner() {
   echo " "
 }
 
-#--------- Args
-
-NODE_VER="6.9.0"
-
-while (( "$#" )); do
-  case "$1" in
-    --node-version)
-      NODE_VER=$2
-      shift 2
-      ;;
-    --) # end argument parsing
-      shift
-      break
-      ;;
-    -*|--*=) # unsupported flags
-      echo "Error: Unsupported flag $1" >&2
-      exit 1
-      ;;
-  esac
-done
-
 #--------- CURL
 
 make_parallel=3
@@ -69,7 +48,7 @@ then
       fi
   fi
 
-
+  
   make all "-j${make_parallel}"
   cd ..
 
@@ -213,33 +192,21 @@ fi
 
 #--------- LIBNODE
 
-if [ ! -e "libnode-v${NODE_VER}/libnode.dylib" ] ||
+if [ ! -e node/libnode.dylib ] ||
    [ "$(uname)" != "Darwin" ]
 then
 
   banner "NODE"
 
-  if [ -e "node-v${NODE_VER}_mods.patch" ]
-  then
-    git apply "node-v${NODE_VER}_mods.patch"
-  fi
-
-  cd "libnode-v${NODE_VER}"
+  cd node
   ./configure --shared
   make "-j${make_parallel}"
-
-  if [ "$(uname)" != "Darwin" ]
-  then
-    ln -sf out/Release/obj.target/libnode.so.* ./
-    ln -sf libnode.so.* libnode.so
-  else
-    ln -sf out/Release/libnode.*.dylib ./
-    ln -sf libnode.*.dylib libnode.dylib
-  fi
-
+  ln -sf out/Release/obj.target/libnode.so.48 libnode.so.48
+  ln -sf libnode.so.48 libnode.so
+  ln -sf out/Release/libnode.48.dylib libnode.48.dylib
+  ln -sf libnode.48.dylib libnode.dylib
   cd ..
-  rm node
-  ln -sf "libnode-v${NODE_VER}" node
+
 fi
 
 #--------- uWebSockets

examples/pxScene2d/external/buildWindows.bat

@@ -15,7 +15,6 @@ copy /y libpng-1.6.28\scripts\pnglibconf.h.prebuilt libpng-1.6.28\pnglibconf.h
 copy /y jpeg-9a\jconfig.vc jpeg-9a\jconfig.h
 
 set buildExternal=0
-set nodeVer="6.9.0"
 if NOT [%APPVEYOR_REPO_COMMIT%] == [] (
     FOR /F "tokens=* USEBACKQ" %%F IN (`git diff --name-only %APPVEYOR_REPO_COMMIT% %APPVEYOR_REPO_COMMIT%~`) DO (
     echo.%%F|findstr "zlib WinSparkle pthread libpng libjpeg-turbo glew freetype curl jpeg-9a"
@@ -79,21 +78,8 @@ cd ..
 
 REM --------- LIBNODE
 
-if %nodeVer% == "6.9.0" (
-  cd libnode-v6.9.0
-  CALL vcbuild.bat x86 nosign
-)
-
-if %nodeVer% == "8.15.1" (
-  git apply node-v8.15.1_mods.patch
-  cd libnode-v8.15.1
-  if %buildExternal% == 1 (
-    CALL vcbuild.bat x86 nosign no-optimization static
-  ) else (
-    CALL vcbuild.bat x86 nosign
-  )
-)
-
+cd libnode-v6.9.0
+CALL vcbuild.bat x86 nosign
 cd ..
 
 REM --------- DUKLUV
@@ -117,4 +103,3 @@ cd sqlite-autoconf-3280000
 cl /c /EHsc sqlite3.c
 lib sqlite3.obj
 cd ..
-

examples/pxScene2d/external/libnode-v6.9.0/node.gyp

@@ -329,7 +329,9 @@
             '<(SHARED_INTERMEDIATE_DIR)/blink', # for inspector
           ],
         }, {
-          'defines': [ 'HAVE_INSPECTOR=0' ]
+          # MODIFIED CODE BEGIN
+          # 'defines': [ 'HAVE_INSPECTOR=0' ]
+          # MODIFIED CODE END
         }],
         [ 'node_use_openssl=="true"', {
           'defines': [ 'HAVE_OPENSSL=1' ],