Miscellaneous fixups to source locations and documentation

Build 1.6.0-SNAPSHOT via Maven.

Fix various ABCL-CONTRIB documentation quirks.

Move Netbeans/Ant integration into a subdirectory.
parent 0de67e0e
......@@ -6,7 +6,7 @@
^nbproject/private
^doc/.+\.aux$
.+\.orig$
.+\.rej$
#.+\.rej$
.+\.class$
^ext/
^test/lisp/abcl/tmp
......
......@@ -3,6 +3,7 @@ Version 1.6.0
<http://abcl.org/svn/trunk/>
<http://gitlab.common-lisp.net/abcl/abcl/>
<http://github.com/armedbear/abcl/>
Unreleased
......
......@@ -1226,9 +1226,10 @@ user.dir
tofile="${dist.dir}/asdf.pdf"/>
</target>
<import file="netbeans-build.xml" optional="true"/>
<import file="etc/ant/build-snapshot.xml" optional="true"/>
<import file="etc/ant/build-maven.xml" optional="true"/>
<import file="etc/ant/netbeans-build.xml"
optional="true"/>
<import file="etc/ant/build-snapshot.xml"
optional="true"/>
<import file="etc/ant/build-maven.xml"
optional="true"/>
</project>
......@@ -97,10 +97,10 @@ named-readtables
# Colophon
Mark <evenson.not.org@gmail.com>
Created: 2011-09-11
Revised: 2017-06-11
<> abcl:documents <abcl.org/release/1.5.0/#abcl-contrib.jar> .
Mark <evenson.not.org@gmail.com>
Created: 2011-09-11
Revised: 2017-06-11
<> abcl:documents <abcl.org/release/1.5.0/#abcl-contrib.jar> .
......@@ -15,7 +15,7 @@ Example 1
---------
For the following ASDF definition stored in a file named "log4j.asd"
that loadable by ASDF
that can be loaded:
;;;; -*- Mode: LISP -*-
(in-package :asdf)
......@@ -25,7 +25,7 @@ that loadable by ASDF
After issuing
CL-USER> (asdf:load-system :log4j)
CL-USER> (asdf:make :log4j)
all the Log4j libraries would be dynamically added to the classpath so
that the following code would
......@@ -33,7 +33,7 @@ that the following code would
(let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
(#"trace" logger "Kilroy wuz here."))
output the message "Kilroy wuz here" to the log4j logging system.
output the message "Kilroy wuz here" to the Log4j logging system.
API
......@@ -53,16 +53,17 @@ ASDF classes derived from ASDF:COMPONENT:
the inheritance of the MVN component while allowing other forms of
uri-like resources to be encapsulated in the future.
The MVN component should specify a [Maven URI][1] as its PATH. A
Maven URI has the form "GROUP-ID/ARTIFACT-ID/VERSION" which specifies
the dependency to be satisfied for this component by resolution
through the Maven distributed dependency graph. The scheme (the
initial "mvn://") is implied, usually omitted for brevity. If a
VERSION is not specified (i.e. by a form like "GROUP-ID/ARTIFACT-ID"),
then the latest available version of the artifact will be retrieved
from the network.
The MVN component should specify a [Maven URI][mvn-uri] as its PATH.
A Maven URI has a namestring of the form
"GROUP-ID/ARTIFACT-ID/VERSION" which specifies the dependency to be
satisfied for this component by resolution through the Maven
distributed dependency graph. The scheme (the initial "mvn://" in a
Maven URI) is implied, and usually omitted for brevity. If a VERSION
is not specified (i.e. by a namestring like "GROUP-ID/ARTIFACT-ID" for
the MVN component), then the latest available version of the artifact
will be retrieved from the network.
[1]: http://team.ops4j.org/wiki/display/paxurl/Mvn+Protocol
[mvn-uri]: http://team.ops4j.org/wiki/display/paxurl/Mvn+Protocol
The MVN component may specify a CLASSNAME which if present in the
current jvm, inhibits further loading from the network. This may be
......@@ -81,7 +82,7 @@ into the currently executing JVM process all recursive dependencies
annotated in the ditributed Maven pom.xml graph.
One can muffle the verbosity of the Maven Aether resolver by setting
ABCL-ASDF:*MAVEN-VERBOSE* to NIL.
CL:*load-VERBOSE* to NIL.
Example 2
---------
......@@ -134,7 +135,7 @@ For a filesystem of jar archives:
./lib/ext/xsb-system/interprolog.jar
The following ASDF defintion loads enough JVM artifacts to use the
[IRIS reasoner][1]:
[IRIS reasoner][iris-reasoner]:
(defsystem :wsml2reasoner-jars
:version "0.6.4" ;; last sync with SVN
......@@ -157,12 +158,12 @@ The following ASDF defintion loads enough JVM artifacts to use the
:pathname "lib/ext/log4j/" :components
((:jar-file "log4j-1.2.14")))))
[1]: http://www.iris-reasoner.org/
[iris-reasoner]: http://www.iris-reasoner.org/
#### Colophon
Mark <evenson.not.org@gmail.com>
Created: 2011-01-01
Revised: 2013-08-16
Revised: 2017-06-13
......@@ -21,7 +21,6 @@ name. When ambiguous, you need to be more specific. A simple example
from CL-USER:
(require :jss)
(in-package :jss)
(let ((sw (new 'StringWriter)))
(#"write" sw "Hello ")
(#"write" sw "World")
......@@ -44,7 +43,7 @@ or
The call
(#"write" sw "Hello ")
(#"write" sw "Hello ")
uses the code in invoke.java to call the method named "write" with
the arguments sw and "Hello ". JSS figures out the right java method
......@@ -78,7 +77,7 @@ want to avoid the overhead of a the dynamic dispatch.
e.g.
(with-constant-signature ((tostring "toString"))
(time (dotimes (i 10000) (tostring "foo"))))
(time (dotimes (i 10000) (tostring "foo"))))
runs about three times faster than
......@@ -86,7 +85,8 @@ runs about three times faster than
So, something like
(with-constant-signature ((tostring "toString" t)) ...)
(with-constant-signature
((tostring "toString" t)) ...)
will cause the toString to be a raw java call. See
JSS::GET-ALL-JAR-CLASSNAMES for an example.
......@@ -122,8 +122,7 @@ specify invocation and chains:
.load(getClass().getClassLoader())
.getLoaded()"
Compatibility
-------------
# Compatibility
The function ENSURE-COMPATIBILITY attempts to provide a compatibility
mode to existing users of JSS by importing the necessary symbols into
......@@ -140,17 +139,17 @@ Some notes on other compatibility issues:
1.0
Equivalent to Alan Ruttenberg's version included with the original
[lsw]().
[lsw2]().
[lsw]: http://mumble.net:8080/svn/lsw/trunk/
[lsw2]: let-me-google-that-for-you
[lsw2]: https://github.com/alanruttenberg/lsw2
3.0
In the JSS package loaded from [abcl-contrib]()
The results the of having JSS package loaded from [abcl-contrib][]
abcl-contrib: http://abcl.org/svn/trunk/abcl/contrib/
[abcl-contrib]: http://abcl.org/svn/trunk/abcl/contrib/
# Colophon
<> dc:created "2005" ;
......
......@@ -1637,7 +1637,7 @@ upon Java 5.
\chapter{The SYSTEM Dictionary}
The public interfaces in this package are subject to change with
\textsc{ABCL} 1.6.
\textsc{ABCL} 1.7.
\include{system}
......
......@@ -4,7 +4,8 @@
<!-- XXX need way to autodetect NetBeans as installed, as this will
probably fail otherwise. -->
<import file="nbproject/build-impl.xml"/>
<import file="../../nbproject/build-impl.xml"/>
<target name="-pre-compile" if="abcl.compile.lisp.skip">
<antcall target="abcl.copy.lisp"/>
......
......@@ -13,7 +13,7 @@
</parent>
<groupId>org.abcl</groupId>
<artifactId>abcl</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ABCL - Armed Bear Common Lisp</name>
<description>Common Lisp implementation running on the JVM</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment