Merge lp:~marcustomlinson/v8-cpp/lp-1473163 into lp:v8-cpp

[Marcus Tomlinson]

Revert some changes to fix link errors

=== modified file 'src/internal/require.h'
--- src/internal/require.h	2015-07-08 09:29:21 +0000
+++ src/internal/require.h	2015-07-15 13:20:57 +0000
@@ -28,8 +28,8 @@
 {
 
 using ModuleInitFunc = void(v8::Handle<v8::Object> exports);
-ModuleInitFunc* node_init_func_;
-std::shared_ptr<std::string> v8cpp_script_path_;
+///!ModuleInitFunc* node_init_func_;
+///!std::shared_ptr<std::string> v8cpp_script_path_;
 
 struct NodeModule
 {
@@ -48,7 +48,7 @@
     // For now we only know that version 14 works here
     if (mp->nm_version == 14)
     {
-        node_init_func_ = mp->nm_register_func;
+        ///!node_init_func_ = mp->nm_register_func;
     }
     else
     {
@@ -92,8 +92,8 @@
 
 inline v8::Local<v8::Object> require(std::string const& module_path)
 {
-    node_init_func_ = nullptr;
-    std::string script_path = v8cpp_script_path_ ? *v8cpp_script_path_ : "";
+    ///!node_init_func_ = nullptr;
+    std::string script_path; ///! = v8cpp_script_path_ ? *v8cpp_script_path_ : "";
 
     // Try append ".node" to module_path
     std::string suffixed_module_path = script_path + module_path + ".node";
@@ -117,12 +117,12 @@
 
     v8::Local<v8::Object> exports = v8::Object::New(v8::Isolate::GetCurrent());
 
-    if (node_init_func_)
-    {
-        node_init_func_(exports);
-    }
-    else
-    {
+///!    if (node_init_func_)
+///!    {
+///!        node_init_func_(exports);
+///!    }
+///!    else
+///!    {
         auto v8cpp_init_func = (ModuleInitFunc*)dlsym(module, "init_module");
         if (!v8cpp_init_func)
         {
@@ -130,7 +130,7 @@
         }
 
         v8cpp_init_func(exports);
-    }
+///!    }
 
     return exports;
 }
 
=== modified file 'src/run.h'
--- src/run.h	2015-07-08 09:29:21 +0000
+++ src/run.h	2015-07-15 13:20:57 +0000
@@ -46,7 +46,7 @@
         isolate->SetData(0, nullptr);
         isolate->Dispose();
 
-        internal::v8cpp_script_path_.reset();
+        ///!internal::v8cpp_script_path_.reset();
     });
 
     // Create an isolate scope.
@@ -70,7 +70,7 @@
         std::size_t found = filename.find_last_of("/");
         if (found != std::string::npos)
         {
-            internal::v8cpp_script_path_ = std::make_shared<std::string>(filename.substr(0, found) + "/");
+            ///!internal::v8cpp_script_path_ = std::make_shared<std::string>(filename.substr(0, found) + "/");
         }
 
         module.add_function("require", &internal::require);
 
=== modified file 'tests/run/scripts/test.js'
--- tests/run/scripts/test.js	2015-07-08 06:20:26 +0000
+++ tests/run/scripts/test.js	2015-07-15 13:20:57 +0000
@@ -16,6 +16,6 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-var module = require("../test-run-module");
+var module = require("./test-run-module"); ///! ../
 var test_object = new module.TestClass(1, 2);
 test_object;
 
=== modified file 'tests/run/scripts/test2.js'
--- tests/run/scripts/test2.js	2015-07-08 06:20:26 +0000
+++ tests/run/scripts/test2.js	2015-07-15 13:20:57 +0000
@@ -21,5 +21,5 @@
 console.log(true, " > ", false);
 console.log("hello", " ", "there");
 
-var module = require("../test-run-module");
+var module = require("./test-run-module"); ///! ../
 new module.TestClass(3, 4);