Merge remote-tracking branch 'origin/nom' into js

Conflicts:
	src/core/Failure.pm
	src/core/Str.pm

Update to current nom.

.travis.yml

@@ -1,4 +1,4 @@
-language: "perl"
+language: "java"
 
 os:
     - linux
@@ -9,9 +9,21 @@ sudo: false
 fast_finish: true
 
 install: "echo"
-
-script: 
-    - "perl Configure.pl $RAKUDO_OPTIONS ; make test"
+dist: trusty
+
+addons:
+  apt:
+    sources:
+    # add PPAs with more up-to-date toolchains
+    - ubuntu-toolchain-r-test
+    packages:
+    # install toolchains
+    - gcc-6
+    #- openjdk-7-jre # Not needed if language is set to "java"
+
+script:
+    - perl Configure.pl $RAKUDO_OPTIONS --moar-option=--cc=$(command -v gcc-6 >/dev/null 2>&1; if [ $? -eq 1 ]; then printf "gcc"; else printf "gcc-6"; fi)
+    - "make test"
     - "make install"
 
 branches:

CREDITS

@@ -79,6 +79,11 @@ D: Pugs, a Perl6->Parrot implementation.
 N: bacek
 E: bacek@illusion.dev.optusnet.com.au
 
+N: Bahtiar `kalkin-` Gadimov
+U: kalkin
+E: bahtiar@gadimov.de
+W: https://bahtiar.gadimov.de/
+
 N: Bart Wiegmans
 U: bdw
 U: brrt
@@ -348,6 +353,10 @@ S: Brooklyn, NY, USA
 N: Jan Ingvoldstad
 E: jani+perl6-2010@ifi.uio.no
 
+N: Jan-Olof Hendig
+U: dogbert17
+E: jan-olof.hendig@bredband.net
+
 N: japhb
 E: gjb@sonic.net
 
@@ -505,6 +514,10 @@ S: South Lake Tahoe, CA, USA
 N: Mark Grimes
 E: mgrimes@cpan.org
 
+N: Mark Rushing
+E: seatek@gmail.com
+U: adaptiveoptics
+
 N: Mark Shoulson
 E: mark@kli.org
 
@@ -662,6 +675,11 @@ E: ruz@bestpractical.com
 N: Salve J. Nilsen
 E: sjn+gnurf@kaizendo.org
 
+N: Samantha McVey
+E: samantham@posteo.net
+W: cry.nu
+U: samcv
+
 N: sergot
 E: filip@sergot.pl
 
@@ -809,6 +827,10 @@ N: Zach Morgan
 E: zpmorgan@gmail.com
 D: Rakudo patch
 
+N: Zoffix Znet
+E: cpan@zoffix.com
+W: perl6.party
+
 N: Zohar Kelrich
 E: lumimies@gmail.com
 

Configure.pl

@@ -1,4 +1,4 @@
-#! perl
+#!/usr/bin/env perl
 # Copyright (C) 2009 The Perl Foundation
 
 use 5.10.1;
@@ -35,7 +35,7 @@
     GetOptions(\%options, 'help!', 'prefix=s',
                'sysroot=s', 'sdkroot=s',
                'backends=s', 'no-clean!',
-               'gen-nqp:s',
+               'with-nqp=s', 'gen-nqp:s',
                'gen-moar:s', 'moar-option=s@',
                'git-protocol=s',
                'make-install!', 'makefile-timing!',
@@ -70,6 +70,11 @@
     }
     my @backends;
     my %backends;
+    if (my $nqp_bin  = $options{'with-nqp'}) {
+        die "Could not find $nqp_bin" unless -e $nqp_bin;
+        $options{backends} = qx{$nqp_bin -e 'print(nqp::getcomp("nqp").backend.name)'}
+            or die "Could not get backend information from $nqp_bin";
+    }
     if (defined $options{backends}) {
         $options{backends} = join ",", @known_backends
             if uc($options{backends}) eq 'ALL';
@@ -107,7 +112,7 @@
             $backends{moar} = 1;
             $default_backend ||= 'moar';
         }
