X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=3c58a6d5a1047e4cf2f1192178e4caad9cc9c742;hb=3a518633f9a8a31e2264e1e9baa70f5e0bcc256b;hp=b84d57b4e302701f504e38ac8166d6a6427f27ad;hpb=fc6ebca703358b9814720cfc4f7313b6ec72e28c;p=xonotic%2Fxonotic.git diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index b84d57b4..3c58a6d5 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -95,6 +95,14 @@ release_common() archive=$1; shift zip -0ry "$archive" "$@" } + getversion() + { + gv=`grep "^gameversion " "$1/defaultXonotic.cfg" | awk '{ print $2 }'` + major=$(($gv / 10000)) + minor=$((($gv / 100) - ($major * 100))) + patch=$(($gv - ($major * 10000) - ($minor * 100))) + versionstr="$major.$minor.$patch" + } } handled=true @@ -148,6 +156,8 @@ case "$cmd" in ;; release) msg "Building a FINISHED RELEASE" + getversion data/xonotic-data.pk3dir + verbose "$SELF" each -k git tag -m "TEMP TAG" -f "xonotic-v$versionstr" ;; *) msg "Building a $RELEASETYPE" @@ -183,8 +193,8 @@ case "$cmd" in rm -f Xonotic/key_15.d0pk { verbose cd Xonotic/mapping - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114.tar.bz2 - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301.tar.bz2 + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301-win32-7z.exe for X in *-7z.exe; do 7za x "$X" rm -f "$X" @@ -432,11 +442,7 @@ case "$cmd" in verbose cp ../source/csprogs.dat . verbose cp ../source/menu.dat . verbose rm -rf qcsrc - gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'` - major=$(($gv / 10000)) - minor=$((($gv / 100) - ($major * 100))) - patch=$(($gv - ($major * 10000) - ($minor * 100))) - versionstr="$major.$minor.$patch" + getversion . case "$RELEASETYPE" in release) ;;