X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=doc%2Fintro.xml;h=f227f2f0724e4d23008d21f24d3cbfb5cf7f01b4;hb=4661cdbb26de93d072226ab6cd9325c1ca7bb75e;hp=ac54ec4e866c6e5a45a11a97d556719cfabb8463;hpb=a35619ce17c910796b4f6f58c5916f8f513073e1;p=clsql.git
diff --git a/doc/intro.xml b/doc/intro.xml
index ac54ec4..f227f2f 100644
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -58,7 +58,7 @@
Prerequisites
- &defsystem;
+ &asdf;
&clsql; uses &asdf; to compile and load its
components. &asdf; is included in the &cclan; collection.
@@ -123,11 +123,11 @@
Installation
- Ensure &defsystem; is loaded
+ Ensure &asdf; is loaded
- Simply load the file defsystem.lisp.
+ Simply load the file asdf.lisp.
-(load "defsystem.lisp")
+(load "asdf.lisp")
@@ -168,7 +168,7 @@ make libs
Load &uffi;
Unzip or untar the &uffi; distribution which creates a directory
- for the &uffi; files. Add that directory to Defsystem's asdf:*central-registry*.
+ for the &uffi; files. Add that directory to &asdf;'s asdf:*central-registry*.
You can do that by pushing the pathname of the directory onto this variable.
The following example code assumes the &uffi; files reside in the
/usr/share/lisp/uffi/
@@ -184,7 +184,7 @@ make libs
If you plan to use the clsql-postgresql-socket interface, you must load the md5 module.
Unzip or untar the cl-md5 distribution, which creates a directory for the cl-md5 files.
- Add that directory to Defsystem's asdf:*central-registry*.
+ Add that directory to &asdf;'s asdf:*central-registry*.
You can do that by pushing the pathname of the directory onto this variable.
The following example code assumes the cl-md5 files reside in the
/usr/share/lisp/cl-md5/
@@ -200,7 +200,7 @@ make libs
Load &clsql; modules
Unzip or untar the &clsql; distribution which creates a directory
- for the &clsql; files. Add that directory to Defsystem's asdf:*central-registry*.
+ for the &clsql; files. Add that directory to &asdf;'s asdf:*central-registry*.
You can do that by pushing the pathname of the directory onto this variable.
The following example code assumes the &clsql; files reside in the
/usr/share/lisp/clsql/
@@ -208,12 +208,12 @@ make libs
the main :clsql system and at least one interface system.
(push #P"/usr/share/lisp/clsql/" asdf:*central-repository*)
-(asdf:oos 'asdf:load-op :clsql-base) ; base clsql package
-(asdf:oos 'asdf:load-op :clsql-mysql) ; MySQL interface
-(asdf:oos 'asdf:load-op :clsql-postgresql) ; PostgreSQL interface
-(asdf:oos 'asdf:load-op :clsql-postgresql-socket) ; Socket PGSQL interface
-(asdf:oos 'asdf:load-op :clsql-aodbc) ; Allegro ODBC interface
-(asdf:oos 'asdf:load-op :clsql) ; main clsql package
+(asdf:operate 'asdf:load-op 'clsql-base) ; base clsql package
+(asdf:operate 'asdf:load-op 'clsql-mysql) ; MySQL interface
+(asdf:operate 'asdf:load-op 'clsql-postgresql) ; PostgreSQL interface
+(asdf:operate 'asdf:load-op 'clsql-postgresql-socket) ; Socket PGSQL interface
+(asdf:operate 'asdf:load-op 'clsql-aodbc) ; Allegro ODBC interface
+(asdf:operate 'asdf:load-op 'clsql) ; main clsql package
@@ -221,15 +221,19 @@ make libs
Run test suite
- After loading &clsql;, you can execute the test program in
- the directory ./test-suite. The test file,
- tester-clsql
- has instructions for creating a test.config.
- After creating that file, simple load the test file with Lisp
- and the tests should automatically execute.
+ After loading &clsql;, you can execute the test suite. A configuration
+ file named .clsql-test.config must be created
+ in your home directory. There are instructures on the format of that file
+ in the tests/tests.lisp file in the &clsql;
+ source directory. After creating that file, you can run the test suite
+ with &asdf;:
+
+(asdf:operate 'asdf:test-op 'clsql)
+ . .
-
+
+