BUILD: Do not use CpMac in osxsnap make target

The documentation for CpMac indicates that since  Mac OS X 10.4
we can use cp instead, and thet CpMac will be deprecated. It looks
like it was finally removed in Xcode 13 as this is no longer
installed as part of the Xcode command line tools.

Also make sure links are preserved when using cp in the bundle make
target. The -P option is the default on macOS and the various Linux
I checked, but this may not be the case on all systems.
This commit is contained in:
Thierry Crozat 2021-10-10 11:28:22 +01:00
parent b8132baa94
commit 96979f06ba

View File

@ -123,7 +123,7 @@ ifdef USE_SPARKLE
mkdir -p $(bundle_name)/Contents/Frameworks
cp $(srcdir)/dists/macosx/dsa_pub.pem $(bundle_name)/Contents/Resources/
rm -rf $(bundle_name)/Contents/Frameworks/Sparkle.framework
cp -R $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
cp -RP $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
endif
ifdef MACOSX_USE_LEGACY_ICONS
cp $(srcdir)/icons/scummvm_legacy.icns $(bundle_name)/Contents/Resources/scummvm.icns
@ -515,7 +515,7 @@ osxsnap: bundle
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/QuickStart
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/*/*
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/*/*
$(XCODETOOLSPATH)/CpMac -r $(bundle_name) ./ScummVM-snapshot/
cp -RP $(bundle_name) ./ScummVM-snapshot/
cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
$(XCODETOOLSPATH)/SetFile -a V ./ScummVM-snapshot/.DS_Store