From ab041bbe617da62c9b5b85fd5035bfc2429a0867 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 24 Jul 2006 22:57:03 +0000 Subject: [PATCH] build script can now send branding picture git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1777 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- misc/buildfiles/brand/pre.tga | Bin 0 -> 22724 bytes misc/makebuild.sh | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 misc/buildfiles/brand/pre.tga diff --git a/misc/buildfiles/brand/pre.tga b/misc/buildfiles/brand/pre.tga new file mode 100644 index 0000000000000000000000000000000000000000..2483e954e898069c13fc55a9f9cbbad10645b387 GIT binary patch literal 22724 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 literal 0 HcmV?d00001 diff --git a/misc/makebuild.sh b/misc/makebuild.sh index 249762fd8..434f141ee 100755 --- a/misc/makebuild.sh +++ b/misc/makebuild.sh @@ -8,9 +8,10 @@ nexdir=$base/nexuiz dpdir=$base/darkplaces tmpdir=/tmp/NEX zipdir=/home/polzer/UT/distfiles/nex/ -mingwdlls=$base/buildfiles/w32 -osxapps=$base/buildfiles/osx -copystrip=$base/buildfiles/copystrip +buildfiles=$base/buildfiles +mingwdlls=$buildfiles/w32 +osxapps=$buildfiles/osx +copystrip=$buildfiles/copystrip fteqcc="fteqcc.bin -O2" mingw=/home/polzer/mingw32 ia32=/chroot/fc4-i386 @@ -119,6 +120,10 @@ cd "$tmpdir/data" mv common-spog.pk3 .. #zip -9r ../data.pk3 . v=$versiontag perl -pi -e '/^set g_nexuizversion "([0-9.]*)[^"]*"/ and $_ = "set g_nexuizversion \"$1$ENV{v}\"\n"' default.cfg +if [ -n "$versiontag" ]; then + perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 1\n$_"' default.cfg + cp "$buildfiles/brand/$versiontag.tga" gfx/brand.tga +fi 7za a -mx=7 -tzip ../data.pk3 . cd "$tmpdir" @@ -143,7 +148,12 @@ zip -9yr "$zipdir/nexuizengineonly$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* N rm -f "$zipdir/nexuizsource$date$ext.zip" zip -9yr "$zipdir/nexuizsource$date$ext.zip" Nexuiz/gpl.txt Nexuiz/sources -zipdiff -o Nexuiz/data/datapatch$date.pk3 -f "$basepk3" -t Nexuiz/data/data$date.pk3 +zipdiff -o "Nexuiz/data/datapatch$date.pk3" -f "$basepk3" -t Nexuiz/data/data$date.pk3 +mkdir -p gfx +unzip "Nexuiz/data/data$date.pk3" gfx/brand.tga +zip -9r "Nexuiz/data/datapatch$date.pk3" gfx/brand.tga +rm -rf gfx + rm -f "$zipdir/nexuizpatch$date$ext.zip" zip -9yr "$zipdir/nexuizpatch$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$date.pk3 -- 2.39.2