Add 'node-main', fix nwjs#36.

zcbenz · zcbenz · commit 1a8131a2e8c7 · 2012-10-26T09:58:13.000+08:00
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -34,9 +34,12 @@ const char kNoToolbar[] = "no-toolbar";
 // Open specified url
 const char kUrl[] = "url";
 
-// Set current working directory
+// Set current working directory.
 const char kWorkingDirectory[] = "working-directory";
 
+// Pass the main script to node.
+const char kNodeMain[] = "node-main";
+
 const char kmMain[]   = "main";
 const char kmName[]   = "name";
 const char kmWebkit[] = "webkit";
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -14,6 +14,7 @@ extern const char kDeveloper[];
 extern const char kNoToolbar[];
 extern const char kUrl[];
 extern const char kWorkingDirectory[];
+extern const char kNodeMain[];
 
 // Manifest settings
 extern const char kmMain[];
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -54,9 +54,19 @@ void ShellContentRendererClient::RenderThreadStarted() {
         command_line->GetSwitchValuePath(switches::kWorkingDirectory));
   }
 
+  int argc = 1;
+  char* argv[] = { const_cast<char*>("node"), NULL, NULL };
+  std::string node_main;
+
+  // Check if there is a 'node-main'.
+  if (command_line->HasSwitch(switches::kNodeMain)) {
+    argc++;
+    node_main = command_line->GetSwitchValueASCII(switches::kNodeMain);
+    argv[1] = const_cast<char*>(node_main.c_str());
+  }
+
   // Initialize uv.
-  char* argv[] = { (char*)"node", NULL };
-  node::SetupUv(1, argv);
+  node::SetupUv(argc, argv);
 
   // Initialize node after render thread is started.
   v8::V8::Initialize();
@@ -66,7 +76,7 @@ void ShellContentRendererClient::RenderThreadStarted() {
   node::g_context->Enter();
 
   // Setup node.js.
-  node::SetupContext(1, argv, node::g_context->Global());
+  node::SetupContext(argc, argv, node::g_context->Global());
 
   // Start observers.
   shell_observer_.reset(new ShellRenderProcessObserver());
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -24,6 +24,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/values.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/nw/src/api/dispatcher_host.h"
@@ -75,6 +76,11 @@ void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
     // Set cwd
     command_line->AppendSwitchPath(switches::kWorkingDirectory,
                                    package->path());
+
+    // Check if we have 'node-main'.
+    std::string node_main;
+    if (package->root()->GetString(switches::kNodeMain, &node_main))
+      command_line->AppendSwitchASCII(switches::kNodeMain, node_main);
   }
 }
 
