Merge branch 'devel'

Author: Barak A. Pearlmutter

.cvsignore

@@ -1 +1,17 @@
-build-stamp
+.deps/
+.dirstamp
+/INSTALL
+/aclocal.m4
+/autom4te.cache/
+/compile
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+Makefile
+Makefile.in

.gitignore

@@ -43,3 +43,12 @@ D: helped alex spec out his emulator mods
 D: perceptive bug-sniffer and system tester: found make-lambda %full-gc bug
 D: ported SLIB and GAMBIT-benchmarks to Oaklisp
 D: scheme-locale mods
+
+N: Blake McBride
+E: [email protected]
+W: http://blake.mcbride.name
+D: Wrote the OaklispSummary document.
+D: Build system updates and documentation.
+D: Misc bug reports and bug fixes
+D: Various tweaks and enhancements.
+D: Motivation.

src/CREDITS renamed to AUTHORS

@@ -0,0 +1,69 @@
+Build instructions for Oaklisp
+==============================
+
+The build system uses autotools (autoconf/automake) so a simple build
+would be:
+
+  autoreconf --install    (to install the autotools support files)
+  ./configure             (to configure the system)
+  make                    (to compile everything)
+  make install            (to install everything)
+
+For further details read INSTALL generated by running autoreconf.
+
+Bootstrapping
+=============
+
+The only unusual aspect here is that Oaklisp is written in Oaklisp,
+i.e., is self-hosting.  This causes a bootstrap issue.  If you already
+have Oaklisp installed, you can just use that: in the above use
+
+  make OAK=/usr/local/bin/oaklisp
+
+and that's that.
+
+If you don't have Oaklisp already installed, read on.
+
+There are only two files required to actually run Oaklisp:
+
+ oaklisp		the executable / emulator / virtual machine
+ oakworld.bin		pre-built oaklisp (read in by the executable)
+
+The file oakworld.bin contains the pre-built, pre-compiled Oaklisp
+system: the parts that are written in Oaklisp itself.  This means you
+need an existing oakworld.bin in order to run "oaklisp" in order to
+build a new oakworld.bin.  Oaklisp *cannot* run without an existing
+oakworld.bin file.  You can however build the executable "oaklisp"
+(which is written in C) without a working Oaklisp.  So all you really
+need is oakworld.bin.  The executable "oaklisp" will look for
+oakworld.bin at a compile-time-specified location, but has an option
+to look elsewhere.  You may need to pass this option to the compiled
+emulator at build time, e.g.,
+
+  make OAKWORLDFLAGS="--world $(pwd)/prebuilt/src/world/oakworld.bin"
+
+or
+
+  make OAKWORLDFLAGS="--world /usr/local/lib/oaklisp/oakworld.bin"
+
+CPU Architecture Issues
+=======================
+
+Oaklisp is sensitive to the endianness of the CPU
+<http://en.wikipedia.org/wiki/Endianness>.  The oakworld.bin included
+in the git branch containing a prebuilt world, or available for
+download as a separate file, is for a little-indian architecture.  x86
+and x86-64 processors are little-endian.  Oaklisp can be made to cross
+build an oakworld.bin for a different-endian architecture.
+
+The executable "oaklisp" currently only works in 32-bit mode.  It can
+be built as a 32-bit executable on 64-bit machines, assuming that
+32-bit development libraries are available.  (These are available on
+most systems, sometimes as an optional package.  E.g., on Debian or
+debian-derived distributions like Ubuntu, the correct package is
+gcc-multilib.)  Compiling with GCC on an x86_64 aka amd64 architecture
+machine one should use the -m32 which builds an i386 architecture
+executable.  This should be added by default by the build system.  For
+the adventurous -mx32, which uses the x86_64 instruction set with
+32-bit pointers, also works provided that x32 kernel support is
+enabled and the x32 development files are available.

BUILD.txt

@@ -0,0 +1,7 @@
+2015-03-03  Barak A. Pearlmutter  <[email protected]>
+
+	* autotools build system
+	* rubber to build LaTeX documentation
+	* prebuilt world on separate git branch
+	* ChangeLog file created for automake happiness
+	* AUTHORS file renamed from src/CREDITS for automake happiness

