r2032: Debian build

diff --git a/clsql-mysql.system b/clsql-mysql.system
index 44fe0ef558ae673f8b5c985a445155a23440c961..2a3f9f3b2b7f7e824a6e7b5283134cbffa89a4e5 100644 (file)
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: clsql-mysql.system,v 1.7 2002/05/13 20:33:56 kevin Exp $\r
+;;;; $Id: clsql-mysql.system,v 1.8 2002/05/13 21:50:52 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -18,11 +18,11 @@
 \r
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 \r
-(in-package :make)\r
+(in-package :clsql-sys)\r
 \r
 ;;; System definition\r
 \r
-(defsystem :clsql-mysql\r
+(mk:defsystem :clsql-mysql\r
     :source-pathname "CL-LIBRARY:clsql;interfaces;mysql;"\r
     :source-extension "cl"\r
     :binary-pathname "CL-LIBRARY:clsql;interfaces;mysql;bin;"\r
@@ -31,15 +31,12 @@
                 (:file "mysql-api" :depends-on ("mysql-loader"))\r
                 (:file "mysql-sql" :depends-on ("mysql-api"))\r
                 (:file "mysql-usql" :depends-on ("mysql-sql")))\r
-    :depends-on (:uffi :clsql-base :clsql-uffi))\r
-\r
-#|\r
+    :depends-on (:uffi :clsql-base :clsql-uffi)\r
     :finally-do\r
     (when (clsql-sys:database-type-library-loaded :mysql)\r
       (clsql-sys:initialize-database-type :database-type :mysql)\r
       (setq clsql:*default-database-type* :mysql)\r
       (pushnew :mysql cl:*features*)))\r
-|#\r
 \r
 \r
 \r

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index ea886ef61214f8dd5f4bb5c5662fc599a076a568..a5ad4b7ba464c2963f39cc0a59cba1e72668f7fc 100644 (file)
--- a/interfaces/clsql-uffi/clsql-uffi-loader.cl
+++ b/interfaces/clsql-uffi/clsql-uffi-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.cl,v 1.1 2002/03/27 08:09:25 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.2 2002/05/13 21:50:52 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,8 +21,8 @@
 
 (defvar *clsql-uffi-library-filename* 
     (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;clsql-uffi;clsql-uffi.so"
-     #+(or mswindows win32) "CLSQL:interfaces;clsql-uffi;clsql-uffi.dll"
+     #+(or linux unix) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.so"
+     #+(or mswindows win32) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.dll"
      ))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index 0ff1ad28c7d23c02ba6a464966d363f0007d1217..65e06a178922e642f781233ad875cacc3e5cbae2 100644 (file)
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.6 2002/04/23 18:28:02 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.7 2002/05/13 21:50:52 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -27,8 +27,8 @@
 
 (defvar *clsql-mysql-library-filename* 
     (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;mysql;clsql-mysql.so"
-     #+(or mswindows win32) "CLSQL:interfaces;mysql;clsql-mysql.dll"
+     #+(or linux unix) "CL-LIBRARY:clsql;interfaces;mysql;clsql-mysql.so"
+     #+(or mswindows win32) "CL-LIBRARY:clsql;interfaces;mysql;clsql-mysql.dll"
      ))
 
 (defvar *mysql-library-filename*

diff --git a/make-debian.sh b/make-debian.sh
index dbe537ffe51198a04b584086ab93f2fa2bb69beb..6fcdb6e891bcd3f18571642b9fd13bbb0444d134 100755 (executable)
--- a/make-debian.sh
+++ b/make-debian.sh
@@ -8,7 +8,6 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 export CVSROOT=`cat CVS/Root`
 
 echo "Building Debian files"
-cvs com -m 'debian build'
 cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare.sh -i.pdf -F -d ${DEBPKG} $*
 
 rm -rf ${PACKAGE_DIR}/${DEBPKG}-${DEBVERSION}

diff --git a/make-upstream.sh b/make-upstream.sh
index c02895c5a69178c12588987ebea87769f748479a..568fe2aa619a706327310ab5579a753fe0e9c5c1 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -12,6 +12,7 @@ usage () {
 Usage: $progname [options]
 Creates upstream archives
 Options:
+  -c   Commit and tag CVS tree with current version numbers
   -t   Tag CVS tree with current version numbers
   -h   Print this brief help
 EOF
@@ -22,6 +23,7 @@ while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
+        -c)  opt_commit=1; opt_tag=1 ;;
         -t)  opt_tag=1               ;;
          *)  usage; exit 0           ;;
     esac
@@ -38,6 +40,10 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_commit} ]; then
+    cvs commit -m 'Debian build'
+fi
+
 if [ ! -z ${opt_tag} ]; then
     UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"