Skip to content
Permalink
Browse files

Support for space in build directory path.

  • Loading branch information...
vrurg committed Apr 29, 2019
1 parent 5620c63 commit e91668ad33221e9fd83deafc2217005973d2d4e5
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
# Copyright (C) 2009 The Perl Foundation
# Copyright (C) 2009-2019 The Perl Foundation

use 5.10.1;
use strict;
@@ -81,6 +81,7 @@ BEGIN
"===WARNING!===\nErrors are being ignored.\nIn the case of any errors the script may behave unexpectedly.\n";
}

$cfg->configure_paths;
$cfg->configure_from_options;
$cfg->configure_refine_vars;
$cfg->configure_relocatability;
@@ -31,11 +31,11 @@ multi sub MAIN("perl6", $perl6, $install-to, $toolchain, $ld-lib-path, $perl6-ho
multi sub MAIN("moar", $moar, $install-to is copy, $mbc, $toolchain, $blib is copy, *@libpaths) {

$blib = ' ' ~ $blib if $blib;
my $libpaths = '--libpath="%s"'.sprintf: @libpaths.join('" --libpath="');
my $libpaths = '--libpath=%s'.sprintf: @libpaths.join(' --libpath=');
my $libpath-line = "%s %s%s".sprintf: $libpaths, $mbc, $blib;
$libpath-line ~~ s:g/\~SCRIPT_DIR\~/\$DIR/ if $*DISTRO ne 'mswin32';
$libpath-line ~~ s:g/\~SCRIPT_DIR\~/"\$DIR"/ if $*DISTRO ne 'mswin32';
$libpath-line ~~ s:g/\~SCRIPT_DIR\~/%DIR%/ if $*DISTRO eq 'mswin32';

$install-to ~= '.bat' if $*DISTRO eq 'mswin32';

my $fh = open $install-to, :w;
@@ -190,4 +190,3 @@ sub get-moar-valgrind-runner($moar, $libpath-line) {
valgrind ${MVM_VALGRIND_OPTS} %s --execname="$EXEC" %s "$@"
EOS
}

@@ -7,7 +7,7 @@ use Cwd;
use POSIX qw<strftime>;
use Digest::SHA;
use File::Find;
use NQP::Config qw<slurp nfp read_config cmp_rev system_or_die>;
use NQP::Config qw<slurp read_config cmp_rev system_or_die>;
use NQP::Macros;

use base qw<NQP::Config>;
@@ -235,19 +235,19 @@ sub configure_moar_backend {
'$(M_GDB_RUNNER) $(M_LLDB_RUNNER) $(M_VALGRIND_RUNNER)';
$config->{'m_install'} = "\t"
. '$(M_RUN_PERL6) '
. nfp("tools/build/create-moar-runner.p6")
. $self->nfp("tools/build/create-moar-runner.p6")
. ' perl6 $(M_RUNNER) $(DESTDIR)$(PREFIX)'
. nfp("/bin/perl6-gdb-m")
. $self->nfp("/bin/perl6-gdb-m")
. ' "gdb" "" "" ""' . "\n\t"
. '$(M_RUN_PERL6) '
. nfp("tools/build/create-moar-runner.p6")
. $self->nfp("tools/build/create-moar-runner.p6")
. ' perl6 $(M_RUNNER) $(DESTDIR)$(PREFIX)'
. nfp("/bin/perl6-lldb-m")
. $self->nfp("/bin/perl6-lldb-m")
. ' "lldb" "" "" ""' . "\n\t"
. '$(M_RUN_PERL6) '
. nfp("tools/build/create-moar-runner.p6")
. $self->nfp("tools/build/create-moar-runner.p6")
. ' perl6 $(M_RUNNER) $(DESTDIR)$(PREFIX)'
. nfp("/bin/perl6-valgrind-m")
. $self->nfp("/bin/perl6-valgrind-m")
. ' "valgrind" "" "" ""';
}
$config->{c_runner_libs} = join( " ", @c_runner_libs );
@@ -286,7 +286,7 @@ sub configure_js_backend {
my $nqp_config;
$config->{js_nqp} = $ijs->{bin};
$config->{'perl6_runtime'} =
File::Spec->rel2abs( nfp('src/vm/js/perl6-runtime') );
File::Spec->rel2abs( $self->nfp('src/vm/js/perl6-runtime') );
$config->{'perl6_lowlevel_libs'} =
File::Spec->rel2abs('node_modules') . $slash;
$config->{'perl6_js_runner'} =
@@ -383,11 +383,11 @@ sub gen_nqp {

for my $b ( $self->active_backends ) {
my $postfix = $self->backend_abbr($b);
my $bin = nfp($nqp_bin)
my $bin = $self->nfp($nqp_bin)
|| (
$sdkroot
? File::Spec->catfile( nfp($sdkroot), $prefix, 'bin',
"nqp-$postfix$bat" )
? File::Spec->catfile( $self->nfp($sdkroot),
$prefix, 'bin', "nqp-$postfix$bat" )
: File::Spec->catfile( $prefix, 'bin', "nqp-$postfix$bat" )
);
$impls->{$b}{bin} = $bin;
@@ -1,7 +1,7 @@
# Copyright (C) 2015 The Perl Foundation

PERL5 = @perl@ -I@nfp(@base_dir@/tools/lib)@ -I@nfp(@base_dir@/3rdparty/nqp-configure/lib)@
CONFIGURE = $(PERL5) @configure@
PERL5 = @shquot(@perl@)@ -I@nfp(@base_dir@/tools/lib)@ -I@nfp(@base_dir@/3rdparty/nqp-configure/lib)@
CONFIGURE = $(PERL5) @shquot(@configure_script@)@ @configure_opts@
MKPATH = @mkpath@
CHMOD = @chmod@
CP = @cp@
@@ -10,13 +10,13 @@ RM_RF = @rm_rf@
TEST_F = @test_f@
@shell@

SYSROOT = @sysroot@
SDKROOT = @sdkroot@
PREFIX = @prefix@
LIBDIR = @libdir@
NQP_HOME = @nfp($(LIBDIR)/nqp)@
PERL6_HOME = @nfp($(LIBDIR)/perl6)@
BASE_DIR = @base_dir@
SYSROOT = @nfp(@sysroot@)@
SDKROOT = @nfp(@sdkroot@)@
PREFIX = @nfp(@prefix@)@
LIBDIR = @nfp(@libdir@)@
NQP_HOME = $(LIBDIR)@nfp(/nqp)@
PERL6_HOME = $(LIBDIR)@nfp(/perl6)@
BASE_DIR = @nfp(@base_dir@)@

BOOTSTRAP_SOURCES = \
@nfp(src/Perl6/Metamodel/BOOTSTRAP.nqp)@ \
@@ -15,7 +15,7 @@ spectest_update :

realclean: clean
$(RM_F) Makefile config.status MANIFEST
$(RM_RF) @nfp(lib/.precomp/ t/04-nativecall/.precomp/)@
$(RM_RF) @nfpl(lib/.precomp/ t/04-nativecall/.precomp/)@

distclean: realclean

@@ -10,7 +10,7 @@ install: @for_backends(@backend_prefix@-install )@ $(LAUNCHER)-install

clean: @for_backends(@backend_prefix@-clean )@
$(RM_F) perl6@runner_suffix@ rakudo.js.map
$(PERL5) @script(clean-precomps.pl)@ @base_dir@
$(PERL5) @shquot(@script(clean-precomps.pl)@)@ @shquot(@base_dir@)@

test: @for_backends(@backend_prefix@-test$(HARNESS_TYPE))@
spectest: @for_backends(@backend_prefix@-spectest$(HARNESS_TYPE))@
@@ -6,28 +6,28 @@ M_LDFLAGS = @ldflags@
M_LDLIBS = @moar::ldlibs@
M_MINGW_UNICODE = @mingw_unicode@

M_GEN_CAT = @script(gen-cat.nqp)@ moar
M_GEN_CAT = @shquot(@script(gen-cat.nqp)@)@ moar

M_BUILD_DIR = @nfp(gen/moar)@

MOAR_PREFIX = @moar::prefix@
MOAR = @moar::bindir@@slash@moar@moar::exe@
MOAR_PREFIX = @nfp(@moar::prefix@)@
MOAR = @nfp(@moar::bindir@/moar@moar::exe@)@
M_NQP = @m_nqp@
M_LIBDEFPATH = $(PREFIX)@slash@share@slash@nqp@slash@lib
M_LIBPATH = $(LIBDIR)@slash@nqp@slash@lib
M_INCPATH = $(MOAR_PREFIX)@slash@include
M_LIBDEFPATH = $(PREFIX)@nfp(/share/nqp/lib)@
M_LIBPATH = $(LIBDIR)@nfp(/nqp/lib)@
M_INCPATH = $(MOAR_PREFIX)@nfp(/include)@
M_MOAR_INC_PATHS = \
$(M_CCINC)"$(M_INCPATH)" \
$(M_CCINC)"$(M_INCPATH)/moar" \
$(M_CCINC)"$(M_INCPATH)/libatomic_ops" \
$(M_CCINC)"$(M_INCPATH)/dyncall" \
$(M_CCINC)"$(M_INCPATH)/moar" \
$(M_CCINC)"$(M_INCPATH)/sha1" \
$(M_CCINC)"$(M_INCPATH)/tinymt" \
$(M_CCINC)"$(M_INCPATH)/libtommath" \
$(M_CCINC)"$(M_INCPATH)/libuv"

M_RUN_PERL6 = "$(MOAR)" --libpath="blib" --libpath="$(M_LIBPATH)" perl6.moarvm --nqp-lib=blib
$(M_CCINC)$(M_INCPATH) \
$(M_CCINC)$(M_INCPATH)@nfp(/moar)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/libatomic_ops)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/dyncall)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/moar)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/sha1)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/tinymt)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/libtommath)@ \
$(M_CCINC)$(M_INCPATH)@nfp(/libuv)@

