This commit was manufactured by cvs2svn to create tag 'raptor_0_9_7'.raptor_0_9_7

3 files changed, 3 insertions, 526 deletions

diff --git a/autogen.sh b/autogen.sh
index b4c73f4d..ef9f08f1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -111,7 +111,6 @@ am_opt=
 # Ensure that these are created by the versions on this system
 # (indirectly via automake)
 rm -f ltconfig ltmain.sh libtool
-rm -rf autom4te.cache
 
 echo "$program: Running libtoolize --copy --automake"
 $DRYRUN libtoolize --copy --automake
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 9f7ebf6f..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,496 +0,0 @@
-dnl -*- Mode: sh -*-
-dnl
-dnl configure.in - autoconf file for Raptor
-dnl (Process this file with autoconf to produce a configure script.)
-dnl
-dnl $Id$
-dnl
-dnl Copyright (C) 2000-2001 David Beckett - http://purl.org/net/dajobe/
-dnl Institute for Learning and Research Technology - http://www.ilrt.org/
-dnl University of Bristol - http://www.bristol.ac.uk/
-dnl 
-dnl This package is Free Software or Open Source available under the
-dnl following licenses (these are alternatives):
-dnl   1. GNU Lesser General Public License (LGPL)
-dnl   2. GNU General Public License (GPL)
-dnl   3. Mozilla Public License (MPL)
-dnl 
-dnl See LICENSE.html or LICENSE.txt at the top of this package for the
-dnl full license terms.
-dnl 
-
-
-AC_REVISION($Revision$)dnl
-
-AC_PREREQ(2.13)
-AC_INIT(raptor_parse.c)
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE(raptor, 0.9.7)
-
-AM_MAINTAINER_MODE
-
-release_version=no
-AC_ARG_ENABLE(release, [  --enable-release        Turn on optimizations.  ], \
- if test "$enableval" = "yes"; then \
-	release_version=yes
-fi;)	
-
-if test $release_version = no; then 
-  CFLAGS=`echo $CFLAGS | sed s/-O2//`
-  CXXFLAGS=`echo $CXXFLAGS | sed s/-O2//`
-  CPPFLAGS=`echo $CPPFLAGS | sed s/-O2//`
-fi
-
-dnl Checks for programs.
-AC_CANONICAL_HOST
-AM_SANITY_CHECK
-AM_PROG_CC_STDC
-AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-# Find a tar command for 'make dist'
-AC_CHECK_PROGS(TAR, gnutar gtar tar)
-
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-
-
-
-dnl compiler checks
-# if using gcc...
-if test "$ac_cv_prog_gcc" = yes; then
-  STANDARD_CFLAGS=
-  MAINTAINER_CFLAGS="-Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-else
-  STANDARD_CFLAGS=
-  MAINTAINER_CFLAGS=
-fi
-
-
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(errno.h stdlib.h unistd.h string.h limits.h dmalloc.h getopt.h expat.h xmlparse.h)
-
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_BIGENDIAN
-
-dnl need to change quotes to allow square brackets
-changequote(<<, >>)dnl
-version_major=`echo $VERSION | sed -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\1/'`
-version_minor=`echo $VERSION | sed -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\2/'`
-version_release=`echo $VERSION | sed -e 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\3/'`
-changequote([, ])dnl
-
-AC_DEFINE_UNQUOTED(RAPTOR_VERSION_MAJOR, $version_major, [Major version number])
-AC_DEFINE_UNQUOTED(RAPTOR_VERSION_MINOR, $version_minor, [Minor version number])
-AC_DEFINE_UNQUOTED(RAPTOR_VERSION_RELEASE, $version_release, [Release version number])
-
-# syntax: CURRENT[:REVISION[:AGE]]
-RAPTOR_LIBTOOL_VERSION=0:0:0
-AC_SUBST(RAPTOR_LIBTOOL_VERSION)
-
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(getopt_long stricmp strcasecmp)
-
-# was AC_REPLACE_FUNCS(strcasecmp) but strcasecmp has two alternatives:
-# the other non-standard function stricmp or a local alternative
-if test $ac_cv_func_stricmp = no -a $ac_cv_func_stricmp = no; then
-  AC_LIBOBJ([strcasecmp])
-fi
-
-
-AC_MSG_CHECKING(whether need to declare optind)
-AC_TRY_LINK([#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif], [int x=optind;],
-            AC_MSG_RESULT(no),
-            AC_DEFINE(NEED_OPTIND_DECLARATION, 1, [need 'extern int optind' declaration?])
-            AC_MSG_RESULT(yes))
-
-
-AC_MSG_CHECKING(for redland sources in parent directory)
-if test -d $srcdir/../librdf -a -r $srcdir/../librdf/rdf_node.c ; then
-  have_redland=1
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(RAPTOR_IN_REDLAND, 1, [is this being built inside redland?])
-  REDLAND_LIBS="../librdf/librdf.la"
-  REDLAND_CPPFLAGS=" -I\$(srcdir)/../librdf"
-  AC_SUBST(REDLAND_LIBS)
-  AC_SUBST(REDLAND_CPPFLAGS)
-else
-  AC_MSG_RESULT(no)
-fi
-
-
-dnl Checks for XML parsers
-have_expat=0
-have_expat_lib=0
-have_expat_source=0
-need_expat=0
-need_expat_source=0
-expat_source_dir=
-expat_obj_dir=
-AC_MSG_CHECKING(for expat sources)
-if test -d $srcdir/expat; then
-  have_expat_source=1
-  have_expat=1
-  expat_source_dir="\$(top_srcdir)/expat"
-  expat_obj_dir="\$(top_builddir)/expat"
-  AC_MSG_RESULT(yes - expat)
-elif test "X$have_redland" = X1 -a -d $srcdir/../expat; then
-  have_expat_source=1
-  have_expat=1
-  expat_source_dir="\$(top_srcdir)/../expat"
-  expat_obj_dir="\$(top_builddir)/../expat"
-  AC_MSG_RESULT(yes - ../expat via redland)
-else
-  AC_MSG_RESULT(no)
-fi
-
-oLIBS="$LIBS"
-AC_CHECK_LIB(xmltok, main, xmlt=1, xmlt=0)
-
-# Raptor needs XML_ParserCreate expat function (not namespace one)
-AC_CHECK_LIB(xmlparse, XML_ParserCreate, xmlp=1, xmlp=0, -lxmltok)
-
-LIBS="$oLIBS"
-AC_CHECK_LIB(expat, XML_ParserCreate, libexpat=1, libexpat=0)
-
-LIBS="$oLIBS"
-AC_MSG_CHECKING(for working expat in libxmlparse and libxmltok)
-if test $xmlp = 1 -a $xmlt = 1 -a  $ac_cv_header_xmlparse_h = yes; then
-  LIBS="$LIBS -lxmlparse -lxmltok"
-  AC_TRY_RUN([#include <stdio.h>
-	     main() {XML_ParserCreate(NULL); return(0);}],
-             worked=yes, worked=no, worked=no)
-  if test $worked = yes; then
-    # Old expat
-    have_expat_lib=1
-    have_expat=1
-    expat_libs="-lxmlparse -lxmltok"
-
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-LIBS="$oLIBS"
-
-AC_MSG_CHECKING(for working expat in libexpat)
-if test $libexpat = 1 -a $ac_cv_header_expat_h = yes ; then
-  LIBS="$LIBS -lexpat"
-  AC_TRY_RUN([#include <stdio.h>
-             main() {XML_ParserCreate(NULL); return(0);}],
-             worked=yes, worked=no, worked=no)
-  if test $worked = yes; then
-    # New expat - expat-1.95.0 or later
-    have_expat_lib=1
-    have_expat=1
-    expat_libs="-lexpat"
-
-    AC_MSG_RESULT(yes)
-
-    AC_MSG_CHECKING(for expat support of UTF-8 BOM)
-    AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef HAVE_EXPAT_H
-#include <expat.h>
-#else
-#ifdef HAVE_XMLPARSE_H
-#include <xmlparse.h>
-#endif
-#endif
-
-int main(int argc, char **argv) {
-  const char *xml_buffer=
-     /* UTF-8 BOM */
-     "\xef\xbb\xbf<?xml version='1.0' encoding='UTF-8'?><tag/>";
-  XML_Parser xp=XML_ParserCreate(NULL);
-  int  len=strlen(xml_buffer);
-  
-  /* This might cause an error on expat 1.95.1 */
-  int rc=XML_Parse(xp, xml_buffer, len, 1);
-
-  /* if expat gives an error ... */
-  if(!rc) {
-    /* then the next line will crash in normal_updatePosition  */
-    int line=XML_GetCurrentLineNumber(xp);
-  }
-  XML_ParserFree(xp);
-
-  return 0;
-}
-],
-            AC_MSG_RESULT(yes),
-            AC_DEFINE(EXPAT_UTF8_BOM_CRASH, 1, [does expat crash when it sees an initial UTF8 BOM?])
-            AC_MSG_RESULT(no)
-            AC_MSG_WARN(The available expat crashes on XML UTF-8 BOM in documents)
-            AC_MSG_WARN(Fix either by using libxml or expat 1.95.2+))
-
-  else
-    AC_MSG_RESULT(no)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
-LIBS="$oLIBS"
-
-AC_ARG_WITH(xml2-config, [  --with-xml2-config=PATH Location of libxml xml2-config []], xml2_config="$withval", xml2_config="")
-
-if test "X$xml2_config" != "X" ; then
-  AC_MSG_CHECKING(for $xml2_config)
-
-  if test -f $xml2_config ; then
-    XML_CONFIG=$xml2_config
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no - searching PATH)
-  fi
-fi
-if test "X$XML_CONFIG" = "X"; then
-  AC_CHECK_PROGS(XML_CONFIG, xml2-config xml-config)
-fi
-
-
-have_libxml=0
-have_libxml_lib=0
-have_libxml_source=0
-need_libxml=0
-need_libxml_source=0
-AC_MSG_CHECKING(for libxml sources)
-if test -d $srcdir/libxml -a -r $srcdir/libxml/libxml.spec ; then
-  have_libxml_source=1
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-oCPPFLAGS="$CPPFLAGS"
-if test "X$XML_CONFIG" != X; then
-  oLIBS="$LIBS"
-  LIBS="$LIBS `$XML_CONFIG --libs`"
-  AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
-  LIBS="$oLIBS"
-  AC_MSG_CHECKING(for system (GNOME) libxml library)
-  if test $have_xmlCreatePushParserCtxt = yes; then
-    have_libxml_lib=1
-    have_libxml=1
-    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
-    LIBXML_VERSION=`$XML_CONFIG --version`
-    AC_MSG_RESULT(yes - version $LIBXML_VERSION)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_CHECK_HEADERS(libxml/parser.h libxml/hash.h gnome-xml/parser.h)
-
-  if test "$ac_cv_header_libxml_parser.h" = no -a "$ac_cv_header_gnome_xml_parser.h" = no; then
-    AC_MSG_WARN(libxml library found but not headers - disabling)
-    have_libxml_lib=0
-    have_libxml=0
-  else
-    AC_MSG_CHECKING(if libxml xmlEntity has name_length field)
-    AC_TRY_LINK([
-#ifdef HAVE_LIBXML_PARSER_H
-#include <libxml/parser.h>
-#else
-#include <gnome-xml/parser.h>
-#endif
-], [xmlEntity foo; foo.name_length=0],
-                AC_MSG_RESULT(yes)
-		AC_DEFINE(RAPTOR_LIBXML_ENTITY_NAME_LENGTH,1,[does libxml struct xmlEntity have a field name_length]),
-		AC_MSG_RESULT(no))
-
-    AC_MSG_CHECKING(if libxml xmlEntity has etype field)
-    AC_TRY_LINK([
-#ifdef HAVE_LIBXML_PARSER_H
-#include <libxml/parser.h>
-#else
-#include <gnome-xml/parser.h>
-#endif
-], [xmlEntity foo; foo.etype=0],
-                AC_MSG_RESULT(yes)
-		AC_DEFINE(RAPTOR_LIBXML_ENTITY_ETYPE, 1, [does libxml struct xmlEntity have a field etype]),
-		AC_MSG_RESULT(no))
-
-    AC_MSG_CHECKING(if libxml xmlSAXHandler has initialized field)
-    AC_TRY_LINK([
-#ifdef HAVE_LIBXML_PARSER_H
-#include <libxml/parser.h>
-#else
-#include <gnome-xml/parser.h>
-#endif
-], [xmlSAXHandler foo; foo.initialized=0],
-                AC_MSG_RESULT(yes)
-		AC_DEFINE(RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED, 1, [does libxml xmlSAXHandler have initialized field]),
-		AC_MSG_RESULT(no))
-  fi
-
-fi
-CPPFLAGS="$oCPPFLAGS"
-
-
-AC_ARG_WITH(xml-parser, [  --with-xml-parser=NAME  Use XML parser - expat, libxml [expat]], xml_parser="$withval", xml_parser="libxml") 
-
-for xml_parser_name in $xml_parser libxml expat; do
-  case $xml_parser_name in
-    expat)
-      if test $have_expat_lib = 1; then
-	need_expat=1
-	AC_DEFINE(RAPTOR_XML_EXPAT, 1, [Use expat XML parser])
-        break
-      elif test $have_expat_source = 1; then
-	need_expat=1
-	need_expat_source=1
-	AC_DEFINE(RAPTOR_XML_EXPAT, 1, [Use expat XML parser])
-        break
-      fi
-      ;;
-
-    libxml)
-      if test $have_libxml_lib = 1; then
-	need_libxml=1
-	AC_DEFINE(RAPTOR_XML_LIBXML, 1, [Use libxml XML parser])
-        break
-      elif test $have_libxml_source = 1; then
-	need_libxml=1
-	need_libxml_source=1
-	AC_DEFINE(RAPTOR_XML_LIBXML, 1, [Use libxml XML parser])
-        break
-      fi
-      ;;
-
-    *)
-      AC_MSG_ERROR(No such XML parser $xml_parser_name)
-      ;;
-esac
-done
-
-
-AC_MSG_CHECKING(XML parser to use)
-result=
-if test $need_libxml = 1; then
-  if test $need_libxml_source = 1; then
-    result="$result libxml(source)"
-  else
-    result="$result libxml(system)"
-  fi
-elif test $need_expat = 1; then
-  if test $need_expat_source = 1; then
-    result="$result expat(source)"
-  else
-    result="$result expat(system)"
-  fi
-else
-  AC_MSG_ERROR(No XML parser available - please install expat or libxml)
-fi
-AC_MSG_RESULT($result)
-
-
-if test $need_libxml = 1; then
-  if test $need_libxml_source = 1; then
-    SD="$SD libxml"
-    (cd libxml && ./configure --cache=../config.cache --enable-shared=no)
-    CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
-    LIBS="$LIBS -Llibxml -llibxml"
-  else
-    LIBS="$LIBS `$XML_CONFIG --libs`"
-    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
-  fi
-fi
-
-
-if test $need_expat = 1; then
-  # Only build local copy if it is needed
-  if test $need_expat_source = 1; then
-    SD="$SD expat"
-    CPPFLAGS="-I$expat_source_dir/xmlparse $CPPFLAGS"
-    LIBS="$LIBS $expat_obj_dir/xmlparse/xmlparse.o $expat_obj_dir/xmlparse/hashtable.o $expat_obj_dir/xmltok/xmlrole.o $expat_obj_dir/xmltok/xmltok.o"
-  else
-    LIBS="$LIBS $expat_libs"
-  fi
-fi
-
-
-xml_parsers_available=
-if test $need_libxml = 1; then
-  if test $need_libxml_source = 1; then
-    xml_parsers_available="$xml_parsers_available libxml(source)"
-  else
-    xml_parsers_available="$xml_parsers_available libxml(system $LIBXML_VERSION)"
-  fi
-fi
-if test $need_expat = 1; then
-  if test $need_expat_source = 1; then
-    xml_parsers_available="$xml_parsers_available expat(source)"
-  else
-    if test $libexpat = 1; then
-      xml_parsers_available="$xml_parsers_available expat(system libexpat)"
-    else
-      xml_parsers_available="$xml_parsers_available expat(system libxmlparse,libxmltok)"
-    fi
-  fi
-fi
-
-
-# Make final changes to cflags
-CPPFLAGS="-DRAPTOR_INTERNAL=1 $CPPFLAGS"
-MEM=
-MEM_LIBS=
-if test "$USE_MAINTAINER_MODE" = yes; then
-  if test "$ac_cv_header_dmalloc_h" = yes; then
-    MEM=-DRAPTOR_MEMORY_DEBUG_DMALLOC=1
-    MEM_LIBS=-ldmalloc
-  fi
-  CPPFLAGS="-DRAPTOR_DEBUG=1 $CPPFLAGS"
-  CFLAGS="-g $CFLAGS"
-fi
-STANDARD_CFLAGS="$STANDARD_CFLAGS $CFLAGS"
-if test "$USE_MAINTAINER_MODE" = yes; then
-  CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
-fi
-
-AC_SUBST(MEM)
-AC_SUBST(MEM_LIBS)
-AC_SUBST(STANDARD_CFLAGS)
-
-ECHO_N="$ECHO_N"
-ECHO_C="$ECHO_C"
-AC_SUBST(ECHO_N)
-AC_SUBST(ECHO_C)
-
-abs_top_srcdir=`cd $srcdir; pwd`
-AC_SUBST(abs_top_srcdir)
-abs_top_builddir=`pwd`
-AC_SUBST(abs_top_builddir)
-
-AC_OUTPUT(Makefile
-raptor.spec
-raptor-config
-raptor-src-config
-tests/Makefile
-win32/Makefile
-debian/Makefile,
-[chmod +x raptor-config raptor-src-config])
-
-
-AC_MSG_RESULT([
-Raptor build summary:
-  XML parser: $xml_parsers_available
-])
diff --git a/manifest.pl b/manifest.pl
index a8026ba4..537d6b08 100755
--- a/manifest.pl
+++ b/manifest.pl
@@ -1,28 +1,4 @@
 #!/usr/bin/perl -w
