phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Updates OS X icon with multiple sizes and slightly reduced transparency to make it more easily clickable.

Browse Source 
Updates OS X bundle build script, disables broken testing, refs #2780

This was SVN commit r16408.
This commit is contained in:
historic_bruno 2015-03-09 00:24:15 +00:00
parent eaa8f89ffc
commit 1a4176ebcf
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/resources/0ad.icns (Stored with Git LFS)
View File

Binary file not shown.

22
build/workspaces/build-osx-bundle.sh
View File

@ -23,14 +23,11 @@
export ARCH=${ARCH:="x86_64"}
# Set SDK and mimimum required OS X version
# (As of Xcode 4.3, the SDKs are located directly in Xcode.app,
# but previously they were in /Developer/SDKs)
#export SYSROOT=${SYSROOT="/Developer/SDKs/MacOSX10.5.sdk"}
export SYSROOT=${SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"}
export MIN_OSX_VERSION=${MIN_OSX_VERSION="10.7"}
export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"}
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"}
# 0 A.D. release version, e.g. Alpha 17 is 0.0.17
BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.0"}
# 0 A.D. release version, e.g. Alpha 18 is 0.0.18
BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.18"}
# Define compiler as "clang", this is all Mavericks supports.
# gcc symlinks may still exist, but they are simply clang with
@ -123,10 +120,11 @@ echo "\nBuilding game\n"
popd > /dev/null
# Run test to confirm all is OK
pushd ../../binaries/system > /dev/null
echo "\nRunning tests\n"
./test || die "Post-build testing failed!"
popd > /dev/null
# TODO: tests are currently broken on OS X (see http://trac.wildfiregames.com/ticket/2780)
#pushd ../../binaries/system > /dev/null
#echo "\nRunning tests\n"
#./test || die "Post-build testing failed!"
#popd > /dev/null
# Create bundle structure
echo "\nCreating bundle directories\n"
@ -212,7 +210,7 @@ PlistBuddy -c "Add :CFBundleDevelopmentRegion string English" ${INFO_PLIST}
PlistBuddy -c "Add :CFBundleInfoDictionaryVersion string 6.0" ${INFO_PLIST}
PlistBuddy -c "Add :CFBundleIconFile string 0ad" ${INFO_PLIST}
PlistBuddy -c "Add :LSMinimumSystemVersion string ${BUNDLE_MIN_OSX_VERSION}" ${INFO_PLIST}
PlistBuddy -c "Add :NSHumanReadableCopyright string Copyright © 2014 Wildfire Games" ${INFO_PLIST}
PlistBuddy -c "Add :NSHumanReadableCopyright string Copyright © 2015 Wildfire Games" ${INFO_PLIST}
# TODO: Automatically create compressed DMG with hdiutil?
# (this is a bit complicated so I do it manually for now)