[Scummvm-cvs-logs] scummvm master -> 8f0f9daeb7625b06a0cdbc540340ee51f7ed9b9b

criezy criezy at scummvm.org
Sun Mar 6 00:08:43 CET 2016


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

Summary:
716dcbc1d8 OSX: Update DS_Store file for release disk image
8f0f9daeb7 BUILD: Use xcode-select to determine the path to the Xcode tools on OS X


Commit: 716dcbc1d869c168e90eaf7f3cf33c60b9a2875e
    https://github.com/scummvm/scummvm/commit/716dcbc1d869c168e90eaf7f3cf33c60b9a2875e
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-03-05T23:08:07Z

Commit Message:
OSX: Update DS_Store file for release disk image

Following the addition of two license files to the image, the layout
of the image was off with the old DS_Store.

Changed paths:
    dists/macosx/DS_Store



diff --git a/dists/macosx/DS_Store b/dists/macosx/DS_Store
index 7ad5a19..164e7be 100644
Binary files a/dists/macosx/DS_Store and b/dists/macosx/DS_Store differ


Commit: 8f0f9daeb7625b06a0cdbc540340ee51f7ed9b9b
    https://github.com/scummvm/scummvm/commit/8f0f9daeb7625b06a0cdbc540340ee51f7ed9b9b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-03-05T23:08:07Z

Commit Message:
BUILD: Use xcode-select to determine the path to the Xcode tools on OS X

We hardcoded the path as /Developer/Tools, but that path changed
with more recent versions of Xcode. There is actually a command line
tool to get this path, so use that. But also add an undocumented
configure option to allow specifying the path manually.

Changed paths:
    configure
    ports.mk



diff --git a/configure b/configure
index 88b8456..7e3edbd 100755
--- a/configure
+++ b/configure
@@ -182,6 +182,7 @@ _stagingpath="staging"
 _win32path="c:/scummvm"
 _amigaospath="Games:ScummVM"
 _staticlibpath=
+_xcodetoolspath=
 _sdlconfig=sdl-config
 _freetypeconfig=freetype-config
 _sdlpath="$PATH"
@@ -1235,6 +1236,9 @@ for ac_option in $@; do
 	--with-staticlib-prefix=*)
 		_staticlibpath=`echo $ac_option | cut -d '=' -f 2`
 		;;
+	--with-xcodetools-path=*)
+		_xcodetoolspath=`echo $ac_option | cut -d '=' -f 2`
+		;;
 	--host=*)
 		_host=`echo $ac_option | cut -d '=' -f 2`
 		;;
@@ -2350,6 +2354,18 @@ case $_host_os in
 				echo "Could not determine prefix for static libraries"
 			fi
 		fi
+		
+		# If _xcodetoolspath is not set yet try first /Developers/Tools and then
+		# /Applications/Xcode.app/Contents/Developer/Tools
+		if test -z "$_xcodetoolspath"; then
+			_xcodetoolspath=`xcode-select -print-path`/Tools
+			if test -d "$_xcodetoolspath"; then
+				echo "Set xcodetools-path to ${_xcodetoolspath}"
+			else
+				_xcodetoolspath=
+				echo "Could not determine path for Xcode Tools"
+			fi
+		fi
 		;;
 	dreamcast)
 		append_var DEFINES "-D__DC__"
@@ -4732,6 +4748,7 @@ STAGINGPATH=$_stagingpath
 WIN32PATH=$_win32path
 AMIGAOSPATH=$_amigaospath
 STATICLIBPATH=$_staticlibpath
+XCODETOOLSPATH=$_xcodetoolspath
 SDLCONFIG=$_sdlconfig
 
 ABI := $ABI
diff --git a/ports.mk b/ports.mk
index fa38084..bcdbe53 100644
--- a/ports.mk
+++ b/ports.mk
@@ -341,7 +341,7 @@ osxsnap: bundle
 	mkdir ScummVM-snapshot/doc/se
 	cp $(srcdir)/doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
 	cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
-	/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
+	$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/da/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/*
@@ -350,11 +350,11 @@ osxsnap: bundle
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/it/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/no-nb/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/se/*
-	/Developer/Tools/CpMac -r $(bundle_name) ./ScummVM-snapshot/
+	$(XCODETOOLSPATH)/CpMac -r $(bundle_name) ./ScummVM-snapshot/
 	cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
 	cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
-	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/.DS_Store
-	/Developer/Tools/SetFile -a V ./ScummVM-snapshot/background.jpg
+	$(XCODETOOLSPATH)/SetFile -a V ./ScummVM-snapshot/.DS_Store
+	$(XCODETOOLSPATH)/SetFile -a V ./ScummVM-snapshot/background.jpg
 	hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
 					-srcfolder ScummVM-snapshot \
 					-volname "ScummVM" \






More information about the Scummvm-git-logs mailing list