-#
-# manifest.pl - Run Raptor against RDF Core tests Manifest.rdf
-#
-# $Id$
-#
-# Copyright (C) 2002 David Beckett - http://purl.org/net/dajobe/
-# Institute for Learning and Research Technology - http://www.ilrt.org/
-# University of Bristol - http://www.bristol.ac.uk/
-# 
-# This package is Free Software or Open Source available under the
-# following licenses (these are alternatives):
-#   1. GNU Lesser General Public License (LGPL)
-#   2. GNU General Public License (GPL)
-#   3. Mozilla Public License (MPL)
-# 
-# See LICENSE.html or LICENSE.txt at the top of this package for the
-# full license terms.
-#
-# USAGE: ./manifest.pl
-#  to run all known tests from $manifest_URL
-#
-#   ./manifest.pl TEST-URL ...
-# to run particular tests (slightly more verbose).
-#
 
 use strict;
 
@@ -31,14 +7,12 @@ use LWP::Simple;
 
 my $progname = basename $0;
 
-my $offline=0;
+my $offline=1;
 
 my $manifest_URL='http://www.w3.org/2000/10/rdf-tests/rdfcore/Manifest.rdf';
 my $local_tests_url='http://www.w3.org/2000/10/rdf-tests/rdfcore/';
-
-# CHANGE THIS for your system
-my $local_tests_area="./rdfcore/";
-my $local_manifest_file="./rdfcore/Manifest.rdf";
+my $local_tests_area=$ENV{HOME}.'/rdf/rdfcore/testcases/tests/';
+my $local_manifest_file=$ENV{HOME}.'/rdf/rdfcore/testcases/tests/Manifest.rdf';
 
 my $format="%-6s %5d %7.2f%%\n";