Move custom/macos* files to macos/*

Move all macOS build scripts and resources into the same directory instead of just having the scripts in one directory and the resources in another.
2021-01-11 18:16:22 -05:00 · 2021-01-11 18:16:22 -05:00 · 3c059ffe36
commit 3c059ffe36
parent 8406ee701b
4 changed files with 3 additions and 6 deletions
--- a/macos/build-app.sh
+++ b/macos/build-app.sh
@ -0,0 +1,78 @@
+#!/bin/sh
+
+BUNDLE=TuxPaint.app
+BINARY="$BUNDLE/Contents/MacOS/tuxpaint"
+LIBS=`find $BUNDLE/Contents/Resources/lib -type f`
+LIBDIR="$BUNDLE/Contents/lib"
+CONF_FILES="/opt/local/etc/fonts/fonts.conf"
+CONFDIR="$BUNDLE/Contents/Resources/etc"
+
+
+# Sanity check
+if [ ! -r "$BINARY" ]; then
+	echo "$BINARY: Where is this file?" 1>&2 
+	exit 1
+fi
+
+if [ ! -d "$BUNDLE" ]; then
+	echo "$BUNDLE: Where is this file?" 1>&2 
+	exit 1
+fi
+
+# Ensure the target folders exist
+install -d -m 755 "$LIBDIR"
+install -d -m 755 "$CONFDIR"
+
+# Copy there any shared libraries referenced by the tuxpaint binary, and any
+# shared libraries those shared libraries reference, and so on. We do this by
+# first copying over any shared libraries referenced by the binary, then
+# repeatedly copying over the shared libraries referenced by any libraries in
+# the target folder until we don't see any more files appearing. There are
+# better ways to do this than copying repeatedly but it works. And you know
+# what they say about premature optimization...
+dylib="$BINARY $LIBS"
+count=0; last=-1
+echo "   * Copying Shared Libraries..."
+while [ $count -ne $last ]; do
+	cp -p `otool -L $dylib | grep '^\t[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/' | sort | uniq` $LIBDIR
+	dylib="$LIBDIR/*"
+
+	last=$count
+	count=`ls -f $dylib | wc -l`
+done
+echo "     -> Copied" $count "files to $LIBDIR"
+
+# We just copied over a bunch of shared libraries into a random folder in our
+# app bundle, but the tuxpaint binary and the shared libraries won't know to
+# look in that folder unless we tell them. So we tell them.
+echo "   * Fixing Shared Library References..."
+for i in "$BINARY" $LIBS $LIBDIR/*; do
+	echo "     -> $i..."
+	for j in `otool -L $dylib | grep '^\t[/]opt[/]local[/]' | sed -e 's/^[[:space:]]*\([^[:space:]]*\)[[:space:]].*/\1/'`; do
+		n=`echo "$j" | sed 's/^[/]opt[/]local[/]/@executable_path\/..\//'`
+		install_name_tool -change "$j" "$n" "$i"
+	done
+
+    # libSDL links to /System/Library/Frameworks/CoreGraphics.framework by
+    # default on newer versions of macOS, but this library is located under
+    # /System/Library/Frameworks/ApplicationServices.framework/Frameworks
+    # instead in macOS 10.7, and is a symlink to its real location in later
+    # versions of macOS.  For compatibility reasons, we tell libSDL to link to
+    # the former location instead.  See here for more information:
+    #
+    # https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7
+    #
+    if [ `otool -L "$i" | grep -c '^\t\/System\/Library\/Frameworks\/CoreGraphics\.framework\/Versions\/A\/CoreGraphics'` -gt 0 ]; then
+        defaultlib="/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
+        compatlib="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
+		install_name_tool -change "$defaultlib" "$compatlib" "$i"
+    fi
+done
+
+# Some libraries require config files, so copy those...
+echo "   * Copying Shared Library Configuration Files..."
+for i in "$CONF_FILES"; do
+	echo "     -> $i..."
+	cp -p "$i" "$CONFDIR"
+done
+
--- a/macos/build-dmg.sh
+++ b/macos/build-dmg.sh
@ -0,0 +1,53 @@
+#!/bin/sh
+
+##############################################################################
+# Script to generate TuxPaint.dmg from TuxPaint.app.
+#
+# Generating a pretty DMG file programmatically is a bit of an art.  Many
+# thanks to the appdmg project for showing how:
+# (https://github.com/LinusU/node-appdmg)
+#
+
+BUNDLE=TuxPaint.app
+TEMP_DMG=temp.dmg
+TEMP_DMG_SIZE=`expr \`du -sm "$BUNDLE" | cut -f1\` \* 15 / 10`m
+FINAL_DMG=TuxPaint.dmg
+VOLNAME="Tux Paint"
+ICON="macos/tuxpaint.icns"
+BACKGROUND="macos/background.png"
+
+
+echo "   * Creating the temporary image..."
+hdiutil create "$TEMP_DMG" -ov -fs HFS+ -size "$TEMP_DMG_SIZE" -volname "$VOLNAME" \
+&& VOLUME=`hdiutil attach "$TEMP_DMG" -nobrowse -noverify -noautoopen | grep Apple_HFS | sed 's/^.*Apple_HFS[[:blank:]]*//'` \
+|| exit 1
+
+echo "   * Adding the image background..."
+mkdir "$VOLUME/.background" \
+&& tiffutil -cathidpicheck "$BACKGROUND" -out "$VOLUME/.background/background.tiff" \
+|| exit 1
+
+echo "   * Setting the folder icon..."
+cp "$ICON" "$VOLUME/.VolumeIcon.icns" \
+&& xattr -wx com.apple.FinderInfo '00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' "$VOLUME" \
+|| exit 1
+
+echo "   * Copying the contents..."
+ln -s "/Applications" "$VOLUME" \
+&& cp -a "$BUNDLE" "$VOLUME" \
+&& cp -a "macos/DS_Store" "$VOLUME/.DS_Store" \
+|| exit 1
+
+echo "   * Configuring the folder to open upon mount..."
+bless --folder "$VOLUME" --openfolder "$VOLUME" \
+|| exit 1
+
+echo "   * Unmounting the temporary image..."
+hdiutil detach "$VOLUME"
+
+echo "   * Creating the final image..."
+hdiutil convert "$TEMP_DMG" -ov -format "UDBZ" -imagekey "zlib-level=9" -o "$FINAL_DMG"
+
+echo "   * Deleting the temporary image..."
+rm -f "$TEMP_DMG"
+