osxbuild.sh: new option --lastrev, 'dummyhelix' preset.

git-svn-id: https://svn.eduke32.com/eduke32@3690 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-17 20:34:45 +00:00
parent 34a965721b
commit 298da67e63

View file

@ -15,7 +15,9 @@ builddebug=0
buildrelease=1 buildrelease=1
pack=1 pack=1
iamhelix=0 iamhelix=0
dummy=0
package=package package=package
lastrevision=
# Enforce OS: # Enforce OS:
if [ `uname -s` != Darwin ]; then if [ `uname -s` != Darwin ]; then
@ -70,6 +72,18 @@ for i in $*; do
buildrelease=0 buildrelease=0
pack=1 pack=1
;; ;;
dummyhelix)
iamhelix=1
buildppc=0
build86=0
build64=0
buildmain=0
buildtools=0
builddebug=0
buildrelease=0
pack=0
dummy=1
;;
# For the convenience of universal distributors: # For the convenience of universal distributors:
dist) dist)
buildppc=1 buildppc=1
@ -136,6 +150,10 @@ for i in $*; do
pack=${i#*=} pack=${i#*=}
;; ;;
--lastrev=*)
lastrevision=${i#*=}
;;
*) *)
echo "usage: ./osxbuild.sh [options]" echo "usage: ./osxbuild.sh [options]"
echo "options:" echo "options:"
@ -350,24 +368,27 @@ fi
# Begin assembling archive contents: # Begin assembling archive contents:
echo Creating fat binaries. echo Creating fat binaries.
success=0
for i in {eduke32,mapster32}{.debug,}; do success=$dummy
binaries= if [ $dummy == 0 ]; then
for j in ${i}.{x86,x64,ppc}; do for i in {eduke32,mapster32}{.debug,}; do
if [ -f "$j" ]; then binaries=
binaries="$binaries $j" for j in ${i}.{x86,x64,ppc}; do
success=1 if [ -f "$j" ]; then
binaries="$binaries $j"
success=1
fi
done
if [ -n "$binaries" ]; then
lipo -create $binaries -output $i
app=${i//eduke32/EDuke32}
app=${app//mapster32/Mapster32}.app
cp -f $i "$app/Contents/MacOS/${i%.debug}"
mv -f "$app" "$package/"
fi fi
done done
fi
if [ -n "$binaries" ]; then
lipo -create $binaries -output $i
app=${i//eduke32/EDuke32}
app=${app//mapster32/Mapster32}.app
cp -f $i "$app/Contents/MacOS/${i%.debug}"
mv -f "$app" "$package/"
fi
done
# Almost done... # Almost done...
if [ $success == 1 ]; then if [ $success == 1 ]; then
@ -386,16 +407,20 @@ if [ $success == 1 ]; then
echo "LibPNG from Fink (http://www.finkproject.org/) statically linked into it." >> README.OSX echo "LibPNG from Fink (http://www.finkproject.org/) statically linked into it." >> README.OSX
# Generate Changelog: # Generate Changelog:
lastrevision=$(ls -A1 eduke32-osx* | tail -n1 | cut -d- -f3 | cut -d. -f1)
if [ -z $lastrevision ]; then if [ -z $lastrevision ]; then
let lastrevision=rev-1 lastrevision=$(ls -A1 eduke32-osx* | tail -n1 | cut -d- -f3 | cut -d. -f1)
elif [ $lastrevision -lt $rev ]; then
let lastrevision+=1 if [ -z $lastrevision ]; then
else let lastrevision=rev-1
let lastrevision=rev-1 elif [ $lastrevision -lt $rev ]; then
let lastrevision+=1
else
let lastrevision=rev-1
fi
fi fi
echo "Using r$lastrevision as last revision for change log"
if [ "$vc" == "svn" ]; then if [ "$vc" == "svn" ]; then
svn log -r $rev:$lastrevision > Changelog.txt svn log -r $rev:$lastrevision > Changelog.txt
elif [ "$vc" == "git" ]; then elif [ "$vc" == "git" ]; then