r1708: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 6fafcdc912a6d076b10c5561bad09bd5f4bcbaa7..ef62a143cfb9fc9435d592e6df5691daba87a5aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-31  Kevin Rosenberg (kevin@rosenberg.net)
+
+       * src/strings.cl:
+       Fixed bug in with-foreign-string (Thanks Harald Hanche-Olsen)
+
+       * examples/Makefile:
+       Create a .a library file for FreeBSD
+       
 2002-03-29  Kevin Rosenberg (kevin@rosenberg.net)
 
        * src/objects.cl: 

diff --git a/VERSION b/VERSION
index 69367fd08f3ce302151ebc9779193d517dfa32de..d22f29b4d0345a7b1a248c6d9189f1fe21eb5b3c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-0.3.0
+0.3.1
 

diff --git a/examples/Makefile b/examples/Makefile
index 198134b41d5e572954b2de044e5510ad0192d7fb..3e3aa0e67f7a1ba7159e45fe93bd36296a1fa805 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.2 2002/03/21 02:41:30 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.3 2002/03/31 23:05:07 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -18,6 +18,7 @@
 CC=gcc
 SHARED_CC_OPT=-fpic
 SHARED_LD_OPT=-shared
+AR=ar
 
 # If you are using Solaris, these are the correct values
 # for creating a shared library
@@ -25,18 +26,31 @@ SHARED_LD_OPT=-shared
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 
+
+base=c-test-fns
+
 # Nothing to configure beyond this point
+source=$(base).c
+object=$(base).o
+shared_lib=$(base).so
+static_lib=$(base).a
+
+all: $(shared_lib) $(static_lib)
 
-all: lib 
 
-lib: c-test-fns.so
+$(shared_lib): $(source)
+       $(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
+       ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+       $(AR) r $(static_lib) $(object)
+       rm $(object)
 
-c-test-fns.so: c-test-fns.c 
-       ${CC} ${SHARED_CC_OPT} -c c-test-fns.c -o c-test-fns.o
-       ld ${SHARED_LD_OPT} c-test-fns.o -o c-test-fns.so
+$(static_lib): $(source)
+       ${CC} -c $(source) -o $(object)
+       $(AR) r $(static_lib) $(object)
+       rm $(object)
 
 clean:
-       rm -f *.o *.so 
+       rm -f $(object) $(static_lib) $(shared_lib)
 
-realclean:
-       rm -f *.o *.so *~
+realclean: clean
+       rm -f *~

diff --git a/examples/c-test-fns.cl b/examples/c-test-fns.cl
index 45f144dfb3fec093773ba1c274a762f28c851ead..a45dda9f23be766e78e84feb9616ec8a28fd700c 100644 (file)
--- a/examples/c-test-fns.cl
+++ b/examples/c-test-fns.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: c-test-fns.cl,v 1.2 2002/03/21 09:54:34 kevin Exp $
+;;;; $Id: c-test-fns.cl,v 1.3 2002/03/31 23:05:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,7 +20,9 @@
 
 (unless (uffi:load-foreign-library 
         (make-pathname :name "c-test-fns" 
-                       :type #+(or linux unix)"so" #+(or win32 mswindows) "dll"
+                       :type #+(or linux unix)"so"
+                       #+(or win32 mswindows) "dll"
+                       #+freebsd "a"
                        :defaults *load-truename*)
         :supporting-libraries '("c")
         :force-load t)

diff --git a/src/strings.cl b/src/strings.cl
index 4d95e334ee1da8c41fd3145ebeb36b9b5ad6cb18..cc3a1edc721d58c6eb948fdbbc02f6ade98c0813 100644 (file)
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.14 2002/03/23 17:06:57 kevin Exp $
+;;;; $Id: strings.cl,v 1.15 2002/03/31 23:05:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -156,7 +156,6 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 (defmacro with-foreign-string ((foreign-string lisp-string) &body body)
-  #-(or lispworks cmu) 
   (let ((result (gensym)))
     `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
            (,result (progn ,@body)))

diff --git a/tests/Makefile b/tests/Makefile
index 198134b41d5e572954b2de044e5510ad0192d7fb..3e3aa0e67f7a1ba7159e45fe93bd36296a1fa805 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.2 2002/03/21 02:41:30 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.3 2002/03/31 23:05:07 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -18,6 +18,7 @@
 CC=gcc
 SHARED_CC_OPT=-fpic
 SHARED_LD_OPT=-shared
+AR=ar
 
 # If you are using Solaris, these are the correct values
 # for creating a shared library
@@ -25,18 +26,31 @@ SHARED_LD_OPT=-shared
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
 
+
+base=c-test-fns
+
 # Nothing to configure beyond this point
+source=$(base).c
+object=$(base).o
+shared_lib=$(base).so
+static_lib=$(base).a
+
+all: $(shared_lib) $(static_lib)
 
-all: lib 
 
-lib: c-test-fns.so
+$(shared_lib): $(source)
+       $(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
+       ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+       $(AR) r $(static_lib) $(object)
+       rm $(object)
 
-c-test-fns.so: c-test-fns.c 
-       ${CC} ${SHARED_CC_OPT} -c c-test-fns.c -o c-test-fns.o
-       ld ${SHARED_LD_OPT} c-test-fns.o -o c-test-fns.so
+$(static_lib): $(source)
+       ${CC} -c $(source) -o $(object)
+       $(AR) r $(static_lib) $(object)
+       rm $(object)
 
 clean:
-       rm -f *.o *.so 
+       rm -f $(object) $(static_lib) $(shared_lib)
 
-realclean:
-       rm -f *.o *.so *~
+realclean: clean
+       rm -f *~

diff --git a/tests/c-test-fns.cl b/tests/c-test-fns.cl
index 45f144dfb3fec093773ba1c274a762f28c851ead..a45dda9f23be766e78e84feb9616ec8a28fd700c 100644 (file)
--- a/tests/c-test-fns.cl
+++ b/tests/c-test-fns.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: c-test-fns.cl,v 1.2 2002/03/21 09:54:34 kevin Exp $
+;;;; $Id: c-test-fns.cl,v 1.3 2002/03/31 23:05:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,7 +20,9 @@
 
 (unless (uffi:load-foreign-library 
         (make-pathname :name "c-test-fns" 
-                       :type #+(or linux unix)"so" #+(or win32 mswindows) "dll"
+                       :type #+(or linux unix)"so"
+                       #+(or win32 mswindows) "dll"
+                       #+freebsd "a"
                        :defaults *load-truename*)
         :supporting-libraries '("c")
         :force-load t)