Merge lp:~marcustomlinson/unity-js-scopes/iojs-to-nodejs into lp:unity-js-scopes

[Marcus Tomlinson]

Update our io.js dependancy to latest stable node.js (v4)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/56/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-10-22 05:41:05 +0000
+++ .bzrignore	2015-11-13 08:51:28 +0000
@@ -1,4 +1,4 @@
-./deps/io.js
+./deps/node.js
 ./deps/v8-cpp
 ./CMakeLists.txt.user
 ./examples/simple-click/CMakeLists.txt.user

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-13 08:51:28 +0000
+++ CMakeLists.txt	2015-11-13 08:51:28 +0000
@@ -41,9 +41,9 @@
 endif()
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/deps/uv/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/deps/v8/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/src
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/node.js/deps/uv/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/node.js/deps/v8/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/node.js/src
   ${CMAKE_CURRENT_SOURCE_DIR}/deps/v8-cpp/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   )
@@ -51,11 +51,11 @@
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
 if(cmake_build_type_tolower STREQUAL "debug")
   link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/out/Debug
+    ${CMAKE_CURRENT_SOURCE_DIR}/deps/node.js/out/Debug
   )
 else()
   link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/out/Release
+    ${CMAKE_CURRENT_SOURCE_DIR}/deps/node.js/out/Release
   )
 endif()
 

=== modified file 'README.md'
--- README.md	2015-10-06 18:22:09 +0000
+++ README.md	2015-11-13 08:51:28 +0000
@@ -1,4 +1,4 @@
-IoJs addon for Ubuntu unity-scopes-api bindings
+Node.js addon for Ubuntu unity-scopes-api bindings
 -----------------------------------------------
 
 

=== modified file 'deps/build-debug.sh'
--- deps/build-debug.sh	2015-08-04 13:58:19 +0000
+++ deps/build-debug.sh	2015-11-13 08:51:28 +0000
@@ -2,10 +2,10 @@
 
 DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-# io.js
+# node.js
 
 cd $DIR
 
-cd io.js
+cd node.js
 ./configure --enable-static --debug
 make -j3

=== modified file 'deps/build.sh'
--- deps/build.sh	2015-08-04 13:58:19 +0000
+++ deps/build.sh	2015-11-13 08:51:28 +0000
@@ -2,10 +2,10 @@
 
 DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-# io.js
+# node.js
 
 cd $DIR
 
-cd io.js
+cd node.js
 ./configure --enable-static
 make -j3

=== modified file 'deps/get.sh'
--- deps/get.sh	2015-08-04 09:06:45 +0000
+++ deps/get.sh	2015-11-13 08:51:28 +0000
@@ -3,12 +3,12 @@
 DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 cd $DIR
 
-# io.js
+# node.js
 
-if [ -d "io.js" ]; then
-    cd io.js; cd ..
+if [ -d "node.js" ]; then
+    cd node.js; cd ..
 else
-    bzr branch http://bazaar.launchpad.net/~webapps/unity-js-scopes/io.js io.js
+    bzr branch http://bazaar.launchpad.net/~webapps/unity-js-scopes/node.js node.js
 fi
 
 # v8cpp

=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-11-13 08:51:28 +0000
+++ src/bindings/CMakeLists.txt	2015-11-13 08:51:28 +0000
@@ -103,7 +103,7 @@
     "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes/lib"
 )
 
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/deps/io.js/deps/npm
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/deps/node.js/deps/npm
   DESTINATION /node_modules
   USE_SOURCE_PERMISSIONS
   )

=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2015-09-30 06:10:51 +0000
+++ src/common/CMakeLists.txt	2015-11-13 08:51:28 +0000
@@ -17,19 +17,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 add_library(
-  iojs-static
+  nodejs-static
   config.h
 )
 
 set_target_properties(
-  iojs-static PROPERTIES
+  nodejs-static PROPERTIES
   LINKER_LANGUAGE CXX
 )
 
 target_link_libraries(
-  iojs-static
+  nodejs-static
 
-  -Wl,--whole-archive iojs -Wl,--no-whole-archive
+  -Wl,--whole-archive node -Wl,--no-whole-archive
   uv
   cares
   openssl
@@ -47,12 +47,12 @@
 
 if(cmake_build_type_tolower STREQUAL "debug")
   add_custom_command(
-    TARGET iojs-static PRE_LINK
+    TARGET nodejs-static PRE_LINK
     COMMAND ${CMAKE_SOURCE_DIR}/deps/build-debug.sh
   )
 else()
   add_custom_command(
-    TARGET iojs-static PRE_LINK
+    TARGET nodejs-static PRE_LINK
     COMMAND ${CMAKE_SOURCE_DIR}/deps/build.sh
   )
 endif()

=== modified file 'src/launcher/CMakeLists.txt'
--- src/launcher/CMakeLists.txt	2015-11-13 08:51:28 +0000
+++ src/launcher/CMakeLists.txt	2015-11-13 08:51:28 +0000
@@ -64,7 +64,7 @@
 
 target_link_libraries(
   ${LAUNCHER_EXECUTABLE_NAME}
-  iojs-static
+  nodejs-static
   ${Boost_LIBRARIES}
   )
 

=== modified file 'src/tool/CMakeLists.txt'
--- src/tool/CMakeLists.txt	2015-09-30 06:10:51 +0000
+++ src/tool/CMakeLists.txt	2015-11-13 08:51:28 +0000
@@ -64,7 +64,7 @@
 
 target_link_libraries(
   ${TOOL_EXECUTABLE_NAME}
-  iojs-static
+  nodejs-static
   ${Boost_LIBRARIES}
   )