-        unless (%backends) {
+        unless (%backends or exists $options{'with-nqp'}) {
             die "No suitable nqp executables found! Please specify some --backends, or a --prefix that contains nqp-{p,j,m} executables\n\n"
               . "Example to build for all backends (which will take a while):\n"
               . "\tperl Configure.pl --backends=moar,jvm --gen-moar\n\n"
@@ -137,6 +142,13 @@
     $config{'runner_suffix'} = $win ? '.bat' : '';
 
     my $make = 'make';
+    if ($^O eq 'solaris') {
+        if (not -X '/usr/bin/gmake') {
+            die "gmake is required to compile rakudo. Please install by 'pkg install gnu-make'";
+        }
+        $make = 'gmake';
+    }
+
     if ($win) {
         my $has_nmake = 0 == system('nmake /? >NUL 2>&1');
         my $has_cl    = `cl 2>&1` =~ /Microsoft Corporation/;
@@ -154,7 +166,7 @@
         }
     }
 
-    for my $target (qw/common_bootstrap_sources moar_core_sources/) {
+    for my $target (qw/common_bootstrap_sources moar_core_sources jvm_core_sources/) {
         open my $FILELIST, '<', "tools/build/$target"
             or die "Cannot read 'tools/build/$target': $!";
         my @lines;
@@ -248,6 +260,7 @@
             $config{'nqp_jars'}      = $nqp_config{'jvm::runtime.jars'};
             $config{'bld_nqp_jars'}  = join( $config{'cpsep'}, map { $config{'sysroot'} . $_ } split( $config{'cpsep'}, $nqp_config{'jvm::runtime.jars'} ) );
             $config{'nqp_classpath'} = $nqp_config{'jvm::runtime.classpath'};
+            $config{'nqp_libdir'}    = $nqp_config{'nqp::libdir'};
             $config{'j_runner'}      = $win ? 'perl6-j.bat' : 'perl6-j';
 
 
@@ -273,8 +286,8 @@
         unless ($win) {
             $config{'m_cleanups'} = "  \$(M_GDB_RUNNER) \\\n  \$(M_VALGRIND_RUNNER)";
             $config{'m_all'}      = '$(M_GDB_RUNNER) $(M_VALGRIND_RUNNER)';
-            $config{'m_install'}  = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_LANG_DIR)/runtime" "gdb" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n"
-                                  . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_LANG_DIR)/runtime" "valgrind" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"';
+            $config{'m_install'}  = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_LANG_DIR)/runtime" "gdb" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n"
+                                  . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_LANG_DIR)/runtime" "valgrind" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"';
         }
 
         unless (@errors) {
@@ -378,6 +391,8 @@ sub print_help {
                        Download, build, and install a copy of NQP before writing the Makefile
     --gen-moar[=branch]
                        Download, build, and install a copy of MoarVM to use before writing the Makefile
+    --with-nqp='/path/to/nqp'
+                       Provide path to already installed nqp
     --make-install     Install Rakudo after configuration is done
     --moar-option='--option=value'
                        Options to pass to MoarVM's Configure.pl

INSTALL.txt

@@ -137,9 +137,6 @@
     the "roast" repository <http://github.com/perl6/roast/> and run all
     of these tests that are currently known to pass.
 
-    You can compare your own results to the results of the daily runs in
-    <https://github.com/coke/perl6-roast-data/>.
-
     At present we do not have any plans to directly store the official test
     suite as part of the Rakudo repository, but will continue to fetch it
     from the roast repository.  Releases of Rakudo get a snapshot of

LICENSE

@@ -1,6 +1,6 @@
 		       The Artistic License 2.0
 
-	    Copyright (c) 2000-2016, The Perl Foundation.
+	    Copyright (c) 2000-2006, The Perl Foundation.
 
      Everyone is permitted to copy and distribute verbatim copies
       of this license document, but changing it is not allowed.

README.md

@@ -2,11 +2,11 @@
 
 This is Rakudo Perl, a Perl 6 compiler for the MoarVM and JVM.
 
-Rakudo Perl is Copyright (C) 2008-2016, The Perl Foundation. Rakudo Perl
+Rakudo Perl is Copyright (C) 2008-2017, The Perl Foundation. Rakudo Perl
 is distributed under the terms of the Artistic License 2.0. For more
 details, see the full text of the license in the file LICENSE.
 
-This directory contains only the Rakudo Perl 6 compiler itself; it 
+This directory contains only the Rakudo Perl 6 compiler itself; it
 does not contain any of the modules, documentation, or other items
 that would normally come with a full Perl 6 distribution.  If you're
 after more than just the bare compiler, please download [the latest
@@ -92,12 +92,14 @@ This is always a good starting point.
 
 If you have a question about Perl 6 syntax or the right way to approach
 a problem using Perl 6, you probably want the "perl6-users@perl.org"
-mailing list or the "irc.freenode.net/#perl6" channel.  The perl6-users
+mailing list or the [irc.freenode.net/#perl6 IRC
+channel](https://webchat.freenode.net/?channels=#perl6). The perl6-users
 list is primarily for the people who want to use Perl 6 to write
 programs, so newbie questions are welcomed there.  Newbie questions
 are also welcome on the #perl6 channel; the Rakudo and Perl 6
 development teams tend to hang out there and are generally glad
-to help.  You can follow "@rakudoperl" on Twitter, and there's
+to help.  You can follow [@perl6org](https://twitter.com/perl6org)
+and [@rakudoperl](https://twitter.com/rakudoperl) on Twitter, and there's
 a Perl 6 news aggregator at [Planet Perl 6](http://pl6anet.org/).
 
 Questions about NQP can also be posted to the #perl6 IRC channel.

VERSION

@@ -1 +1 @@
-2016.09
+2016.12

appveyor.yml

@@ -2,9 +2,9 @@
 # For appveyor.yml syntax reference, please see
 # https://www.appveyor.com/docs/appveyor-yml
 #
-# JVM is already preinstalled in build worker. Please see 
+# JVM is already preinstalled in build worker. Please see
 # https://www.appveyor.com/docs/installed-software#java
-# 
+#
 
 # Platforms (e.g. x64, x86)
 platform:
@@ -46,7 +46,7 @@ matrix:
 # Installation
 install:
   - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
-  - choco install strawberryperl
+  - appveyor-retry choco install strawberryperl --version 5.20.1.1 --allow-empty-checksums
   - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
   - ECHO %RAKUDO_OPTIONS%
   - CD %APPVEYOR_BUILD_FOLDER%