<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c23d65410dae0780993ab13eabc236618238613a">https://github.com/macports/macports-ports/commit/c23d65410dae0780993ab13eabc236618238613a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c23d65410dae0780993ab13eabc236618238613a
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Aug 11 11:12:31 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> common_lisp PG: allow to control patterns for used systems
</span>---
_resources/port1.0/group/common_lisp-1.0.tcl | 51 +++++++++++++++++-----------
1 file changed, 32 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/common_lisp-1.0.tcl b/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e2192007fe0..776e5b30b6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/common_lisp-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,12 @@ default common_lisp.clisp yes
</span> options common_lisp.build_run
default common_lisp.build_run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options common_lisp.system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default common_lisp.system {*.asd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options common_lisp.test_system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default common_lisp.test_system {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories lisp
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,21 +116,28 @@ pre-test {
</span> }
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${common_lisp.build}/source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${common_lisp.build}/system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${common_lisp.build}
</span>
xinstall -m 0755 -d ${common_lisp.build}/source
xinstall -m 0755 -d ${common_lisp.build}/system
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${common_lisp.build}/test_system
</span>
file copy ${worksrcpath} ${common_lisp.build}/source/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -dir ${common_lisp.build}/source/${subport} -tails *.asd] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ../source/${subport}/$f ${common_lisp.build}/system/$f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -dir ${common_lisp.build}/source/${subport} -tails {*}[option common_lisp.system]] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ../source/${subport}/$f ${common_lisp.build}/system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ../source/${subport}/$f ${common_lisp.build}/test_system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength [option common_lisp.test_system]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -dir ${common_lisp.build}/source/${subport} -tails {*}[option common_lisp.test_system]] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ../source/${subport}/$f ${common_lisp.build}/test_system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[option common_lisp.build_run]} {
foreach item [glob -dir ${common_lisp.build}/system -tails *.asd] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::asdf_operate "build-op" [string range ${item} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::asdf_operate "build-op" [string range ${item} 0 end-4] ${common_lisp.build}/system
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,55 +155,55 @@ test {
</span> return
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach item [glob -dir ${common_lisp.build}/system -tails *.asd] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::asdf_operate "test-op" [string range ${item} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach item [glob -dir ${common_lisp.build}/test_system -tails *.asd] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::asdf_operate "test-op" [string range ${item} 0 end-4] ${common_lisp.build}/test_system
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc common_lisp::asdf_operate {op name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc common_lisp::asdf_operate {op name build_system_path} {
</span> global common_lisp.sbcl
global common_lisp.ecl
global common_lisp.clisp
if {[option common_lisp.sbcl]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::sbcl_asdf_operate ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::sbcl_asdf_operate ${op} ${name} ${build_system_path}
</span> }
if {[option common_lisp.ecl]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::ecl_asdf_operate ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::ecl_asdf_operate ${op} ${name} ${build_system_path}
</span> }
if {[option common_lisp.clisp]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::clisp_asdf_operate ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::clisp_asdf_operate ${op} ${name} ${build_system_path}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc common_lisp::sbcl_asdf_operate {op name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc common_lisp::sbcl_asdf_operate {op name build_system_path} {
</span> global prefix
ui_info "Execute asdf:${op} at ${name} by SBCL"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::run "${prefix}/bin/sbcl --no-sysinit --no-userinit --non-interactive" "--eval" ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::run "${prefix}/bin/sbcl --no-sysinit --no-userinit --non-interactive" "--eval" ${op} ${name} ${build_system_path}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc common_lisp::ecl_asdf_operate {op name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc common_lisp::ecl_asdf_operate {op name build_system_path} {
</span> global prefix
ui_info "Execute asdf:${op} at ${name} by ECL"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::run "${prefix}/bin/ecl -q" "--eval" ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::run "${prefix}/bin/ecl -q" "--eval" ${op} ${name} ${build_system_path}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc common_lisp::clisp_asdf_operate {op name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc common_lisp::clisp_asdf_operate {op name build_system_path} {
</span> global prefix
ui_info "Execute asdf:${op} at ${name} by CLISP"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- common_lisp::run "${prefix}/bin/clisp --quiet --quiet" "-x" ${op} ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_lisp::run "${prefix}/bin/clisp --quiet --quiet" "-x" ${op} ${name} ${build_system_path}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc common_lisp::run {lisp eval_arg op name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc common_lisp::run {lisp eval_arg op name build_system_path} {
</span> global workpath common_lisp.build common_lisp.prefix
set lisp-system-path "#p\"${common_lisp.prefix}/system/\""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set lisp-build-system-path "#p\"${common_lisp.build}/system/\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lisp-build-system-path "#p\"${build_system_path}/\""
</span>
set loadcmd ${lisp}
</pre><pre style='margin:0'>
</pre>