From f7e7679bcdaada8926df21e9de5ae101addf45ee Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Sat, 16 Nov 2019 16:29:43 +0100 Subject: Replace Linenoise with Readline --- .gitlab-ci.yml | 2 +- .gitmodules | 6 ++++++ Dockerfile | 2 +- modules/LibraryCheck | 1 + modules/Linenoise | 1 - modules/MODULES.txt | 7 ++++--- modules/Readline | 1 + 7 files changed, 14 insertions(+), 6 deletions(-) create mode 160000 modules/LibraryCheck delete mode 160000 modules/Linenoise create mode 160000 modules/Readline diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcb0eff..2e0e1a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ Rakudo Star: stage: Build image: alpine:latest before_script: - - apk add --no-cache coreutils bash build-base git linenoise-dev perl + - apk add --no-cache coreutils bash build-base git openssl-dev perl readline-dev - bin/mkchecksum.sh "work/release/rakudo-star-$CI_COMMIT_REF_NAME.tar.gz" - mkdir -p "$CI_PROJECT_DIR/work/build" - cd -- "$CI_PROJECT_DIR/work/build" diff --git a/.gitmodules b/.gitmodules index 9cd06e3..6583850 100644 --- a/.gitmodules +++ b/.gitmodules @@ -172,3 +172,9 @@ [submodule "modules/Test::Output"] path = modules/Test::Output url = git://github.com/perl6-community-modules/perl6-Test-Output.git +[submodule "modules/LibraryCheck"] + path = modules/LibraryCheck + url = git://github.com/jonathanstowe/LibraryCheck.git +[submodule "modules/Readline"] + path = modules/Readline + url = git://github.com/drforr/perl6-readline.git diff --git a/Dockerfile b/Dockerfile index 012e31e..3117420 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY work /tmp/work WORKDIR /tmp/rakudo-star -RUN apk add --no-cache build-base git perl perl-utils libressl +RUN apk add --no-cache build-base git perl perl-utils openssl-dev readline-dev RUN tar xzf "/tmp/work/release/rakudo-star-$VERSION.tar.gz" RUN cd -- "rakudo-star-$VERSION" \ && perl Configure.pl --prefix=/usr/local --backend=moar --gen-moar --make-install diff --git a/modules/LibraryCheck b/modules/LibraryCheck new file mode 160000 index 0000000..e713a7f --- /dev/null +++ b/modules/LibraryCheck @@ -0,0 +1 @@ +Subproject commit e713a7f773f3352801bd43d399e3bdcb3baae5f0 diff --git a/modules/Linenoise b/modules/Linenoise deleted file mode 160000 index 480fd91..0000000 --- a/modules/Linenoise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 480fd919b2c082e691c518fd50c19ad8719532b6 diff --git a/modules/MODULES.txt b/modules/MODULES.txt index ce332f3..c02c62f 100644 --- a/modules/MODULES.txt +++ b/modules/MODULES.txt @@ -43,10 +43,9 @@ File::Temp # File::Directory::Tree File::Find p6doc # File::Temp Debugger::UI::CommandLine -Shell::Command -LibraryMake # check needed? -Linenoise File::Which +Shell::Command # File::Which, File::Temp +LibraryMake # Shell::Command IO::String DateTime::Format DateTime::Parse # HTTP::UserAgent @@ -57,3 +56,5 @@ JSON::RPC # PSGI, HTTP::Useragent Getopt::Long TAP App::Prove6 +LibraryCheck +Readline # LibraryCheck diff --git a/modules/Readline b/modules/Readline new file mode 160000 index 0000000..054a8e9 --- /dev/null +++ b/modules/Readline @@ -0,0 +1 @@ +Subproject commit 054a8e9461e79473099b2e75e4a5e0797adae3a7 -- cgit v1.1