diff --git a/system b/system deleted file mode 160000 index 5a543f5..0000000 --- a/system +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5a543f51e99f79b7ee22e19fd235f5f75da4f5a4 diff --git a/system-new/AUTHOR b/system-new/AUTHOR new file mode 100644 index 0000000..44dbcb1 --- /dev/null +++ b/system-new/AUTHOR @@ -0,0 +1 @@ +Retropikzel diff --git a/system-new/Jenkinsfile b/system-new/Jenkinsfile new file mode 100644 index 0000000..1fa81ae --- /dev/null +++ b/system-new/Jenkinsfile @@ -0,0 +1,34 @@ +pipeline { + agent any + + options { + disableConcurrentBuilds() + buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) + } + + stages { + stage('Tests') { + steps { + script { + def implementations = sh(script: 'docker run retropikzel1/compile-r7rs:chibi sh -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split() + + parallel implementations.collectEntries { SCHEME -> + [(SCHEME): { + stage("${SCHEME}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + if("${SCHEME}" == "chicken") { + DOCKERIMG="chicken:5" + } else { + DOCKERIMG="${SCHEME}:head" + } + sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-system-test-${SCHEME} -f Dockerfile.test ." + sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-system-test-${SCHEME} sh -c \"timeout 120 make SCHEME=${SCHEME} clean all force-install test\"" + } + } + }] + } + } + } + } + } +} diff --git a/system-new/LICENSE b/system-new/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/system-new/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/system-new/Makefile b/system-new/Makefile new file mode 100644 index 0000000..01ff3f6 --- /dev/null +++ b/system-new/Makefile @@ -0,0 +1,11 @@ +VERSION=1.1.2 +build: + snow-chibi package \ + --version=${VERSION} \ + --authors="Retropikzel" \ + --doc=README.html \ + --description="Library for running shell commands" \ + retropikzel/system.sld + +package-name: + @echo "retropikzel-system-${VERSION} diff --git a/system-new/README.md b/system-new/README.md new file mode 100644 index 0000000..4e35628 --- /dev/null +++ b/system-new/README.md @@ -0,0 +1,33 @@ +Execute a shell command. + +Built upon [(foreign c)](https://sr.ht/~retropikzel/foreign-c/). + +[Repository](https://git.sr.ht/~retropikzel/foreign-c-system) + +[Issue tracker](https://sr.ht/~retropikzel/foreign-c/trackers) + +[Maling lists](https://sr.ht/~retropikzel/foreign-c/lists) + +[Jenkins](https://jenkins.scheme.org/job/retropikzel/job/foreign-c-system/) + + +(**system** _command_) + +_command_ is a string containing the command you want to run. + +Returns the exit code of the command. + +Example: + + (import (scheme base) + (scheme write) + (scheme file) + (retropikzel system)) + + (define testfile "test.txt") + (system (apply string-append `("echo \"Hello\" > " ,testfile))) + + (define text (with-input-from-file testfile (lambda () (read-line)))) + (display text) + (newline) + diff --git a/system-new/VERSION b/system-new/VERSION new file mode 100644 index 0000000..45a1b3f --- /dev/null +++ b/system-new/VERSION @@ -0,0 +1 @@ +1.1.2 diff --git a/system-new/retropikzel/system.scm b/system-new/retropikzel/system.scm new file mode 100644 index 0000000..04644ec --- /dev/null +++ b/system-new/retropikzel/system.scm @@ -0,0 +1,8 @@ +(define-c-library libc '("stdlib.h") libc-name '((additional-versions ("6")))) +(define-c-procedure c-system libc 'system 'int '(pointer)) + +(define (system command) + (let* ((command-pointer (string->c-utf8 command)) + (result (c-system command-pointer))) + (c-free command-pointer) + result)) diff --git a/system-new/retropikzel/system.sld b/system-new/retropikzel/system.sld new file mode 100644 index 0000000..5cb61a4 --- /dev/null +++ b/system-new/retropikzel/system.sld @@ -0,0 +1,7 @@ +(define-library + (retropikzel system) + (import (scheme base) + (scheme write) + (foreign c)) + (export system) + (include "system.scm")) diff --git a/system-new/test.scm b/system-new/test.scm new file mode 100644 index 0000000..c84e363 --- /dev/null +++ b/system-new/test.scm @@ -0,0 +1,25 @@ +(import (scheme base) + (scheme write) + (scheme file) + (scheme process-context) + (foreign c) + (retropikzel system) + (srfi 64)) + +(test-begin "foreign-c-system") + +(define testfile "/tmp/foreign-c-system-test.txt") + +(define exit-code1 (system (apply string-append `("echo \"Hello\" > " ,testfile)))) + +(test-assert (= exit-code1 0)) + +(define text (with-input-from-file testfile (lambda () (read-line)))) + +(test-assert (string=? text "Hello")) + +(define exit-code2 (system "no-such-command")) + +(test-assert (not (= exit-code1 0))) + +(test-end "foreign-c-system")