From: merlijn <mhofstra@gmail.com>
Date: Sun, 20 May 2012 16:44:13 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.7.0~55
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1f5d74bfbf3e6e79e72d81fdd3d2dd39caef6398;hp=-c

Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
---

1f5d74bfbf3e6e79e72d81fdd3d2dd39caef6398
diff --combined misc/tools/all/release.subr
index 69f54b24,8e0d5e55..e97bddb2
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@@ -60,7 -60,7 +60,7 @@@ release_common(
  		zipflags=-9
  		find "$@" -exec touch -d "2001-01-01 01:01:01 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly
  		ziplist=`mktemp`
 -		find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
 +		find "$@" -xtype f \( -executable -or -type l \) -print | sed 's,\([./][^./]*$\),\1 \1,' | sort -k2 | cut -d\  -f1 > "$ziplist"
  		7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
  		zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
  		rm -f "$ziplist"
@@@ -170,7 -170,7 +170,7 @@@ case "$cmd" i
  			verbose date +%Y%m%d > Xonotic/stamp.txt
  			verbose date +%Y%m%d > Xonotic/pk3stamp.txt
  		fi
- 		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
+ 		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
  		(
  			verbose cd Xonotic
  			verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
@@@ -293,14 -293,14 +293,14 @@@
  	release-engine-linux32)
  		release_common
  		verbose "$SELF" release-compile linux32 \
- 			'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+ 			'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \
  			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
  			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
  		;;
  	release-engine-linux64)
  		release_common
  		verbose "$SELF" release-compile linux64 \
- 			'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+ 			'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \
  			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
  			release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
  		;;
@@@ -557,6 -557,7 +557,7 @@@
  		fi
  		# build the archives
  		verbose mkzip Xonotic-$stamp-enginesource.zip \
+ 			Xonotic/Makefile \
  			Xonotic/source/darkplaces/ \
  			Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
  		verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-engine.zip