Re: [Warzone-dev] 2.0.5 released
This patch does NOT apply, could you please resend it? I guess this is because of the line endings you also patched. --Dennis pgpf8oe3BfE84.pgp Description: PGP signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Dennis Schridde schreef:
This patch does NOT apply, could you please resend it?
I guess this is because of the line endings you also patched.
Had to check the RFC822 `In-Reply-To' header to be sure you meant the
NSIS one.
But anyway here it is.
Just been awake for an hour or so, so I hope my double checking for
applicability was thorough enough.
--
Giel
Index: nsis/warzone2100.nsi
===
--- nsis/warzone2100.nsi(revision 573)
+++ nsis/warzone2100.nsi(working copy)
@@ -12,7 +12,7 @@
;Name and file
Name Warzone 2100
- OutFile Warzone 2100.exe
+ OutFile ${OUTFILE}
;Default installation folder
InstallDir $PROGRAMFILES\Warzone 2100
@@ -75,8 +75,8 @@
;
;License Language String
- LicenseLangString MUILicense ${LANG_ENGLISH} data\License.txt
- LicenseLangString MUILicense ${LANG_GERMAN} data\License.txt
+ LicenseLangString MUILicense ${LANG_ENGLISH} ..\COPYING
+ LicenseLangString MUILicense ${LANG_GERMAN} ..\COPYING
;
;Reserve Files
@@ -100,28 +100,50 @@
;ADD YOUR OWN FILES HERE...
- File data\warzone2100.exe
- File data\OpenAL32.dll
- File data\wrap_oal.dll
- File data\mp.wz
- File data\warzone.wz
+ ; Main executable
+ File ..\src\warzone2100.exe
- File data\License.txt
- File data\Readme.txt
+ ; Required runtime libs
+ File ${DEVDIR}\lib\SDL.dll
+ File ${DEVDIR}\lib\SDL_net.dll
+ File ${DEVDIR}\lib\physfs.dll
+ File ${DEVDIR}\lib\vorbisfile.dll
+ File ${DEVDIR}\lib\ogg.dll
+ File ${DEVDIR}\lib\vorbis.dll
+ File ${DEVDIR}\lib\png13.dll
+ File ${DEVDIR}\lib\zlib1.dll
+ File ${DEVDIR}\lib\jpeg6b.dll
+ File ${DEVDIR}\lib\OpenAL32.dll
+ File ${DEVDIR}\lib\wrap_oal.dll
+ ; Data files
+ File ..\data\mp.wz
+ File ..\data\warzone.wz
+ ; Information/documentation files
+ File /oname=License.txt ..\COPYING
+ File /oname=Readme.txt ..\README
+
+
;Store installation folder
WriteRegStr HKCU Software\Warzone 2100 $INSTDIR
- ;Create uninstaller
- WriteUninstaller $INSTDIR\Uninstall.exe
+ ; Write the Windows-uninstall keys and create the uninstaller
+ WriteRegStr HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100
DisplayName Warzone 2100
+ WriteRegStr HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100
DisplayIcon $INSTDIR\warzone2100.exe,0
+ WriteRegStr HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100 Publisher
Warzone Resurrection Project
+; WriteRegStr HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100
DisplayVersion 2.0.5 r571
+ WriteRegStr HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100
UninstallString '$INSTDIR\uninstall.exe'
+ WriteRegDWORD HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100 NoModify 1
+ WriteRegDWORD HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100 NoRepair 1
+ WriteUninstaller uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory $SMPROGRAMS\$STARTMENU_FOLDER
-CreateShortCut $SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk
$INSTDIR\Uninstall.exe
-CreateShortCut $SMPROGRAMS\$STARTMENU_FOLDER\Warzone 2100.lnk
$INSTDIR\Warzone2100.exe
+CreateShortCut $SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk
$INSTDIR\uninstall.exe
+CreateShortCut $SMPROGRAMS\$STARTMENU_FOLDER\Warzone 2100.lnk
$INSTDIR\warzone2100.exe
!insertmacro MUI_STARTMENU_WRITE_END
@@ -134,7 +156,7 @@
SetOutPath $INSTDIR\mods\global
- File data\grim.wz
+ File ..\data\grim.wz
SetOutPath $INSTDIR
@@ -210,6 +232,15 @@
;ADD YOUR OWN FILES HERE...
Delete $INSTDIR\warzone2100.exe
+ Delete $INSTDIR\SDL.dll
+ Delete $INSTDIR\SDL_net.dll
+ Delete $INSTDIR\physfs.dll
+ Delete $INSTDIR\vorbisfile.dll
+ Delete $INSTDIR\ogg.dll
+ Delete $INSTDIR\vorbis.dll
+ Delete $INSTDIR\png13.dll
+ Delete $INSTDIR\zlib1.dll
+ Delete $INSTDIR\jpeg6b.dll
Delete $INSTDIR\OpenAL32.dll
Delete $INSTDIR\wrap_oal.dll
Delete $INSTDIR\warzone.wz
@@ -218,7 +249,7 @@
Delete $INSTDIR\Readme.txt
Delete $INSTDIR\License.txt
- Delete $INSTDIR\Uninstall.exe
+ Delete $INSTDIR\uninstall.exe
Delete $INSTDIR\mods\global\grim.wz
@@ -249,6 +280,9 @@
DeleteRegValue HKCU Software\Warzone 2100
DeleteRegKey /ifempty HKCU Software\Warzone 2100
+ ; Unregister with Windows' uninstall system
+ DeleteRegKey HKCU
Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100
+
SectionEnd
;
signature.asc
Description: OpenPGP digital signature
___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Am Mittwoch, 27. Dezember 2006 15:47 schrieb Giel van Schijndel: Dennis Schridde schreef: Am Mittwoch, 27. Dezember 2006 15:05 schrieb Giel van Schijndel: Dennis Schridde schreef: This patch does NOT apply, could you please resend it? I guess this is because of the line endings you also patched. Had to check the RFC822 `In-Reply-To' header to be sure you meant the NSIS one. But anyway here it is. Just been awake for an hour or so, so I hope my double checking for applicability was thorough enough. Weird... It still fails completely. But now I am at least able to apply it manually... Hmm, done some checking between the mail I've send to the mailing list and received back. It seems that the mailing list adds some empty lines in between of the patch file and also modifies some rfc822 headers, this causes both the GPG signature to be invalid and the patch to fail application. Simply removing empty line number 114 should pull the trick in applicability. Did it manually now. One further idea: You use $OUTFILE... Maybe we could use something like $APPNAME=Warzone 2100 instead and use it in more than one place? Maybe also $SHORTAPPNAME=warzone2100 and $VERSION=2.0.5 would concat to an OutFile of warzone2100-2.0.5.exe? pgpHzxD67bTAv.pgp Description: PGP signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Dennis Schridde schreef: Am Mittwoch, 27. Dezember 2006 02:50 schrieb Giel van Schijndel: Christian Ohm schreef: On Wednesday, 27 December 2006 at 1:46, Giel van Schijndel wrote: * added some DLLs (SDL.dll, SDL_net.dll, physfs.dll, vorbisfile.dll, ogg.dll, vorbis.dll, png13.dll, zlib1.dll, jpeg6b.dll) ( *NOTE: I'm afraight that the current installer executable you're distributing won't work without these DLLs* ) What current installer? The one you can download from gna.org for 2.0.5 works on a system that has never seen Warzone before (but perhaps you're talking about something else, and I'm too tired to notice). Nah, it apparently was me who was/is too tired to notice (CET=GMT+1 here, so calculate it if you wish). It seems that that executable is statically linked to these libraries. Exactly. :) Some ppl said that they didn't like all those DLLs in the folder, they are not needed anyway, since probably never more than 1 app will use our compilation of libpng or whatever and it saves some download space, so I linked statically... I assume that you've modified the warzone devpackage for that ( this one: http://download.gna.org/warzone/development/warzone-devpkg.7z ), would you care to upload the version you're using there? That'd be much appreciated (i.e. by me for one thing). -- Giel signature.asc Description: OpenPGP digital signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Am Mittwoch, 27. Dezember 2006 18:11 schrieb Giel van Schijndel: Dennis Schridde schreef: Am Mittwoch, 27. Dezember 2006 02:50 schrieb Giel van Schijndel: Christian Ohm schreef: On Wednesday, 27 December 2006 at 1:46, Giel van Schijndel wrote: * added some DLLs (SDL.dll, SDL_net.dll, physfs.dll, vorbisfile.dll, ogg.dll, vorbis.dll, png13.dll, zlib1.dll, jpeg6b.dll) ( *NOTE: I'm afraight that the current installer executable you're distributing won't work without these DLLs* ) What current installer? The one you can download from gna.org for 2.0.5 works on a system that has never seen Warzone before (but perhaps you're talking about something else, and I'm too tired to notice). Nah, it apparently was me who was/is too tired to notice (CET=GMT+1 here, so calculate it if you wish). It seems that that executable is statically linked to these libraries. Exactly. :) Some ppl said that they didn't like all those DLLs in the folder, they are not needed anyway, since probably never more than 1 app will use our compilation of libpng or whatever and it saves some download space, so I linked statically... I assume that you've modified the warzone devpackage for that ( this one: http://download.gna.org/warzone/development/warzone-devpkg.7z ), would you care to upload the version you're using there? Allready done, just didn't announce it yet. (MSVC package is not yet uploaded.) http://download.gna.org/warzone/development/warzone-devpkg-mingw32.7z The warzone-devpkg.7z will vanish when I uploaded the MSVC pkg. --Dennis pgp1SgSFzlCFw.pgp Description: PGP signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Dennis Schridde schreef:
Am Mittwoch, 27. Dezember 2006 18:11 schrieb Giel van Schijndel:
Dennis Schridde schreef:
Am Mittwoch, 27. Dezember 2006 02:50 schrieb Giel van Schijndel:
Christian Ohm schreef:
On Wednesday, 27 December 2006 at 1:46, Giel van Schijndel wrote:
* added some DLLs
(SDL.dll, SDL_net.dll, physfs.dll, vorbisfile.dll, ogg.dll,
vorbis.dll, png13.dll, zlib1.dll, jpeg6b.dll)
( *NOTE: I'm afraight that the current installer executable you're
distributing won't work without these DLLs* )
What current installer? The one you can download from gna.org for 2.0.5
works on a system that has never seen Warzone before (but perhaps
you're talking about something else, and I'm too tired to notice).
Nah, it apparently was me who was/is too tired to notice (CET=GMT+1
here, so calculate it if you wish).
It seems that that executable is statically linked to these libraries.
Exactly. :)
Some ppl said that they didn't like all those DLLs in the folder, they
are not needed anyway, since probably never more than 1 app will use our
compilation of libpng or whatever and it saves some download space, so I
linked statically...
I assume that you've modified the warzone devpackage for that ( this
one: http://download.gna.org/warzone/development/warzone-devpkg.7z ),
would you care to upload the version you're using there?
Allready done, just didn't announce it yet. (MSVC package is not yet
uploaded.)
http://download.gna.org/warzone/development/warzone-devpkg-mingw32.7z
The warzone-devpkg.7z will vanish when I uploaded the MSVC pkg.
Well that new MinGW devpackage doesn't work all to nice. It gives me a
whole bunch of png related compiler errors.
g++ -m32 -DVERSION=\2.0.5\ -DYY_STATIC -I.. -I../..
-IC:\devpkg/include -fpermissive -Wall -O0 -g3 -DDEBUG -mwindows
-DWIN32 -c -opcx.o pcx.c
In file included from pcx.c:1:
C:/devpkg/include/png.h:1: error: expected constructor, destructor, or
type conversion before '/' token
C:/devpkg/include/png.h:1: error: expected `,' or `;' before '/' token
In file included from pcx.c:1:
C:/devpkg/include/png.h:1:15: warning: no newline at end of file
pcx.c:12: error: `png_size_t' does not name a type
pcx.c:16: error: variable or field `wzpng_read_data' declared void
pcx.c:16: error: `png_structp' was not declared in this scope
pcx.c:16: error: `png_bytep' was not declared in this scope
pcx.c:16: error: `png_size_t' was not declared in this scope
pcx.c:17: warning: initializer expression list treated as compound
expression
pcx.c:17: error: expected `,' or `;' before '{' token
pcx.c: In function `BOOL pie_PNGLoadMem(char*, iSprite*, iColour*)':
pcx.c:31: error: `png_structp' undeclared (first use this function)
pcx.c:31: error: (Each undeclared identifier is reported only once for
each func
tion it appears in.)
pcx.c:31: error: expected `;' before png_ptr
pcx.c:32: error: `png_infop' undeclared (first use this function)
pcx.c:32: error: expected `;' before info_ptr
pcx.c:38: error: 'struct wzpng_io_buf' has no member named 'length'
pcx.c:42: error: `png_byte' undeclared (first use this function)
pcx.c:42: error: expected primary-expression before ')' token
pcx.c:42: error: `png_size_t' undeclared (first use this function)
pcx.c:42: error: `png_sig_cmp' undeclared (first use this function)
pcx.c:47: error: `png_ptr' undeclared (first use this function)
pcx.c:47: error: `PNG_LIBPNG_VER_STRING' undeclared (first use this
function)
pcx.c:48: error: `png_create_read_struct' undeclared (first use this
function)
pcx.c:55: error: `info_ptr' undeclared (first use this function)
pcx.c:55: error: `png_create_info_struct' undeclared (first use this
function)
pcx.c:62: error: `png_jmpbuf' undeclared (first use this function)
pcx.c:62: error: `_setjmp' undeclared (first use this function)
pcx.c:67: error: `png_uint_32' undeclared (first use this function)
pcx.c:67: error: expected `;' before width
pcx.c:70: error: `png_set_read_fn' undeclared (first use this function)
pcx.c:73: error: `png_read_info' undeclared (first use this function)
pcx.c:74: error: `width' undeclared (first use this function)
pcx.c:74: error: `height' undeclared (first use this function)
pcx.c:75: error: `png_get_IHDR' undeclared (first use this function)
pcx.c:78: error: `png_set_strip_16' undeclared (first use this function)
pcx.c:83: error: `png_set_packing' undeclared (first use this function)
pcx.c:86: error: `png_set_gray_to_rgb' undeclared (first use this
function)
pcx.c:87: error: `png_set_palette_to_rgb' undeclared (first use this
function)
pcx.c:88: error: `png_set_tRNS_to_alpha' undeclared (first use this
function)
pcx.c:89: error: `PNG_FILLER_AFTER' undeclared (first use this function)
pcx.c:89: error: `png_set_filler' undeclared (first use this function)
pcx.c:90: error: `png_set_gray_1_2_4_to_8' undeclared (first use this
Re: [Warzone-dev] 2.0.5 released
2.05 wouldn't happen to be in portage for gentoo would it?? bc i have no clue how to install the autopackage lmao.. On 12/27/06, Dennis Schridde [EMAIL PROTECTED] wrote: Am Mittwoch, 27. Dezember 2006 18:49 schrieb Giel van Schijndel: Dennis Schridde schreef: Am Mittwoch, 27. Dezember 2006 18:11 schrieb Giel van Schijndel: Dennis Schridde schreef: Am Mittwoch, 27. Dezember 2006 02:50 schrieb Giel van Schijndel: Christian Ohm schreef: On Wednesday, 27 December 2006 at 1:46, Giel van Schijndel wrote: * added some DLLs (SDL.dll, SDL_net.dll, physfs.dll, vorbisfile.dll, ogg.dll, vorbis.dll, png13.dll, zlib1.dll, jpeg6b.dll) ( *NOTE: I'm afraight that the current installer executable you're distributing won't work without these DLLs* ) What current installer? The one you can download from gna.org for 2.0.5 works on a system that has never seen Warzone before (but perhaps you're talking about something else, and I'm too tired to notice). Nah, it apparently was me who was/is too tired to notice (CET=GMT+1 here, so calculate it if you wish). It seems that that executable is statically linked to these libraries. Exactly. :) Some ppl said that they didn't like all those DLLs in the folder, they are not needed anyway, since probably never more than 1 app will use our compilation of libpng or whatever and it saves some download space, so I linked statically... I assume that you've modified the warzone devpackage for that ( this one: http://download.gna.org/warzone/development/warzone-devpkg.7z ), would you care to upload the version you're using there? Allready done, just didn't announce it yet. (MSVC package is not yet uploaded.) http://download.gna.org/warzone/development/warzone-devpkg-mingw32.7z The warzone-devpkg.7z will vanish when I uploaded the MSVC pkg. Well that new MinGW devpackage doesn't work all to nice. It gives me a whole bunch of png related compiler errors. g++ -m32 -DVERSION=\2.0.5\ -DYY_STATIC -I.. -I../.. -IC:\devpkg/include -fpermissive -Wall -O0 -g3 -DDEBUG -mwindows -DWIN32 -c -opcx.o pcx.c In file included from pcx.c:1: C:/devpkg/include/png.h:1: error: expected constructor, destructor, or type conversion before '/' token C:/devpkg/include/png.h:1: error: expected `,' or `;' before '/' token In file included from pcx.c:1: C:/devpkg/include/png.h:1:15: warning: no newline at end of file Did you have a look at that png.h? Could it be related to DOS/UNIX lineendings? ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev -- Karma, It's Real! No penguins were harmed during the writing, just a bunch of broken windows to let them escape...-xtacocorex ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
2006/12/27, Daemon Xavier [EMAIL PROTECTED]: 2.05 wouldn't happen to be in portage for gentoo would it?? bc i have no clue how to install the autopackage lmao.. You just execute the autopackage file, and it'll launch an installer. -- Venlig hilsen / Kind regards, Christian Vest Hansen. ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Am Mittwoch, 27. Dezember 2006 19:25 schrieb Daemon Xavier: 2.05 wouldn't happen to be in portage for gentoo would it?? bc i have no clue how to install the autopackage lmao.. It is allready in portage, according to my eix... Installing the AutoPackage is easy: sh warzone2100-2.0.5.package The rest is handled by the GTK (or ncurses if you lack gtk) GUI. --Dennis pgps0NtsChhEm.pgp Description: PGP signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
lol ok thx much, for some reason i was using run or something. On 12/27/06, Dennis Schridde [EMAIL PROTECTED] wrote: Am Mittwoch, 27. Dezember 2006 19:25 schrieb Daemon Xavier: 2.05 wouldn't happen to be in portage for gentoo would it?? bc i have no clue how to install the autopackage lmao.. It is allready in portage, according to my eix... Installing the AutoPackage is easy: sh warzone2100-2.0.5.package The rest is handled by the GTK (or ncurses if you lack gtk) GUI. --Dennis ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev -- Karma, It's Real! No penguins were harmed during the writing, just a bunch of broken windows to let them escape...-xtacocorex ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
Christian Ohm schreef: I just installed the Windows version on my sister's laptop to test the 3D graphics (too slow for Warzone) and noticed there's no entry in the list of installed software to uninstall it, just the start menu entry. Hmm, I've got a fairly good idea what causes it. If Dennis (think it is him that makes the NSIS-installer?) could show me the NSIS script then I might be able to help fix this, because I've created my own NSIS script as well, which _does_ show up in the Add/Remove list of software. How about including the NSIS script in the Subversion repository btw? -- Giel signature.asc Description: OpenPGP digital signature ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
On Tuesday, 26 December 2006 at 11:26, Dennis Schridde wrote: Am Dienstag, 26. Dezember 2006 02:57 schrieb Christian Ohm: I see you have merged most fixes into 2.0.5, thanks for that, I was thinking about bringing that up again. Just curious why you didn't include the gamma patch. It was split into 1001 pieces and I didn't want to bother with that. ;) Hey, that was why I sent one unified patch for that! :) If we fix the Radeon issue in a short amount of time, you might want to apply it yourself to the 2.0 branch, so it gets into 2.0.6. You know, last time I checked, I wasn't a member of the gna project :) (2.0.6 wont exist if the Radeon issue is not fixed fast.) You mean bug 7308? I have a Radeon 9600 with the mesa driver, and I didn't want to bother with the binary stuff... What do you need to install for that? A kernel module and the X driver, right? Perhaps I'll try and see what happens (and hope it doesn't mess my system up...). -- The infidels of one age have been the aureoled saints of the next. The destroyers of the old are the creators of the new. [Robert G. Ingersoll, The Great Infidels, 1881] ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [Warzone-dev] 2.0.5 released
I see you have merged most fixes into 2.0.5, thanks for that, I was thinking about bringing that up again. Just curious why you didn't include the gamma patch. -- tigah_- i have 4gb for /tmp Knghtbrd What do you do with 4G /tmp? Compile X? tigah_- yes ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
