~ chicken-core (chicken-5) e9956349195a91f99f341da7c467978794ff7f09
commit e9956349195a91f99f341da7c467978794ff7f09
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Jan 4 09:15:09 2010 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Mon Jan 4 09:15:09 2010 +0100
removed obsolete stuff; no more documentation handling by chicken-install; removed chicken-setup stub
diff --git a/chicken-setup.scm b/chicken-setup.scm
deleted file mode 100644
index 04bcfc4b..00000000
--- a/chicken-setup.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-;;;; chicken-setup.scm - stub application to overwrite old versions of this program on installation
-;
-; Copyright (c) 2009, The Chicken Team
-; All rights reserved.
-;
-; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
-; conditions are met:
-;
-; Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-; disclaimer.
-; Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-; disclaimer in the documentation and/or other materials provided with the distribution.
-; Neither the name of the author nor the names of its contributors may be used to endorse or promote
-; products derived from this software without specific prior written permission.
-;
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-; AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-; POSSIBILITY OF SUCH DAMAGE.
-
-
-(print "This program is obsolete. Please use `chicken-install' instead.")
-(exit 1)
diff --git a/distribution/manifest b/distribution/manifest
index ef7e2bac..05a75d22 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -86,53 +86,6 @@ files.scm
chicken-bug.1
chicken-bug.scm
chicken-bug.c
-html/Accessing external objects.html
-html/Acknowledgements.html
-html/Basic mode of operation.html
-html/Bibliography.html
-html/Bugs and limitations.html
-html/C interface.html
-html/Callbacks.html
-html/Data representation.html
-html/Declarations.html
-html/Deviations from the standard.html
-html/Embedding.html
-html/Extensions to the standard.html
-html/Extensions.html
-html/Foreign type specifiers.html
-html/Getting started.html
-html/Interface to external functions and variables.html
-html/Locations.html
-html/Modules and macros.html
-html/Non-standard macros and special forms.html
-html/The R5RS standard.html
-html/Non-standard read syntax.html
-html/Other support procedures.html
-html/Getting Started.html
-html/Parameters.html
-html/Supported language.html
-html/The User's Manual.html
-html/Unit data-structures.html
-html/Unit eval.html
-html/Unit expand.html
-html/Unit extras.html
-html/Unit files.html
-html/Unit library.html
-html/Unit lolevel.html
-html/Unit ports.html
-html/Unit posix.html
-html/Unit regex.html
-html/Unit srfi-1.html
-html/Unit srfi-13.html
-html/Unit srfi-14.html
-html/Unit srfi-18.html
-html/Unit srfi-4.html
-html/Unit tcp.html
-html/Unit utils.html
-html/Using the compiler.html
-html/Using the interpreter.html
-html/faq.html
-html/manual.css
library.scm
lolevel.scm
optimizer.scm
@@ -287,8 +240,6 @@ chicken-status.scm
chicken-status.c
chicken-install.scm
chicken-install.c
-chicken-setup.scm
-chicken-setup.c
chicken-uninstall.scm
chicken-uninstall.c
setup.defaults
@@ -300,3 +251,50 @@ setup-api.c
setup-api.import.c
setup-download.import.c
types.db
+manual/Accessing external objects
+manual/Acknowledgements
+manual/Basic mode of operation
+manual/Bibliography
+manual/Bugs and limitations
+manual/C interface
+manual/Callbacks
+manual/Data representation
+manual/Declarations
+manual/Deviations from the standard
+manual/Embedding
+manual/Extensions
+manual/Extensions to the standard
+manual/Extensions~
+manual/Foreign type specifiers
+manual/Getting started
+manual/Interface to external functions and variables
+manual/Locations
+manual/Modules and macros
+manual/Non-standard macros and special forms
+manual/Non-standard read syntax
+manual/Other support procedures
+manual/Parameters
+manual/Supported language
+manual/The R5RS standard
+manual/The User's Manual
+manual/Unit data-structures
+manual/Unit eval
+manual/Unit expand
+manual/Unit extras
+manual/Unit files
+manual/Unit library
+manual/Unit lolevel
+manual/Unit ports
+manual/Unit posix
+manual/Unit regex
+manual/Unit srfi-1
+manual/Unit srfi-13
+manual/Unit srfi-14
+manual/Unit srfi-18
+manual/Unit srfi-4
+manual/Unit srfi-69
+manual/Unit tcp
+manual/Unit utils
+manual/Using the compiler
+manual/Using the interpreter
+manual/faq
diff --git a/manual/Extensions b/manual/Extensions
index 2c3d4b0b..8c55b386 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -53,7 +53,7 @@ on the command line.
Sometimes an extension requires a C library to compile. Compilation
can fail when your system has this library in a nonstandard
-location. Luckily, normally Chicken searches in the default locations
+location. Normally the C compiler searches in the default locations
{{/usr}} and {{/usr/local}}, and in the prefix where Chicken itself
was installed. Sometimes this is not enough, so you'll need to supply
{{chicken-install}} with some extra hints to the C compiler/linker. Here's
diff --git a/misc/manual.css b/misc/manual.css
deleted file mode 100644
index 238d3455..00000000
--- a/misc/manual.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* manual.css - Stylesheet for HTML manual */
-
-
-CODE {
- color: #666666;
-}
-
-a:link {
- color: #336;
-}
-
-a:visited { color: #666; }
-
-a:active { color: #966; }
-
-a:hover { color: #669; }
-
-body {
- background: #fff;
- color: #000;
- font: 9pt "Lucida Grande", "Verdana", sans-serif;
- margin: 8em;
-}
-
-TABLE {
- font: 9pt "Lucida Grande", "Verdana", sans-serif;
-}
-
-H3 {
- color: #113;
-}
-
-PRE { font-family: "Andale Mono", monospace; }
diff --git a/misc/programs.files b/misc/programs.files
index 84f90222..d4f133d4 100644
--- a/misc/programs.files
+++ b/misc/programs.files
@@ -1,7 +1,6 @@
chicken-bug.scm
chicken-install.scm
chicken-profile.scm
-chicken-setup.scm
chicken-status.scm
chicken-uninstall.scm
csc.scm
diff --git a/rules.make b/rules.make
index 87d9dbcb..e7a4446b 100644
--- a/rules.make
+++ b/rules.make
@@ -660,9 +660,6 @@ chicken-uninstall$(O): chicken-uninstall.c chicken.h $(CHICKEN_CONFIG_H)
chicken-status$(O): chicken-status.c chicken.h $(CHICKEN_CONFIG_H)
$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
$(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
-chicken-setup$(O): chicken-setup.c chicken.h $(CHICKEN_CONFIG_H)
- $(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
- $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
csc$(O): csc.c chicken.h $(CHICKEN_CONFIG_H)
$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
$(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
@@ -763,9 +760,6 @@ $(CHICKEN_UNINSTALL_PROGRAM)$(EXE): chicken-uninstall$(O) $(PRIMARY_LIBCHICKEN)
$(CHICKEN_STATUS_PROGRAM)$(EXE): chicken-status$(O) $(PRIMARY_LIBCHICKEN)
$(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
$(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
-$(CHICKEN_SETUP_PROGRAM)$(EXE): chicken-setup$(O) $(PRIMARY_LIBCHICKEN)
- $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
- $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
$(CHICKEN_PROFILE_PROGRAM)$(EXE): chicken-profile$(O) $(PRIMARY_LIBCHICKEN)
$(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
@@ -929,8 +923,8 @@ endif
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-status.1 "$(DESTDIR)$(IMANDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-profile.1 "$(DESTDIR)$(IMANDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-bug.1 "$(DESTDIR)$(IMANDIR)"
- $(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) "$(DESTDIR)$(IDOCDIR)$(SEP)html"
- -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)html$(SEP)* "$(DESTDIR)$(IDOCDIR)$(SEP)html"
+ $(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) "$(DESTDIR)$(IDOCDIR)$(SEP)manual"
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)manual$(SEP)* "$(DESTDIR)$(IDOCDIR)$(SEP)manual"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)README "$(DESTDIR)$(IDOCDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)LICENSE "$(DESTDIR)$(IDOCDIR)"
ifdef WINDOWS_SHELL
@@ -1212,8 +1206,6 @@ chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm
$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -ignore-repository -output-file $@
chicken-status.c: $(SRCDIR)chicken-status.scm
$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -ignore-repository -output-file $@
-chicken-setup.c: $(SRCDIR)chicken-setup.scm
- $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -ignore-repository -output-file $@
csc.c: $(SRCDIR)csc.scm
$(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
chicken-bug.c: $(SRCDIR)chicken-bug.scm
@@ -1237,7 +1229,7 @@ distfiles: library.c eval.c expand.c chicken-syntax.c \
ulibrary.c ueval.c udata-structures.c uports.c ufiles.c uextras.c ulolevel.c \
uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
usrfi-18.c usrfi-69.c uposixunix.c uposixwin.c uregex.c \
- chicken-profile.c chicken-install.c chicken-uninstall.c chicken-status.c chicken-setup.c \
+ chicken-profile.c chicken-install.c chicken-uninstall.c chicken-status.c \
csc.c csi.c chicken.c batch-driver.c compiler.c optimizer.c \
compiler-syntax.c scrutinizer.c support.c \
c-platform.c c-backend.c chicken-bug.c $(IMPORT_LIBRARIES:=.import.c)
@@ -1263,7 +1255,7 @@ endif
clean:
-$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) chicken$(EXE) csi$(EXE) csc$(EXE) \
chicken-profile$(EXE) csi-static$(EXE) \
- chicken-install$(EXE) chicken-uninstall$(EXE) chicken-status$(EXE) chicken-setup$(EXE) \
+ chicken-install$(EXE) chicken-uninstall$(EXE) chicken-status$(EXE) \
csc-static$(EXE) chicken-static$(EXE) chicken-bug$(EXE) *$(O) \
$(LIBCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE) $(LIBCHICKENGUI_SO_FILE) \
libchicken$(A) libuchicken$(A) libchickengui$(A) libchicken$(SO) $(PROGRAM_IMPORT_LIBRARIES) \
@@ -1286,7 +1278,7 @@ spotless: distclean testclean
ulibrary.c ueval.c udata-structures.c uports.c ufiles.c uextras.c ulolevel.c \
uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
usrfi-18.c usrfi-69.c uposixunix.c uposixwin.c uregex.c chicken-profile.c chicken-bug.c \
- csc.c csi.c chicken-install.c chicken-setup.c chicken-uninstall.c chicken-status.c \
+ csc.c csi.c chicken-install.c chicken-uninstall.c chicken-status.c \
chicken.c batch-driver.c compiler.c optimizer.c compiler-syntax.c \
scrutinizer.c support.c \
c-platform.c c-backend.c chicken-boot$(EXE) setup-api.c setup-download.c \
diff --git a/scripts/import-to-index b/scripts/import-to-index
deleted file mode 100755
index 934bbaaf..00000000
--- a/scripts/import-to-index
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#| import-to-index - convert import-library to documentation-index -*- Scheme -*-
-exec csi -s "$0" "$@"
-|#
-
-(define (usage code)
- (print "usage: import-to-index [-p PREFIX] [-s SUFFIX] [-l LINK] IMPORTLIB ...")
- (exit code))
-
-(define (main args)
- (let ((prefix "")
- (suffix "")
- (link #f))
- (let loop ((args args) (libs '()))
- (cond ((null? args)
- (for-each
- (lambda (lib)
- ;; those slot accesses are naturally highly implementation dependent
- (let* ((mod (##sys#find-module (string->symbol lib)))
- (exports (map car (append (##sys#slot mod 10) (##sys#slot mod 11)))))
- (define (make-name s)
- (or link (conc prefix s suffix)))
- (print "; " lib)
- (for-each
- (lambda (s)
- (if (symbol? s)
- (pp (cons s (make-name s)))
- (pp (cons (car s) (make-name (car s))))))
- exports)))
- (reverse libs)))
- ((string=? "-p" (car args))
- (set! prefix (cadr args))
- (loop (cddr args) libs))
- ((string=? "-s" (car args))
- (set! suffix (cadr args))
- (loop (cddr args) libs))
- ((string=? "-l" (car args))
- (set! link (cadr args))
- (loop (cddr args) libs))
- (else
- (let ((lib (car args)))
- (eval `(import ,(string->symbol lib)))
- (loop (cdr args) (cons lib libs))))))))
-
-(main (command-line-arguments))
diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index 69b80cb0..37405849 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -51,20 +51,6 @@
(run (tar cfz ,(conc distname ".tar.gz") ,distname))
(run (rm -fr ,distname)) ) )
-(define (make-html)
- (unless (file-exists? "html")
- (create-directory "html"))
- (run (rm -f "manual/*~"))
- (run (,(or (get-environment-variable "CSI")
- (let ((this (car (argv))))
- (if (string=? "csi" (pathname-file this))
- this
- "csi")) )
- -s scripts/wiki2html.scm
- --outdir=html
- ,@(map (o qs (cut make-pathname "manual" <>))
- (directory "manual")))))
-
(define (usage . _)
(print "usage: makedist [--release] [--make=PROGRAM] [--platform=PLATFORM] MAKEOPTION ...")
(exit 1))
@@ -78,7 +64,4 @@
(run (,*make* -f ,(conc "Makefile." *platform*) distfiles ,@*makeargs*))
-(make-html)
-(run (cp misc/manual.css html))
-
(release *release*)
diff --git a/setup-api.scm b/setup-api.scm
index 9ca75c5d..e80e5e60 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -534,26 +534,7 @@
(equal? (pathname-extension to) "a"))
(run (,*ranlib-command* ,(shellpath to)) ) ))
(make-dest-pathname rpath f)))
- files) )
- (pre (installation-prefix))
- (docpath (ensure-directory (make-pathname pre "share/chicken/doc"))))
- (and-let* ((docs (assq 'documentation info)))
- (print "\n* Installing documentation files in " docpath ":")
- (for-each
- (lambda (f)
- (copy-file f (make-pathname docpath f) #f) )
- (cdr docs))
- (newline))
- (and-let* ((exs (assq 'examples info)))
- (print "\n* Installing example files in " docpath ":")
- (for-each
- (lambda (f)
- (let ((destf (make-pathname docpath f)))
- (copy-file f destf #f)
- (unless *windows-shell*
- (run (,*chmod-command* a+rx ,destf)) ) ))
- (cdr exs))
- (newline))
+ files) ) )
(write-info id dests info) ) ) )
(define (install-program id files #!optional (info '()))
Trap