1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
--- misc/rasqal-0.9.15/LICENSE.txt Sun Apr 22 23:09:08 2007
+++ misc/build/rasqal-0.9.15/LICENSE.txt Mon Jun 16 15:55:45 2008
@@ -61,3 +61,15 @@
Copyright (C) 2003-2007 Dave Beckett
Copyright (C) 2003-2005 University of Bristol
+
+
+LGPL Disclaimer
+
+For the avoidance of doubt, except that if any license choice other
+than GPL or LGPL is available it will apply instead, Sun elects to
+use only the Lesser General Public License version 2.1 (LGPLv2) at
+this time for any software where a choice of LGPL license versions
+is made available with the language indicating that LGPLv2.1 or any
+later version may be used, or where a choice of which version of the
+LGPL is applied is otherwise unspecified.
+
--- misc/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:30:20 2008
+++ misc/build/rasqal-0.9.15/src/makefile.mk Mon Jun 16 19:25:48 2008
@@ -1,1 +1,95 @@
-dummy
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: rasqal-0.9.15.patch,v $
+#
+# $Revision: 1.2.6.2 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..$/..
+
+PRJNAME=redland
+TARGET=rasqal
+LIBTARGET=NO
+
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
+ $(SLO)$/rasqal_datetime.obj \
+ $(SLO)$/rasqal_decimal.obj \
+ $(SLO)$/rasqal_engine.obj \
+ $(SLO)$/rasqal_expr.obj \
+ $(SLO)$/rasqal_feature.obj \
+ $(SLO)$/rasqal_general.obj \
+ $(SLO)$/rasqal_graph_pattern.obj \
+ $(SLO)$/rasqal_literal.obj \
+ $(SLO)$/rasqal_map.obj \
+ $(SLO)$/rasqal_query_results.obj \
+ $(SLO)$/rasqal_query.obj \
+ $(SLO)$/rasqal_raptor.obj \
+ $(SLO)$/rasqal_result_formats.obj \
+ $(SLO)$/rasqal_xsd_datatypes.obj \
+ $(SLO)$/rdql_lexer.obj \
+ $(SLO)$/rdql_parser.obj \
+ $(SLO)$/sparql_lexer.obj \
+ $(SLO)$/sparql_parser.obj \
+ $(SLO)$/strcasecmp.obj \
+
+
+# $(SLO)$/rasqal_redland.obj \
+
+SHL1DEPN= makefile.mk
+SHL1OBJS= $(SLOFILES)
+SHL1USE_EXPORTS=name
+
+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+SHL1TARGET= $(TARGET)
+SHL1IMPLIB= lib$(TARGET)
+
+#SHL1VERSIONMAP=../service/exports.map
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+
+SHL1STDLIBS= \
+ $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
+
+
+#$(LIBXML2LIB) \
+# $(XSLTLIB) \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
--- misc/rasqal-0.9.15/src/rasqal-config.in Sun Apr 22 22:58:51 2007
+++ misc/build/rasqal-0.9.15/src/rasqal-config.in Mon Jun 16 15:55:45 2008
@@ -22,13 +22,22 @@
#
#
-prefix=@prefix@
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
+#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
+# HACK: map to build directory
+includedir=../../../../inc
+libdir=../../../../lib
+includes=-I${includedir}
-if test "@includedir@" != /usr/include ; then
- includes="-I@includedir@"
-else
- includes=
-fi
+#prefix=@prefix@
+#
+#if test "@includedir@" != /usr/include ; then
+# includes="-I@includedir@"
+#else
+# includes=
+#fi
usage()
@@ -109,7 +118,8 @@
echo $includes
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -lrasqal
+# echo -L@libdir@ -lrasqal
+ echo -L${libdir} -lrasqal
fi
if test "$echo_libtool_libs" = "yes"; then
echo @libdir@/@RASQAL_LIBTOOLLIBS@
--- misc/rasqal-0.9.15/src/win32_rasqal_config.h Mon Apr 23 09:18:27 2007
+++ misc/build/rasqal-0.9.15/src/win32_rasqal_config.h Mon Jun 16 15:55:45 2008
@@ -39,10 +39,13 @@
#define HAVE_STDLIB_H 1
+#define HAVE_ERRNO_H 1
+
#define HAVE_STRICMP 1
/* MS names for these functions */
-#define vsnprintf _vsnprintf
+// next line breaks build on wntmsci12
+//#define vsnprintf _vsnprintf
#define snprintf _snprintf
#define access _access
#define stricmp _stricmp
@@ -87,6 +90,9 @@
#include <io.h>
#include <memory.h>
+// argh! stupid winnt.h...
+#undef DELETE
+
/* This is a SPARQL token define */
#ifdef OPTIONAL
#undef OPTIONAL
@@ -118,8 +124,14 @@
/* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
/* Use PCRE regex library */
-#define RASQAL_REGEX_PCRE 1
+//#define RASQAL_REGEX_PCRE 1
+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
+#define HAVE_LIBXML_XMLSCHEMAS_H 1
+
+#define RASQAL_DECIMAL_NONE 1
+
#ifdef _DEBUG
#define RASQAL_DEBUG 1
#endif
--- misc/rasqal-0.9.15/ltmain.sh 2006-03-12 03:49:04.000000000 +0900
+++ misc/build/rasqal-0.9.15/ltmain.sh 2008-07-06 14:30:56.975375000 +0900
@@ -1518,6 +1518,11 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
absdir=`cd "$dir" && pwd`
+ case $host_os in
+ mingw*)
+ absdir=`cygpath -m $absdir`
+ ;;
+ esac
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
absdir="$dir"
@@ -3195,9 +3200,9 @@
revision="$number_revision"
;;
freebsd-aout|freebsd-elf|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor - 1`
@@ -3275,8 +3280,8 @@
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
;;
irix | nonstopux)
|
