[Scummvm-cvs-logs] scummvm branch-1-8 -> 08254293b7ab3b991dd32d6492d1ca07990ba727
criezy
criezy at scummvm.org
Sat Apr 9 22:48:09 CEST 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f765ae0157 BUILD: Use xcode-select to determine the path to the Xcode tools on OS X
72ca519097 BUILD: Fix comment for how we get the path to the Xcode Tools
e97f183990 BUILD: Fix creating OS X application bundle when Sparkle is enabled
08254293b7 UPDATES: Fix interval normalization
Commit: f765ae01577d79540a24ab08fe2814f75c9c9a75
https://github.com/scummvm/scummvm/commit/f765ae01577d79540a24ab08fe2814f75c9c9a75
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T21:40:52+01:00
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 8d8f134..959f7c2 100755
--- a/configure
+++ b/configure
@@ -183,6 +183,7 @@ _stagingpath="staging"
_win32path="c:/scummvm"
_amigaospath="Games:ScummVM"
_staticlibpath=
+_xcodetoolspath=
_sdlconfig=sdl-config
_freetypeconfig=freetype-config
_sdlpath="$PATH"
@@ -1240,6 +1241,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`
;;
@@ -2355,6 +2359,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__"
@@ -4772,6 +4788,7 @@ STAGINGPATH=$_stagingpath
WIN32PATH=$_win32path
AMIGAOSPATH=$_amigaospath
STATICLIBPATH=$_staticlibpath
+XCODETOOLSPATH=$_xcodetoolspath
SDLCONFIG=$_sdlconfig
ABI := $ABI
diff --git a/ports.mk b/ports.mk
index d9a80d5..c7cf699 100644
--- a/ports.mk
+++ b/ports.mk
@@ -380,7 +380,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/*
@@ -389,11 +389,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" \
Commit: 72ca519097d0d3789bd6f77f73773a231cefd81e
https://github.com/scummvm/scummvm/commit/72ca519097d0d3789bd6f77f73773a231cefd81e
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T21:41:04+01:00
Commit Message:
BUILD: Fix comment for how we get the path to the Xcode Tools
Changed paths:
configure
diff --git a/configure b/configure
index 959f7c2..ce2fd37 100755
--- a/configure
+++ b/configure
@@ -2360,8 +2360,7 @@ case $_host_os in
fi
fi
- # If _xcodetoolspath is not set yet try first /Developers/Tools and then
- # /Applications/Xcode.app/Contents/Developer/Tools
+ # If _xcodetoolspath is not set yet use xcode-select to get the path
if test -z "$_xcodetoolspath"; then
_xcodetoolspath=`xcode-select -print-path`/Tools
if test -d "$_xcodetoolspath"; then
Commit: e97f183990052c7d0ffd1f6ab4614a3a92600875
https://github.com/scummvm/scummvm/commit/e97f183990052c7d0ffd1f6ab4614a3a92600875
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T21:41:22+01:00
Commit Message:
BUILD: Fix creating OS X application bundle when Sparkle is enabled
Changed paths:
configure
ports.mk
diff --git a/configure b/configure
index ce2fd37..33cbc83 100755
--- a/configure
+++ b/configure
@@ -184,6 +184,7 @@ _win32path="c:/scummvm"
_amigaospath="Games:ScummVM"
_staticlibpath=
_xcodetoolspath=
+_sparklepath=
_sdlconfig=sdl-config
_freetypeconfig=freetype-config
_sdlpath="$PATH"
@@ -1167,8 +1168,7 @@ for ac_option in $@; do
;;
--with-sparkle-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
- SPARKLE_CFLAGS="-F$arg"
- SPARKLE_LIBS="-F$arg"
+ _sparklepath=$arg
;;
--with-readline-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
@@ -3942,20 +3942,24 @@ case $_host_os in
if test "$_updates" = no; then
_sparkle=no
else
- if test "$_sparkle" = auto ; then
- _sparkle=no
- cat > $TMPC << EOF
+ if test ! -z $_sparklepath ; then
+ SPARKLE_CFLAGS="-F$_sparklepath"
+ SPARKLE_LIBS="-F$_sparklepath"
+ fi
+ if test "$_sparkle" = auto ; then
+ _sparkle=no
+ cat > $TMPC << EOF
#include <Cocoa/Cocoa.h>
#include <Sparkle/Sparkle.h>
int main(void) { SUUpdater *updater = [SUUpdater sharedUpdater]; return 0; }
EOF
- cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes
- fi
- if test "$_sparkle" = yes ; then
- append_var LIBS "$SPARKLE_LIBS -framework Sparkle"
- append_var INCLUDES "$SPARKLE_CFLAGS"
- fi
- define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
+ cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes
+ fi
+ if test "$_sparkle" = yes ; then
+ append_var LIBS "$SPARKLE_LIBS -framework Sparkle"
+ append_var INCLUDES "$SPARKLE_CFLAGS"
+ fi
+ define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
fi
echo "$_sparkle"
;;
@@ -4788,6 +4792,7 @@ WIN32PATH=$_win32path
AMIGAOSPATH=$_amigaospath
STATICLIBPATH=$_staticlibpath
XCODETOOLSPATH=$_xcodetoolspath
+SPARKLEPATH=$_sparklepath
SDLCONFIG=$_sdlconfig
ABI := $ABI
diff --git a/ports.mk b/ports.mk
index c7cf699..67a59d4 100644
--- a/ports.mk
+++ b/ports.mk
@@ -97,7 +97,8 @@ endif
ifdef USE_SPARKLE
mkdir -p $(bundle_name)/Contents/Frameworks
cp $(srcdir)/dists/macosx/dsa_pub.pem $(bundle_name)/Contents/Resources/
- cp -R $(STATICLIBPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
+ rm -rf $(bundle_name)/Contents/Frameworks/Sparkle.framework
+ cp -R $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
endif
cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(DIST_FILES_DOCS) $(bundle_name)/
@@ -327,7 +328,10 @@ OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
endif
ifdef USE_SPARKLE
-OSX_STATIC_LIBS += -framework Sparkle -F$(STATICLIBPATH)
+ifneq ($(SPARKLEPATH),)
+OSX_STATIC_LIBS += -F$(SPARKLEPATH)
+endif
+OSX_STATIC_LIBS += -framework Sparkle -Wl,-rpath, at loader_path/../Frameworks
endif
# Special target to create a static linked binary for Mac OS X.
Commit: 08254293b7ab3b991dd32d6492d1ca07990ba727
https://github.com/scummvm/scummvm/commit/08254293b7ab3b991dd32d6492d1ca07990ba727
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T21:46:51+01:00
Commit Message:
UPDATES: Fix interval normalization
When given a valid value the normalization was returning the next
valid value instead of returning the given one. This caused for
example the interval to be changed each time we opened the
options (and thus check to be automatically activated the first
time the options were accessed).
Changed paths:
common/updates.cpp
diff --git a/common/updates.cpp b/common/updates.cpp
index 4174a96..087002a 100644
--- a/common/updates.cpp
+++ b/common/updates.cpp
@@ -42,7 +42,7 @@ int UpdateManager::normalizeInterval(int interval) {
const int *val = updateIntervals;
while (*val != -1) {
- if (*val > interval)
+ if (*val >= interval)
return *val;
val++;
}
More information about the Scummvm-git-logs
mailing list