Updated makefiles for MSVC - trunk for 1.2.4

[Charlie Hull]

Includes a small patch for api/compactor.cc and omega/diritor.h - the latter works on Windows, but there may be a tidier way to do this.

[Charlie Hull]

patch for MSVC makefiles - 1.2.4

[Olly Betts]

Hmm, the patch seems to include a number of changes that seem a bit peculiar, and some which seem unlikely to be intended.

Going through the files:

xapian-applications/omega/diritor.h - applied with minor tweaks, though it'd be nicer to return the file's owner (seems to require use of win32 API calls from what I can see). r15289.

xapian-core/api/compactor.cc - we're using the C++ versions of standard C headers (except where there is a good reason not to), so that added #include <ctime> instead. r15290.

xapian-maintainer-tools/win32msvc/ChangeLog - this patch seems very messed up, so not applied. It's a really good idea to at least skim through the generated patch for reasonableness before sending it in.

xapian-maintainer-tools/win32msvc/config.h.win32 - it's silly to be defining and setting the euid member on platforms where we aren't going to be using it, which simplifies the patch needed here. Setting PKGLIBBINDIR to "" isn't a good plan - this means that helpers will be looked for in the root directory of the current drive, which isn't desirable and could perhaps even be a security concern. If there isn't a good default, we should throw an exception if XAPIAN_OMEGA_PKGLIBBINDIR isn't set in the environment. The readability tests are currently pointless if we can't get the file's owner, so perhaps there's a cleaner way of dealing with that - I will ponder that.

xapian-maintainer-tools/win32msvc/config.h.win32 - OK.

xapian-maintainer-tools/win32msvc/config.mak - seems to rather arbitrarily change paths (or quoting of paths) for omega, python 3, php stuff - is that intended? Not applied.

xapian-maintainer-tools/win32msvc/README - "Xapian trunk 1.2.4" should probably just be "Xapian 1.2.4" - applied with that change in r15294.

xapian-maintainer-tools/win32msvc/win32_applications_omega.mak - another path change which I wonder about. Not applied for now.

xapian-maintainer-tools/win32msvc/win32_bindings_php.mak - seems to no longer clean up some files which might well be produced - is that meant?

xapian-maintainer-tools/win32msvc/win32_bindings_python.mak - seems to be removing support for Python 3...

xapian-maintainer-tools/win32msvc/win32_expand.mak and xapian-maintainer-tools/win32msvc/win32_unicode.mak just seem to be removing newlines at the end of the file, which seems unhelpful if anything, so I didn't apply those.

I applied the remaining makefile changes in r15295.

[Olly Betts]

I noticed the ChangeLog issue was mostly due to whitespace differences (tabs vs spaces). I'm guessing you've diff-ed current SVN against a separate tree you have locally, so Richard and/or I have done some clean ups and these are being reversed by your patch. If so, it's hard to know if some things are such reversals, or intentional changes.

Anyway, probably the simplest thing is to work through the patch on IRC at some point.

There should be ample time to resolve this before 1.2.5.

[Charlie Hull]

The remainder of the changes, including a much simpler Changelog patch.

[Charlie Hull]

I've added a small patch file with the remainder of the changes, including a better Changelog patch - still not sure what to do about XAPIAN_OMEGA_PKGLIBBINDIR...

[Olly Betts]

uid_t and geteuid() should no longer be needed.

I've just committed a change so that the S_IRUSR, etc defines aren't needed (r15396).

I wonder if the answer to XAPIAN_OMEGA_PKGLIBBINDIR is to get the path from argv[0] and use that by default, so that helper programs are looked for in the same directory as omindex.exe?

Moving milestone - we can test these updates with 1.2.5 and fold back in patches for 1.2.6.

[Olly Betts]

I've applied what remained in r15488, except I dropped the uid_t, geteuid(), and S_IRUSER, etc changes as those should no longer be needed, and I'd prefer to get a compile error if the alternative fixes aren't working.

I also cleaned up some whitespace, so please repull from SVN before generating patches next time.

Still not sure what to do about XAPIAN_OMEGA_PKGLIBBINDIR - any thoughts?

The stuff which needed doing for 1.2.6 is now done, so milestone -> 1.2.x.

[Olly Betts]

Is there a newer patch? I see 1.2.8 on the download site (though that's rather behind current releases - 1.2.12 is the latest, and has been out for months now).

[Charlie Hull]

I realise the makefiles are lagging releases - apologies, purely due to pressure of work here. I will see if I can make a new release soon.

[Olly Betts]

"boomboo" reports on IRC that the MSVC makefiles "work perfectly fine for the 1.2.x branch", so I'm closing this ticket.

[Olly Betts]

Setting milestone to a version this was presumably working in based on date of ticket closure.