| blob | 44bce4b18749c81095088a840a44ca6d95b97d8f |
1 --- misc/raptor-1.4.17/LICENSE.txt Sun Mar 30 06:52:22 2008
2 +++ misc/build/raptor-1.4.17/LICENSE.txt Mon Jun 16 15:55:38 2008
3 @@ -60,3 +60,15 @@
5 Copyright (C) 2000-2008 David Beckett
6 Copyright (C) 2000-2005 University of Bristol
7 +
8 +
9 +LGPL Disclaimer
10 +
11 +For the avoidance of doubt, except that if any license choice other
12 +than GPL or LGPL is available it will apply instead, Sun elects to
13 +use only the Lesser General Public License version 2.1 (LGPLv2) at
14 +this time for any software where a choice of LGPL license versions
15 +is made available with the language indicating that LGPLv2.1 or any
16 +later version may be used, or where a choice of which version of the
17 +LGPL is applied is otherwise unspecified.
18 +
19 --- misc/raptor-1.4.17/src/makefile.mk Mon Jun 16 17:24:23 2008
20 +++ misc/build/raptor-1.4.17/src/makefile.mk Mon Jun 16 19:25:14 2008
21 @@ -1,1 +1,121 @@
22 -dummy
23 +#*************************************************************************
24 +#
25 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
26 +#
27 +# Copyright 2008 by Sun Microsystems, Inc.
28 +#
29 +# OpenOffice.org - a multi-platform office productivity suite
30 +#
31 +# $RCSfile: raptor-1.4.17.patch,v $
32 +#
33 +# $Revision: 1.2.6.2 $
34 +#
35 +# This file is part of OpenOffice.org.
36 +#
37 +# OpenOffice.org is free software: you can redistribute it and/or modify
38 +# it under the terms of the GNU Lesser General Public License version 3
39 +# only, as published by the Free Software Foundation.
40 +#
41 +# OpenOffice.org is distributed in the hope that it will be useful,
42 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
43 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44 +# GNU Lesser General Public License version 3 for more details
45 +# (a copy is included in the LICENSE file that accompanied this code).
46 +#
47 +# You should have received a copy of the GNU Lesser General Public License
48 +# version 3 along with OpenOffice.org. If not, see
49 +# <http://www.openoffice.org/license.html>
50 +# for a copy of the LGPLv3 License.
51 +#
52 +#*************************************************************************
53 +
54 +PRJ=..$/..$/..$/..$/..
55 +
56 +PRJNAME=redland
57 +TARGET=raptor
58 +LIBTARGET=NO
59 +
60 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
61 +
62 +
63 +# --- Settings -----------------------------------------------------
64 +
65 +.INCLUDE : settings.mk
66 +
67 +CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
68 +
69 +# --- Files --------------------------------------------------------
70 +
71 +SLOFILES = \
72 + $(SLO)$/n3_lexer.obj \
73 + $(SLO)$/n3_parser.obj \
74 + $(SLO)$/ntriples_parse.obj \
75 + $(SLO)$/parsedate.obj \
76 + $(SLO)$/raptor_feature.obj \
77 + $(SLO)$/raptor_general.obj \
78 + $(SLO)$/raptor_guess.obj \
79 + $(SLO)$/raptor_identifier.obj \
80 + $(SLO)$/raptor_iostream.obj \
81 + $(SLO)$/raptor_libxml.obj \
82 + $(SLO)$/raptor_locator.obj \
83 + $(SLO)$/raptor_namespace.obj \
84 + $(SLO)$/raptor_nfc.obj \
85 + $(SLO)$/raptor_nfc_data.obj \
86 + $(SLO)$/raptor_parse.obj \
87 + $(SLO)$/raptor_qname.obj \
88 + $(SLO)$/raptor_rdfxml.obj \
89 + $(SLO)$/raptor_rfc2396.obj \
90 + $(SLO)$/raptor_rss.obj \
91 + $(SLO)$/raptor_rss_common.obj \
92 + $(SLO)$/raptor_sax2.obj \
93 + $(SLO)$/raptor_sequence.obj \
94 + $(SLO)$/raptor_serialize.obj \
95 + $(SLO)$/raptor_serialize_ntriples.obj \
96 + $(SLO)$/raptor_serialize_rdfxml.obj \
97 + $(SLO)$/raptor_serialize_rdfxmla.obj \
98 + $(SLO)$/raptor_serialize_rss.obj \
99 + $(SLO)$/raptor_serialize_simple.obj \
100 + $(SLO)$/raptor_set.obj \
101 + $(SLO)$/raptor_stringbuffer.obj \
102 + $(SLO)$/raptor_uri.obj \
103 + $(SLO)$/raptor_utf8.obj \
104 + $(SLO)$/raptor_win32.obj \
105 + $(SLO)$/raptor_www.obj \
106 + $(SLO)$/raptor_www_libxml.obj \
107 + $(SLO)$/raptor_xml.obj \
108 + $(SLO)$/raptor_xml_writer.obj \
109 + $(SLO)$/raptor_xsd.obj \
110 + $(SLO)$/raptor_strcasecmp.obj \
111 + $(SLO)$/turtle_common.obj \
112 + $(SLO)$/turtle_lexer.obj \
113 + $(SLO)$/turtle_parser.obj \
114 + $(SLO)$/raptor_grddl.obj \
115 + $(SLO)$/raptor_abbrev.obj \
116 + $(SLO)$/raptor_avltree.obj \
117 + $(SLO)$/raptor_statement.obj \
118 + $(SLO)$/raptor_turtle_writer.obj \
119 +
120 +
121 +SHL1DEPN= makefile.mk
122 +SHL1OBJS= $(SLOFILES)
123 +SHL1USE_EXPORTS=name
124 +
125 +#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
126 +SHL1TARGET= $(TARGET)
127 +SHL1IMPLIB= lib$(TARGET)
128 +
129 +#SHL1VERSIONMAP=../service/exports.map
130 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
131 +DEF1NAME=$(SHL1TARGET)
132 +
133 +SHL1STDLIBS= \
134 + $(LIBXML2LIB) \
135 + $(XSLTLIB) \
136 +
137 +# --- Targets ------------------------------------------------------
138 +
139 +.INCLUDE : target.mk
140 +
141 +$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
142 + $(COPY) $< $@
143 +
144 --- misc/raptor-1.4.17/src/raptor-config.in Sat Jan 6 05:02:00 2007
145 +++ misc/build/raptor-1.4.17/src/raptor-config.in Mon Jun 16 15:55:38 2008
146 @@ -21,14 +21,23 @@
147 #
148 #
150 -prefix=@prefix@
151 -exec_prefix=@exec_prefix@
152 +prefix=${SOLARVERSION}/${INPATH}
153 +exec_prefix=${SOLARVERSION}/${INPATH}
154 +#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
155 +#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
156 +# HACK: map to build directory
157 +includedir=../../../../inc
158 +libdir=../../../../lib
159 +includes=-I${includedir}
161 -if test "@includedir@" != /usr/include ; then
162 - includes="-I@includedir@"
163 -else
164 - includes=
165 -fi
166 +#prefix=@prefix@
167 +#exec_prefix=@exec_prefix@
168 +#
169 +#if test "@includedir@" != /usr/include ; then
170 +# includes="-I@includedir@"
171 +#else
172 +# includes=
173 +#fi
176 usage()
177 @@ -130,7 +139,8 @@
178 done
179 fi
180 if test "$echo_libs" = "yes"; then
181 - echo -L@libdir@ -lraptor
182 +# echo -L@libdir@ -lraptor
183 + echo -L${libdir} -lraptor
184 fi
185 if test "$echo_libtool_libs" = "yes"; then
186 echo @libdir@/@RAPTOR_LIBTOOLLIBS@
187 --- misc/raptor-1.4.17/src/win32_raptor_config.h Tue Oct 2 06:12:55 2007
188 +++ misc/build/raptor-1.4.17/src/win32_raptor_config.h 2008-07-06 10:27:03.553625000 +0900
189 @@ -38,6 +38,8 @@
191 #define HAVE_STDLIB_H 1
193 +#define HAVE_ERRNO_H 1
194 +
195 #if 0
196 /* For using expat on win32 */
197 #define RAPTOR_XML_EXPAT 1
198 @@ -47,8 +49,17 @@
199 /* For using libxml2 on win32 */
200 #define RAPTOR_XML_LIBXML
201 #define HAVE_LIBXML_XMLREADER_H
202 +#define HAVE_LIBXML_HASH_H 1
203 +#define HAVE_LIBXML_HTMLPARSER_H 1
204 +#define HAVE_LIBXML_NANOHTTP_H 1
205 +#define HAVE_LIBXML_PARSER_H 1
206 +#define HAVE_LIBXSLT_XSLT_H 1
207 +
208 +#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
209 +#define RAPTOR_LIBXML_XML_PARSE_NONET 1
210 +
211 /* does libxml struct xmlEntity have a field etype */
212 -/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
213 +#define RAPTOR_LIBXML_ENTITY_ETYPE
215 /* does libxml struct xmlEntity have a field name_length */
216 /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
217 @@ -60,16 +71,17 @@
218 #define HAVE_XMLSAX2INTERNALSUBSET 1
220 /* does libxml xmlSAXHandler have externalSubset field */
221 -/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
222 +#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
224 /* does libxml xmlSAXHandler have initialized field */
225 -/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
226 +#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
227 #endif
229 #define HAVE_STRICMP 1
231 /* MS names for these functions */
232 -#define vsnprintf _vsnprintf
233 +// next line breaks build on wntmsci12
234 +//#define vsnprintf _vsnprintf
235 #define snprintf _snprintf
236 #define access _access
237 #define stricmp _stricmp
238 @@ -114,7 +126,9 @@
240 #define RAPTOR_PARSER_GUESS 1
241 #define RAPTOR_PARSER_GRDDL 1
242 +#ifndef __MINGW32__ /* conflicts with normal configure result */
243 #define RAPTOR_PARSER_N3 1
244 +#endif
245 #define RAPTOR_PARSER_TURTLE 1
246 #define RAPTOR_PARSER_NTRIPLES 1
247 #define RAPTOR_PARSER_RDFXML 1
248 @@ -125,7 +139,8 @@
249 #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
250 #define RAPTOR_SERIALIZER_NTRIPLES 1
252 -#define RAPTOR_WWW_LIBCURL 1
253 +//#define RAPTOR_WWW_LIBCURL 1
254 +#define RAPTOR_WWW_LIBXML 1
257 #include <windows.h>
258 --- misc/raptor-1.4.17/ltmain.sh 2008-02-02 22:28:24.000000000 +0900
259 +++ misc/build/raptor-1.4.17/ltmain.sh 2008-07-08 11:58:42.000000000 +0900
260 @@ -3262,9 +3262,9 @@
261 revision="$number_revision"
262 ;;
263 freebsd-aout|freebsd-elf|sunos)
264 - current="$number_major"
265 - revision="$number_minor"
266 - age="0"
267 + current=`expr $number_major + $number_minor`
268 + age="$number_minor"
269 + revision="$number_revision"
270 ;;
271 irix|nonstopux)
272 current=`expr $number_major + $number_minor`
273 @@ -3344,8 +3344,8 @@
274 ;;
276 freebsd-elf)
277 - major=".$current"
278 - versuffix=".$current";
279 + major=.`expr $current - $age`
280 + versuffix="$major.$age.$revision"
281 ;;
283 irix | nonstopux)
284 --- misc/raptor-1.4.17/configure 2008-03-17 16:37:20.000000000 +0900
285 +++ misc/build/raptor-1.4.17/configure 2008-07-06 09:05:29.974875000 +0900
286 @@ -4317,7 +4317,7 @@
288 cygwin*)
289 # func_win32_libid is a shell function defined in ltmain.sh
290 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
291 + lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
292 lt_cv_file_magic_cmd='func_win32_libid'
293 ;;
295 @@ -4326,7 +4326,7 @@
296 # func_win32_libid shell function, so use a weaker test based on 'objdump',
297 # unless we find 'file', for example because we are cross-compiling.
298 if ( file / ) >/dev/null 2>&1; then
299 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
300 + lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
301 lt_cv_file_magic_cmd='func_win32_libid'
302 else
303 lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'