From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 6 May 2013 14:15:06 +0000 (+0200)
Subject: disable fteqcc compilation
X-Git-Tag: xonotic-v0.7.0~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e1c3187dda562c1bf95bd9954f29a0248e087f3;p=xonotic%2Fxonotic.git

disable fteqcc compilation
---

diff --git a/Makefile b/Makefile
index 18861e38..72c16677 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ all-zip-binary:
 all-zip-source:
 	( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
 	$(MAKE) -C source/d0_blind_id
-	$(MAKE) -C source/fteqcc
-	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/fteqcc/fteqcc.bin
+	$(MAKE) -C source/gmqcc
+	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/gmqcc/gmqcc
 	$(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
 	$(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
 	$(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
@@ -50,7 +50,7 @@ clean-zip-binary:
 .PHONY: clean-zip
 clean-zip-source:
 	-$(MAKE) -C source/d0_blind_id distclean
-	$(MAKE) -C source/fteqcc clean
+	$(MAKE) -C source/gmqcc clean
 	$(MAKE) -C source/qcsrc clean
 	$(MAKE) -C source/darkplaces clean
 
diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index e08be12f..ab4445e7 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -12,7 +12,6 @@ allrepos()
 	"$@" d0_blind_id                   d0_blind_id.git              master         ""
 	"$@" data/xonotic-maps.pk3dir      xonotic-maps.pk3dir.git      master         ""
 	"$@" mediasource                   mediasource.git              master         "no"
-	"$@" fteqcc                        fteqcc.git                   xonotic-stable "noautocrlf"
 	"$@" gmqcc                         gmqcc.git                    master         ""
 	"$@" xonstat                       xonstat.git                  master         "no"
 	"$@" xonstatdb                     xonstatdb.git                master         "no"
diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 544902fc..b13213f2 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -173,7 +173,7 @@ case "$cmd" in
 		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 gmqcc fteqcc source source/darkplaces source/fteqcc source/gmqcc source/d0_blind_id mapping
+			verbose mkdir data gmqcc source source/darkplaces source/gmqcc source/d0_blind_id mapping
 			verbose rm -rf misc/builddeps
 			verbose mv misc/buildfiles/win32 bin32 || true
 			verbose mv bin32/SDL.dll . || true
@@ -183,7 +183,6 @@ case "$cmd" in
 			verbose rm -rf misc/pki
 		)
 		release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces" .
-		release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc" .
 		release_git_extract_dir "gmqcc" "Xonotic/source/gmqcc" .
 		release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
 		release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id" .
@@ -256,13 +255,10 @@ case "$cmd" in
 		makeflags=$2
 		gmqcc_maketargets=$3
 		gmqcc_files=$4
-		fteqcc_maketargets=$5
-		fteqcc_files=$6
-		darkplaces_maketargets=$7
-		darkplaces_files=$8
+		darkplaces_maketargets=$5
+		darkplaces_files=$6
 		host=xonotic-build-$suffix
 		verbose "$SELF" release-compile-run "$host" /tmp/gmqcc.build."$suffix" "$gmqcc_maketargets" "$makeflags" "Xonotic/source/gmqcc" "$d0/misc/builddeps/dp.$suffix" "$gmqcc_files"
-		verbose "$SELF" release-compile-run "$host" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$d0/misc/builddeps/dp.$suffix" "$fteqcc_files"
 		verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/dp.$suffix" "$darkplaces_files"
 		;;
 	release-engine-win32)
@@ -270,7 +266,6 @@ case "$cmd" in
 		verbose "$SELF" release-compile win32 \
 			'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \
 			gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc.exe' \
-			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
 		;;
 	release-engine-win64)
@@ -278,7 +273,6 @@ case "$cmd" in
 		verbose "$SELF" release-compile win64 \
 			'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \
 			gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc-x64.exe' \
-			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
 		;;
 	release-engine-osx)
@@ -287,7 +281,6 @@ case "$cmd" in
 		verbose "$SELF" release-compile osx \
 			'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
 			gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.osx' \
-			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
 			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
 		;;
 	release-engine-linux32)
