Skip to content
Permalink
Browse files

Finalized support for spaces in directory names

  • Loading branch information...
vrurg committed May 2, 2019
1 parent f12a8c9 commit 99c53c39382c8dd11b59981c75d68faff699ef4f
@@ -226,7 +226,7 @@ sub configure_moar_backend {
# . $nqp_config->{'moar::moar'}
# . ' $(PREFIX)'
# . $slash . 'bin';
$config->{m_install} = 'Makefile-install-win';
$config->{m_install} = 'Makefile-install'; # We'll need .windows extension
}
if ( $nqp_config->{'moar::os'} eq 'mingw32' ) {
$config->{'mingw_unicode'} = '-municode';
@@ -1,5 +1,8 @@
$(M_@uc(@toolchain@)@_RUNNER): @@configure_script@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR) @template(@backend_subdir@/perl6-@toolchain@-m)@
$(M_@uc(@toolchain@)@_RUNNER): @@configure_script@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR) @@template(perl6-@toolchain@-m)@@ @@template(perl6-debug-notice)@@ @@template(sh-prelude)@@
$(RM_F) $(M_@uc(@toolchain@)@_RUNNER)
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-@toolchain@-m)@ --out @nfpq(@base_dir@/perl6-@toolchain@-m)@ --set-var=MOAR=$(MOAR) --set-var=ctx_subdir=@backend_subdir@
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-@toolchain@-m)@ --out @nfpq(perl6-@toolchain@-m)@ \
--set-var=MOAR=$(MOAR) \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=runner_opts=@insert(Makefile-runner_opts)@
-$(CHMOD) 755 $(M_@uc(@toolchain@)@_RUNNER)

