Re: [Bacula-devel] fix another link error in Windows

2009-10-20 Thread James Harper
The attached patch works for me. I replaced your makedef file with mine, tidied it up a bit (eg used your nm path code), and put it in the Makefile so that a 'make' takes care of everything. Not tested for 64 bit though... is the 64 bit mingw still called mingw32? If so it might 'just work'. It sho

Re: [Bacula-devel] git question

2009-10-20 Thread Eric Bollengier
On Tuesday 20 October 2009 11:02:49 James Harper wrote: > I have a checked out copy of bacula. I made some changes and sent the > resulting 'git diff' to kern, and it appears to have been committed. In > between sending the 'git diff' and the subsequent 'git pull', I also > made some additional cha

Re: [Bacula-devel] fix another link error in Windows

2009-10-20 Thread Kern Sibbald
Hello James, There is a script called make_def in each of directories with xxx.def files. In principle, it should make the def file, but due to changes in nm, it no longer works perfectly, so I redirect it to a file then cut and paste. The original files bacula.def were made using that script, so

Re: [Bacula-devel] fix another link error in Windows

2009-10-20 Thread James Harper
> > Time to look at trying to automate that file I think... > I wrote the following little bit of shell code and put it in src/win32/lib/mk_def.sh: " #bin/sh echo LIBRARY bacula.dll echo EXPORTS /usr/local/src/bacula.git/cross-tools/mingw32/mingw32/bin/nm \ --defined-only --extern-only $@ |

[Bacula-devel] fix another link error in Windows

2009-10-20 Thread James Harper
Kern, Please add _Z10aop_to_striR8POOL_MEM to the bacula32.def file, under "; util.c", eg: diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def index 50737a9..4cd6e30 100644 --- a/bacula/src/win32/lib/bacula32.def +++ b/bacula/src/win32/lib/bacula32.def @@ -736,6 +73

[Bacula-devel] git question

2009-10-20 Thread James Harper
I have a checked out copy of bacula. I made some changes and sent the resulting 'git diff' to kern, and it appears to have been committed. In between sending the 'git diff' and the subsequent 'git pull', I also made some additional changes, and now git pull won't update my tree properly as the patc