r2050: Debian build

diff --git a/base/package.cl b/base/package.cl
index 2016b38f5e52fb77592a63f6a2e589e8ee8042d0..30fc9a54ffd32da7b0acf8596bd991e80e752e44 100644 (file)
--- a/base/package.cl
+++ b/base/package.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: package.cl,v 1.2 2002/05/13 17:20:35 marc.battyani Exp $
+;;;; $Id: package.cl,v 1.3 2002/05/15 17:21:29 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -120,7 +120,7 @@
         ;; utils.cl
         #:number-to-sql-string
         #:float-to-sql-string
-        #:sql-escape-quotes
+        #:sql-escape
 
         ;; For UncommonSQL support
         #:sql-ident

diff --git a/base/utils.cl b/base/utils.cl
new file mode 100644 (file)
index 0000000..a33fb41
--- /dev/null
+++ b/base/utils.cl
@@ -0,0 +1,49 @@
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:         utils.cl
+;;;; Purpose:      SQL utility functions
+;;;; Programmer:   Kevin M. Rosenberg
+;;;; Date Started: Mar 2002
+;;;;
+;;;; $Id: utils.cl,v 1.1 2002/05/15 17:19:42 kevin Exp $
+;;;;
+;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;;
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
+;;;; *************************************************************************
+
+(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
+(in-package :clsql-sys)
+
+(defun number-to-sql-string (num)
+  (etypecase num
+    (integer
+     num)
+    (rational
+     (float-to-sql-string (coerce num 'double-float)))
+    (number
+     (float-to-sql-string num))))
+
+(defun float-to-sql-string (num)
+  "Convert exponent character for SQL"
+  (substitute #\e #\f (substitute #\e #\d (write-to-string num :readably t))))
+
+(defun sql-escape-quotes (s)
+  "Escape single quotes for SQL"
+  (substitute-string-for-char s #\' "''"))
+
+(defun substitute-string-for-char (procstr match-char subst-str) 
+"Substitutes a string for a single matching character of a string"
+  (let ((pos (position match-char procstr)))
+    (if pos
+       (concatenate 'string
+         (subseq procstr 0 pos) subst-str
+         (substitute-string-for-char 
+          (subseq procstr (1+ pos)) match-char subst-str))
+      procstr)))
+
+

diff --git a/clsql-base.system b/clsql-base.system
index 51b0c5845fd4cf29b64eb5c942f7ef8db75cdc36..b22e34f44e7ebe05becd2e882fee1ab03c8e58b8 100644 (file)
--- a/clsql-base.system
+++ b/clsql-base.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.system,v 1.5 2002/05/15 17:10:28 kevin Exp $
+;;;; $Id: clsql-base.system,v 1.6 2002/05/15 17:19:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -33,6 +33,7 @@
     :binary-pathname "CL-LIBRARY:clsql;base;bin;"
     :components ((:file "cmucl-compat")
                 (:file "package")
+                (:file "utils" :depends-on ("package"))
                 (:file "classes" :depends-on ("package"))
                 (:file "conditions" :depends-on ("classes"))
                 (:file "db-interface" :depends-on ("conditions"))

diff --git a/clsql.system b/clsql.system
index aa634762040ab4d9505bd917909a4309fbd53006..aa1356e845630af6d5fffe26c89c71b098d3832d 100644 (file)
--- a/clsql.system
+++ b/clsql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.system,v 1.13 2002/05/15 17:10:28 kevin Exp $
+;;;; $Id: clsql.system,v 1.14 2002/05/15 17:19:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -35,7 +35,6 @@
                 (:file "loop-extension")
                 (:file "sql" :depends-on ("pool"))
                 (:file "transactions" :depends-on ("sql"))
-                (:file "utils")
                 (:file "functional" :depends-on ("sql"))
                 (:file "usql" :depends-on ("sql")))
     :depends-on (:clsql-base)

diff --git a/debian/rules b/debian/rules
index 4f5cb8d8470bad36ef5b25712e1e2361970f9d8e..136cddb14b907761ece7e5b09ae64bcd5ddca6b1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ prefix-aodbc  := debian/$(pkg-aodbc)
 
 ## Lisp sources
 srcs           := $(wildcard sql/*.cl)
-srcs-cmucl-compat:= $(wildcard cmucl-compat/*.cl)
 srcs-base      := $(wildcard base/*.cl)
 srcs-base-uffi := $(wildcard interfaces/clsql-uffi/*.cl) 
 srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
@@ -78,7 +77,6 @@ install: build
 
        # Main package
        $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
 
        # Base
        $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/base

diff --git a/sql/utils.cl b/sql/utils.cl
deleted file mode 100644 (file)
index aa0aa33..0000000
--- a/sql/utils.cl
+++ /dev/null
@@ -1,49 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:         utils.cl
-;;;; Purpose:      SQL utility functions
-;;;; Programmer:   Kevin M. Rosenberg
-;;;; Date Started: Mar 2002
-;;;;
-;;;; $Id: utils.cl,v 1.2 2002/03/27 05:04:19 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-sys)
-
-(defun number-to-sql-string (num)
-  (etypecase num
-    (integer
-     num)
-    (rational
-     (float-to-sql-string (coerce num 'double-float)))
-    (number
-     (float-to-sql-string num))))
-
-(defun float-to-sql-string (num)
-  "Convert exponent character for SQL"
-  (substitute #\e #\f (substitute #\e #\d (write-to-string num :readably t))))
-
-(defun sql-escape-quotes (s)
-  "Escape single quotes for SQL"
-  (substitute-string-for-char s #\' "''"))
-
-(defun substitute-string-for-char (procstr match-char subst-str) 
-"Substitutes a string for a single matching character of a string"
-  (let ((pos (position match-char procstr)))
-    (if pos
-       (concatenate 'string
-         (subseq procstr 0 pos) subst-str
-         (substitute-string-for-char 
-          (subseq procstr (1+ pos)) match-char subst-str))
-      procstr)))
-
-