From nsiivola at common-lisp.net Thu Mar 11 17:15:42 2010 From: nsiivola at common-lisp.net (nsiivola) Date: Thu, 11 Mar 2010 12:15:42 -0500 Subject: [Linedit-cvs] CVS src Message-ID: Update of /project/linedit/cvsroot/src In directory cl-net:/tmp/cvs-serv24994 Modified Files: linedit.asd Log Message: dylib generation on Mac OS X for Allegro and Lispworks Patch by: Kevin M. Rosenberg --- /project/linedit/cvsroot/src/linedit.asd 2008/02/15 12:02:37 1.33 +++ /project/linedit/cvsroot/src/linedit.asd 2010/03/11 17:15:42 1.34 @@ -1,5 +1,5 @@ ;; Copyright (c) 2003 Nikodemus Siivola -;; +;; ;; Permission is hereby granted, free of charge, to any person obtaining ;; a copy of this software and associated documentation files (the ;; "Software"), to deal in the Software without restriction, including @@ -7,10 +7,10 @@ ;; distribute, sublicense, and/or sell copies of the Software, and to ;; permit persons to whom the Software is furnished to do so, subject to ;; the following conditions: -;; +;; ;; The above copyright notice and this permission notice shall be included ;; in all copies or substantial portions of the Software. -;; +;; ;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -28,16 +28,25 @@ (defvar *gcc* "/usr/bin/gcc") -(defvar *gcc-options* '(#-darwin "-shared" - #+darwin "-bundle" - "-fPIC")) +(defvar *gcc-options* '(#-(or darwin macosx) "-shared" + #+(or darwin macosx) "-dynamic" + #+(or darwin macosx) "-arch" + #+(or darwin macosx) "x86_64" + #+(or darwin macosx) "-arch" + #+(or darwin macosx) "i386" + #+(or darwin macosx) "-bundle" + #+(or darwin macosx) "/usr/lib/bundle1.o" + #+(or darwin macosx) "-flat_namespace" + #+(or darwin macosx) "-undefined" + #+(or darwin macosx) "suppress" + #-(or darwin macosx) "-fPIC")) ;;; Separate class so that we don't mess up other packages (defclass uffi-c-source-file (c-source-file) ()) (defmethod output-files ((o compile-op) (c uffi-c-source-file)) (list (make-pathname :name (component-name c) - :type "so" + :type #-(or darwin macosx) "so" #+(or darwin macosx) "dylib" :defaults (component-pathname c)))) (defmethod perform ((o load-op) (c uffi-c-source-file)) From nsiivola at common-lisp.net Thu Mar 11 17:21:30 2010 From: nsiivola at common-lisp.net (nsiivola) Date: Thu, 11 Mar 2010 12:21:30 -0500 Subject: [Linedit-cvs] CVS src Message-ID: Update of /project/linedit/cvsroot/src In directory cl-net:/tmp/cvs-serv27405 Modified Files: linedit.asd Log Message: make linedit.asd Allegro modern-mode friendly Patch by Kevin M. Rosenberg --- /project/linedit/cvsroot/src/linedit.asd 2010/03/11 17:15:42 1.34 +++ /project/linedit/cvsroot/src/linedit.asd 2010/03/11 17:21:30 1.35 @@ -50,7 +50,7 @@ :defaults (component-pathname c)))) (defmethod perform ((o load-op) (c uffi-c-source-file)) - (let ((loader (intern "LOAD-FOREIGN-LIBRARY" :uffi))) + (let ((loader (intern (symbol-name '#:load-foreign-library) :uffi))) (dolist (f (asdf::input-files o c)) (funcall loader f :module (pathname-name f))))) From nsiivola at common-lisp.net Thu Mar 11 21:58:04 2010 From: nsiivola at common-lisp.net (nsiivola) Date: Thu, 11 Mar 2010 16:58:04 -0500 Subject: [Linedit-cvs] CVS src Message-ID: Update of /project/linedit/cvsroot/src In directory cl-net:/tmp/cvs-serv7154 Modified Files: linedit.asd packages.lisp Log Message: fix SBCL build, work with modern Osicat * Oops, those linedit.asd changes broke the build on SBCL, and I didn't notice. *blush* * Current Osicat doesn't have *OSICAT-VERSION* anymore. * Missing dependency in linedit.asd. --- /project/linedit/cvsroot/src/linedit.asd 2010/03/11 17:21:30 1.35 +++ /project/linedit/cvsroot/src/linedit.asd 2010/03/11 21:58:04 1.36 @@ -28,18 +28,16 @@ (defvar *gcc* "/usr/bin/gcc") -(defvar *gcc-options* '(#-(or darwin macosx) "-shared" - #+(or darwin macosx) "-dynamic" - #+(or darwin macosx) "-arch" - #+(or darwin macosx) "x86_64" - #+(or darwin macosx) "-arch" - #+(or darwin macosx) "i386" - #+(or darwin macosx) "-bundle" - #+(or darwin macosx) "/usr/lib/bundle1.o" - #+(or darwin macosx) "-flat_namespace" - #+(or darwin macosx) "-undefined" - #+(or darwin macosx) "suppress" - #-(or darwin macosx) "-fPIC")) +(defvar *gcc-options* + #-(or darwin macosx) + (list "-shared" "-fPIC") + #+(or darwin macosx) + (append + (list "-dynamic" "-bundle") + #+(or x86 x86-64) + (list "-arch" "x86_64" "-arch" "i386") + #-sbcl + (list "/usr/lib/bundle1.o" "-flat_namespace" "-undefined" "suppress"))) ;;; Separate class so that we don't mess up other packages (defclass uffi-c-source-file (c-source-file) ()) @@ -63,13 +61,13 @@ (error 'operation-error :component c :operation o))) (defsystem :linedit - :version "0.16.1" + :version "0.16.2" :depends-on (:uffi :terminfo :osicat) :components (;; Common (:file "packages") - (:file "utility-macros" :depends-on ("packages")) (:file "utility-functions" :depends-on ("packages")) + (:file "utility-macros" :depends-on ("packages" "utility-functions")) (:file "matcher" :depends-on ("packages")) ;; Backend --- /project/linedit/cvsroot/src/packages.lisp 2004/04/25 14:43:02 1.18 +++ /project/linedit/cvsroot/src/packages.lisp 2010/03/11 21:58:04 1.19 @@ -19,18 +19,6 @@ ;;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;;;; Check requirements -- this might be best done in a separate file, -;;;; or an asdf method. -#.(cond - ((stringp osicat:*osicat-version*) - (error "This version of Linedit requires Osicat version 0.4.0 or later, -but current Osicat version is ~A." osicat:*osicat-version*)) - ((consp osicat:*osicat-version*) - (unless (<= 4 (second osicat:*osicat-version*)) - (error "This version of Linedit requires Osicat version 0.4.0 or later, -but current Osicat version is ~{~A~^.~}." osicat:*osicat-version*))) - (t (error "No Osicat version found."))) - ;;;; Package (defpackage :linedit From nsiivola at common-lisp.net Thu Mar 11 22:11:26 2010 From: nsiivola at common-lisp.net (nsiivola) Date: Thu, 11 Mar 2010 17:11:26 -0500 Subject: [Linedit-cvs] CVS src Message-ID: Update of /project/linedit/cvsroot/src In directory cl-net:/tmp/cvs-serv11957 Added Files: TODO Log Message: add TODO ...for enterprising hackers. --- /project/linedit/cvsroot/src/TODO 2010/03/11 22:11:26 NONE +++ /project/linedit/cvsroot/src/TODO 2010/03/11 22:11:26 1.1 Linedit TODO * Switch to Git. * Use CFFI instead of UFFI. * Use terminfo properly instead of ad-hoc terminal translations. * See how much of the C-side glue is really necessary. * Some of the terminal stuff is very similar to bits of TTY hemlock *** Maybe refactor into a library both can use? *** There may be other parts Linedit and Hemlock could share...