r5537 - trunk/misc

[esteel at icculus.org]

Author: esteel
Date: 2009-01-15 04:52:04 -0500 (Thu, 15 Jan 2009)
New Revision: 5537

Modified:
   trunk/misc/makebuild.sh
Log:
pro is now havoc, one more file that knows this fact :P


Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2009-01-15 08:04:16 UTC (rev 5536)
+++ trunk/misc/makebuild.sh	2009-01-15 09:52:04 UTC (rev 5537)
@@ -13,7 +13,7 @@
 basepk3=$base/data20080229.pk3 # 2.4
 hotbasepk3= # hotfix
 nexdir=$base/nexuiz
-nexprodir=$base/nexuiz/pro
+havocdir=$base/nexuiz/havoc
 dpdir=$base/darkplaces
 tmpdir=/tmp/NEX
 zipdir=$base/builds
@@ -184,9 +184,9 @@
 svn info . > "$tmpdir/data/nexuiz-data-base-revision.txt"
 svn log > "$tmpdir/data/ChangeLog"
 
-# prepare pro
-cd "$nexprodir"
-svn export . "$tmpdir/pro"
+# prepare havoc
+cd "$havocdir"
+svn export . "$tmpdir/havoc"
 
 # prepare Docs
 cd "$nexdir/Docs"
@@ -240,14 +240,14 @@
 echo >> default.cfg
 echo "$defaultcfg" >> default.cfg
 mk7z ../data.pk3 .
-cd "$tmpdir/pro"
-perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version-pro'\n"' default.cfg
+cd "$tmpdir/havoc"
+perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version-havoc'\n"' default.cfg
 if [ -n "$versiontag" ]; then
 	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
 fi
 echo >> default.cfg
 echo "$defaultcfg" >> default.cfg
-mk7z ../pro.pk3 .
+mk7z ../havoc.pk3 .
 
 # make data pk3
 cd "$tmpdir"
@@ -255,9 +255,9 @@
 mkdir data
 mv data.pk3 data/data$tag$date.pk3
 mv common-spog.pk3 data/
-rm -rf pro
-mkdir pro
-mv pro.pk3 pro/data$tag${date}pro.pk3
+rm -rf havoc
+mkdir havoc
+mv havoc.pk3 havoc/data$tag${date}havoc.pk3
 
 cp -r "$mingwdlls"/* .
 # fix up permissions
@@ -270,7 +270,7 @@
 find . -name .svn -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/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/pro/*
+zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/*
 ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip"
 
 rm -f "$zipdir/nexuizengineonly$date$ext.zip"
@@ -314,11 +314,11 @@
 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/data/datapatch$tag$date.pk3 Nexuiz/pro/*
+zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$tag$date.pk3 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/data/datapatch$tag$date""hotfix.pk3 Nexuiz/pro/*
+[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$tag$date""hotfix.pk3 Nexuiz/havoc/*
 [ -n "$hotbasepk3" ] && ln -snf nexuizhotfix$date$ext.zip "$zipdir/nexuizhotfix-$newest.zip"
 
 rm -f "$zipdir/nexuizdocs$date$ext.zip"