Compiling 1.0.1 on windows : version.h

I tried to compile xapian 1.0.1 under windows but the new 
/msvc/version.h file has #undef XAPIAN_HAS_REMOTE_BACKEND
which prevents 
/backends/dbfactory_remote.cc to be built.

The old (hand-written) version.h.win32 had it defined to 1.
Everything build fine if I replace #undef with #define in
version.h.

Cheers,
-- 

Daniel Ménard

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

Daniel Ménard wrote:
> I tried to compile xapian 1.0.1 under windows but the
new 
> /msvc/version.h file has #undef
XAPIAN_HAS_REMOTE_BACKEND which prevents 
> /backends/dbfactory_remote.cc to be built.
> 
> The old (hand-written) version.h.win32 had it defined
to 1.
> Everything build fine if I replace #undef with #define
in version.h.
> 
> Cheers,

A related issue; the current SVN-HEAD build files don't copy
in 
version.h correctly (there's no configure on Windows
remember). Anyway, 
the following patch to win32msvcMakefile fixes it.

Cheers

Charlie

Index: Makefile
============================================================
=======
--- Makefile	(revision 8907)
+++ Makefile	(working copy)
 -92,7
+92,7 
  # Copy mak files to the right folders
  COPYMAKFILES:
     copy config.h.win32 ..config.h
-   copy ..msvcversion.h ..includexapianversion.h
+   copy ..msvcversion.h.in ..includexapianversion.h
     copy  win32_api.mak ..apiMakefile
     copy  win32_backends.mak ..backendsMakefile
     copy  win32_backends_flint.mak
..backendsflintMakefile

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

Charlie Hull a écrit :
> -   copy ..msvcversion.h ..includexapianversion.h
> +   copy ..msvcversion.h.in
..includexapianversion.h

I have problems if I do that:
.version.cc(27) : error C2018: unknown char '0x40'
.version.cc(27) : error C2018: unknown char '0x40'
.version.cc(27) : error C2065: 'MAJOR_VERSION' : ident not
declared
and so on

cheers,

-- 

Daniel Ménard

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

On Wed, Jun 13, 2007 at 04:22:21PM +0200, Daniel M?nard
wrote:
> I tried to compile xapian 1.0.1 under windows but the
new 
> /msvc/version.h file has #undef
XAPIAN_HAS_REMOTE_BACKEND which prevents 
> /backends/dbfactory_remote.cc to be built.

Fixed in SVN (that #undef is a remnant from before Mark
Hammond got the
remote backend to work on Windows).

Cheers,
    Olly

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

On Wed, Jun 13, 2007 at 04:18:44PM +0100, Charlie Hull
wrote:
> A related issue; the current SVN-HEAD build files don't
copy in 
> version.h correctly (there's no configure on Windows
remember).

There doesn't need to be a configure, since msvc/version.h
is shipped in
the tarball:

-rw-r--r-- 1019/1019      1398 2007-05-18 00:00:12
xapian-core-1.0.0/msvc/version.h

> Anyway, the following patch to win32msvcMakefile
fixes it.

That copies in the file without the values substituted, so
it won't
work.

Cheers,
    Olly

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

Olly Betts wrote:
> There doesn't need to be a configure, since
msvc/version.h is shipped in
> the tarball:

True.  It would be nice if windows builds could be performed
from SVN, 
though (with the old version.h file, this worked, albeit
with the wrong 
version number).

I'm not sure there's a clean fix for this, though - other
than to make 
configure capable of building with MSVC, and using MSYS.

-- 
Richard

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

Olly Betts wrote:
> On Wed, Jun 13, 2007 at 04:18:44PM +0100, Charlie Hull
wrote:
>> A related issue; the current SVN-HEAD build files
don't copy in 
>> version.h correctly (there's no configure on
Windows remember).
> 
> There doesn't need to be a configure, since
msvc/version.h is shipped in
> the tarball:
> 
> -rw-r--r-- 1019/1019      1398 2007-05-18 00:00:12
xapian-core-1.0.0/msvc/version.h
> 
>> Anyway, the following patch to win32msvcMakefile
fixes it.
> 
> That copies in the file without the values substituted,
so it won't
> work.
> 
> Cheers,
>     Olly
> 
Ah yes, sorry, I was working on SVN-HEAD.

C

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel

On Wed, Jun 13, 2007 at 04:53:10PM +0100, Richard Boulton
wrote:
> Olly Betts wrote:
> >There doesn't need to be a configure, since
msvc/version.h is shipped in
> >the tarball:
> 
> True.  It would be nice if windows builds could be
performed from SVN, 
> though (with the old version.h file, this worked,
albeit with the wrong 
> version number).

I thought we'd agreed that it was reasonable to expect
people to
use SVN snapshots on Windows?
 
> I'm not sure there's a clean fix for this, though -
other than to make 
> configure capable of building with MSVC, and using
MSYS.

In this case, you just need to be able to be able to run
"autoreconf",
and then run configure so it can generate msvc/version.h.

Cheers,
    Olly

_______________________________________________
Xapian-devel mailing list
Xapian-devellists.xapian.org
http://lists.xapian.org/mailman/listinfo/xapian-devel