Fixed merge conflicts in imported patch.
This commit is contained in:
parent
cd5b1dc815
commit
5e3546154a
19
build.sh
19
build.sh
@ -1,18 +1,23 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
RELEASEDIR=release
|
|
||||||
BUILDDIR=build
|
|
||||||
VERSION="zombiereloaded-3.0-b2"
|
VERSION="zombiereloaded-3.0-b2"
|
||||||
REVISION=$(hg id -n)
|
REVISION=$(hg id -n)
|
||||||
ZIPFILE=$VERSION-r$REVISION.zip
|
|
||||||
|
|
||||||
PLUGINFILES="cstrike/*"
|
# Source paths
|
||||||
DOCS="docs/*"
|
BUILDDIR=build
|
||||||
DOCS_DEST=$RELEASEDIR/zrdocs
|
|
||||||
PLUGINFILE=zombiereloaded.smx
|
PLUGINFILE=zombiereloaded.smx
|
||||||
PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins
|
PLUGINFILES="cstrike/*"
|
||||||
ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools
|
ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools
|
||||||
|
DOCS="docs/*"
|
||||||
|
SOURCEDIR="src/*"
|
||||||
|
|
||||||
|
# Destination paths
|
||||||
|
RELEASEDIR=release
|
||||||
|
SOURCE_DEST=$RELEASEDIR/addons/sourcemod/scripting
|
||||||
|
DOCS_DEST=$RELEASEDIR/zrdocs
|
||||||
|
PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins
|
||||||
EXTENSIONDIR=$RELEASEDIR/addons/sourcemod/extensions
|
EXTENSIONDIR=$RELEASEDIR/addons/sourcemod/extensions
|
||||||
|
ZIPFILE=$VERSION-r$REVISION.zip
|
||||||
|
|
||||||
MAKEPATCH=false
|
MAKEPATCH=false
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user