X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fconfig.subr;h=03499ba98cdfec3f7edc38f91882bd688027be5d;hp=e08be12f5ad49ed2b7c8f5483cf3c9f7863c6671;hb=3c6cdec66548d3ca18ab097d3337bd00cfca856a;hpb=7f41702e5b0d36f261f76202b1d51d863cac4d2f

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index e08be12f..03499ba9 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -1,4 +1,5 @@
 devsite_url="http://dev.xonotic.org/"
+gitsite_url="http://gitlab.com/groups/xonotic/"
 
 allrepos()
 {
@@ -12,26 +13,47 @@ 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"
+	"$@" xonotic.org                   xonotic.org.git              master         "no"
+	"$@" wiki                          xonotic.wiki.git             master         "no"
 }
 
 allmirrors()
 {
+	# Legacy git URLs.
 	"$@" git  ''   git://git.xonotic.org/xonotic/      ''
 	"$@" http ''   http://git.xonotic.org/xonotic/     ''
 	"$@" ssh  ''   ssh://xonotic@git.xonotic.org/      ''
+	"$@" git  ''   git://nl.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://nl.git.xonotic.org/xonotic/  ''
+	"$@" git  ''   git://us.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
-	"$@" git  us   git://us.git.xonotic.org/xonotic/   '*2/3'
-	"$@" http us   http://us.git.xonotic.org/xonotic/  '*2/3'
+	# Gitlab host (divVerent).
+	"$@" http gitlab   https://gitlab.com/xonotic/     ''
 
+	# German host (divVerent).
 	"$@" git  de   git://de.git.xonotic.org/xonotic/   ''
 	"$@" http de   http://de.git.xonotic.org/xonotic/  ''
 
-	"$@" git  nl   git://nl.git.xonotic.org/xonotic/   '*2'
-	"$@" http nl   http://nl.git.xonotic.org/xonotic/  '*2'
+	# Pushing destination (authoritative server; merlijn).
+	"$@" ssh  push ssh://git@gitlab.com/xonotic/       ''
+}
 
-	"$@" ssh  push ssh://xonotic@push.git.xonotic.org/ ''
+have_time=true
+measure_time()
+{
+	if $have_time; then
+		time -p "$@"
+	else
+		"$@"
+	fi
 }
+if { measure_time sh -c 'true'; } 2>&1 >/dev/null | grep '^user ' >/dev/null; then
+	msg "Timing via the time utility works."
+else
+	have_time=false
+	msg "Timing not supported."
+fi