[Swig-cvs] SWIG/Examples/s-exp uffi.lisp,1.4,1.5

[Matthias K. <mk...@us...>]

Update of /cvsroot/swig/SWIG/Examples/s-exp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25412

Modified Files:
	uffi.lisp 
Log Message:
Minor fix to the example.


Index: uffi.lisp
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/s-exp/uffi.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** uffi.lisp	2 Nov 2003 14:40:56 -0000	1.4
--- uffi.lisp	30 Oct 2004 17:58:16 -0000	1.5
***************
*** 16,25 ****
  (defvar *swig-source-directory* #p"/home/mkoeppe/s/swig1.3/")
  
! (defvar *swig-program* (merge-pathnames "swig" *swig-source-directory*))
  
  (defun run-swig (swig-interface-file-name &key directory-search-list module
  		 ignore-errors c++)
-   (setf (port:getenv :SWIG_LIB)
- 	(namestring (merge-pathnames "Lib" *swig-source-directory*)))
    (let ((temp-file-name "/tmp/swig.lsp"))
      (let ((process
--- 16,23 ----
  (defvar *swig-source-directory* #p"/home/mkoeppe/s/swig1.3/")
  
! (defvar *swig-program* (merge-pathnames "preinst-swig" *swig-source-directory*))
  
  (defun run-swig (swig-interface-file-name &key directory-search-list module
  		 ignore-errors c++)
    (let ((temp-file-name "/tmp/swig.lsp"))
      (let ((process
***************
*** 213,217 ****
  (defvar *struct-fields* '())
  
! (defvar *linkage* nil "NIL or :C")
  
  (defgeneric handle-node (node-type &key &allow-other-keys)
--- 211,215 ----
  (defvar *struct-fields* '())
  
! (defvar *linkage* :C "NIL or :C")
  
  (defgeneric handle-node (node-type &key &allow-other-keys)
***************
*** 346,350 ****
  
  
! (with-open-file (f "/tmp/swig-uffi.lisp" :direction :output)
    (let ((*uffi-definitions* '())
  	(*uffi-output* f)
--- 344,349 ----
  
  
! (with-open-file (f "/tmp/swig-uffi.lisp" :direction :output
! 		   :if-exists :supersede)
    (let ((*uffi-definitions* '())
  	(*uffi-output* f)
***************
*** 363,371 ****
  (compile-file "/tmp/swig-uffi.lisp")
  
- (load "/tmp/swig-uffi.lisp")
- 
  (uffi:load-foreign-library (merge-pathnames "Examples/GIFPlot/libgifplot.a"
  					    *swig-source-directory*))
  
  (load (merge-pathnames "Examples/GIFPlot/Common-Lisp/full/runme.lisp" *swig-source-directory*))
  
--- 362,370 ----
  (compile-file "/tmp/swig-uffi.lisp")
  
  (uffi:load-foreign-library (merge-pathnames "Examples/GIFPlot/libgifplot.a"
  					    *swig-source-directory*))
  
+ (load "/tmp/swig-uffi.lisp")
+ 
  (load (merge-pathnames "Examples/GIFPlot/Common-Lisp/full/runme.lisp" *swig-source-directory*))
  
***************
*** 377,380 ****
--- 376,381 ----
  ;;; Link to SWIG itself
  
+ #||
+ 
  (defparameter *c++-compiler* "g++")
  
***************
*** 410,417 ****
  		  :c++ t))
    (with-open-file (f *swig-uffi-pathname* :direction :output)
! 		  (let ((*uffi-definitions* '())
! 			(*uffi-output* f)
! 			(*uffi-primitive-type-alist* *uffi-default-primitive-type-alist*))
! 		    (apply 'handle-node *swig-interface*)))
    (compile-file *swig-uffi-pathname*)
    (alien:load-foreign (merge-pathnames "Source/libswig.a"
--- 411,419 ----
  		  :c++ t))
    (with-open-file (f *swig-uffi-pathname* :direction :output)
!     (let ((*linkage* :c++)
! 	  (*uffi-definitions* '())
! 	  (*uffi-output* f)
! 	  (*uffi-primitive-type-alist* *uffi-default-primitive-type-alist*))
!       (apply 'handle-node *swig-interface*)))
    (compile-file *swig-uffi-pathname*)
    (alien:load-foreign (merge-pathnames "Source/libswig.a"
***************
*** 425,428 ****
--- 427,432 ----
    (load (compile-file-pathname *swig-uffi-pathname*)))
  
+ ||#
+ 
  ;;;; TODO: