Opened 17 years ago

Closed 17 years ago

Last modified 17 years ago

#184 closed defect (released)

msvc builds failing to generate version.h

Reported by: Mark Hammond Owned by: Charlie Hull
Priority: normal Milestone:
Component: MSVC makefiles Version: SVN trunk
Severity: normal Keywords:
Cc: Olly Betts, Richard Boulton Blocked By:
Blocking: #154 Operating System: Microsoft Windows

Description

The msvc builds appear to be failing due to a missing version.h[1]. I'm attaching a patch that works for me.

[1] http://buildbot.enfoldsystems.com/xapian/xapian-msvc/builds/323/step-compile/0

Attachments (2)

gen_version_h.patch (1.2 KB ) - added by Mark Hammond 17 years ago.
generate include\xapian\version.h from msvc\version.h.in
patch10.patch (1.0 KB ) - added by Charlie Hull 17 years ago.
Fix makefile

Download all attachments as: .zip

Change History (13)

by Mark Hammond, 17 years ago

Attachment: gen_version_h.patch added

generate include\xapian\version.h from msvc\version.h.in

comment:1 by Richard Boulton, 17 years ago

Resolution: fixed
Status: newclosed

Applied

comment:2 by Olly Betts, 17 years ago

Cc: olly@… added
Resolution: fixed
Status: closedreopened

I believe this change will break builds from tarballs, since genversion.pl isn't shipped. If we're taking this approach, it probably should ship with the MSVC makefiles archive.

Also, comments in genversion.pl need updating to reflect this revised approach.

And there's no point configure generating msvc/version.h now either, nor in us shipping it. I'll fix the last part - the rest is better done by someone who can test on MS Windows.

comment:3 by Olly Betts, 17 years ago

Blocking: 154 added

While we could fix this by updating the msvc makefiles after the 1.0.3 release, we're stuffed if we discover that changes to xapian-core are needed. So marking this as a blocker.

comment:4 by Richard Boulton, 17 years ago

Agreed that builds from tarballs are broken currently.

Agreed that there's no point in configure generating msvc/version.h (or shipping it) - we should have a consistent way of generating the version.h file, whether its a tarball or an svn build.

msvc/version.h.in and msvc/genversion.pl should be distributed together, since they're useless separately. There's no particular reason that they should be separate from the rest of the build files - perhaps they should both be moved into xapian-maintainer-tools/win32msvc/ with the other files.

comment:5 by Richard Boulton, 17 years ago

Changes made - genversion.pl and msvc/version.h are now in win32msvc/, and I've removed the generation of version.h from the tarball.

comment:6 by Olly Betts, 17 years ago

Thanks - so does this just need testing with a tarball now?

comment:7 by Olly Betts, 17 years ago

Cc: richard@… added
op_sys: AllWindows NT

Setting OS correctly; adding Richard to the Cc list (since I assume he wants to be!)

comment:8 by Richard Boulton, 17 years ago

Yes, it just needs testing. I'll try and get round to it shortly if Charlie doesn't.

by Charlie Hull, 17 years ago

Attachment: patch10.patch added

Fix makefile

comment:9 by Olly Betts, 17 years ago

Resolution: fixed
Status: reopenedclosed

Patch applied.

I assume that with this patch, everything now works? I'll close the bug, but please reopen if I've mis-inferred.

comment:10 by Charlie Hull, 17 years ago

Yep, it builds and tests.

comment:11 by Olly Betts, 17 years ago

Operating System: Microsoft Windows
Resolution: fixedreleased

Fixed in 1.0.4

Note: See TracTickets for help on using tickets.