ChangeLog

@@ -14,8 +14,7 @@
 # or from the Free Software Foundation, 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA
 
-.PHONY: all install clean
-all install clean:
-	$(MAKE) -C src $@
-	$(MAKE) -C doc $@
-	$(MAKE) -C man $@
+SUBDIRS = src doc
+
+man_MANS = man/man1/oaklisp.1
+doc_DATA = README AUTHORS COPYING BUILD.txt ChangeLog NEWS

Makefile renamed to Makefile.am

@@ -0,0 +1 @@
+Build system switched to autotools.

NEWS

@@ -1,57 +1,37 @@
-This is the Oaklisp source distribution.
+This is an Oaklisp source distribution.
 
-Oaklisp's home is:
-http://oaklisp.alioth.debian.org/
+Oaklisp is a portable lisp interpreter / compiler for the Oaklisp
+dialect of lisp.
 
-Old releases are still at:
-See http://www-bcl.cs.may.ie/~barak/oaklisp/ for updates.
+Oaklisp is an object-oriented dialect of lisp sharing the standard
+lisp syntax, including common lisp style macros, first class types,
+multiple inheritance, and multiple namespaces (packages).  Oaklisp is
+also a Lisp-1 dialect meaning functions and variables share the same
+namespace (like Scheme).
 
+Project homepage(s)
+  https://alioth.debian.org/projects/oaklisp/ (main homepage)
+  https://github.com/barak/oaklisp            (collaborative development)
+  http://www.bcl.hamilton.ie/~barak/oaklisp/  (ancient history)
 
-*** GETTING IT WORKING ***
+The compiler compiles Oaklisp source code into byte-code for the
+included Oaklisp emulator / virtual machine.  The implmentation
+is described in the included documentation, and also in
 
- Oaklisp should be straightforward to install on a virgin machine.
- You need to compile some C source to make the emulator:
+  Kevin J. Lang and Barak A. Pearlmutter.  Oaklisp: an object-oriented
+  Scheme with first class types. In OOPSLA-86, pages 30–7. doi:
+  10.1145/960112.28701.  Special issue of ACM SIGPLAN Notices 21(11).
 
-   make -C src/emulator install
+  Kevin J. Lang and Barak A. Pearlmutter. Oaklisp: an object-oriented
+  dialect of Scheme. Lisp and Symbolic Computation, 1(1):39–51, May
+  1988.
 
- If you want the emulator to look for its world somewhere else, add eg
-    CPPFLAGS='-DFAST -DDEFAULT_WORLD=\"/usr/local/lib/oaklisp/oakworld.bin\"'
+  Barak A. Pearlmutter. Garbage collection with pointers to single
+  cells.  Communications of the ACM, 39(12):202–6, December 1996.  URL
+  http://www.acm.org/cacm/extension/pearlmt.pdf.
 
- Then you need to put the recompiled binary world it will use in place:
+  Barak A. Pearlmutter and Kevin J. Lang. The implementation of
+  Oaklisp.  In Peter Lee, editor, Topics in Advanced Language
+  Implementation, pages 189–215. MIT Press, 1991.
 
-   cp -a src/world/oakworld.bin /usr/local/lib/oaklisp/
-
- (You can't just use "make -C src/world install" because a new world
- can't be built until Oaklisp is working, which requires a world to be
- installed.  That's why the source distribution includes a pre-built
- oakworld.bin.)
-
- Now invoking /usr/local/bin/oaklisp should land you in an Oaklisp
- read-eval-print loop.
-
-
-*** INSTALLING DOCUMENTATION ***
-
-Probably you should
-
-  make -C man install
-
-The language and implementation manuals are in doc/lang/lang.ps and
-doc/lim/lim.ps.  They are latex source but include working Makefiles.
-You should be able to build and install them with
-
-  make -C doc install
-
-
-*** BUILDING A NEW WORLD ***
-
-Note that Oaklisp is written in Oaklisp, so you must have a working
-Oaklisp before you can rebuild the Oaklisp world, which is done via
-
- make -C src/world
-
-In fact, you should be able to rebuild and reinstall *everything* via
-
-  make install
-
-in this top-level directory.
+See BUILD.txt for instructions on how to build the system.