M_RUN_PERL6 = $(MOAR) --libpath=blib --libpath=$(M_LIBPATH) perl6.moarvm --nqp-lib=blib

M_BAT = @runner_suffix@
M_BAT_RUNNER = perl6-m@runner_suffix@
@@ -55,7 +55,7 @@ SETTING_MOAR = CORE.setting.moarvm
R_SETTING_MOAR = RESTRICTED.setting.moarvm

M_PERL6_OPS_DIR = dynext
M_PERL6_OPS_DLL = @expand(@!nfp($(M_PERL6_OPS_DIR)/@perl6_ops_dll@)@)@
M_PERL6_OPS_DLL = $(M_PERL6_OPS_DIR)@nfp(/@perl6_ops_dll@)@
M_PERL6_OPS_OBJ = @nfp($(M_PERL6_OPS_DIR)/perl6_ops@moar::obj@)@
M_PERL6_CONT_OBJ = @nfp($(M_PERL6_OPS_DIR)/container@moar::obj@)@
M_PERL6_OPS_SRC = @nfp(src/vm/moar/ops/perl6_ops.c)@
@@ -82,7 +82,7 @@ M_CORE_SOURCES = \
@insert_filelist(moar_core_sources)@
@for_specs(
M_CORE_@ucspec@_SOURCES = \
@insert_filelist(@nfp(moar_core_sources)@)@
@insert_filelist(moar_core_sources)@
)@

PERL6_DEBUG_MOAR = perl6-debug.moarvm
@@ -122,8 +122,8 @@ M_RUN_CLEAN_TARGET_FILES = $(M_RUN_PERL6) -e "for @*ARGS.head(*-1) { given (@*AR

m-all: check_@backend_prefix@_nqp_version $(PERL6_MOAR) $(SETTING_MOAR) @for_specs($(SETTING_@ucspec@_MOAR) )@$(R_SETTING_MOAR) $(M_BAT_RUNNER) $(PERL6_DEBUG_MOAR) $(M_BAT_DEBUG_RUNNER) $(M_C_RUNNER) $(M_C_DEBUG_RUNNER) @m_all@

check_@backend_prefix@_nqp_version: @script(check-nqp-version.pl)@
$(PERL5) @script(check-nqp-version.pl)@ $(M_NQP)
check_@backend_prefix@_nqp_version: @@script(check-nqp-version.pl)@@
$(PERL5) @shquot(@script(check-nqp-version.pl)@)@ $(M_NQP)

$(M_PERL6_OPS_DLL): $(M_PERL6_OPS_SRC) $(M_PERL6_CONT_SRC)
$(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) $(M_MOAR_INC_PATHS) @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
@@ -135,32 +135,30 @@ $(PERL6_ML_MOAR): @nfp(src/Perl6/ModuleLoader.nqp)@ @nfp(src/vm/moar/ModuleLoade
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_ML_MOAR) \
@nfp($(M_BUILD_DIR)/ModuleLoader.nqp)@

