Skip to content

Commit

Permalink
Deprecate nqp-lib (#3810)
Browse files Browse the repository at this point in the history 
* Remove all uses of the `--nqp-lib` command line parameter

The parameter has currently no effect. It probably became effectless during
the relocatability refactor a year ago.

* Add a deprecation notice when `--nqp-lib` is used
  • Loading branch information
@patrickbkr
patrickbkr committed Jul 27, 2020
1 parent 3843a1e commit 9071653
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 18 deletions.
4 changes: 4 additions & 0 deletions src/Perl6/Compiler.nqp
View file
Expand Up @@ -54,6 +54,10 @@ class Perl6::Compiler is HLL::Compiler {
%options<doc> := 'Text';
}

if nqp::existskey(%options, 'nqp-lib') {
note('Option `--nqp-lib` is deprecated, has no effect and will be removed in 2021.06.');
}

my $argiter := nqp::iterator(@args);
nqp::shift($argiter) if $argiter && !nqp::defined(%options<e>);
nqp::bindhllsym('Raku', '$!ARGITER', $argiter);
Expand Down
14 changes: 7 additions & 7 deletions tools/build/create-jvm-runner.pl
View file
Expand Up @@ -8,9 +8,9 @@
use File::Copy 'cp';
use Cwd 'abs_path';

my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp-home> <rakudo-home> <blib> <third party jars>\n";
my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp-home> <rakudo-home> <third party jars>\n";

my ($type, $destdir, $prefix, $static_nqp_home, $static_rakudo_home, $blib, $thirdpartyjars) = @ARGV
my ($type, $destdir, $prefix, $static_nqp_home, $static_rakudo_home, $thirdpartyjars) = @ARGV
or die $USAGE;

my $relocatable = $static_nqp_home eq '' && $static_rakudo_home eq '';
Expand Down Expand Up @@ -49,7 +49,7 @@
File::Spec->catfile($jardir, 'rakudo-runtime.jar'),
File::Spec->catfile($jardir, $debugger ? 'rakudo-debug.jar' : 'rakudo.jar'));

my $NQP_LIB = $blib ? ': ${NQP_LIB:="blib"}' : '';
my $NQP_LIB = $type eq 'install' ? '' : ': ${NQP_LIB:="blib"}';

my $preamble_unix = <<'EOS';
#!/bin/sh
Expand Down Expand Up @@ -156,10 +156,10 @@ sub install {
install "perl6-debug-j", "java $jopts rakudo-debug";
}
else {
install "rakudo-j", "java $jopts perl6 $blib";
install "perl6-j", "java $jopts perl6 $blib";
install "rakudo-jdb-server", "java $jdbopts $jopts perl6 $blib";
install "perl6-jdb-server", "java $jdbopts $jopts perl6 $blib";
install "rakudo-j", "java $jopts perl6";
install "perl6-j", "java $jopts perl6";
install "rakudo-jdb-server", "java $jdbopts $jopts perl6";
install "perl6-jdb-server", "java $jdbopts $jopts perl6";
install "rakudo-eval-server", "java -Xmx3000m $jopts org.raku.nqp.tools.EvalServer";
install "perl6-eval-server", "java -Xmx3000m $jopts org.raku.nqp.tools.EvalServer";
}
Expand Down
10 changes: 5 additions & 5 deletions tools/templates/jvm/Makefile.in
View file
Expand Up @@ -45,7 +45,7 @@ $(RUNTIME_JAR): $(RUNTIME_JAVAS)

$(J_RUNNER): @@script(create-jvm-runner.pl)@@
@echo(+++ Setting up $@)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ --nqp-lib=blib @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ @q($(NQP_JARS))@

@backend_prefix@-runner-default: @backend_prefix@-all
@echo(+++ Setting up @uc(@backend@)@ runner)@
Expand All @@ -54,7 +54,7 @@ $(J_RUNNER): @@script(create-jvm-runner.pl)@@

@bpm(DEBUG_RUNNER)@: @@script(create-jvm-runner.pl)@@ @bsm(RAKUDO_DEBUG)@
@echo(+++ Setting up $@)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ --nqp-lib=blib @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ @q($(NQP_JARS))@

eval-client.pl:
@echo(+++ Setting up $@)@
Expand Down Expand Up @@ -84,14 +84,14 @@ sometests: @backend_prefix@-all

@backend_prefix@-runner-default-install: @backend_prefix@-install
@echo(+++ Installing @uc(@backend@)@ launcher)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ "" @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q(@static_rakudo_home@)@ @q($(NQP_JARS))@
$(NOECHO)$(CP) @nfpq($(DESTDIR)$(PREFIX)/bin/rakudo-j$(J_BAT))@ @nfpq($(DESTDIR)$(PREFIX)/bin/rakudo$(J_BAT))@
$(NOECHO)$(CHMOD) 755 @nfpq($(DESTDIR)$(PREFIX)/bin/rakudo$(J_BAT))@

@backend_prefix@-install-main:: $(RUNTIME_JAR) @@script(create-jvm-runner.pl)@@
$(NOECHO)$(CP) $(RUNTIME_JAR) @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install-debug @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q($(NQP_PREFIX))@ @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install-debug @q($(DESTDIR))@ @q($(PREFIX))@ @q(@static_nqp_home@)@ @q($(NQP_PREFIX))@ @q($(NQP_JARS))@

## cleaning
@backend_prefix@-clean:
Expand Down
2 changes: 1 addition & 1 deletion tools/templates/moar/Makefile-runner_opts.in
View file
@@ -1 +1 @@
@shquot(--execname="\@envvar(EXEC)@" --libpath="\@envvar(DIR)@" --libpath="\@nfp(\@envvar(DIR)@/blib)@" --libpath="\@nfp(\@nqp::libdir@)@" "\@nfp(\@envvar(DIR)@/perl6.moarvm)@" --nqp-lib="\@nfp(\@envvar(DIR)@/blib)@")@
@shquot(--execname="\@envvar(EXEC)@" --libpath="\@envvar(DIR)@" --libpath="\@nfp(\@envvar(DIR)@/blib)@" --libpath="\@nfp(\@nqp::libdir@)@" "\@nfp(\@envvar(DIR)@/perl6.moarvm)@")@
2 changes: 1 addition & 1 deletion tools/templates/moar/Makefile.in
View file
Expand Up @@ -11,7 +11,7 @@ MOAR_PREFIX = @nfp(@moar::prefix@)@
MOAR = @nfpq(@moar::bindir@/moar@moar::exe@)@
@bpv(NQP)@ = @nfpq(@m_nqp@)@
@bpv(NQP_RR)@ = @bpm(NQP)@
@bpv(RUN_RAKUDO)@ = $(MOAR) --libpath=@nfpq($(BASE_DIR)/blib)@ --libpath=@q(@bpm(NQP_LIBDIR)@)@ @bsm(RAKUDO)@ --nqp-lib=@nfpq($(BASE_DIR)/blib)@ --rakudo-home=@nfpq($(BASE_DIR)/gen/build_rakudo_home)@
@bpv(RUN_RAKUDO)@ = $(MOAR) --libpath=@nfpq($(BASE_DIR)/blib)@ --libpath=@q(@bpm(NQP_LIBDIR)@)@ @bsm(RAKUDO)@ --rakudo-home=@nfpq($(BASE_DIR)/gen/build_rakudo_home)@

@bpv(RUNNER_SUFFIX)@ = @moar::exe@

Expand Down
3 changes: 1 addition & 2 deletions tools/templates/moar/rakudo-m-build.c.in
View file
Expand Up @@ -13,7 +13,7 @@ int main(int argc, char *argv[])
char **exec_argv;
char *moar = "@c_escape(@nfp(@MOAR@)@)@";

moar_argc = 6;
moar_argc = 5;

// program name + moar args + passed args (without program name) + NULL pointer
exec_argc = 1 + moar_argc + (argc - 1) + 1;
Expand All @@ -27,7 +27,6 @@ int main(int argc, char *argv[])
exec_argv[3] = "--libpath=@c_escape(@nfp(@base_dir@/blib)@)@";
exec_argv[4] = "--libpath=@c_escape(@nfp(@nqp_lib_dir@)@)@";
exec_argv[5] = "@c_escape(@nfp(@base_dir@/@mbc@)@)@";
exec_argv[6] = "--nqp-lib=@c_escape(@nfp(@base_dir@/blib)@)@";

// Copy passed args.
for (c = 0; c < argc - 1; c++) {
Expand Down
3 changes: 1 addition & 2 deletions tools/templates/moar/rakudo-m-build.c.windows
View file
Expand Up @@ -78,7 +78,7 @@ int wmain(int argc, wchar_t *argv[]) {
STARTUPINFOW si;
PROCESS_INFORMATION pi;

moar_argc = 7;
moar_argc = 6;

// moar args + passed args (without program name) + NULL pointer
exec_argc = moar_argc + (argc - 1) + 1;
Expand All @@ -91,7 +91,6 @@ int wmain(int argc, wchar_t *argv[]) {
exec_argv[3] = L"--libpath=@c_escape(@nfp(@base_dir@/blib)@)@";
exec_argv[4] = L"--libpath=@c_escape(@nfp(@nqp_lib_dir@)@)@";
exec_argv[5] = L"@c_escape(@nfp(@base_dir@/@mbc@)@)@";
exec_argv[6] = L"--nqp-lib=@c_escape(@nfp(@base_dir@/blib)@)@";

// Copy passed args.
for (c = 0; c < argc - 1; c++) {
Expand Down

0 comments on commit 9071653

Please sign in to comment.