[redland-dev] Windows 1.0.2 patch
Dave Beckett
dave.beckett at bristol.ac.uk
Wed Jun 22 11:17:27 BST 2005
On Wed, 2005-06-22 at 20:58 +1200, John C Barstow wrote:
> I've attached the patches I'm used to build the Windows 1.0.2 port, with
> two notable omissions. I took out the %llu -> %I64u hack im the mysql
> storage since I need to do the proper C99 way (or as close to it as I
> can manage with Windows); this should be done anyhow since llu may map
> to a different size on different platforms.
OK.
> I also left out the previously submitted Windows URL-parsing patch since
> Dave rejected it last time. I'm still trying to figure out how this
> function is meant to work on Windows.
Yeah, that's why I rejected it :)
> Happy Birthday, Redland - I hope people are using it successfully on the
> 'new' platform; I know I am.
Thanks, that's good to know.
Anyway on to patches
win32-redland-1.0.2.patch:
I managed to apply only a few of them:
librdf/rdf_storage_mysql.c
rasqal/win32_rasqal_config.h
The .vcproj and .sln files didn't work. Having a look at them it looks
like the ones I have in CVS aren't what you were patching against.
Maybe you could just make a zip of those files and I'll overwrite rather
than patch.
win32-redland-bindings.patch:
I'm guessing here the diff program is getting confused between DOS
and Unix line endings, as it's reporting changes to DOS line-ended
files such as the C# sources - even though there are none - and
changes to Unix line-ending files. diffstat says:
csharp/AssemblyInfo.cs | 76
csharp/Node.cs | 514 -
csharp/Parser.cs | 340
csharp/Redland.NET.public.key | 0
csharp/Stream.cs | 218
python/Redland_wrap.c |15947
+++++++++++++++++++++---------------------
python/setup-win32.py | 23
7 files changed, 8572 insertions(+), 8546 deletions(-)
the python/Redland_wrap.c file (all lines changed) should not be
changed as it's generated.
The .cs file changes look OK as they fix some namespace issues I think
and as are you say, just 1 line fixes.
I won't be changing the AssemblyKeyFile stuff in CVS for now until we
work out if the signing should be done with the same key on Win32/rest
anyway Redland.Net.public.key wasn't in the patch ...
----------------
Index: csharp/Redland.NET.public.key
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: csharp\Redland.NET.public.key
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
----------------
... and probably shouldn't be
The python/setup-win32.py had the wrong version number in it
which I've fixed by hand.
Thanks
Dave
More information about the redland-dev
mailing list