scsh-conservatory
/
scsh-0.6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ use unified patch format

This commit is contained in:
eknauel 2003-03-20 16:04:23 +00:00
parent 975e08732e
commit 45dfc0fbde
1 changed files with 265 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

466
scsh/odbc/README
View File

@ -20,88 +20,137 @@ Index: autogen.sh
=================================================================== ===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/autogen.sh,v RCS file: /cvsroot/scsh/scsh-0.6/autogen.sh,v
retrieving revision 1.7 retrieving revision 1.7
diff -r1.7 autogen.sh diff -u -r1.7 autogen.sh
5c5 --- autogen.sh 12 Feb 2002 16:26:05 -0000 1.7
< ./configure && +++ autogen.sh 20 Mar 2003 16:01:57 -0000
--- @@ -2,7 +2,7 @@
> ./configure --with-iODBC=/usr/lib &&
15,16c15 autoheader &&
< make build/initial.image && autoconf &&
< make distclean -./configure &&
--- +./configure --with-iODBC=/usr/lib &&
> make build/initial.image touch scsh/*.c &&
touch build/filenames.scm &&
rm -f scheme48.image cig/cig.image scsh/scsh.image &&
@@ -12,5 +12,4 @@
make i-know-what-i-am-doing &&
make c/scheme48.h&&
make linker &&
-make build/initial.image &&
-make distclean
+make build/initial.image
Index: configure.in Index: configure.in
=================================================================== ===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/configure.in,v RCS file: /cvsroot/scsh/scsh-0.6/configure.in,v
retrieving revision 1.27 retrieving revision 1.27
diff -r1.27 configure.in diff -u -r1.27 configure.in
397c397,420 --- configure.in 13 Dec 2002 15:22:13 -0000 1.27
< +++ configure.in 20 Mar 2003 16:01:57 -0000
--- @@ -394,7 +394,30 @@
> AC_ARG_WITH(unixODBC, AC_SUBST(LIBS)
> [ --with-unixODBC=DIR Support for unixODBC ], AC_SUBST(TMPDIR)
> [ with_unixodbc=$withval ],
> [ with_unixodbc=no ] -
> ) +AC_ARG_WITH(unixODBC,
> if test "$with_unixodbc" != no; then + [ --with-unixODBC=DIR Support for unixODBC ],
> odbc_includes="-I$with_unixodbc/include" + [ with_unixodbc=$withval ],
> odbc_libs="-lodbc -L$with_unixodbc/lib" + [ with_unixodbc=no ]
> AC_SUBST(odbc_includes) + )
> AC_SUBST(odbc_libs) +if test "$with_unixodbc" != no; then
> fi + odbc_includes="-I$with_unixodbc/include"
> + odbc_libs="-lodbc -L$with_unixodbc/lib"
> AC_ARG_WITH(iODBC, + AC_SUBST(odbc_includes)
> [ --with-iODBC=DIR Support for iODBC ], + AC_SUBST(odbc_libs)
> [ with_iodbc=$with_iodbc ], +fi
> [ with_iodbc=no ] +
> ) +AC_ARG_WITH(iODBC,
> if test "$with_iodbc" != no; then + [ --with-iODBC=DIR Support for iODBC ],
> odbc_includes="-I$with_iodbc/include" + [ with_iodbc=$with_iodbc ],
> odbc_libs="-liodbc -L$with_iodbc/lib" + [ with_iodbc=no ]
> AC_SUBST(odbc_includes) + )
> AC_SUBST(odbc_libs) +if test "$with_iodbc" != no; then
> fi + odbc_includes="-I$with_iodbc/include"
> + odbc_libs="-liodbc -L$with_iodbc/lib"
+ AC_SUBST(odbc_includes)
+ AC_SUBST(odbc_libs)
+fi
+
AC_CONFIG_FILES(Makefile scsh/endian.scm scsh-config)
AC_CONFIG_COMMANDS([scsh-config+x],[chmod +x scsh-config])
AC_OUTPUT
Index: Makefile.in Index: Makefile.in
=================================================================== ===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/Makefile.in,v RCS file: /cvsroot/scsh/scsh-0.6/Makefile.in,v
retrieving revision 1.59 retrieving revision 1.59
diff -r1.59 Makefile.in diff -u -r1.59 Makefile.in
11,12c11,12 --- Makefile.in 13 Jan 2003 06:17:49 -0000 1.59
< LIBS = @LIBS@ +++ Makefile.in 20 Mar 2003 16:01:57 -0000
< CFLAGS = @CFLAGS@ @@ -8,8 +8,8 @@
--- VPATH = @srcdir@
> LIBS = @LIBS@ @odbc_libs@ CC = @CC@
> CFLAGS = @CFLAGS@ @odbc_includes@ DEFS = @DEFS@
50c50,51 -LIBS = @LIBS@
< BUILD_RUNNABLE = /afs/wsi/i386_fbsd32/bin/scheme48 -CFLAGS = @CFLAGS@
--- +LIBS = @LIBS@ @odbc_libs@
> BUILD_RUNNABLE = /afs/wsi/ppc_macx55/scheme48-0.53/bin/scheme48 +CFLAGS = @CFLAGS@ @odbc_includes@
> #BUILD_RUNNABLE = /afs/wsi/ppc_macx55/scheme48-0.53/bin/scheme48 INSTALL = @INSTALL@
136c137 INSTALL_PROGRAM = @INSTALL_PROGRAM@
< scsh/md5.o INSTALL_DATA = @INSTALL_DATA@
--- @@ -47,7 +47,8 @@
> scsh/md5.o # BUILD_RUNNABLE has to be Scheme 48 0.53. This is used for builds directly
172,173c173,175 # out of the CVS repository.
< EXTERNAL_OBJECTS = $(SOCKET_OBJECTS) $(LOOKUP_OBJECTS) # We cannot use Scsh here since -i is not understood.
< EXTERNAL_FLAGS = $(SOCKET_FLAGS) -BUILD_RUNNABLE = /afs/wsi/i386_fbsd32/bin/scheme48
--- +BUILD_RUNNABLE = /afs/wsi/ppc_macx55/scheme48-0.53/bin/scheme48
> EXTERNAL_OBJECTS = $(SOCKET_OBJECTS) $(LOOKUP_OBJECTS) $(ODBC_OBJECTS) +#BUILD_RUNNABLE = /afs/wsi/ppc_macx55/scheme48-0.53/bin/scheme48
> EXTERNAL_FLAGS = $(SOCKET_FLAGS) $(ODBC_FLAGS) RUNNABLE = scsh
> EXTERNAL_LDFLAGS = $(SOCKET_LD_FLAGS) $(ODBC_LD_FLAGS) MANPAGE = $(RUNNABLE).$(manext)
176a179 LIB = $(libdir)/$(RUNNABLE)
> $(ODBC_INITIALIZERS) \ @@ -133,7 +134,7 @@
181a185,189 scsh/userinfo1.o \
> scsh/odbc/odbc.o: scsh/odbc/odbc.h scsh/sighandlers1.o \
> scsh/libscsh.o \
> ODBC_OBJECTS = scsh/odbc/odbc.o - scsh/md5.o
> ODBC_INITIALIZERS = s48_init_odbc + scsh/md5.o
>
838c846,847 SCSH_INITIALIZERS = s48_init_syslog s48_init_posix_regexp \
< scsh/rx/regress.scm s48_init_userinfo s48_init_sighandlers \
--- @@ -169,16 +170,23 @@
> scsh/rx/regress.scm \ # External code to include in the VM
> scsh/odbc/odbc.scm # After changing any of these you should delete `scheme48vm' and remake it.
-EXTERNAL_OBJECTS = $(SOCKET_OBJECTS) $(LOOKUP_OBJECTS)
-EXTERNAL_FLAGS = $(SOCKET_FLAGS)
+EXTERNAL_OBJECTS = $(SOCKET_OBJECTS) $(LOOKUP_OBJECTS) $(ODBC_OBJECTS)
+EXTERNAL_FLAGS = $(SOCKET_FLAGS) $(ODBC_FLAGS)
+EXTERNAL_LDFLAGS = $(SOCKET_LD_FLAGS) $(ODBC_LD_FLAGS)
EXTERNAL_INITIALIZERS = $(ADDITIONAL_INITIALIZER) $(SOCKET_INITIALIZERS) \
$(LOOKUP_INITIALIZERS) \
$(SCSH_INITIALIZERS) $(SRFI_INITIALIZERS) \
+ $(ODBC_INITIALIZERS) \
s48_init_cig
# Rules for any external code.
+scsh/odbc/odbc.o: scsh/odbc/odbc.h
+
+ODBC_OBJECTS = scsh/odbc/odbc.o
+ODBC_INITIALIZERS = s48_init_odbc
+
# Socket rules
c/unix/socket.o: c/scheme48.h c/fd-io.h c/event.h
@@ -835,7 +843,8 @@
scsh/rx/re-high.scm \
scsh/rx/regexp.scm \
scsh/rx/re-low.scm \
- scsh/rx/regress.scm
+ scsh/rx/regress.scm \
+ scsh/odbc/odbc.scm
# scsh/dbm.scm db.scm ndbm.scm
# jcontrol
This will add some rules to Makefile and add two options to configure: This will add some rules to Makefile and add two options to configure:
--with-iODBC=PATH and --with-unixODBC=PATH. --with-iODBC=PATH and --with-unixODBC=PATH.
@ -114,137 +163,152 @@ Index: scsh-package.scm
=================================================================== ===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-package.scm,v RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-package.scm,v
retrieving revision 1.59 retrieving revision 1.59
diff -r1.59 scsh-package.scm diff -u -r1.59 scsh-package.scm
599a600,617 --- scsh-package.scm 25 Feb 2003 12:58:37 -0000 1.59
> +++ scsh-package.scm 20 Mar 2003 16:03:38 -0000
> ;;; ODBC stuff @@ -597,3 +597,21 @@
> signals
> (define-structure odbc-data-types odbc-data-types-interface srfi-9)
> (open (files srfi-19))
> scheme define-structure +
> external-calls) +;;; ODBC stuff
> (files (odbc odbc-types))) +
> +(define-structure odbc-data-types odbc-data-types-interface
> (define-structure odbc odbc-interface + (open
> (open + scheme define-structure
> scheme define-record-types + external-calls)
> external-calls + (files (odbc odbc-types)))
> scsh-utilities +
> conditions signals) +(define-structure odbc odbc-interface
> (files (odbc odbc) + (open
> (odbc odbc-bindcol))) + scheme define-record-types
> + external-calls
+ scsh-utilities
+ conditions signals)
+ (files (odbc odbc)
+ (odbc odbc-bindcol)))
+
Index: scsh-interfaces.scm Index: scsh-interfaces.scm
=================================================================== ===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-interfaces.scm,v RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-interfaces.scm,v
retrieving revision 1.53 retrieving revision 1.53
diff -r1.53 scsh-interfaces.scm diff -u -r1.53 scsh-interfaces.scm
1169,1175c1169,1175 --- scsh-interfaces.scm 25 Feb 2003 12:58:37 -0000 1.53
< (export uname +++ scsh-interfaces.scm 20 Mar 2003 16:03:39 -0000
< uname:os-name @@ -1166,13 +1166,13 @@
< uname:node-name (export crypt))
< uname:release
< uname:version (define-interface uname-interface
< uname:machine - (export uname
< type/uname)) - uname:os-name
--- - uname:node-name
> (export uname - uname:release
> uname:os-name - uname:version
> uname:node-name - uname:machine
> uname:release - type/uname))
> uname:version + (export uname
> uname:machine + uname:os-name
> type/uname)) + uname:node-name
1277a1278,1366 + uname:release
> + uname:version
> ;;; ODBC stuff + uname:machine
> (define-interface odbc-data-types-interface + type/uname))
> (export
> (define-interface md5-interface
> make-sql-date (export make-md5-context
> sql-date? @@ -1275,3 +1275,92 @@
> sql-date-year ;; Date to string/string to date converters.
> sql-date-month date->string
> sql-date-day string->date))
> +
> make-sql-time +;;; ODBC stuff
> sql-time? +(define-interface odbc-data-types-interface
> sql-time-hour + (export
> sql-time-minute +
> sql-time-second + make-sql-date
> + sql-date?
> make-sql-timestamp + sql-date-year
> sql-timestamp? + sql-date-month
> sql-timestamp-year + sql-date-day
> sql-timestamp-month +
> sql-timestamp-day + make-sql-time
> sql-timestamp-hour + sql-time?
> sql-timestamp-minute + sql-time-hour
> sql-timestamp-second + sql-time-minute
> sql-timestamp-fraction + sql-time-second
> +
> make-sql-numeric + make-sql-timestamp
> sql-numeric? + sql-timestamp?
> sql-numeric-precision + sql-timestamp-year
> sql-numeric-scale + sql-timestamp-month
> sql-numeric-sign + sql-timestamp-day
> sql-numeric-value)) + sql-timestamp-hour
> + sql-timestamp-minute
> (define-interface odbc-interface + sql-timestamp-second
> (export + sql-timestamp-fraction
> odbc-handle? +
> environment-handle? + make-sql-numeric
> connection-handle? + sql-numeric?
> statement-handle? + sql-numeric-precision
> descriptor-handle? + sql-numeric-scale
> + sql-numeric-sign
> odbc-alloc-environment-handle + sql-numeric-value))
> odbc-alloc-connection-handle +
> odbc-alloc-statement-handle +(define-interface odbc-interface
> odbc-sql-connect + (export
> + odbc-handle?
> odbc-sql-data-sources + environment-handle?
> odbc-sql-drivers + connection-handle?
> odbc-sql-get-info-int + statement-handle?
> odbc-sql-get-info-string + descriptor-handle?
> odbc-sql-get-func +
> odbc-sql-get-type-info + odbc-alloc-environment-handle
> + odbc-alloc-connection-handle
> odbc-sql-set-connect-attr-int + odbc-alloc-statement-handle
> odbc-sql-set-connect-attr-string + odbc-sql-connect
> odbc-sql-get-connect-attr-string +
> odbc-sql-get-connect-attr-int + odbc-sql-data-sources
> odbc-sql-set-env-attr-int + odbc-sql-drivers
> odbc-sql-get-env-attr-int + odbc-sql-get-info-int
> odbc-sql-set-stmt-attr-int + odbc-sql-get-info-string
> odbc-sql-get-stmt-attr-int + odbc-sql-get-func
> + odbc-sql-get-type-info
> odbc-sql-prepare +
> odbc-sql-bind-parameter-exec-out + odbc-sql-set-connect-attr-int
> odbc-sql-get-cursor-name + odbc-sql-set-connect-attr-string
> odbc-sql-set-cursor-name + odbc-sql-get-connect-attr-string
> + odbc-sql-get-connect-attr-int
> odbc-sql-execute + odbc-sql-set-env-attr-int
> odbc-sql-execute-direct + odbc-sql-get-env-attr-int
> + odbc-sql-set-stmt-attr-int
> odbc-sql-row-count + odbc-sql-get-stmt-attr-int
> odbc-sql-get-data +
> odbc-sql-fetch + odbc-sql-prepare
> + odbc-sql-bind-parameter-exec-out
> odbc-sql-free-statement + odbc-sql-get-cursor-name
> odbc-sql-close-cursor + odbc-sql-set-cursor-name
> odbc-sql-cancel +
> odbc-sql-num-result-cols + odbc-sql-execute
> odbc-sql-describe-col + odbc-sql-execute-direct
> +
> odbc-sql-disconnect + odbc-sql-row-count
> odbc-sql-free-handle + odbc-sql-get-data
> + odbc-sql-fetch
> odbc-buffer-exceeded? +
> signal-buffer-exceeded + odbc-sql-free-statement
> odbc-unbound-column? + odbc-sql-close-cursor
> signal-unbound-column + odbc-sql-cancel
> odbc-sql-bindcol)) + odbc-sql-num-result-cols
+ odbc-sql-describe-col
+
+ odbc-sql-disconnect
+ odbc-sql-free-handle
+
+ odbc-buffer-exceeded?
+ signal-buffer-exceeded
+ odbc-unbound-column?
+ signal-unbound-column
+ odbc-sql-bindcol))
Now it's time to build scsh. Edit the call to configure in autgen.sh to Now it's time to build scsh. Edit the call to configure in autgen.sh to
your needs, e.g.: your needs, e.g.: