From 2cbd37a5f6756109e4dfab9bb64b05a6c45aceeb Mon Sep 17 00:00:00 2001 From: felix Date: Tue, 5 Dec 2017 13:03:58 +0100 Subject: [PATCH] Remove chicken-bug --- NEWS | 1 + README | 6 +- chicken-bug.mdoc | 83 ---------------------- chicken-bug.scm | 174 ---------------------------------------------- chicken-do.mdoc | 6 +- chicken-install.mdoc | 6 +- chicken-profile.mdoc | 6 +- chicken-status.mdoc | 6 +- chicken-uninstall.mdoc | 6 +- chicken.mdoc | 6 +- csc.mdoc | 8 +-- csi.mdoc | 6 +- defaults.make | 1 - distribution/manifest | 3 - feathers.mdoc | 6 +- manual/Cross development | 2 - rules.make | 23 +----- 17 files changed, 14 insertions(+), 335 deletions(-) delete mode 100644 chicken-bug.mdoc delete mode 100644 chicken-bug.scm diff --git a/NEWS b/NEWS index f3b00b4..ee80572 100644 --- a/NEWS +++ b/NEWS @@ -31,6 +31,7 @@ - The new "-link" option to csc allows linking with objects from extensions. - The ambiguous "-l" option for csc has been removed (#1193). - Removed deprecated "-n" shorthand for "-emit-inline-file" from csc. + - Removed "chicken-bug" tool. - Core libraries - Removed support for memory-mapped files (posix), queues diff --git a/README b/README index 09da681..3920775 100644 --- a/README +++ b/README @@ -263,7 +263,6 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ |-- bin | |-- chicken - | |-- chicken-bug | |-- chicken-install | |-- chicken-profile | |-- chicken-status @@ -347,7 +346,6 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ | `-- setup.defaults `-- man `-- man1 - |-- chicken-bug.1 |-- chicken-install.1 |-- chicken-profile.1 |-- chicken-status.1 @@ -676,8 +674,8 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ 9. What's next? - If you find any bugs, or want to report a problem, please consider - using the "chicken-bug" tool to create a detailed bug report. + If you find any bugs, or want to report a problem, please send + a detailed bug report. If you have any more questions or problems (even the slightest problems, or the most stupid questions), then please subscribe diff --git a/chicken-bug.mdoc b/chicken-bug.mdoc deleted file mode 100644 index 7cd670b..0000000 --- a/chicken-bug.mdoc +++ /dev/null @@ -1,83 +0,0 @@ -.\" Copyright (c) 2007-2017, 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: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. 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. -.\" 3. The name of the authors may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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. -.\" -.\" -.Dd Apr 26, 2017 -.Dt CHICKEN-BUG 1 -.Os -.Sh NAME -.Nm chicken-bug -.Nd generate bug report from user input -.Sh SYNOPSIS -.Nm -.Op Ar OPTION ... -.Op Ar FILENAME -.Sh DESCRIPTION -.Nm -generates a bug report file that collects user-input, optional -files and system information obtained from the installed CHICKEN -executables and libraries. Non-option arguments given on the command line -are inserted into the bug report. If no option is given, or if -.Sq \- -has been passed on the command line, then a description of the problem -is read from standard input, until EOF -.Pq CTRL-D -or a line consisting only -of -.Sq \&. -.Pq period -is read. -.Pp -The bug report will be written to a file in the current directory, -which should be sent to CHICKEN maintainers as it contains various -useful bits of information that make it easier to classify the -problem described. -.Pp -Bug reports should be as detailed as possible. It is also very helpful -to include code that reproduces the problem. The more detailed the input -and the more thorough the description is, the easier you make it for -the CHICKEN developers to help you. -.Pp -The program accepts following arguments: -.Bl -tag -width Ds -.It Fl h Ns , Fl help -Show usage and exit. -.It Fl to-stdout -Write bug report to standard output. -.It Fl -Read description from standard input. -.El -.Sh EXIT STATUS -.Ex -std -.Sh SEE ALSO -.Xr chicken 1 -.Pp -More information can be found in the -.Lk http://wiki.call-cc.org/manual/index "CHICKEN User's Manual". -.Sh AUTHORS -.An The CHICKEN Team -.Sh BUGS -Submit bug reports by e-mail to -.Mt address@hidden diff --git a/chicken-bug.scm b/chicken-bug.scm deleted file mode 100644 index 0a916d0..0000000 --- a/chicken-bug.scm +++ /dev/null @@ -1,174 +0,0 @@ -;;;; chicken-bug.scm - Bug report-generator -; -; Copyright (c) 2008-2017, 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. - -(declare (block)) - -(module main () - -(import chicken scheme) - -(import (only chicken.data-structures chop) - chicken.foreign - chicken.format - chicken.io - chicken.keyword - chicken.pathname - chicken.port - chicken.posix - chicken.platform - chicken.sort - (only chicken.string string-intersperse) - chicken.time) - -(define-constant +bug-report-file+ "chicken-bug-report.~a-~a-~a") - -(define-foreign-variable +cc+ c-string "C_TARGET_CC") -(define-foreign-variable +cxx+ c-string "C_TARGET_CXX") -(define-foreign-variable +c-include-path+ c-string "C_INSTALL_INCLUDE_HOME") - -(define (user-id) - (cond-expand - (mingw32 "") - (else (user-information (current-user-id))))) - -(define (collect-info) - (print "\n--------------------------------------------------\n") - (print "This is a bug report generated by chicken-bug(1).\n") - (print "Date:\t" (seconds->string (current-seconds)) "\n\n") - (printf "User information:\t~s~%~%" (user-id)) - (print "Host information:\n") - (print "\tmachine type:\t" (machine-type)) - (print "\tsoftware type:\t" (software-type)) - (print "\tsoftware version:\t" (software-version)) - (print "\tbuild platform:\t" (build-platform) "\n") - (print "CHICKEN version is:\n" (chicken-version #t) "\n") - (print "Home directory:\t" (chicken-home) "\n") - (printf "Include path:\t~s~%~%" ##sys#include-pathnames) - (print "Features:") - (for-each - (lambda (lst) - (display "\n ") - (for-each - (lambda (f) - (printf "~a~a" f (make-string (fxmax 1 (fx- 16 (string-length f))) #\space)) ) - lst) ) - (chop (sort (map keyword->string ##sys#features) string&1" - (lambda () - (display (read-string))))) - (newline) ) - -(define (usage code) - (print #<string n))) - (if (> (string-length s) 1) - s - (string-append "0" s)))) - -(define (main args) - (let ((msg "") - (files #f) - (stdout #f)) - (for-each - (lambda (arg) - (cond ((string=? "-" arg) - (set! files #t) - (set! msg (string-append msg "\n\nUser input:\n\n" (user-input))) ) - ((member arg '("--help" "-h" "-help")) - (usage 0) ) - ((string=? "-to-stdout" arg) - (set! stdout #t) ) - (else - (set! files #t) - (set! msg - (string-append - msg - "\n\nFile added: " arg "\n\n" - (with-input-from-file arg read-string)))))) - args) - (unless files - (set! msg (string-append msg "\n\n" (user-input)))) - (newline) - (let* ((lt (seconds->local-time (current-seconds))) - (day (vector-ref lt 3)) - (mon (vector-ref lt 4)) - (yr (vector-ref lt 5)) ) - (if stdout - (begin - (print msg) - (collect-info)) - (generate-report - (sprintf +bug-report-file+ (+ 1900 yr) (justify mon) (justify day)) - (with-output-to-string - (lambda () - (print msg) - (collect-info)))))))) - -(define (generate-report fname msg) - (with-output-to-file fname - (lambda () (print msg))) - (print "\nA bug report has been written to `" fname "'.")) - -(main (command-line-arguments)) - -) diff --git a/chicken-do.mdoc b/chicken-do.mdoc index 9311c4f..90bb8ed 100644 --- a/chicken-do.mdoc +++ b/chicken-do.mdoc @@ -64,7 +64,6 @@ Build a C program from sources: .Dl $ chicken-do prg gcc prg.c -o prg \& : prg.c inc.h .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr chicken-status 1 , .Xr chicken-install 1 , .Xr chicken-uninstall 1 , @@ -76,7 +75,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/chicken-install.mdoc b/chicken-install.mdoc index f3eb43b..1264f07 100644 --- a/chicken-install.mdoc +++ b/chicken-install.mdoc @@ -138,7 +138,6 @@ Install an egg as an normal user but elevating privileges with different program .Dl $ SUDO=/usr/bin/doas chicken-install -s regex .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr chicken-status 1 , .Xr chicken-uninstall 1 , .Xr csc 1 @@ -149,7 +148,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/chicken-profile.mdoc b/chicken-profile.mdoc index 8517233..c47cf19 100644 --- a/chicken-profile.mdoc +++ b/chicken-profile.mdoc @@ -75,7 +75,6 @@ entries. .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr csc 1 .Pp More information can be found in the @@ -84,7 +83,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/chicken-status.mdoc b/chicken-status.mdoc index 1e15f08..6ff1f07 100644 --- a/chicken-status.mdoc +++ b/chicken-status.mdoc @@ -84,7 +84,6 @@ installation repository. .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr chicken-install 1 , .Xr chicken-uninstall 1 .Pp @@ -94,7 +93,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/chicken-uninstall.mdoc b/chicken-uninstall.mdoc index b05a30e..ff008b0 100644 --- a/chicken-uninstall.mdoc +++ b/chicken-uninstall.mdoc @@ -83,7 +83,6 @@ flag in command. If not provided, defaults to .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr chicken-install 1 , .Xr chicken-status 1 .Pp @@ -93,7 +92,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/chicken.mdoc b/chicken.mdoc index 786b5ae..adf4342 100644 --- a/chicken.mdoc +++ b/chicken.mdoc @@ -259,7 +259,6 @@ Holds a string of default compiler options that should apply to every invocation .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr chicken-install 1 , .Xr chicken-uninstall 1 .Pp @@ -269,7 +268,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/csc.mdoc b/csc.mdoc index 9383290..1c027fa 100644 --- a/csc.mdoc +++ b/csc.mdoc @@ -352,8 +352,7 @@ Can hold default options that should be passed to every invocation of .Sh EXIT STATUS .Ex -std .Sh SEE ALSO -.Xr chicken 1 , -.Xr chicken-bug 1 +.Xr chicken 1 .Pp More information can be found in the .Lk http://wiki.call-cc.org/manual/index "CHICKEN User's Manual". @@ -361,7 +360,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/csi.mdoc b/csi.mdoc index b590668..3bda11f 100644 --- a/csi.mdoc +++ b/csi.mdoc @@ -129,7 +129,6 @@ can not be passed using this method. .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr csc 1 .Pp More information can be found in the @@ -138,7 +137,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/defaults.make b/defaults.make index 813806c..04c070e 100644 --- a/defaults.make +++ b/defaults.make @@ -283,7 +283,6 @@ CHICKEN_PROFILE_PROGRAM = $(PROGRAM_PREFIX)chicken-profile$(PROGRAM_SUFFIX) CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX) CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX) CHICKEN_STATUS_PROGRAM = $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX) -CHICKEN_BUG_PROGRAM = $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX) CHICKEN_DO_PROGRAM = $(PROGRAM_PREFIX)chicken-do$(PROGRAM_SUFFIX) CHICKEN_DEBUGGER_PROGRAM ?= $(PROGRAM_PREFIX)feathers$(PROGRAM_SUFFIX)$(SCRIPT_EXT) IMPORT_LIBRARIES = $(DYNAMIC_IMPORT_LIBRARIES) \ diff --git a/distribution/manifest b/distribution/manifest index 4a82b0b..409681f 100644 --- a/distribution/manifest +++ b/distribution/manifest @@ -77,9 +77,6 @@ data-structures.scm debugger-client.scm port.scm file.scm -chicken-bug.mdoc -chicken-bug.scm -chicken-bug.c continuation.scm internal.scm library.scm diff --git a/feathers.mdoc b/feathers.mdoc index 1c2dc8c..05c143b 100644 --- a/feathers.mdoc +++ b/feathers.mdoc @@ -78,7 +78,6 @@ defaults to localhost:9999 .Ex -std .Sh SEE ALSO .Xr chicken 1 , -.Xr chicken-bug 1 , .Xr csc 1 , .Xr csi 1 .Pp @@ -88,7 +87,4 @@ More information can be found in the .An The CHICKEN Team .Sh BUGS Submit bug reports by e-mail to -.Mt address@hidden , -preferably using the -.Xr chicken-bug 1 -tool. +.Mt address@hidden diff --git a/manual/Cross development b/manual/Cross development index fb77cf8..2d9f3d9 100644 --- a/manual/Cross development +++ b/manual/Cross development @@ -81,7 +81,6 @@ You should now have these files on {{~/target}}: |-- bin | |-- chicken - | |-- chicken-bug | |-- chicken-install | |-- chicken-profile | |-- chicken-status @@ -154,7 +153,6 @@ In {{~/cross-chicken}}, you should find the following: |-- bin | |-- arm-chicken - | |-- arm-chicken-bug | |-- arm-chicken-install | |-- arm-chicken-profile | |-- arm-chicken-status diff --git a/rules.make b/rules.make index 30e74e6..fc91396 100644 --- a/rules.make +++ b/rules.make @@ -54,13 +54,10 @@ COMPILER_STATIC_OBJECTS = $(COMPILER_OBJECTS_1:=-static$(O)) UTILITY_PROGRAM_OBJECTS_1 = \ csc csi chicken-install chicken-uninstall chicken-status chicken-profile -ALWAYS_STATIC_UTILITY_PROGRAM_OBJECTS_1 = \ - chicken-bug - ## TODO: Shouldn't these manpages match their program names (ie CSI_PROGRAM etc)? MANPAGES = \ chicken csc csi chicken-install chicken-uninstall \ - chicken-status chicken-profile chicken-bug feathers + chicken-status chicken-profile feathers # Not all programs built are installed(?) This is the master list that takes # care of which programs should actually be installed/uninstalled @@ -77,7 +74,6 @@ endif # They are not cleaned by the 'clean' target, but only by 'spotless'. DISTFILES = $(filter-out runtime.c,$(LIBCHICKEN_OBJECTS_1:=.c)) \ $(UTILITY_PROGRAM_OBJECTS_1:=.c) \ - $(ALWAYS_STATIC_UTILITY_PROGRAM_OBJECTS_1:=.c) \ $(COMPILER_OBJECTS_1:=.c) \ $(IMPORT_LIBRARIES:=.import.c) \ $(DYNAMIC_IMPORT_LIBRARIES:=.import.scm) \ @@ -194,9 +190,6 @@ $(1)$(O): $(1).c chicken.h $$(CHICKEN_CONFIG_H) $$(INCLUDES) endef -$(foreach obj, $(ALWAYS_STATIC_UTILITY_PROGRAM_OBJECTS_1),\ - $(eval $(call declare-always-static-utility-program-object,$(obj)))) - # resource objects %.rc.o: %.rc @@ -271,7 +264,6 @@ $(1): $(2)$(O) lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A) endef $(eval $(call declare-program-from-object,$(CSI_STATIC_EXECUTABLE),csi)) -$(eval $(call declare-program-from-object,$(CHICKEN_BUG_PROGRAM)$(EXE),chicken-bug)) # "chicken-do" @@ -663,17 +655,6 @@ csi.c: csi.scm \ chicken.sort.import.scm \ chicken.string.import.scm \ chicken.syntax.import.scm -chicken-bug.c: chicken-bug.scm \ - chicken.foreign.import.scm \ - chicken.format.import.scm \ - chicken.io.import.scm \ - chicken.keyword.import.scm \ - chicken.pathname.import.scm \ - chicken.platform.import.scm \ - chicken.port.import.scm \ - chicken.posix.import.scm \ - chicken.string.import.scm \ - chicken.time.import.scm chicken-profile.c: chicken-profile.scm \ chicken.internal.import.scm \ chicken.posix.import.scm \ @@ -916,8 +897,6 @@ chicken-status.c: $(SRCDIR)chicken-status.scm $(SRCDIR)mini-srfi-1.scm $(SRCDIR) $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ csc.c: $(SRCDIR)csc.scm $(SRCDIR)mini-srfi-1.scm $(SRCDIR)egg-environment.scm $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ -chicken-bug.c: $(SRCDIR)chicken-bug.scm - $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@ # distribution files -- 1.7.9.5