Dennis Schridde schreef: > Author: devurandom > Date: Wed Dec 27 16:48:28 2006 > New Revision: 576 > > URL: http://svn.gna.org/viewcvs/warzone?rev=576&view=rev > Log: > - Modify NSIS script to support more flexible directory structures > - Use external version definition > > Modified: > trunk/nsis/Makefile.raw > trunk/nsis/warzone2100.nsi > These modifications do not work with the current makerules/config.mk.tmpl where VERSION is defined as \"n.n.n\" because these quotation-marks get directly copied into the NSIS script.
Example:
makerules/config.mk:
VERSION=\"2.0.5\"
NSIS-code (line 15):
OutFile "warzone2100-${VERSION}.exe"
resulting NSIS-code:
OutFile "warzone2100-"2.0.5".exe"
And because of these quotation-marks it interprets that string as two
parameters to OutFile which only accepts one parameter: result=error.
So to fix this, attached patch modifies the build-system in a very small
way (i.e. simply changing the way VERSION is declared in the
makerules/config.mk makefile).
--
Giel
Index: makerules/config.mk.tmpl =================================================================== --- makerules/config.mk.tmpl (revision 576) +++ makerules/config.mk.tmpl (working copy) @@ -1,5 +1,5 @@ # Version of Warzone you are compiling -#VERSION=\"0.0.0\" +#VERSION=0.0.0 # Platform you are running #PLATFORM=windows Index: makerules/configure.mk =================================================================== --- makerules/configure.mk (revision 576) +++ makerules/configure.mk (working copy) @@ -48,7 +48,7 @@ # Setup paths and static values -CFLAGS+=-m32 -DVERSION=$(VERSION) -DYY_STATIC -I.. -I../.. -I$(DEVDIR)/include +CFLAGS+=-m32 -DVERSION=\"$(VERSION)\" -DYY_STATIC -I.. -I../.. -I$(DEVDIR)/include LDFLAGS+=-L$(DEVDIR)/lib
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
