X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=c6fda9bc6153a04f2a5cab099c167020f992cbcc;hb=0be4e76a8d526fca89fd6e6adc809bd6fbcd02ee;hp=381e9f7fb5c3206983e35e7481b15357fbe83faf;hpb=c8b899ef1adc8e88174085a04bd42698271f0ad7;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 381e9f7f..c6fda9bc 100755
--- a/all
+++ b/all
@@ -268,8 +268,29 @@ cmd=$1
 shift
 
 case "$cmd" in
-	release-*)
+	release|release-*)
 		export LC_ALL=C
+
+		release_args="$cmd $*"
+		msg "*** $release_args: start"
+		release_starttime=`date +%s`
+		release_end()
+		{
+			release_endtime=`date +%s`
+			release_deltatime=$(($release_endtime - $release_starttime))
+			msg "*** $release_args: $release_deltatime seconds"
+		}
+		trap release_end EXIT
+		release_tempstarttime=$release_starttime
+		release_timereport()
+		{
+			release_endtime=`date +%s` # RELEASE NOW!!!
+			if [ -n "$*" ]; then
+				release_deltatime=$(($release_endtime - $release_tempstarttime))
+				msg "**** $release_args: $*: $release_deltatime seconds"
+			fi
+			release_tempstarttime=$release_endtime
+		}
 		;;
 esac
 
@@ -358,21 +379,41 @@ fix_git_config()
 mkzipr()
 {
 	archive=$1; shift
+	case "$RELEASETYPE" in
+		release)
+			sevenzipflags=-mx=9
+			zipflags=-9
+			;;
+		*)
+			sevenzipflags=-mx=1
+			zipflags=-1
+			;;
+	esac
 	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"
-	7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
-	zip         -9y   -@<"$ziplist" "$archive"      || true
+	7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
+	zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
 	rm -f "$ziplist"
 }
 
 mkzip()
 {
 	archive=$1; shift
+	case "$RELEASETYPE" in
+		release)
+			sevenzipflags=-mx=9
+			zipflags=-9
+			;;
+		*)
+			sevenzipflags=-mx=1
+			zipflags=-1
+			;;
+	esac
 	ziplist=`mktemp`
 	find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
-	7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
-	zip         -9y   -@<"$ziplist" "$archive"      || true
+	7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
+	zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
 	rm -f "$ziplist"
 }
 
@@ -1777,7 +1818,9 @@ case "$cmd" in
 				dst="$PWD/$dst"
 				;;
 		esac
+		release_timereport
 		verbose rm -rf Xonotic/temp
+		release_timereport "deleted temp directory"
 		verbose mkdir -p Xonotic/temp
 		{
 			verbose cd "$src"
@@ -1786,6 +1829,7 @@ case "$cmd" in
 			verbose cd Xonotic/temp
 			verbose tar xvf -
 		}
+		release_timereport "extracted data"
 		verbose cd Xonotic/temp
 		if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
 			verbose cp ../source/progs.dat .
@@ -1832,10 +1876,14 @@ case "$cmd" in
 			done
 		fi
 		verbose export git_src_repo="$d0/$src" # skip hash-object
+		release_timereport "processed data"
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
+		release_timereport "transformed data"
 		verbose mkzipr "../../$dst" *
+		release_timereport "zipped data"
 		verbose cd ../..
 		verbose rm -rf Xonotic/temp
+		release_timereport "deleted temp directory again"
 		;;
 	release-buildpk3s)
 		stamp=`cat Xonotic/stamp.txt`