$(PERL6_OPS_MOAR): @nfp(src/vm/moar/Perl6/Ops.nqp $(M_PERL6_OPS_DLL) gen/nqp-version)@
$(PERL6_OPS_MOAR): @nfp(src/vm/moar/Perl6/Ops.nqp)@ $(M_PERL6_OPS_DLL) @nfp(gen/nqp-version)@
$(M_NQP) --target=mbc --output=$(PERL6_OPS_MOAR) \
@nfp(src/vm/moar/Perl6/Ops.nqp)@

$(PERL6_W_MOAR): $(PERL6_ML_MOAR) $(PERL6_OPS_MOAR) $(PERL6_P_MOAR) @nfp(src/Perl6/World.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_W_MOAR) \
@nfp(src/Perl6/World.nqp)@

$(PERL6_P_MOAR): @nfp(src/Perl6/Pod.nqp gen/nqp-version)@
$(PERL6_P_MOAR): @nfpl(src/Perl6/Pod.nqp gen/nqp-version)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_P_MOAR) \
@nfp(src/Perl6/Pod.nqp)@

$(PERL6_A_MOAR): @nfp(src/Perl6/Actions.nqp)@ $(PERL6_P_MOAR) $(PERL6_OPS_MOAR)
$(M_NQP) $(M_GEN_CAT) @nfp(src/Perl6/Actions.nqp \
src/Perl6/PodActions.nqp > $(M_BUILD_DIR)/Perl6-Actions.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfpl(src/Perl6/Actions.nqp src/Perl6/PodActions.nqp > $(M_BUILD_DIR)/Perl6-Actions.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_A_MOAR) \
@nfp($(M_BUILD_DIR)/Perl6-Actions.nqp)@

$(PERL6_G_MOAR): @nfp(src/Perl6/Grammar.nqp)@ $(PERL6_W_MOAR) $(PERL6_A_MOAR) $(PERL6_P_MOAR)
$(M_NQP) $(M_GEN_CAT) @nfp(src/Perl6/Grammar.nqp \
src/Perl6/PodGrammar.nqp > $(M_BUILD_DIR)/Perl6-Grammar.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfpl(src/Perl6/Grammar.nqp src/Perl6/PodGrammar.nqp > $(M_BUILD_DIR)/Perl6-Grammar.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_G_MOAR) \
@nfp($(M_BUILD_DIR)/Perl6-Grammar.nqp)@

$(PERL6_O_MOAR): @nfp(src/Perl6/Optimizer.nqp)@ $(PERL6_OPS_MOAR)
$(M_NQP) $(M_GEN_CAT) @nfp(src/Perl6/Optimizer.nqp > $(M_BUILD_DIR)/Perl6-Optimizer.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfpl(src/Perl6/Optimizer.nqp > $(M_BUILD_DIR)/Perl6-Optimizer.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_O_MOAR) \
@nfp($(M_BUILD_DIR)/Perl6-Optimizer.nqp)@

@@ -170,12 +168,12 @@ $(PERL6_C_MOAR): @nfp(src/Perl6/Compiler.nqp)@ $(PERL6_O_MOAR)

$(PERL6_MOAR): @nfp(src/main.nqp)@ $(PERL6_G_MOAR) $(PERL6_A_MOAR) $(PERL6_C_MOAR) $(PERL6_P_MOAR) $(M_METAMODEL_SOURCES) $(M_BOOTSTRAP_SOURCES) $(M_CORE_SOURCES)@for_specs( $(M_CORE_@ucspec@_SOURCES))@
$(CONFIGURE) --expand main-version --out @nfp($(M_BUILD_DIR)/main-version.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfp(src/main.nqp $(M_BUILD_DIR)/main-version.nqp > $(M_BUILD_DIR)/main.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfpl(src/main.nqp $(M_BUILD_DIR)/main-version.nqp > $(M_BUILD_DIR)/main.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_MOAR) \
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init @nfp($(M_BUILD_DIR)/main.nqp)@

$(PERL6_M_MOAR): $(M_METAMODEL_SOURCES) $(PERL6_OPS_MOAR)
$(M_NQP) $(M_GEN_CAT) -f @template(common_bootstrap_sources)@ > @nfp($(M_BUILD_DIR)/Metamodel.nqp)@
$(M_NQP) $(M_GEN_CAT) -f @shquot(@template(common_bootstrap_sources)@)@ > @nfp($(M_BUILD_DIR)/Metamodel.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_M_MOAR) \
@nfp($(M_BUILD_DIR)/Metamodel.nqp)@

@@ -185,22 +183,22 @@ $(PERL6_B_MOAR): $(M_BOOTSTRAP_SOURCES) $(PERL6_M_MOAR)
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init @nfp($(M_BUILD_DIR)/BOOTSTRAP.nqp)@

$(SETTING_MOAR): $(PERL6_MOAR) $(PERL6_B_MOAR) $(M_CORE_SOURCES)
$(M_NQP) $(M_GEN_CAT) -f @template(moar_core_sources)@ > @nfp($(M_BUILD_DIR)/CORE.setting)@
$(M_NQP) $(M_GEN_CAT) -f @shquot(@template(moar_core_sources)@)@ > @nfp($(M_BUILD_DIR)/CORE.setting)@
@echo "The following step can take a long time, please be patient."
$(M_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=mbc --stagestats --output=$(SETTING_MOAR) @nfp($(M_BUILD_DIR)/CORE.setting)@

@for_specs($(SETTING_@ucspec@_MOAR): $(PERL6_MOAR) $(PERL6_B_MOAR) $(SETTING_MOAR) $(M_CORE_@ucspec@_SOURCES)
$(M_NQP) $(M_GEN_CAT) -f @template(moar_core_sources)@ > @nfp($(M_BUILD_DIR)/CORE.@lcspec@.setting)@
$(M_NQP) $(M_GEN_CAT) -f @shquot(@template(moar_core_sources)@)@ > @nfp($(M_BUILD_DIR)/CORE.@lcspec@.setting)@
@echo "The following step can take a long time, please be patient."
$(M_RUN_PERL6) --setting=NULL.@lcspec@ --ll-exception --optimize=3 --target=mbc --stagestats --output=$(SETTING_@ucspec@_MOAR) @nfp($(M_BUILD_DIR)/CORE.@lcspec@.setting)@

)@
$(R_SETTING_MOAR): $(PERL6_MOAR) $(SETTING_MOAR) $(R_SETTING_SRC) $(SETTING_MOAR)
$(M_RUN_PERL6) --target=mbc --ll-exception --output=$(R_SETTING_MOAR) $(R_SETTING_SRC)

$(M_BAT_RUNNER): @script(create-moar-runner.p6)@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(M_BAT_RUNNER): @@script(create-moar-runner.p6)@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_BAT_RUNNER)
$(M_RUN_PERL6) @script(create-moar-runner.p6)@ moar "$(MOAR)" perl6-m ~SCRIPT_DIR~/perl6.moarvm "" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
$(M_RUN_PERL6) @shquot(@script(create-moar-runner.p6)@)@ moar $(MOAR) perl6-m ~SCRIPT_DIR~/perl6.moarvm "" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
-$(CHMOD) 755 $(M_BAT_RUNNER)

m-runner-default: $(M_BAT_RUNNER)
@@ -209,26 +207,26 @@ m-runner-default: $(M_BAT_RUNNER)
-$(CHMOD) 755 perl6@runner_suffix@

$(PERL6_DEBUG_MOAR): @nfp(src/perl6-debug.nqp)@ $(PERL6_MOAR)
$(M_NQP) $(M_GEN_CAT) @nfp(src/perl6-debug.nqp $(M_BUILD_DIR)/main-version.nqp > $(M_BUILD_DIR)/perl6-debug.nqp)@
$(M_NQP) $(M_GEN_CAT) @nfpl(src/perl6-debug.nqp $(M_BUILD_DIR)/main-version.nqp > $(M_BUILD_DIR)/perl6-debug.nqp)@
$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_DEBUG_MOAR) \
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init @nfp($(M_BUILD_DIR)/perl6-debug.nqp)@

$(M_BAT_DEBUG_RUNNER): @script(create-moar-runner.p6)@ $(M_C_DEBUG_RUNNER) $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
$(M_RUN_PERL6) @script(create-moar-runner.p6)@ moar "$(MOAR)" perl6-debug-m ~SCRIPT_DIR~/perl6-debug.moarvm "" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
$(M_BAT_DEBUG_RUNNER): @@script(create-moar-runner.p6)@@ $(M_C_DEBUG_RUNNER) $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
$(M_RUN_PERL6) @shquot(@script(create-moar-runner.p6)@)@ moar $(MOAR) perl6-debug-m ~SCRIPT_DIR~/perl6-debug.moarvm "" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)

$(M_GDB_RUNNER): @script(create-moar-runner.p6)@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(M_GDB_RUNNER): @@script(create-moar-runner.p6)@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_GDB_RUNNER)
$(M_RUN_PERL6) @script(create-moar-runner.p6)@ moar "$(MOAR)" perl6-gdb-m ~SCRIPT_DIR~/perl6.moarvm "gdb" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
$(M_RUN_PERL6) @shquot(@script(create-moar-runner.p6)@)@ moar $(MOAR) perl6-gdb-m ~SCRIPT_DIR~/perl6.moarvm "gdb" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
-$(CHMOD) 755 $(M_GDB_RUNNER)

$(M_LLDB_RUNNER): @script(create-moar-runner.p6)@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(M_LLDB_RUNNER): @@script(create-moar-runner.p6)@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_LLDB_RUNNER)
$(M_RUN_PERL6) @script(create-moar-runner.p6)@ moar "$(MOAR)" perl6-lldb-m ~SCRIPT_DIR~/perl6.moarvm "lldb" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
$(M_RUN_PERL6) @shquot(@script(create-moar-runner.p6)@)@ moar $(MOAR) perl6-lldb-m ~SCRIPT_DIR~/perl6.moarvm "lldb" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
-$(CHMOD) 755 $(M_LLDB_RUNNER)

$(M_VALGRIND_RUNNER): @script(create-moar-runner.p6)@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(M_VALGRIND_RUNNER): @@script(create-moar-runner.p6)@@ $(M_C_RUNNER) $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_VALGRIND_RUNNER)
$(M_RUN_PERL6) @script(create-moar-runner.p6)@ moar "$(MOAR)" perl6-valgrind-m ~SCRIPT_DIR~/perl6.moarvm "valgrind" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
$(M_RUN_PERL6) @shquot(@script(create-moar-runner.p6)@)@ moar $(MOAR) perl6-valgrind-m ~SCRIPT_DIR~/perl6.moarvm "valgrind" --nqp-lib=~SCRIPT_DIR~/blib ~SCRIPT_DIR~ ~SCRIPT_DIR~/blib $(M_LIBPATH)
-$(CHMOD) 755 $(M_VALGRIND_RUNNER)

