[Scummvm-git-logs] scummvm master -> 96979f06bab2a5d98357a7c88bb46bd71affdd92

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
96979f06ba BUILD: Do not use CpMac in osxsnap make target


Commit: 96979f06bab2a5d98357a7c88bb46bd71affdd92
    https://github.com/scummvm/scummvm/commit/96979f06bab2a5d98357a7c88bb46bd71affdd92
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-10-11T19:41:18+01:00

Commit Message:
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.

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index 27b00768b2..435d5738de 100644
--- a/ports.mk
+++ b/ports.mk
@@ -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