r11021: 2006-08-13 Kevin Rosenberg (kevin@rosenberg.net)

        * src/objects.lisp: Add support for Lispworks 5 by Bill Atkins

diff --git a/ChangeLog b/ChangeLog
index 137b47fa2dd66884069e0ffe9de2e52dcd7b007e..688f4b6ecebd80ef1af1d1cfe1dcbe93cad264bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-13 Kevin Rosenberg (kevin@rosenberg.net)
+       * src/objects.lisp: Add support for Lispworks 5 by Bill Atkins 
+
 2006-07-04 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.14
        * src/{objects,strings}.lisp: Apply patch from Edi Weitz

diff --git a/doc/Makefile b/doc/Makefile
index cfae6cc7467329fed8196fe6ea113baa55b3c652..db4b9f6c54554cab252eafcf5b35896db43999b9 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -18,6 +18,7 @@ DOCFILE_EXT_DEFAULT:=xml
 # Standard docfile processing
 
 DEBIAN=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Debian.*')
+UBUNTU=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Ubuntu.*')
 SUSE=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE.*')
 SUSE91=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE Linux 9.1.*')
 REDHAT=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Red Hat.*')
@@ -41,6 +42,10 @@ else
         else   
           ifneq (${DARWIN},0)
             OS=darwin
+          else  
+            ifneq (${UBUNTU},0)
+              OS=ubuntu
+            endif 
           endif 
         endif
       endif

diff --git a/doc/catalog-ubuntu.xml b/doc/catalog-ubuntu.xml
new file mode 100644 (file)
index 0000000..b924d99
--- /dev/null
+++ b/doc/catalog-ubuntu.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/docbook/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/"
+        rewritePrefix="dtd/xml/4.2/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="stylesheet/xsl/nwalsh/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/xml/4.2/catalog.xml" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="dtd/xml/4.2/xml/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index eb2e1ac220f8ade834d941b1fe25b6bf4974cfeb..7514b35a70452fdd6573bec75f33d21aa22daa5e 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index ab0d6a28b7e6d9b1bb619eb2d74c186097dc0886..208307895a37363c28e6ddaccf439e10b5054c95 100644 (file)
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -18,6 +18,8 @@
 
 (in-package uffi-tests)
 
+#+clisp (uffi:load-foreign-library "/usr/lib/libz.so" :module "z")
+#-clisp
 (unless (uffi:load-foreign-library
         (uffi:find-foreign-library
          #-(or macosx darwin)
@@ -27,13 +29,15 @@
          (list (pathname-directory *load-pathname*)
                "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
                "/usr/lib/" "/zlib/"))
-        :module "zlib" 
+        :module "zlib"
         :supporting-libraries '("c"))
   (warn "Unable to load zlib"))
-  
-(unless (uffi:load-foreign-library 
+
+#+clisp (uffi:load-foreign-library "/home/kevin/debian/src/uffi/tests/uffi-c-test.so" :module "uffi_tests")
+#-clisp
+(unless (uffi:load-foreign-library
         (uffi:find-foreign-library
-         '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test") 
+         '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test")
          (list (pathname-directory *load-truename*)
                "/usr/lib/uffi/"
                "/home/kevin/debian/src/uffi/tests/"))