@@ -295,7 +288,6 @@ case "$cmd" in
 		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 DP_GMP_STATIC_LIBDIR=.deps/lib' \
 			gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux32' \
-			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)
@@ -303,7 +295,6 @@ case "$cmd" in
 		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 DP_GMP_STATIC_LIBDIR=.deps/lib' \
 			gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux64' \
-			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'
 		;;
 	release-engine)
@@ -327,7 +318,6 @@ case "$cmd" in
 	release-qc)
 		release_common
 		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/gmqcc/gmqcc.linux64" XON_BUILDSYSTEM=1 clean all
-		verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
 		release_common
@@ -573,12 +563,10 @@ case "$cmd" in
 		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
 		verbose mkzip Xonotic-$stamp-common.zip \
 			Xonotic/source/d0_blind_id/ \
-			Xonotic/source/fteqcc/ \
 			Xonotic/source/gmqcc/ \
 			Xonotic/source/qcsrc/ \
 			Xonotic/Docs \
 			Xonotic/misc \
-			Xonotic/fteqcc \
 			Xonotic/gmqcc \
 			Xonotic/server \
 			Xonotic/key_0.d0pk \
@@ -587,7 +575,6 @@ case "$cmd" in
 		verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip
 		verbose mkzip Xonotic-$stamp-source.zip \
 			Xonotic/source/d0_blind_id/ \
-			Xonotic/source/fteqcc/ \
 			Xonotic/source/gmqcc/ \
 			Xonotic/source/qcsrc/ \
 			Xonotic/misc/logos
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 405c0ff4..aca52d61 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -202,37 +202,21 @@ case "$cmd" in
 			verbose make $MAKEFLAGS
 		fi
 
-		if [ x"$USE_FTEQCC" = x"yes" ]; then
-			verbose cd "$d0/fteqcc"
-			if $cleanqcc; then
-				verbose make $MAKEFLAGS clean
-			fi
-			verbose make $MAKEFLAGS
-
-			verbose cd "$d0/data/xonotic-data.pk3dir"
-			if $cleanqc; then
-				verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
-				#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
-			fi
-			verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
-			#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+		verbose cd "$d0/gmqcc"
+		if $cleanqcc; then
+			verbose make $MAKEFLAGS clean
+		fi
+		if [ -n "$WE_HATE_OUR_USERS" ]; then
+			verbose make $MAKEFLAGS gmqcc.exe
 		else
-			verbose cd "$d0/gmqcc"
-			if $cleanqcc; then
-				verbose make $MAKEFLAGS clean
-			fi
-			if [ -n "$WE_HATE_OUR_USERS" ]; then
-				verbose make $MAKEFLAGS gmqcc.exe
-			else
-				verbose make $MAKEFLAGS gmqcc
-			fi
+			verbose make $MAKEFLAGS gmqcc
+		fi
 
-			verbose cd "$d0/data/xonotic-data.pk3dir"
-			if $cleanqc; then
-				verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
-			fi
-			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+		verbose cd "$d0/data/xonotic-data.pk3dir"
+		if $cleanqc; then
+			verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
 		fi
+		verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"
diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index d1c42087..3ac6e5c7 100755
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -157,7 +157,6 @@ case "$action" in
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-original) continue ;;
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;;
 				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;;
-				xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;;
 				xonotic/darkplaces.git:refs/remotes/origin/dp-mqc-render) continue ;;
 			esac
 