$(M_C_RUNNER): @nfp(src/vm/moar/runner/main.c)@
@@ -262,7 +260,7 @@ m-quicktest: m-quicktest$(HARNESS_TYPE)
m-stresstest: m-stresstest$(HARNESS_TYPE)

m-coretest5: m-all
$(M_HARNESS5) @nfp(t/01-sanity t/02-rakudo t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/09-moar t/10-qast)@
$(M_HARNESS5) @nfpl(t/01-sanity t/02-rakudo t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/09-moar t/10-qast)@

# Run the spectests that we know work.
m-spectest5: m-testable @nfp(t/spectest.data)@
@@ -283,7 +281,7 @@ m-stresstest5: m-testable @nfp(t/spectest.data)@


m-coretest6: m-all
$(M_HARNESS6) @nfp(t/01-sanity t/02-rakudo t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/09-moar t/10-qast)@
$(M_HARNESS6) @nfpl(t/01-sanity t/02-rakudo t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/09-moar t/10-qast)@

# Run the spectests that we know work.
m-spectest6: m-testable @nfp(t/spectest.data)@
@@ -317,7 +315,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(create-moar-runner.p6)@@ @@script(install-core-dist.p6)@@ $(SETTING_MOAR)
$(MKPATH) @nfp($(DESTDIR)$(PREFIX)/bin)@
$(MKPATH) @nfp($(DESTDIR)$(M_LIBPATH)/Perl6)@
$(M_RUN_CLEAN_TARGET_FILES) $(M_PERL6_LANG_OUTPUT) @nfp($(DESTDIR)$(M_LIBPATH)/Perl6)@
@@ -330,10 +328,10 @@ m-install: m-all @script(create-moar-runner.p6)@ @script(install-core-dist.p6)@
$(CP) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
$(MKPATH) @nfp($(DESTDIR)$(PERL6_HOME)/runtime/dynext)@
$(CP) $(M_PERL6_OPS_DLL) @nfp($(DESTDIR)$(PERL6_HOME)/runtime/dynext)@
.@slash@$(M_BAT_RUNNER) @script(upgrade-repository.p6)@ $(DESTDIR)$(PERL6_HOME)
.@slash@$(M_BAT_RUNNER) @script(upgrade-repository.p6)@ @nfp($(DESTDIR)$(PERL6_HOME)/vendor)@
.@slash@$(M_BAT_RUNNER) @script(upgrade-repository.p6)@ @nfp($(DESTDIR)$(PERL6_HOME)/site)@
.@slash@$(M_BAT_RUNNER) @script(install-core-dist.p6)@ $(DESTDIR)$(PERL6_HOME)
.@slash@$(M_BAT_RUNNER) @shquot(@script(upgrade-repository.p6)@)@ $(DESTDIR)$(PERL6_HOME)
.@slash@$(M_BAT_RUNNER) @shquot(@script(upgrade-repository.p6)@)@ @nfp($(DESTDIR)$(PERL6_HOME)/vendor)@
.@slash@$(M_BAT_RUNNER) @shquot(@script(upgrade-repository.p6)@)@ @nfp($(DESTDIR)$(PERL6_HOME)/site)@
.@slash@$(M_BAT_RUNNER) @shquot(@script(install-core-dist.p6)@)@ $(DESTDIR)$(PERL6_HOME)
$(CP) $(M_C_RUNNER) @nfp($(DESTDIR)$(PREFIX)/bin/$(M_RUNNER))@
$(CP) $(M_C_DEBUG_RUNNER) @nfp($(DESTDIR)$(PREFIX)/bin/$(M_DEBUG_RUNNER))@
@m_install@

0 comments on commit e91668a

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