Exchange appdmg for create-dmg

This replaces the Node.js app 'appdmg' by a shell script 'create-dmg'.

4 files changed, 22 insertions, 35 deletions

diff --git a/packaging/macos/020-vars.sh b/packaging/macos/020-vars.sh
index dbc1f4152..c3c1810f7 100644
--- a/packaging/macos/020-vars.sh
+++ b/packaging/macos/020-vars.sh
@@ -152,6 +152,7 @@ APP_PLIST=$APP_CON_DIR/Info.plist
 URL_BOOST=https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2
 URL_CPPUNIT=https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
 URL_CURL_CACERT=https://curl.haxx.se/ca/cacert.pem
+URL_CREATEDMG=https://github.com/andreyvit/create-dmg/archive/v1.0.0.5.tar.gz
 URL_DOUBLE_CONVERSION=https://github.com/google/double-conversion/archive/v3.1.4.tar.gz
 URL_FREETYPE=https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2
 URL_GC=https://github.com/ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz
@@ -171,7 +172,6 @@ URL_LIBREVENGE=https://ayera.dl.sourceforge.net/project/libwpd/librevenge/librev
 URL_LIBSOUP=https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.65/libsoup-2.65.92.tar.xz
 URL_LIBVISIO=https://github.com/LibreOffice/libvisio/archive/libvisio-0.1.6.tar.gz
 URL_LIBWPG=https://netcologne.dl.sourceforge.net/project/libwpg/libwpg/libwpg-0.3.3/libwpg-0.3.3.tar.xz
-URL_NODEJS=https://nodejs.org/dist/v10.16.0/node-v10.16.0-darwin-x64.tar.gz
 URL_OPENJPEG=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz
 URL_OPENMP=https://github.com/llvm/llvm-project/releases/download/llvmorg-7.1.0/openmp-7.1.0.src.tar.xz
 # use OpenSSL version as in gtk-osx moduleset
@@ -181,5 +181,5 @@ URL_POPPLER=https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-0.7
 URL_POTRACE=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz
 URL_PYTHON3=https://github.com/dehesselle/py3framework/releases/download/py368.5/py368_framework_5.tar.xz
 # A pre-built version of the complete toolset.
-URL_TOOLSET_CACHE=https://github.com/dehesselle/mibap/releases/download/v0.13/mibap_v0.13.tar.xz
+URL_TOOLSET_CACHE=https://github.com/dehesselle/mibap/releases/download/v0.14/mibap_v0.14.tar.xz
 
diff --git a/packaging/macos/160-jhbuild-other.sh b/packaging/macos/160-jhbuild-other.sh
index 0b5214a37..2dbd3265c 100755
--- a/packaging/macos/160-jhbuild-other.sh
+++ b/packaging/macos/160-jhbuild-other.sh
@@ -12,12 +12,7 @@
 SELF_DIR=$(cd $(dirname "$0"); pwd -P)
 for script in $SELF_DIR/0??-*.sh; do source $script; done
 
-### install Node.js ############################################################
+### install create-dmg #########################################################
 
-get_source $URL_NODEJS
-
-(
-  export PATH=$PATH:$(pwd)/bin
-  npm install -g appdmg   # tool to easily create .dmg
-)
+get_source $URL_CREATEDMG
 
diff --git a/packaging/macos/230-inkscape-distrib.sh b/packaging/macos/230-inkscape-distrib.sh
index bb7997895..631610317 100755
--- a/packaging/macos/230-inkscape-distrib.sh
+++ b/packaging/macos/230-inkscape-distrib.sh
@@ -15,19 +15,6 @@ set -e
 
 ### create disk image for distribution #########################################
 
-# Update the .json file with our paths.
-
-cp $SELF_DIR/inkscape_dmg.json $SRC_DIR
-
-(
-  # escaping forward slashes: https://unix.stackexchange.com/a/379577
-  # ESCAPED=${STRING//\//\\\/}
-
-  FILE=$SRC_DIR/inkscape_dmg.png
-  sed -i '' "s/PLACEHOLDERBACKGROUND/${FILE//\//\\\/}/" $SRC_DIR/inkscape_dmg.json
-  sed -i '' "s/PLACEHOLDERPATH/${APP_DIR//\//\\\/}/" $SRC_DIR/inkscape_dmg.json
-)
-
 # Create background for development snapshots. This is not meant for
 # official releases, those will be re-packaged manually (they also need
 # to be signed and notarized).
@@ -43,16 +30,28 @@ convert -size 560x400 xc:transparent \
 
 # create the disk image
 
-(
-  cd $SRC_DIR/node-*
-  export PATH=$PATH:$(pwd)/bin
-  appdmg $SRC_DIR/inkscape_dmg.json $ARTIFACT_DIR/Inkscape.dmg
-)
+# A few things to note:
+#   - For this script to work, there must be a running desktop session.
+#   - There have been reports of troubles with the Applescript portions
+#     of this script, requiring additional privileges on newer macOS versions.
+#   - The background image in the '.dmg' does not show in OS X El Capitan
+#     (10.11), it has something to do with how the '.DS_Store' is generated.
+
+cd $SRC_DIR/create-dmg*
+./create-dmg \
+  --volname Inkscape \
+  --background $SRC_DIR/inkscape_dmg.png \
+  --icon "Inkscape.app" 390 240 \
+  --icon-size 64 \
+  $TMP_DIR/Inkscape.dmg $ARTIFACT_DIR
+
+rm -rf $APP_DIR
+mv $TMP_DIR/Inkscape.dmg $ARTIFACT_DIR
 
 # CI: move disk image to a location accessible for the runner
 
 if [ ! -z $CI_JOB_ID ]; then
   [ -d $INK_DIR/artifacts ] && rm -rf $INK_DIR/artifacts
   mv $ARTIFACT_DIR $INK_DIR/artifacts
-  rm -rf $INK_DIR/artifacts/*.app
 fi
+
diff --git a/packaging/macos/inkscape_dmg.json b/packaging/macos/inkscape_dmg.json
deleted file mode 100644
index f098073f4..000000000
--- a/packaging/macos/inkscape_dmg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title": "Inkscape",
-  "background": "PLACEHOLDERBACKGROUND",
-  "contents": [
-    { "x": 420, "y": 260, "type": "file", "path": "PLACEHOLDERPATH" }
-  ]
-}