README

@@ -0,0 +1,63 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# This file is part of Oaklisp.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# The GNU GPL is available at http://www.gnu.org/licenses/gpl.html
+# or from the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA
+
+# Prologue
+AC_PREREQ([2.69])
+AC_INIT([Oaklisp],[1.3.4],[[email protected]],[oaklisp],[http://oaklisp.alioth.debian.org/])
+AC_CONFIG_SRCDIR([src/emulator/oaklisp.c])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([subdir-objects -Wall])
+
+# Checks for options
+dnl --enable-threads
+dnl --enable-ndebug
+
+# No double there is a "right" way of doing this.
+AM_CONDITIONAL(USE_M32, [test "$(uname --machine)" = "x86_64"])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_CHECK_PROGS([INDENT],[indent],[true])
+AC_CHECK_PROGS([RUBBER],[rubber],[false])
+
+# Checks for libraries.
+AC_SEARCH_LIBS([pthread_create],[pthread])
+
+# Checks for header files.
+AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AX_CFLAGS_WARN_ALL
+AC_CHECK_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_INT8_T
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([gettimeofday strerror])
+
+# Epilogue
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/world/Makefile])
+AC_OUTPUT

configure.ac

@@ -1,9 +1,9 @@
-/*.log
 /*.debhelper
+/*.log
 /*.substvars
+/autoreconf.after
+/autoreconf.before
 /files
-/oaklisp
-/oaklisp-doc
-/oaklisp-doc.files
-/tmp
-substvars
+/oaklisp-doc/
+/oaklisp/
+/tmp/

debian/.gitignore

@@ -1,8 +1,23 @@
-oaklisp (1.3.3-6) unstable; urgency=low
-
-  * priority option per override (debian/control)
-
- -- Barak A. Pearlmutter <[email protected]>  Mon, 31 Jan 2011 18:38:53 +0000
+oaklisp (1.3.4-1) unstable; urgency=low
+  
+  * debian/control: priority option per override (debian/control)
+  * debian/control: bump debian policy
+  * debian/rules: bump to dh 9
+  * debian/control: build dependency on gcc-multiarch for amd64
+  * debian/control: update vcs browser url (closes: #528298)
+  * debian/control: longer descriptions
+  * new upstream version
+  * adapt to new autotool upstream build scripts
+    - debian/rules: dh --with autoreconf
+    - debian/control: build dependency on rubber for LaTeX
+    - debian/control: remove build dependency on ghostscript
+    - debian/control: build depend on autoconf-archive for AX_CFLAGS_WARN_ALL
+    - debian/rules: use prebuilt world or installed oaklisp (closes: #534078)
+    - debian/README-BUILDING.Debian: remove, see upstream BUILD.txt
+    - general simplifications
+    - let upstream do more of the installation
+  
+ -- Barak A. Pearlmutter <[email protected]>  Tue, 03 Mar 2015 13:01:02 +0000
 
 oaklisp (1.3.3-5) unstable; urgency=low
 

debian/README-BUILDING.Debian

@@ -5,11 +5,13 @@ Maintainer: Barak A. Pearlmutter <[email protected]>
 Standards-Version: 3.9.6
 Build-depends:
 	debhelper (>= 9),
+	dh-autoreconf,
+	autoconf-archive,
 	texlive-latex-base, texlive-latex-extra, texlive-fonts-recommended,
-	ghostscript,
+	rubber,
 	gcc-multilib [amd64]
 Homepage: http://oaklisp.alioth.debian.org/
-Vcs-Git: git://git.debian.org/git/oaklisp/oaklisp.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/oaklisp/oaklisp.git
 Vcs-Browser: https://alioth.debian.org/scm/browser.php?group_id=100056
 
 Package: oaklisp

debian/changelog

@@ -1 +1 @@
-doc/*/*.pdf usr/share/doc/oaklisp-doc
+/usr/share/doc/oaklisp/* /usr/share/doc/oaklisp-doc/

debian/control

@@ -0,0 +1,3 @@
+/usr/bin/oaklisp
+/usr/lib/*/oaklisp/oakworld.bin
+/usr/share/man/*/*