diff --git a/misc/tools/makebuild.sh b/misc/tools/makebuild.sh
deleted file mode 100755
index 7e31a7fb..00000000
--- a/misc/tools/makebuild.sh
+++ /dev/null
@@ -1,395 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Options:
-#   pw=foo          extract password
-#   version=2.5     make a FINAL build
-#   tag=FOO         insert FOO before the date in build names
-
-base=`pwd`
-
-# customizable specific stuff
-netradiant_release=1.5.0-svn402
-basepk3=$base/data20090403.pk3 # 2.5
-hotbasepk3=$base/data20091001.pk3 # hotfix
-nexdir=$base/nexuiz
-havocdir=$base/nexuiz/havoc
-dpdir=$base/darkplaces
-tmpdir=/tmp/NEX
-zipdir=$base/builds
-buildfiles=$base/nexuiz/misc/buildfiles
-mingwdlls=$buildfiles/w32
-osxapps=$buildfiles/osx
-copystrip=$buildfiles/copystrip
-zipdiff=$base/nexuiz/misc/tools/zipdiff
-fteqccdir="$base/fteqcc"
-fteqccflags=""
-menuqc=menu
-newest=NEWEST
-# end system specific stuff
-
-case "$pw" in
-	'')
-		zipflags=
-		;;
-	*)
-		zipflags="-P $pw"
-		;;
-esac
-
-: ${date:=`date +%Y%m%d`}
-: ${versiontag:=}
-echo "date stamp: $date"
-
-case "$version" in
-	'')
-		version=2.5s
-		versiontag=test
-		defaultcfg=
-		ext=
-		;;
-	*)
-		version=$version
-		versiontag=$versiontag
-		defaultcfg=
-		ext=_$version
-		;;
-esac
-
-mk7z()
-{
-	7za a -tzip -mx=9 "$@"
-	chmod 644 "$1"
-}
-
-#if [ -n "$EXPERIMENTAL" ]; then
-#	basepk3=$base/data20071231.pk3 # newer build to make smaller patches
-#	nexdir=$base/nexuiz
-#fi
-
-# TODO normalize the builds
-platforms='x86 amd64 osx'
-buildon()
-{
-	host=$1
-	prefix=$2
-	fteqccname=$3
-	path=$4
-	makeflags=$5
-	strip=$6
-
-	fteqcc_cflags=
-	case "$fteqccname" in
-		*.exe)
-			fteqcc_cflags=win
-			;;
-	esac
-
-	rm -f "$fteqccdir"/*.o
-	rm -f "$fteqccdir"/*.bin
-	rsync --exclude "*.o" --exclude "*.d" --exclude "nexuiz-*" --delete-excluded --delete -zvaSHP . "$copystrip" "$fteqccdir" "$host:$path"
-	ssh "$host" ". ~/.profile && cd $path && COPYSTRIP_STRIP=$strip PATH=$path/copystrip:\$PATH make $makeflags clean nexuiz && cd ${fteqccdir##*/} && make $makeflags $fteqcc_cflags"
-	rsync --exclude "*.o" --exclude "*.d" --delete-excluded --delete -zvaSHP "$host:$path/." .
-	for P in -dedicated -sdl -glx -wgl -agl -dedicated.exe -sdl.exe .exe; do
-		[ -f nexuiz$P ] && mv nexuiz$P "$tmpdir/$prefix$P"
-		[ -f nexuiz$P-withdebug ] && mv nexuiz$P-withdebug "$tmpdir/debuginfo/$prefix$P"
-		[ -f nexuiz$P.dSYM ] && mv nexuiz$P.dSYM "$tmpdir/debuginfo/$prefix$P.dSYM"
-	done
-	case "$fteqccname" in
-		*.exe)
-			mv "${fteqccdir##*/}"/fteqcc.exe "$tmpdir/fteqcc/$fteqccname"
-			;;
-		*)
-			mv "${fteqccdir##*/}"/fteqcc.bin "$tmpdir/fteqcc/$fteqccname"
-			;;
-	esac
-	make clean
-}
-
-build()
-{
-#	buildon alientrap.org                         nexuiz              fteqcc.exe          /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I$HOME/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip
-	buildon nex686build                           nexuiz              fteqcc.exe          /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' '"$HOME/mingw32/bin/i386-mingw32-strip"'
-	buildon nex686build                           nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
-#	buildon eos.thruhere.net                      nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
-	buildon nexmacbuild                           nexuiz-osx          fteqcc-osx          /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
-	buildon alientrap.org                         nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
-		mv "$tmpdir/nexuiz-osx-agl"     "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin"
-		mv "$tmpdir/nexuiz-osx-sdl"     "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin"
-}
-
-# avoid dupes
-i=
-while [ -f "$zipdir/nexuiz$date$i$ext.zip" ]; do
-	if [ -z "$i" ]; then
-		i=a
-	else
-		i=`echo "$i" | tr a-y b-z`
-	fi
-done
-ext=$i$ext
-
-echo "Using build name nexuiz$date$ext"
-sleep 3
-
-# check for remains
-conflicts=`find "$dpdir" "$nexdir" -name '*.orig' -o -name '*.rej' -o -name '*.mine' -o -name '.#*' -o -name '.*~'`
-if [ -n "$conflicts" ]; then
-	echo "CONFLICTS OR UNNEEDED FILES HAVE BEEN FOUND!"
-	echo "NOT PROCEEDING"
-	echo
-	echo "$conflicts"
-	exit 1
-fi
-
-set -x
-
-# prepare temp dir
-rm -rf "$tmpdir"
-mkdir -p "$tmpdir"
-
-# clean up and patch DP
-cd "$dpdir"
-quilt pop -a || true
-svn revert -R .
-if [ -s patches/series ]; then
-	quilt push -a # apply all patches
-fi
-
-# prepare directory structure
-cp -r "$osxapps"/*.app "$tmpdir"
-mkdir "$tmpdir/debuginfo"
-mkdir "$tmpdir/fteqcc"
-
-# prepare fteqcc build
-cd "$fteqccdir"
-git checkout-index -a -f --prefix="$tmpdir/fteqcc/source/"
-git log -1 > "$tmpdir/fteqcc/source/fteqcc-base-revision.txt"
-fteqccrev=`git show --pretty=%ct-%H | head -n 1`
-echo "fteqcc rev $fteqccrev"
-
-# build all executables
-cd "$dpdir"
-rm -rf nexuiz-* *.o
-make clean
-build
-rm -rf nexuiz-* *.o
-rm -rf fteqcc copystrip
-make clean
-
-# move shell scripts and license
-cd "$tmpdir"
-cp "$nexdir/"nexuiz-*.sh "$tmpdir/"
-cp "$nexdir/gpl.txt" "$tmpdir/"
-cp "$nexdir/readme.html" "$tmpdir/"
-
-# prepare data
-cd "$nexdir/data"
-svn export . "$tmpdir/data"
-svn info . > "$tmpdir/data/nexuiz-data-base-revision.txt"
-svn log > "$tmpdir/data/ChangeLog"
-
-# prepare havoc
-cd "$havocdir"
-svn export . "$tmpdir/havoc"
-
-# prepare Docs
-cd "$nexdir/Docs"
-svn export . "$tmpdir/Docs"
-
-# prepare server
-cd "$nexdir/server"
-svn export . "$tmpdir/server"
-
-# make gamesource
-cd "$tmpdir/data"
-mkdir -p "$tmpdir/sources"
-mk7z ../sources/gamesource$date.zip qcsrc nexuiz-data-base-revision.txt ChangeLog
-
-# make enginesource
-cd "$dpdir"
-svn export . "$tmpdir/darkplaces"
-svn info > "$tmpdir/darkplaces/nexuiz-base-revision.txt"
-svn diff > "$tmpdir/darkplaces/nexuiz-engine-changes.diff"
-svn log > "$tmpdir/darkplaces/ChangeLog"
-cd "$tmpdir"
-mk7z "$tmpdir/sources/enginesource$date.zip" "darkplaces"
-rm -rf darkplaces
-
-# make fteqcc archive
-cd "$tmpdir"
-zip -9r "$tmpdir/sources/fteqcc-binaries-and-source-rev$fteqccrev.zip" "fteqcc"
-rm -rf fteqcc
-
-# clean fteqcc dir
-cd "$fteqccdir"
-rm -f *.o *.bin
-make
-
-# make local compiler
-cd "$tmpdir/data"
-make FTEQCC="$fteqccdir/fteqcc.bin"
-
-# prepare root
-rm -rf "$tmpdir/data/qcsrc"
-cd "$tmpdir/Docs"
-cp "$dpdir/darkplaces.txt" .
-cd "$tmpdir/data"
-perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version'\n"' defaultNexuiz.cfg
-if [ -z "$versiontag" ]; then
-	perl -pi -e 'm|^//!<showbrand| .. m|^//!>showbrand| and $_ = "";' defaultNexuiz.cfg
-	rm -f gfx/brand.tga
-fi
-echo >> defaultNexuiz.cfg
-echo "$defaultcfg" >> defaultNexuiz.cfg
-
-cd "$nexdir/misc/mediasource/menuskins/wickedz/background_builder"
-sh append.sh "`echo "$version" | sed 's/svn/s/g'`" "$tmpdir/data/gfx/menu/wickedz/"
-cd "$tmpdir/data"
-
-pk3dirpk3s=
-for X in *.pk3dir; do
-	Y=${X%.pk3dir}.pk3
-	cd "$X"
-		mk7z ../../"$Y" .
-	cd ..
-	rm -rf "$X"
-	pk3dirpk3s="$pk3dirpk3s Nexuiz/data/$Y"
-done
-mv common-spog.pk3 ..
-mk7z ../data.pk3 .
-
-cd "$tmpdir/havoc"
-mk7z ../havoc.pk3 .
-
-# make data pk3
-cd "$tmpdir"
-rm -rf data
-mkdir data
-mv data.pk3 data/data$tag$date.pk3
-rm -rf havoc
-mkdir havoc
-mv havoc.pk3 havoc/data$tag${date}havoc.pk3
-mv *.pk3 data/
-
-cp -r "$mingwdlls"/* .
-# fix up permissions
-chmod 644 *.dll *.exe
-
-mkdir extra
-cd extra
-wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-win32.zip
-#echo "Downloading netradiant, press enter and type the PWs"
-#read -r DUMMY
-#scp divverent@icculus.org:netradiant-webspace/files/netradiant-${netradiant_release}-win32.zip .
-unzip netradiant-${netradiant_release}-win32.zip
-mv NetRadiant netradiant-${netradiant_release}-win32
-rm -f netradiant-${netradiant_release}-win32.zip
-wget http://www.icculus.org/netradiant/files/netradiant-${netradiant_release}-osxintel.zip
-#scp divverent@icculus.org:netradiant-webspace/files/netradiant-${netradiant_release}-osxintel.zip .
-unzip netradiant-${netradiant_release}-osxintel.zip
-mv NetRadiant.app NetRadiant-${netradiant_release}-osxintel.app
-rm -f netradiant-${netradiant_release}-osxintel.zip
-cat >> unsupported.txt <<EOF
-This directory contains NetRadiant, a stabilized Q3 map editor,
-configured for Nexuiz.
-
-It is not officially supported by Alientrap.
-
-Website: http://www.icculus.org/netradiant/
-EOF
-cd ..
-
-# make main structure
-mkdir Nexuiz
-mv * Nexuiz/ || true
-
-find . -name .svn -exec rm -rf {} \; -prune
-find . -name .git -exec rm -rf {} \; -prune
-
-rm -f "$zipdir/nexuiz$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 $pk3dirpk3s Nexuiz/havoc/* Nexuiz/extra/*
-ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip"
-
-rm -f "$zipdir/nexuizengineonly$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizengineonly$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll
-ln -snf nexuizengineonly$date$ext.zip "$zipdir/nexuizengineonly-$newest.zip"
-
-rm -f "$zipdir/nexuizsource$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizsource$date$ext.zip"     Nexuiz/gpl.txt                                            Nexuiz/sources
-ln -snf nexuizsource$date$ext.zip "$zipdir/nexuizsource-$newest.zip"
-
-# TODO remove these excludes after the version after 2.4.2
-$zipdiff -o "Nexuiz/data/data$tag$date""patch.pk3" -f "$basepk3" -t Nexuiz/data/data$tag$date.pk3
-[ -n "$hotbasepk3" ] && $zipdiff -o "Nexuiz/data/data$tag$date""hotfix.pk3" $pk3dirpk3s -f "$hotbasepk3" -t Nexuiz/data/data$tag$date.pk3
-mkdir -p gfx
-if unzip "Nexuiz/data/data$tag$date.pk3" gfx/brand.tga; then
-	zip -9r "Nexuiz/data/data$tag$date""patch.pk3" gfx/brand.tga
-	[ -n "$hotbasepk3" ] && zip -9r "Nexuiz/data/data$tag$date""hotfix.pk3" gfx/brand.tga
-	rm -rf gfx
-fi
-
-rm -f "$zipdir/nexuizpatch$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/data$tag$date""patch.pk3 $pk3dirpk3s Nexuiz/havoc/*
-ln -snf nexuizpatch$date$ext.zip "$zipdir/nexuizpatch-$newest.zip"
-
-[ -n "$hotbasepk3" ] && rm -f "$zipdir/nexuizhotfix$date$ext.zip"
-[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/readme.html Nexuiz/server Nexuiz/data/data$tag$date""hotfix.pk3 $pk3dirpk3s Nexuiz/havoc/*
-[ -n "$hotbasepk3" ] && ln -snf nexuizhotfix$date$ext.zip "$zipdir/nexuizhotfix-$newest.zip"
-
-rm -f "$zipdir/nexuizdocs$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizdocs$date$ext.zip"       Nexuiz/gpl.txt Nexuiz/Docs Nexuiz/readme.html
-ln -snf nexuizdocs$date$ext.zip "$zipdir/nexuizdocs-$newest.zip"
-
-rm -f "$zipdir/nexuizdebug$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizdebug$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/debuginfo/* Nexuiz/sources
-ln -snf nexuizdebug$date$ext.zip "$zipdir/nexuizdebug-$newest.zip"
-
-case "$versiontag" in
-	test)
-		# these builds are public
-		ssh atoffload "sh clean-builds.sh"
-		rsync -vaSHP "$zipdir/nexuiz"*"$date$ext.zip" "$zipdir/nexuiz"*"-$newest.zip" atoffload:offload.alientrap.org/nexuiz/builds/
-		;;
-	*)
-		ssh atoffload "sh clean-builds.sh"
-		rsync -vaSHP "$zipdir/nexuiz"*"$date$ext.zip" "$zipdir/nexuiz"*"-$newest.zip" atoffload:offload.alientrap.org/nexuiz/builds.versioned/
-		cat <<'EOF'
-
-NOTE: This is a RELEASE BUILD.
-
-To upload and finish the build, these things have to be done:
-
-- Test the build:
-  - On Linux/ATI
-  - On Vista/nvidia
-  - On Vista/ATI
-  - On Vista/Intel
-  - On OSX/ATI
-  - Turn on "developer 1"; watch out for suspicious messages.
-  - While testing, make sure all campaign levels are tested. In CTF/KH levels,
-    try to do a capture. After that, finish the game by prvm_edictset server 1
-    frags 1000.
-  - Play on a server running the new code. Ideally, that server should be public
-    and "somewhat compatible" to old clients, and some other players should be
-    on it.
-- Post the build on the forum as a test release. E.g. run this script again
-  with the "version" variable NOT SET, so the build gets marked "testing only",
-  and upload it and post it on the forum for testing. Mention the test server
-  that is already running the new code. Wait for at least one week for critical
-  bug reports.
-- If needed, fix the reported bugs and re-run this script for a release build.
-  Possibly repeat the testing process.
-- Upload the "final" build you have just made to Sourceforge (upload.sf.net,
-  incoming). Use the naming scheme nexuiz-25.zip, nexuizpatch-24-to-25.zip
-- Make the download available on sourceforge.
-- Announce the build on the forum; update the downloads website. Note that the
-  download may be still unavailable because of the SF mirror system.
-- Wait for the mirrors to catch up.
-- Edit the website: make a new news item for the new release, change the logo
-  image in the top left for the new version (ask [-z-]).
-
-EOF
-		;;
-esac
diff --git a/misc/tools/rsync-updater/update-to-autobuild.bat b/misc/tools/rsync-updater/update-to-autobuild.bat
index 2e2a323e..138a67c8 100644
--- a/misc/tools/rsync-updater/update-to-autobuild.bat
+++ b/misc/tools/rsync-updater/update-to-autobuild.bat
@@ -82,8 +82,8 @@ if not "%XONOTIC_INCLUDE_ALL%" == "" goto endbit
 set excludes=%excludes% --exclude=/xonotic-linux*
 set excludes=%excludes% --exclude=/xonotic-osx-*
 set excludes=%excludes% --exclude=/Xonotic*.app
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.linux*
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx
+set excludes=%excludes% --exclude=/gmqcc/gmqcc.linux*
+set excludes=%excludes% --exclude=/gmqcc/gmqcc.osx
 
 if "%ProgramFiles(x86)%" == "" goto bit32
 :bit64
@@ -91,7 +91,7 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 	set excludes=%excludes% --exclude=/xonotic.exe
 	set excludes=%excludes% --exclude=/xonotic-sdl.exe
 	set excludes=%excludes% --exclude=/xonotic-dedicated.exe
-	set excludes=%excludes% --exclude=/fteqcc/fteqcc.exe
+	set excludes=%excludes% --exclude=/gmqcc/gmqcc.exe
 	set excludes=%excludes% --exclude=/bin32
 	set excludes=%excludes% --exclude=/*.dll
 	goto endbit
@@ -99,7 +99,7 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 	set excludes=%excludes% --exclude=/xonotic-x64.exe
 	set excludes=%excludes% --exclude=/xonotic-x64-sdl.exe
 	set excludes=%excludes% --exclude=/xonotic-x64-dedicated.exe
-	set excludes=%excludes% --exclude=/fteqcc/fteqcc-x64.exe
+	set excludes=%excludes% --exclude=/gmqcc/gmqcc-x64.exe
 	set excludes=%excludes% --exclude=/bin64
 	goto endbit
 :endbit
diff --git a/misc/tools/rsync-updater/update-to-autobuild.sh b/misc/tools/rsync-updater/update-to-autobuild.sh
index 1ebefb56..7065f852 100755
--- a/misc/tools/rsync-updater/update-to-autobuild.sh
+++ b/misc/tools/rsync-updater/update-to-autobuild.sh
@@ -58,7 +58,7 @@ fi
 excludes=
 if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 	excludes="$excludes --exclude=/*.exe"
-	excludes="$excludes --exclude=/fteqcc/*.exe"
+	excludes="$excludes --exclude=/gmqcc/*.exe"
 	excludes="$excludes --exclude=/bin32"
 	excludes="$excludes --exclude=/*.dll"
 	excludes="$excludes --exclude=/bin64"
@@ -66,23 +66,23 @@ if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 	case `uname`:`uname -m` in
 		Darwin:*)
 			excludes="$excludes --exclude=/xonotic-linux*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.linux*"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux*"
 			;;
 		Linux:x86_64)
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
 			if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
 				excludes="$excludes --exclude=/xonotic-linux32-*"
-				excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+				excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
 			fi
 			;;
 		Linux:i?86)
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
 			excludes="$excludes --exclude=/xonotic-linux64-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.linux64"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux64"
 			;;
 		*)
 			echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
diff --git a/misc/tools/rsync-updater/update-to-release.bat b/misc/tools/rsync-updater/update-to-release.bat
index 2e2a323e..138a67c8 100644
--- a/misc/tools/rsync-updater/update-to-release.bat
+++ b/misc/tools/rsync-updater/update-to-release.bat
@@ -82,8 +82,8 @@ if not "%XONOTIC_INCLUDE_ALL%" == "" goto endbit
 set excludes=%excludes% --exclude=/xonotic-linux*
 set excludes=%excludes% --exclude=/xonotic-osx-*
 set excludes=%excludes% --exclude=/Xonotic*.app
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.linux*
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx
+set excludes=%excludes% --exclude=/gmqcc/gmqcc.linux*
+set excludes=%excludes% --exclude=/gmqcc/gmqcc.osx
 
 if "%ProgramFiles(x86)%" == "" goto bit32
 :bit64
@@ -91,7 +91,7 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 	set excludes=%excludes% --exclude=/xonotic.exe
 	set excludes=%excludes% --exclude=/xonotic-sdl.exe
 	set excludes=%excludes% --exclude=/xonotic-dedicated.exe
-	set excludes=%excludes% --exclude=/fteqcc/fteqcc.exe
+	set excludes=%excludes% --exclude=/gmqcc/gmqcc.exe
 	set excludes=%excludes% --exclude=/bin32
 	set excludes=%excludes% --exclude=/*.dll
 	goto endbit
@@ -99,7 +99,7 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 	set excludes=%excludes% --exclude=/xonotic-x64.exe
 	set excludes=%excludes% --exclude=/xonotic-x64-sdl.exe
 	set excludes=%excludes% --exclude=/xonotic-x64-dedicated.exe
-	set excludes=%excludes% --exclude=/fteqcc/fteqcc-x64.exe
+	set excludes=%excludes% --exclude=/gmqcc/gmqcc-x64.exe
 	set excludes=%excludes% --exclude=/bin64
 	goto endbit
 :endbit
diff --git a/misc/tools/rsync-updater/update-to-release.sh b/misc/tools/rsync-updater/update-to-release.sh
index 1ebefb56..7065f852 100755
--- a/misc/tools/rsync-updater/update-to-release.sh
+++ b/misc/tools/rsync-updater/update-to-release.sh
@@ -58,7 +58,7 @@ fi
 excludes=
 if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 	excludes="$excludes --exclude=/*.exe"
-	excludes="$excludes --exclude=/fteqcc/*.exe"
+	excludes="$excludes --exclude=/gmqcc/*.exe"
 	excludes="$excludes --exclude=/bin32"
 	excludes="$excludes --exclude=/*.dll"
 	excludes="$excludes --exclude=/bin64"
@@ -66,23 +66,23 @@ if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
 	case `uname`:`uname -m` in
 		Darwin:*)
 			excludes="$excludes --exclude=/xonotic-linux*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.linux*"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux*"
 			;;
 		Linux:x86_64)
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
 			if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
 				excludes="$excludes --exclude=/xonotic-linux32-*"
-				excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+				excludes="$excludes --exclude=/gmqcc/gmqcc.linux32"
 			fi
 			;;
 		Linux:i?86)
 			excludes="$excludes --exclude=/Xonotic*.app"
 			excludes="$excludes --exclude=/xonotic-osx-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.osx"
 			excludes="$excludes --exclude=/xonotic-linux64-*"
-			excludes="$excludes --exclude=/fteqcc/fteqcc.linux64"
+			excludes="$excludes --exclude=/gmqcc/gmqcc.linux64"
 			;;
 		*)
 			echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
diff --git a/misc/tools/tag-release.sh b/misc/tools/tag-release.sh
index c390eb2e..15f56d9e 100755
--- a/misc/tools/tag-release.sh
+++ b/misc/tools/tag-release.sh
@@ -20,7 +20,7 @@ for r in \
 	/home/rpolzer/Games/Xonotic/d0_blind_id \
 	/home/rpolzer/Games/Xonotic/data/xonotic-maps.pk3dir \
 	/home/rpolzer/Games/Xonotic/mediasource \
-	/home/rpolzer/Games/Xonotic/fteqcc
+	/home/rpolzer/Games/Xonotic/gmqcc
 do
 	cd "$r"
 	git tag -u D276946B -m"version $VER" xonotic-v"$VER"