nwjs · ayushmanchhabra · Mar 3, 2023 · Mar 6, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ tests/tmp-nw
 tags
 Thumbs.db
 /tmp
+log
diff --git a/BUILD.gn b/BUILD.gn
@@ -283,7 +283,7 @@ if (is_mac) {
 }
 
 copy("copy_node") {
-  if (is_debug) {
+  if (is_debug && !is_linux) {
      node_dir = "$root_out_dir/../Debug/lib/"
   } else {
      node_dir = "$root_out_dir/../Release/lib/"

diff --git a/patch/patches/icu.patch b/patch/patches/icu.patch
@@ -1,7 +1,7 @@
 diff --git a/icu.gyp b/icu.gyp
-index b3c12030..799dce2a 100644
---- icu.gyp
-+++ icu.gyp
+index 7deb43c..b0bc0a3 100644
+--- a/icu.gyp
++++ b/icu.gyp
 @@ -25,6 +25,7 @@
      'defines': [
        'U_USING_ICU_NAMESPACE=0',
@@ -29,3 +29,12 @@ index b3c12030..799dce2a 100644
        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
           or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
          (target_arch=="arm" or target_arch=="ia32" or \
+@@ -173,7 +184,7 @@
+                    '_toolset == "host" and host_os == "mac")', {
+                    'action': ['python', '<@(_inputs)', '<@(_outputs)', '--mac'],
+                  } , {
+-                   'action': ['python', '<@(_inputs)', '<@(_outputs)'],
++                   'action': ['python3', '<@(_inputs)', '<@(_outputs)'],
+                  }],
+               ],
+             },
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -370,6 +370,8 @@ NWWindow.prototype.toggleKioskMode = function() {
 };
 
 NWWindow.prototype.showDevTools = function(frm, callback) {
+  if (process.versions['nw-flavor'] !== 'sdk')
+    return new Error('showDevTools does not exist on normal build flavor.');
   var id = '';
   if (typeof frm === 'string')
     id = frm;

diff --git a/src/resources/api_nw_window.js b/src/resources/api_nw_window.js
@@ -372,6 +372,8 @@ apiBridge.registerCustomHook(function(bindingsAPI) {
     };
 
     NWWindow.prototype.showDevTools = function(frm, callback) {
+      if (process.versions['nw-flavor'] !== 'sdk')
+      return new Error('showDevTools does not exist on normal build flavor.');
       var id = '';
       if (typeof frm === 'string')
         id = frm;

diff --git a/test/sanity/window-showdevtools/index.html b/test/sanity/window-showdevtools/index.html
@@ -0,0 +1,22 @@
+<html>
+
+<head>
+    <script>
+        document.addEventListener("DOMContentLoaded", () => {
+            const process = require(process);
+            const w = nw.Window.get();
+            const e = nw.showDevTools();
+
+            document.getElementById("flavor").innerText = process.versions["nw-flavor"];
+            document.getElementById("result").innerText = e.message;
+
+        });
+    </script>
+</head>
+
+<body>
+    <span id="flavor"></span>
+    <span id="result"></span>
+</body>
+
+</html>
diff --git a/test/sanity/window-showdevtools/package.json b/test/sanity/window-showdevtools/package.json
@@ -0,0 +1,4 @@
+{
+    "name": "window-showdevtools",
+    "main": "index.html"
+}
diff --git a/test/sanity/window-showdevtools/test.py b/test/sanity/window-showdevtools/test.py
@@ -0,0 +1,24 @@
+import os
+
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+
+chrome_options = Options()
+chrome_options.add_argument("nwapp=" + os.path.dirname(os.path.abspath(__file__)))
+
+driver = webdriver.Chrome(
+    service=Service(
+        executable_path=os.environ["CHROMEDRIVER"]
+    ),
+    options=chrome_options
+)
+driver.implicitly_wait(5)
+try:
+    flavor = driver.find_element(By.ID, 'flavor').get_attribute('innerHTML')
+    if (flavor == "normal"):
+        result = driver.find_element(By.ID, 'result').get_attribute('innerHTML')
+        assert(result == 'showDevTools does not exist on normal build flavor.')
+finally:
+    driver.quit()
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ tests/tmp-nw @@
     tags
     Thumbs.db
     /tmp
+    log