Fix for MAS submission requirements

Cong Liu · Lin Sun · commit 639ea506b8a2 · 2018-04-11T08:12:16.000+08:00
* Fix for "Anatomy of Framework Bundles" compatible (nw part)
* Fixed package script for MAS flavor
  - keep symbolic links when copying and zipping files
  - use `-mas` for package name
* Fix loading path for libnode.dylib
diff --git a/BUILD.gn b/BUILD.gn
@@ -254,7 +254,11 @@ action("commit_id") {
 if (is_mac) {
   copy("copy_ffmpeg") {
     sources = [ "$root_out_dir/libffmpeg.dylib" ]
+    if (nwjs_mas) {
+      outputs = [ "$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/Versions/A/libffmpeg.dylib" ]
+    } else {
     outputs = [ "$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/libffmpeg.dylib" ]
+    }
     deps = [
       "//chrome",
       "//third_party/ffmpeg:ffmpeg"
@@ -274,7 +278,11 @@ copy("copy_node") {
   }
   if (is_mac) {
     sources = [ "$node_dir" + "../libnode.dylib" ]
+    if (nwjs_mas) {
+      outputs = [ "$root_out_dir/nwjs.app/Contents/Versions/$chrome_version_full/nwjs Framework.framework/Versions/A/libnode.dylib" ]
+    } else {
     outputs = [ "$root_out_dir/nwjs.app/Contents/Versions/$chrome_version_full/nwjs Framework.framework/libnode.dylib" ]
+    }
   }
   if (is_win) {
     suffix=""
@@ -396,7 +404,9 @@ executable("payload") {
 if (!is_component_build) {
   action("dist") {
     script = "tools/package_binaries.py"
-    if (nwjs_sdk) {
+    if (is_mac && nwjs_mas) {
+      package_mode = "mas"
+    } else if (nwjs_sdk) {
       package_mode = "sdk"
     } else {
       package_mode = "nosdk"
diff --git a/nw.gypi b/nw.gypi
@@ -421,7 +421,17 @@
             '<(DEPTH)/components/nacl.gyp:nacl',
           ]
         }],
-        [ 'OS=="mac"', {
+        [ 'OS=="mac" and nwjs_mas==1', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Versions/<(version_full)/<(mac_product_name) Framework.framework/Versions/Current/',
+              'files': [
+                '<(PRODUCT_DIR)/libnode.dylib',
+              ],
+            },
+          ],
+        }],
+        [ 'OS=="mac" and nwjs_mas!=1', {
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Versions/<(version_full)/<(mac_product_name) Framework.framework/',
@@ -448,6 +458,9 @@
           ['disable_nacl==0 and nwjs_sdk==0', {
             'package_mode': 'nacl',
           }],
+          ['nwjs_mas==1 and OS=="mac"', {
+            'package_mode': 'mas',
+          }],
         ],  # conditions
       },  # variables
       'actions': [
diff --git a/src/renderer/nw_content_renderer_hooks.cc b/src/renderer/nw_content_renderer_hooks.cc
@@ -39,7 +39,11 @@ namespace nw {
 void LoadNodeSymbols() {
   base::NativeLibraryLoadError error;
 #if defined(OS_MACOSX)
+#if defined(NWJS_MAS)
+  base::FilePath node_dll_path = base::mac::FrameworkBundlePath().Append("Versions").Append("Current").Append(base::FilePath::FromUTF8Unsafe(base::GetNativeLibraryName("node")));
+#else
   base::FilePath node_dll_path = base::mac::FrameworkBundlePath().Append(base::FilePath::FromUTF8Unsafe(base::GetNativeLibraryName("node")));
+#endif
 #else
   base::FilePath node_dll_path = base::FilePath::FromUTF8Unsafe(base::GetNativeLibraryName("node"));
 #endif
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -6,6 +6,7 @@
 import os
 import platform
 import shutil
+import stat
 import sys
 import tarfile
 import zipfile
@@ -39,7 +40,7 @@
 is_headers_ok = False           # record whether nw-headers generated
 package_name = 'nwjs'
 
-if flavor in ['sdk', 'nacl']:
+if flavor in ['sdk', 'nacl', 'mas']:
     package_name = 'nwjs-' + args.mode
 
 step = args.step
@@ -379,6 +380,20 @@ def _ArchiveDirectory(parentDirectory):
     zipOut.close()
 
 def compress(from_dir, to_dir, fname, compress):
+
+    def zipOneFile(z, filename, root):
+        _path = os.path.join(root, filename)
+        _arcname = _path.replace(from_dir+os.sep, '')
+        _mode = os.lstat(_path).st_mode
+        if stat.S_ISLNK(_mode): # deal with symbolic links
+            _zipInfo = zipfile.ZipInfo(_arcname)
+            _zipInfo.create_system = 3 # 0 - Windows, 3 - Unix
+            _zipInfo.compress_type = zipfile.ZIP_STORED
+            _zipInfo.external_attr = _mode << 16L
+            z.writestr(_zipInfo, os.readlink(_path))
+        elif stat.S_ISREG(_mode): # regular file
+            z.write(_path, _arcname)
+
     from_dir = os.path.normpath(from_dir)
     to_dir = os.path.normpath(to_dir)
     _from = os.path.join(from_dir, fname)
