Merge lp:~marcustomlinson/unity-js-scopes/build-fixes into lp:unity-js-scopes

[Marcus Tomlinson]

* Add .bzrignore.
* Depend on iojs and v8 from deps/ rather than system installed versions.
* Fixed install by making ADDON_BINARY_FILES relative to CMAKE_CURRENT_BINARY_DIR.
* Fixed "Error: No such module: contextify" iojs runtime error by using "--whole-archive" when linking iojs.
* Fixed iojs link order.

* Add .bzrignore.
* Depend on iojs and v8 from deps/ rather than system installed versions.
* Fixed install by making ADDON_BINARY_FILES relative to CMAKE_CURRENT_BINARY_DIR.
* Fixed "Error: No such module: contextify" iojs runtime error by using "--whole-archive" when linking iojs.
* Fixed iojs link order.

[Marcus Tomlinson (marcustomlinson)]

Hey Alex, I had trouble getting things building and running on my machine. I had to make these changes to get it going.

First issue I had was unity-js-scopes-launcher not recognising the scope.ini argument from the ScopeRunner entry in the example. Then I got "Error: No such module: contextify" when node::Start() was hit.

These changes fixed the above issues I was having, but now I'm still having an issue getting the scope running via unity-scope-tool. I'm calling "unity-scope-tool './examples/simple/simple.ini'", but the scope seems to just hang on startup. Running "unity-js-scopes-launcher './examples/simple/simple.ini'", just gives me the node terminal (">"). I looks like the simple.js script is either not even running, or is failing and no error message is being shown.

Sorry for rambling, I hope I'm making sense here.

I'm not proposing that these changes are all sane :p Please have a look through them and let me know if I'm doing anything stupid / if you have any better solutions.

[lp:~marcustomlinson/unity-js-scopes/build-fixes]

11. By Marcus Tomlinson on 2015-06-25

Whoops, link order fixed

[Marcus Tomlinson (marcustomlinson)]

Hmmm, seems I may have jumped the gun here. Sorry. I see that the "simple" scope is calling some functions that don't actually exist in the bindings.

Is this project still WIP? Or do you have some other uncommitted changes hanging around?

Let me know if I can help.

[lp:~marcustomlinson/unity-js-scopes/build-fixes]

12. By Marcus Tomlinson on 2015-07-09

Merged trunk

13. By Marcus Tomlinson on 2015-07-09

Revert launcher changes

[Marcus Tomlinson (marcustomlinson)]

Alex, could you please have a look at this. The aim here is to have unity-ja-scopes link against the iojs and v8 from deps/ rather than searching for system installed versions.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-07-09 06:54:48 +0000
@@ -0,0 +1,3 @@
+./deps/io.js
+./deps/v8-cpp
+./CMakeLists.txt.user
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-19 20:38:02 +0000
+++ CMakeLists.txt	2015-07-09 06:54:48 +0000
@@ -37,18 +37,15 @@
   message(FATAL_ERROR "Retriving deps failed")
 endif()
 
-set(CMAKE_MODULE_PATH
-  ${CMAKE_MODULE_PATH}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deps/v8-cpp/cmake
-  )
-
-find_package(Node REQUIRED)
-
 include_directories(
-  ${NODE_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/deps/v8/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/src
   ${CMAKE_CURRENT_SOURCE_DIR}/deps/v8-cpp/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   )
+link_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/deps/io.js/out/Release
+  )
 
 add_custom_target(
   deps
 
=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-06-23 19:47:08 +0000
+++ src/bindings/CMakeLists.txt	2015-07-09 06:54:48 +0000
@@ -36,7 +36,6 @@
     )
 
 link_directories(
-  ${NODE_DEPS_LIB_DIRS}
   ${SCOPE_LIB_DIRS}
   )
 
@@ -64,7 +63,6 @@
   )
 
 include_directories(
-  "${CMAKE_SOURCE_DIR}/include"
   ${Boost_INCLUDE_DIRS}
   ${SCOPE_INCLUDE_DIRS}
   )
@@ -90,7 +88,7 @@
   )
 
 set(ADDON_BINARY_FILES
-  ${SCOPE_NODEJS_ADDON_BIN_NAME}.node
+  ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NODEJS_ADDON_BIN_NAME}.node
   )
 
 install(DIRECTORY .
 
=== modified file 'src/launcher/CMakeLists.txt'
--- src/launcher/CMakeLists.txt	2015-06-19 20:38:02 +0000
+++ src/launcher/CMakeLists.txt	2015-07-09 06:54:48 +0000
@@ -35,9 +35,7 @@
 )
 
 link_directories(
-  ${NODE_DEPS_LIB_DIRS}
   ${Boost_LIB_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/io.js/out/Release
 )
 
 set(EXECUTABLE_NAME unity-js-scopes-launcher)
@@ -61,13 +59,13 @@
 target_link_libraries(
   ${EXECUTABLE_NAME}
 
+  -Wl,--whole-archive iojs -Wl,--no-whole-archive
+  uv
   cares
-  http_parser
-  iojs
   openssl
-  uv
   zlib
-  
+  http_parser
+
   v8_base
   v8_libbase
   v8_libplatform