[LyX/master] Add missing parts for the creation of the resolution independent multi-image TIFF as disk image background.

Stephan Witt switt at lyx.org
Fri Dec 16 14:14:25 UTC 2022


commit 12e22708aabf706451b8435c501190dc35ca30e3
Author: Stephan Witt <switt at lyx.org>
Date:   Fri Dec 16 16:10:34 2022 +0100

    Add missing parts for the creation of the resolution independent multi-image TIFF as disk image background.
---
 development/LyX-Mac-binary-release.sh |   11 +++++++----
 development/MacOSX/Makefile.am        |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index d2503ec..f2683fe 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -1012,15 +1012,18 @@ EOF
 # The image was made with with inkscape and tiffutil from dmg-background.svgz
 make_image() {
 	INKSCAPE=/Applications/Inkscape.app/Contents/MacOS/inkscape
-	cd "${LyxSourceDir}"/development/MacOSX
-	${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
-	${INKSCAPE} --export-type=png -w 1120 -o dmg-background at 2x.png dmg-background.svgz
-	tiffutil -cathidpicheck dmg-background.png dmg-background at 2x.png -out dmg-background.tiff
+	(
+		cd "${LyxSourceDir}"/development/MacOSX
+		test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
+		test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 1120 -o dmg-background at 2x.png dmg-background.svgz
+		tiffutil -cathidpicheck dmg-background.png dmg-background at 2x.png -out dmg-background.tiff
+	)
 }
 
 make_dmg() {
 	cd "${1}"
 
+	test -f "${DmgBackground}" || make_image
 	BGSIZE=$(file "$DmgBackground" | awk -F , '/TIFF/{ print $10 $4 ;}/PNG/{ print $2; }'|sed -e 's/width=//' -e 's/height=//' -e 's/x//')
 	BG_W=$(echo ${BGSIZE} | awk '{print $1 }')
 	BG_H=$(echo ${BGSIZE} | awk '{print $2 }')
diff --git a/development/MacOSX/Makefile.am b/development/MacOSX/Makefile.am
index 2dfb970..ba8b29f 100644
--- a/development/MacOSX/Makefile.am
+++ b/development/MacOSX/Makefile.am
@@ -10,7 +10,7 @@ nodist_bundle_DATA = Info.plist
 
 dist_bin_SCRIPTS = lyxeditor maxima inkscape lilypond lilypond-book
 
-dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef dmg-background.png
+dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef dmg-background.png dmg-background at 2x.png dmg-background.svgz
 nodist_pkgdata_DATA = lyxrc.dist
 
 


More information about the lyx-cvs mailing list