@@ -1,3 +1,13 @@
$(M_RUN_PERL6) @q(@script(create-moar-runner.p6)@)@ perl6 @q($(M_RUNNER))@ @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-gdb-m)@ "gdb" "" "" ""
$(M_RUN_PERL6) @q(@script(create-moar-runner.p6)@)@ perl6 @q($(M_RUNNER))@ @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-lldb-m)@ "lldb" "" "" ""
$(M_RUN_PERL6) @q(@script(create-moar-runner.p6)@)@ perl6 @q($(M_RUNNER))@ @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m)@ "valgrind" "" "" ""
@perl(
for my $toolchain (qw<gdb lldb valgrind>) {
my $scope = $cfg->push_config( toolchain => $toolchain );
$out .= $macros->expand(<<'TMPL');
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-@toolchain@-m)@ \
--out @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-@toolchain@-m)@ \
--set-var=MOAR=@shquot(\@nfp(\@envvar(DIR)@/$(M_RUNNER))@)@ \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=runner_opts=''
-$(CHMOD) 755 @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-@toolchain@-m)@
TMPL
}
)@
@@ -0,0 +1 @@
@shquot(--execname="\@envvar(EXEC)@" --libpath="\@envvar(DIR)@" --libpath="\@nfp(\@envvar(DIR)@/blib)@" --libpath="\@nfp(\@libdir@/nqp/lib)@" "\@nfp(\@envvar(DIR)@/perl6.moarvm)@" --nqp-lib="\@nfp(\@envvar(DIR)@/blib)@")@
@@ -95,7 +95,7 @@ M_VALGRIND_RUNNER = perl6-valgrind-m@runner_suffix@
M_CLEANUPS = \
*.manifest \
@nfp(blib/Perl6/*.moarvm)@ \
$(SETTING_MOAR) \@for_specs(
$(SETTING_MOAR) \\@for_specs(
$(SETTING_@ucspec@_MOAR) \)@
$(R_SETTING_MOAR) \
$(PERL6_MOAR) \
@@ -207,24 +207,30 @@ $(PERL6_DEBUG_MOAR): @nfp(src/perl6-debug.nqp)@ $(PERL6_MOAR)
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init @nfpq($(M_BUILD_DIR)/perl6-debug.nqp)@

@perl(
my $out = "";
for my $toolchain (qw<gdb lldb valgrind>) {
my $scope = $cfg->push_config( toolchain => $toolchain, mbc => 'perl6.moarvm', );
my $scope = $cfg->push_config( toolchain => $toolchain );
$out .= $macros->expand(<<'TMPL');
@insert(Makefile-gen-runner)@

TMPL
}
return $out;
)@
$(M_BAT_RUNNER): @@configure_script@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) @q($(M_BAT_RUNNER))@
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-m)@ --out @q($(M_BAT_RUNNER))@ --set-var=MOAR=$(MOAR) --set-var=mbc=perl6.moarvm --set-var=ctx_subdir=@backend_subdir@
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-m)@ --out @q($(M_BAT_RUNNER))@ \
--set-var=MOAR=$(MOAR) \
--set-var=mbc=perl6.moarvm \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=runner_opts=@insert(Makefile-runner_opts)@
-$(CHMOD) 755 $(M_BAT_RUNNER)

$(M_BAT_DEBUG_RUNNER): @@configure_script@@ $(M_C_DEBUG_RUNNER) $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
$(RM_F) @q($(M_BAT_DEBUG_RUNNER))@
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-m)@ --out @q($(M_BAT_DEBUG_RUNNER))@ --set-var=MOAR=$(MOAR) --set-var=mbc=perl6-debug.moarvm --set-var=ctx_subdir=@backend_subdir@
$(CONFIGURE) --expand @nfpq(@backend_subdir@/perl6-m)@ --out @q($(M_BAT_DEBUG_RUNNER))@ \
--set-var=MOAR=$(MOAR) \
--set-var=mbc=perl6-debug.moarvm \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=runner_opts=@insert(Makefile-runner_opts)@
-$(CHMOD) 755 $(M_BAT_DEBUG_RUNNER)

$(M_C_RUNNER): @nfp(src/vm/moar/runner/main.c)@
@@ -313,7 +319,7 @@ m-localtest_loud: m-all spectest_checkout @nfp(t/localtest.data)@
m-sometests: m-all
@$(M_HARNESS6_WITH_FUDGE) $(TESTFILES)

m-install: m-all @@script(create-moar-runner.p6)@@ @@script(install-core-dist.p6)@@ $(SETTING_MOAR)
m-install: m-all @@script(install-core-dist.p6)@@ $(SETTING_MOAR)
$(MKPATH) @nfpq($(DESTDIR)$(PREFIX)/bin)@
$(MKPATH) @nfpq($(DESTDIR)$(M_LIBPATH)/Perl6)@
$(M_RUN_CLEAN_TARGET_FILES) $(M_PERL6_LANG_OUTPUT) @nfpq($(DESTDIR)$(M_LIBPATH)/Perl6)@
@@ -1,4 +1,4 @@
@q(@MOAR@)@ @insert(perl6-opts)@ -e @q(
"@expand(@MOAR@)@" @expand(@runner_opts@)@ -e @q(
say "=" x 96;

say "This is Rakudo Perl 6 running in the @uc(@toolschain@)@ debugger, which often allows the user to generate useful back-\ntraces to debug or report issues in Rakudo, the MoarVM backend or the currently running code.\n";
@@ -2,4 +2,4 @@

@insert(perl6-debug-notice)@

gdb --quiet --ex=run --args @q(@MOAR)@) @insert(perl6-opts)@
gdb --quiet --ex=run --args "@expand(@MOAR@)@" @expand(@runner_opts@)@ "$@"
@@ -2,5 +2,5 @@

@insert(perl6-debug-notice)@

lldb @q(@MOAR)@) -- @insert(perl6-opts)@
lldb "@expand(@MOAR@)@" -- @expand(@runner_opts@)@ "$@"

@@ -1,3 +1,3 @@
@insert(sh-prelude)@

exec @q(@MOAR@)@ @insert(perl6-opts)@
exec "@expand(@MOAR@)@" @expand(@runner_opts@)@ "$@"

This file was deleted.

@@ -1,6 +1,6 @@
@insert(sh-prelude)@

@q(@MOAR@)@ @insert(perl6-opts)@ -e @q(
"@expand(@MOAR@)@" @expand(@runner_opts@)@ -e @q(
say "=" x 96;

say qq:to/END/;
@@ -15,5 +15,5 @@ say "running on $*DISTRO.gist() / $*KERNEL.gist()";
say "-" x 96;
)@

valgrind ${MVM_VALGRIND_OPTS} @q(@MOAR)@) -- @insert(perl6-opts)@
valgrind ${MVM_VALGRIND_OPTS} "@expand(@MOAR@)@" -- @expand(@runner_opts@)@ "$@"

0 comments on commit 99c53c3

Please sign in to comment.
You can’t perform that action at this time.