Use @shquot()@ for echo

rakudo · Sep 6, 2019 · 09456ad · 09456ad
1 parent dc9328b
commit 09456ad
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 32 deletions.
diff --git a/tools/lib/NQP/Config/Rakudo.pm b/tools/lib/NQP/Config/Rakudo.pm
@@ -1,5 +1,3 @@
-## Please see file perltidy.ERR
-## Please see file perltidy.ERR
 use v5.10.1;
 
 package NQP::Config::Rakudo;
@@ -241,7 +239,7 @@ sub configure_misc {
     #];
 
     # Get version info from VERSION template and git.
-    my $VERSION = slurp( File::Spec->catfile( $self->cfg('base_dir'), 'VERSION') );
+    my $VERSION = slurp( File::Spec->catfile( $self->cfg('base_dir'), 'VERSION' ) );
     chomp $VERSION;
     @{$config}{qw<version release codename>} = split( ' ', $VERSION, 3 );
 
@@ -350,17 +348,22 @@ sub configure_moar_backend {
           File::Spec->rel2abs(
             File::Spec->catdir( $config->{prefix}, 'share', 'perl6' ) );
         $nqp_config->{static_nqp_home_define} =
-          '-DSTATIC_NQP_HOME='
-          . $qchar . $self->c_escape_string( $nqp_config->{static_nqp_home} ) . $qchar;
+            '-DSTATIC_NQP_HOME='
+          . $qchar
+          . $self->c_escape_string( $nqp_config->{static_nqp_home} )
+          . $qchar;
         $nqp_config->{static_perl6_home_define} =
-          '-DSTATIC_PERL6_HOME='
-          . $qchar . $self->c_escape_string( $nqp_config->{static_perl6_home} ) . $qchar;
+            '-DSTATIC_PERL6_HOME='
+          . $qchar
+          . $self->c_escape_string( $nqp_config->{static_perl6_home} )
+          . $qchar;
     }
 
     # Strip rpath from ldflags so we can set it differently ourself.
     $nqp_config->{ldflags} = $nqp_config->{'moar::ldflags'};
     $nqp_config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath'}\E ?//;
-    $nqp_config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath_relocatable'}\E ?//;
+    $nqp_config->{ldflags} =~
+      s/\Q$nqp_config->{'moar::ldrpath_relocatable'}\E ?//;
     if ( $config->{prefix} ne '/usr' ) {
         $nqp_config->{ldflags} .= ' '
           . (
@@ -491,28 +494,37 @@ sub opts_for_configure {
 }
 
 sub clean_old_p6_libs {
-    my $self = shift;
-    my $is_moar  = $self->active_backend('moar');
-    if ( $is_moar ) {
+    my $self    = shift;
+    my $is_moar = $self->active_backend('moar');
+    if ($is_moar) {
         my $nqp_config = $self->{impls}{moar}->{config};
-        my $lib_dir = File::Spec->rel2abs(File::Spec->catdir( $nqp_config->{'nqp::prefix'}, 'share', 'nqp', 'lib', 'Perl6' ));
+        my $lib_dir    = File::Spec->rel2abs(
+            File::Spec->catdir(
+                $nqp_config->{'nqp::prefix'},
+                'share', 'nqp', 'lib', 'Perl6'
+            )
+        );
 
         return if !-d $lib_dir;
 
-        my @files = qw(Actions.moarvm BOOTSTRAP.moarvm Compiler.moarvm Grammar.moarvm Metamodel.moarvm ModuleLoader.moarvm Ops.moarvm Optimizer.moarvm Pod.moarvm World.moarvm);
+        my @files =
+          qw(Actions.moarvm BOOTSTRAP.moarvm Compiler.moarvm Grammar.moarvm Metamodel.moarvm ModuleLoader.moarvm Ops.moarvm Optimizer.moarvm Pod.moarvm World.moarvm);
 
         my @notes;
-        for ( @files ) {
+        for (@files) {
             my $file = File::Spec->catdir( $lib_dir, $_ );
             next unless -f $file;
             push @notes, "Will remove: $file\n";
             $self->{config}->{clean_old_p6_libs} .= "\t\$(RM_F) $file\n";
         }
-        $self->note('NOTICE',
+        $self->note(
+            'NOTICE',
             "Found stale files in $lib_dir.\n",
             "These files were left by a previous install and cause breakage\n",
-            "in this Rakudo version. The files will be removed during install.\n",
-            "\n", @notes) if @notes;
+"in this Rakudo version. The files will be removed during install.\n",
+            "\n",
+            @notes
+        ) if @notes;
     }
 }
 
@@ -602,7 +614,8 @@ sub gen_nqp {
         my %c        = read_config($bin);
         my $nqp_have = $c{'nqp::version'} || '';
         $self->backend_config( $b, \%c ) if %c;
-        my $nqp_ver_ok = $nqp_have ? (0 <= cmp_rev( $nqp_have, $nqp_want )) : 0;
+        my $nqp_ver_ok =
+          $nqp_have ? ( 0 <= cmp_rev( $nqp_have, $nqp_want ) ) : 0;
         my $nqp_ok = $nqp_have && $nqp_ver_ok;
 
         unless ( !$nqp_have || $nqp_ver_ok || $options->{'ignore-errors'} ) {
@@ -754,34 +767,34 @@ sub _m_source_digest {
 }
 
 sub _m_gencat {
-    my $self = shift;
-    my $text = shift;
+    my $self       = shift;
+    my $text       = shift;
     my $all_prereq = $self->cfg->cfg('make_all_prereq');
     return $self->expand(<<TPL);
 $text
-\t\@echo "+++ Generating\t\$\@"
+\t\@echo \@shquot(+++ Generating\t\$\@)@
 \t\@noecho\@\@bpm(NQP)\@ \@bpm(GEN_CAT)\@ $all_prereq > \$\@
 TPL
 }
 
 sub _m_comp {
-    my $self = shift;
-    my $text = shift;
+    my $self         = shift;
+    my $text         = shift;
     my $first_prereq = $self->cfg->cfg('make_first_prereq');
     return $self->expand(<<TPL);
 $text
-\t\@echo "+++ Compiling\t\$@" 
+\t\@echo \@shquot(+++ Compiling\t\$@)@
 \t\@noecho@\@bpm(NQP)@ \@bpm(NQP_FLAGS)@ --target=\@btarget@ --output=\$@ $first_prereq
 TPL
 }
 
 sub _m_comp_rr {
-    my $self = shift;
-    my $text = shift;
+    my $self         = shift;
+    my $text         = shift;
     my $first_prereq = $self->cfg->cfg('make_first_prereq');
     return $self->expand(<<TPL);
 $text
-\t\@echo "+++ Compiling\t\$@" 
+\t\@echo @shquot(+++ Compiling\t\$@)@
 \t\@noecho@\@bpm(NQP_RR)@ \@bpm(NQP_FLAGS)@ --target=\@btarget@ --output=\$@ \@bpm(NQP_FLAGS_EXTRA)@ $first_prereq
 TPL
 }

diff --git a/tools/templates/Makefile-backend-common.in b/tools/templates/Makefile-backend-common.in
@@ -133,7 +133,7 @@
 # --- Main rules ---
 
 check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@
-	@echo "+++ Checking for @backend@ NQP version"
+	@echo @shquot(+++ Checking for @backend@ NQP version)@
 	@noecho@$(PERL5) @shquot(@script(check-nqp-version.pl)@)@ @bpm(NQP)@
 
 # gen-cat sources into gen/<backend>
@@ -161,7 +161,7 @@ check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@
 @comp(@bsm(PERL6_W)@: 	@nfp(@bpm(BUILD_DIR)@/World.nqp)@ @bsm(PERL6_ML)@ @bsm(PERL6_OPS)@ @bsm(PERL6_P)@)@
 
 @nfp(@bpm(BUILD_DIR)@/main-version.nqp)@: @@template(main-version)@@ $(CONFIGURE_SOURCES) @bsm(METAMODEL_ALL_SOURCES)@@for_specs( @bpm(BOOTSTRAP_@ucspec_SOURCES)@ @bpm(CORE_@ucspec@_SOURCES)@)@
-	@echo "+++ Expanding	$@"
+	@echo @shquot(+++ Expanding	$@)@
 	@noecho@$(CONFIGURE) --expand main-version --out @nfpq(@bpm(BUILD_DIR)@/main-version.nqp)@
 
 @comp_rr(@bsm(PERL6)@: @nfp(@bpm(BUILD_DIR)@/perl6.nqp)@ @bsm(PERL6_G)@ @bsm(PERL6_A)@ @bsm(PERL6_C)@ @bsm(PERL6_P)@ @bpm(PERL6_DEPS_EXTRA)@)@
@@ -173,13 +173,12 @@ check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@
 @comp_rr(@bsm(PERL6_BOOTSTRAP_@ucspec@)@: @nfp(@bpm(BUILD_DIR)@/BOOTSTRAP/v6@lcspec@.nqp)@ @bsm(PERL6_M)@)@
 
 @bsm(SETTING_@ucspec@)@: @bsm(PERL6)@ @bsm(PERL6_BOOTSTRAP_@ucspec@)@ @bpm(CORE_ALL_SOURCES)@
-	@echo "+++ Compiling	$@"
+	@echo @shquot(+++ Compiling	$@)@
 	@noecho@$(CONFIGURE) --expand @shquot(@ctx_template(core_sources)@)@ \
 			 --out @nfpq(@bpm(BUILD_DIR)@/core_sources.@lcspec@)@ \
 			 --set-var=backend=@backend@
 	@noecho@@bpm(NQP)@ @bpm(GEN_CAT)@ -f @nfpq(@bpm(BUILD_DIR)@/core_sources.@lcspec@)@ > @nfpq(@bpm(BUILD_DIR)@/CORE.@lcspec@.setting)@
-	@echo "The following step can take a long time, please be patient."
-	@noecho@@bpm(SET_NQP_LIB)@@bpm(RUN_PERL6)@ --setting=NULL.@lcspec@ --ll-exception --optimize=3 --target=@btarget@ --stagestats --output=@bsm(SETTING_@ucspec@)@ @nfpq(@bpm(BUILD_DIR)@/CORE.@lcspec@.setting)@
+	@echo @shquot(The following step can take a long time, please be patient.)@
 
 )@