Skip to content

Commit

Permalink
Consistify P6 scripts.
Browse files Browse the repository at this point in the history
Fixes #2077.
  • Loading branch information
jkramer committed Jul 16, 2018
1 parent 38d046f commit 906bec8
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/core/Cool.pm6
Expand Up @@ -404,7 +404,7 @@ multi sub uniprop(Int:D $code) {
nqp::getuniprop_str($code,nqp::unipropcode('General_Category'));
}
multi sub uniprop(Int:D $code, Stringy:D $propname) {
## The code below was generated by tools/build/makeUNIPROP.pl6
## The code below was generated by tools/build/makeUNIPROP.p6
my constant $prefs = nqp::hash(
'AHex','B','ASCII_Hex_Digit','B','Age','S','Alpha','B','Alphabetic','B',
'Bidi_C','B','Bidi_Class','S','Bidi_Control','B','Bidi_M','B',
Expand Down
2 changes: 1 addition & 1 deletion src/core/Rakudo/Internals.pm6
Expand Up @@ -1349,7 +1349,7 @@ my class Rakudo::Internals {
}

#- start of generated part of succ/pred ---------------------------------------
#- Generated on 2016-08-10T14:19:20+02:00 by tools/build/makeMAGIC_INC_DEC.pl6
#- Generated on 2016-08-10T14:19:20+02:00 by tools/build/makeMAGIC_INC_DEC.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

# normal increment magic chars & incremented char at same index
Expand Down
2 changes: 1 addition & 1 deletion src/core/SLICE.pm6
@@ -1,6 +1,6 @@
#===============================================================================
#
# This file has been generated by tools/build/makeSLICE.pl6
# This file has been generated by tools/build/makeSLICE.p6
# on 2016-08-08T14:40:48.554014Z.
#
# Please do *NOT* make changes to this file, as they will be lost
Expand Down
12 changes: 6 additions & 6 deletions src/core/native_array.pm6
Expand Up @@ -89,7 +89,7 @@ my class array does Iterable {

my role strarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of strarray role -----------------------------------
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.pl6
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method AT-POS(strarray:D: int $idx) is raw {
Expand Down Expand Up @@ -546,7 +546,7 @@ my class array does Iterable {

my role intarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of intarray role -----------------------------------
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.pl6
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method AT-POS(intarray:D: int $idx) is raw {
Expand Down Expand Up @@ -1055,7 +1055,7 @@ my class array does Iterable {

my role numarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of numarray role -----------------------------------
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.pl6
#- Generated on 2018-06-09T09:10:42+02:00 by tools/build/makeNATIVE_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method AT-POS(numarray:D: int $idx) is raw {
Expand Down Expand Up @@ -1580,7 +1580,7 @@ my class array does Iterable {
}

#- start of generated part of shapedintarray role -----------------------------
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.pl6
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

role shapedintarray does shapedarray {
Expand Down Expand Up @@ -2131,7 +2131,7 @@ my class array does Iterable {
#- end of generated part of shapedintarray role -------------------------------

#- start of generated part of shapednumarray role -----------------------------
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.pl6
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

role shapednumarray does shapedarray {
Expand Down Expand Up @@ -2682,7 +2682,7 @@ my class array does Iterable {
#- end of generated part of shapednumarray role -------------------------------

#- start of generated part of shapedstrarray role -----------------------------
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.pl6
#- Generated on 2018-06-09T09:16:36+02:00 by tools/build/makeNATIVE_SHAPED_ARRAY.p6
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

role shapedstrarray does shapedarray {
Expand Down
6 changes: 3 additions & 3 deletions tools/build/Makefile-JVM.in
Expand Up @@ -225,11 +225,11 @@ j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist.
$(CP) $(PERL6_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(PERL6_DEBUG_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(CP) $(RUNTIME_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
.@slash@$(J_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(J_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/vendor
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
Expand Down
6 changes: 3 additions & 3 deletions tools/build/Makefile-Moar.in
Expand Up @@ -298,9 +298,9 @@ m-install: m-all tools/build/create-moar-runner.p6 tools/build/install-core-dist
$(CP) $(PERL6_MOAR) $(PERL6_DEBUG_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime/dynext
$(CP) $(M_PERL6_OPS_DLL) $(DESTDIR)$(PERL6_LANG_DIR)/runtime/dynext
.@slash@$(M_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)
.@slash@$(M_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(M_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/vendor
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(M_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_LANG_DIR)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(M_LIBPATH)" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(M_LIBPATH)" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
Expand Down
2 changes: 2 additions & 0 deletions tools/build/makeMAGIC_INC_DEC.pl6 → tools/build/makeMAGIC_INC_DEC.p6 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env perl6

# This script reads the Rakudo/Internals.pm6 file from STDIN, and generates
# the necessary lookup hashes for making magic Str .succ / .pred work, and
# writes it to STDOUT.
Expand Down
2 changes: 2 additions & 0 deletions tools/build/makeNATIVE_ARRAY.pl6 → tools/build/makeNATIVE_ARRAY.p6 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env perl6

# This script reads the native_array.pm6 file from STDIN, and generates the
# intarray, numarray and strarray roles in it, and writes it to STDOUT.

Expand Down
2 changes: 2 additions & 0 deletions tools/build/makeNATIVE_SHAPED_ARRAY.pl6 → tools/build/makeNATIVE_SHAPED_ARRAY.p6 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env perl6

# This script reads the native_array.pm file from STDIN, and generates the
# shapedintarray, shapednumarray and shapedstrarray roles in it, and writes
# it to STDOUT.
Expand Down
2 changes: 2 additions & 0 deletions tools/build/makeSLICE.pl6 → tools/build/makeSLICE.p6 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env perl6

# This script generates the logic for doing adverbed slices, usually part of
# the core settings as "src/core/SLICE.pm6". When run, it will generate the
# source code on STDOUT.
Expand Down
2 changes: 1 addition & 1 deletion tools/build/makeUNIPROP.pl6 → tools/build/makeUNIPROP.p6
Expand Up @@ -264,7 +264,7 @@ sub print-line (Str:D $str, Bool :$flush?) {
sub create-Str-code {
my @allowed-types = 'uc', 'lc', 'tc', 'na', 'B', 'S', 'nv', 'bmg';
my %hash = get-uni-props;
say $base-indent, '## The code below was generated by tools/build/makeUNIPROP.pl6';
say $base-indent, '## The code below was generated by tools/build/makeUNIPROP.p6';
say $base-indent, 'my constant $prefs = nqp::hash(';
# These Emoji properties are not in the UCD, but are officially a spec of the Unicode Org
# These may or may not currently have short names. When/if they do, we should add these to the hash
Expand Down
2 changes: 2 additions & 0 deletions tools/build/upgrade-repository.pl → tools/build/upgrade-repository.p6 100644 → 100755
@@ -1,3 +1,5 @@
#!/usr/bin/env perl6

CompUnit::Repository::Installation.new(:prefix(@*ARGS[0])).upgrade-repository;

# vim: ft=perl6
8 changes: 4 additions & 4 deletions tools/install-dist.pl → tools/install-dist.p6
Expand Up @@ -3,9 +3,9 @@

=begin pod
This script is for installing Perl6 modules. B<install-dist.pl> does the same module registration like the 'zef' tool.
This script is for installing Perl6 modules. B<install-dist.p6> does the same module registration like the 'zef' tool.
B<install-dist.pl> makes it easy to install a module system wide.
B<install-dist.p6> makes it easy to install a module system wide.
=head1 OPTIONS
Expand All @@ -23,11 +23,11 @@ =head1 OPTIONS
The command in the install session for packaging a Perl 6 module could be done in the form:
install-dist.pl --to=<buildroot/...> --for=vendor
install-dist.p6 --to=<buildroot/...> --for=vendor
It is recommended to set the environment variable 'RAKUDO_RERESOLVE_DEPENDENCIES' by using the script:
RAKUDO_RERESOLVE_DEPENDENCIES=0 install-dist.pl --to=<buildroot/...> --for=site
RAKUDO_RERESOLVE_DEPENDENCIES=0 install-dist.p6 --to=<buildroot/...> --for=site
=end pod

Expand Down

0 comments on commit 906bec8

Please sign in to comment.