diff --git a/build.sh b/build.sh index 038b081..da79001 100644 --- a/build.sh +++ b/build.sh @@ -2,9 +2,9 @@ RELEASEDIR=release BUILDDIR=build -VERSION=$(hg id -b) +VERSION="zombiereloaded-3.0-dev" REVISION=$(hg id -n) -ZIPFILE=$VERSION-$REVISION.zip +ZIPFILE=$VERSION-r$REVISION.zip PLUGINFILES="cstrike/*" DOCS="docs/*" @@ -43,7 +43,7 @@ then exit 1 fi - ZIPFILE=$VERSION-patch-$PATCHREV-$REVISION.zip + ZIPFILE=$VERSION-patch-r$PATCHREV-r$REVISION.zip else echo "Missing base revision number. Usage: build.sh patch " exit 1 diff --git a/compiling.txt b/compiling.txt index e63f319..af88f7a 100644 --- a/compiling.txt +++ b/compiling.txt @@ -4,12 +4,23 @@ on info from a automatically generated file (hgversion.h.inc). There's a script that generate this file and must be executed every time before compiling: - updateversion.sh - updateversion.bat (Executes updateversion.sh using Cygwin) + Linux: updateversion.sh + Windows: updateversion.bat (Executes updateversion.sh using Cygwin) -Mercurial (or TortoiseHG) must be installed for this script to work. Use the -makefile to compile since that one will do most of the work. Make sure you -clean any existing builds before compiling: +Mercurial (or TortoiseHG) must be installed for this script to work. If you +don't have Mercurial, there's an option to disable version info. In +zombiereloaded.sp there's a line like this: + + #define ADD_VERSION_INFO + +To disable it, comment that line like this: + + //#define ADD_VERSION_INFO + +Then you should be able to compile without hgversion.h.inc. + +On linux use the makefile to compile since that one will do most of the work. +Make sure you clean any existing builds before compiling: make clean make @@ -17,14 +28,3 @@ clean any existing builds before compiling: For compiling on windows, run: compile.bat - -If you don't have Mercurial, there's an option to disable this feature. In -zombiereloaded.sp there's a line like this: - - #define ADD_VERSION_INFO 1 - -To disable it, comment that line like this: - - //#define ADD_VERSION_INFO 1 - -Then you should be able to compile without hgversion.h.inc.