Merge for building pkg.

Bitcoin-com · Sep 5, 2018 · ce02025 · ce02025
2 parents 3afbdf7 + d271501
commit ce02025
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json'),
     exec: {
       get_nwjs_for_pkg: {
-        command: 'if [ ! -d ./cache/0.19.5-pkg/osx64/nwjs.app ]; then cd ./cache; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output nwjs.zip; unzip nwjs.zip; mkdir -p ./0.19.5-pkg/osx64; cp -R ./nwjs-mas-v0.19.5-osx-x64/nwjs.app  ./0.19.5-pkg/osx64/; fi'
+        command: 'if [ ! -d ./cache/0.19.4/osx64/nwjs.app ]; then mkdir -p ./cache/0.19.4/osx64; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output ./cache/nwjs.zip; unzip ./cache/nwjs.zip -d ./cache; cp -R ./cache/nwjs-mas-v0.19.5-osx-x64/nwjs.app  ./cache/0.19.4/osx64/; fi'
       },
       create_others_dist: {
         command: 'sh webkitbuilds/create-others-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"'
@@ -296,10 +296,10 @@ module.exports = function(grunt) {
       },
       pkg: {
         options: {
-          appName: '<%= pkg.nameCaseNoSpace %>',
+          appName: '<%= pkg.title %>',
           platforms: ['osx64'],
           buildDir: './webkitbuilds/pkg',
-          version: '0.19.5',
+          version: '0.19.4',
           macIcns: './resources/<%= pkg.name %>/mac/pkg/app.icns',
           exeIco: './www/img/app/logo.ico',
           macPlist: {

diff --git a/app-template/create-pkg-dist.sh b/app-template/create-pkg-dist.sh
@@ -24,8 +24,9 @@ ln -s ../resources/bitcoin.com/mac/pkg/build.cfg build.cfg
 rm build_mas.py
 ln -s ../resources/bitcoin.com/mac/pkg/build_mas.py build_mas.py
 
-echo "Signing ${APP_NAME}"
-export APP_PATH="pkg/${APP_NAME}/osx64/${APP_NAME}"
+echo "Signing ${APP_FULLNAME}"
+export CURRENT_PATH=`pwd`
+export APP_PATH="pkg/${APP_FULLNAME}/osx64/${APP_FULLNAME}"
 export TMP_PATH="tmp"
 export DIST_PATH="dist"
 
@@ -36,10 +37,16 @@ if [ ! -d $DIST_PATH ]; then
   mkdir $DIST_PATH
 fi
 
-python build_mas.py -C build.cfg -O "${TMP_PATH}/${APP_NAME}.app" -I "${APP_PATH}.app" -P "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg"
+cd "${APP_PATH}.app/Contents/Versions"
+ln -s "55.0.2883.87" "Current"
+
+cd $CURRENT_PATH
+chmod -vR 777 "${APP_PATH}.app/Contents"
+
+python build_mas.py -C build.cfg -O "${TMP_PATH}/${APP_FULLNAME}.app" -I "${APP_PATH}.app" -P "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg"
 
 echo "Signing Done"
 
 echo "Done."
 
-exit
+exit
diff --git a/resources/bitcoin.com/mac/pkg/build_mas.py b/resources/bitcoin.com/mac/pkg/build_mas.py
@@ -178,11 +178,17 @@ def codesign_app(config, args):
 
   plistlib.writePlist(child_entitlements, tmp_child_entitlements)
   info('Child entitlements: %s' % tmp_child_entitlements)
-  framework = glob(args.output, 'nwjs Framework.framework', returnOnFound=True)
-  system('codesign -f --verbose -s "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, framework))
-  helperApp = glob(args.output, 'nwjs Helper.app', returnOnFound=True)
-  system('codesign -f --verbose -s "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, helperApp))
+
+  libffmpeg = glob(os.path.join(args.output, 'Contents/Versions/55.0.2883.87/nwjs Framework.framework/Versions/A'), 'libffmpeg.dylib', returnOnFound=True)
+  system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, libffmpeg))
+  libnode = glob(os.path.join(args.output, 'Contents/Versions/55.0.2883.87/nwjs Framework.framework/Versions/A'), 'libnode.dylib', returnOnFound=True)
+  system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, libnode))
 
+  helperApp = glob(args.output, 'nwjs Helper.app', returnOnFound=True)
+  system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, helperApp))
+  framework = glob(args.output, 'nwjs Framework.framework', returnOnFound=True)
+  system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, framework))
+
   ## sign parent app
   (_, tmp_parent_entitlements) = tempfile.mkstemp()
   if config.has_option('Sign', 'ParentEntitlements'):

diff --git a/resources/bitcoin.com/mac/pkg/entitlements-parent.plist b/resources/bitcoin.com/mac/pkg/entitlements-parent.plist
@@ -5,7 +5,9 @@
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
-	<string>$GROUPID</string>
+  <array>
+	  <string>299HJ3G3BP.com.bitcoin.mwallet.mac</string>
+  </array>
 	<key>com.apple.security.files.user-selected.read-only</key>
 	<true/>
 	<key>com.apple.security.network.client</key>