Merge branch 'master' into whiteknight/eh_subclass

.gitignore

@@ -10,6 +10,10 @@
 *.patch
 *.diff
 
+# Ignore profiling files
+callgrind.out.*
+cachegrind.out.*
+
 # ports/ should not go into release tarballs
 *.obj
 *.rc
@@ -33,6 +37,9 @@
 /*.tmp
 # vim swap files
 /\.*sw?
+/*/*.sw?
+/*/*/*.sw?
+/*/*/*/*.sw?
 /*.vcproj*
 /.git
 /.parrot_current_rev
@@ -51,6 +58,8 @@
 /installable*
 /libparrot.def
 /libparrot.dll
+/libparrot.dll.a
+/cygparrot*.dll
 /miniparrot
 /myconfig
 /ops2c
@@ -73,7 +82,7 @@
 /parrot_nci_thunk_gen
 /parrot_nci_thunk_gen.c
 /parrot_nci_thunk_gen.pbc
-/parrot_test_run.tar.gz
+/parrot_old
 /pbc_disassemble
 /pbc_dump
 /pbc_info
@@ -175,41 +184,12 @@
 /examples/pir/befunge/MANIFEST
 /examples/pir/befunge/befunge
 /examples/pir/befunge/installable_befunge
-/ext/Makefile
-/ext/Parrot-Embed/*.bs
-/ext/Parrot-Embed/*.bundle
-/ext/Parrot-Embed/*.c
-/ext/Parrot-Embed/*.def
-/ext/Parrot-Embed/*.dll
-/ext/Parrot-Embed/*.dump
-/ext/Parrot-Embed/*.dylib
-/ext/Parrot-Embed/*.exe
-/ext/Parrot-Embed/*.exp
-/ext/Parrot-Embed/*.h
-/ext/Parrot-Embed/*.ilk
-/ext/Parrot-Embed/*.lib
-/ext/Parrot-Embed/*.manifest
-/ext/Parrot-Embed/*.o
-/ext/Parrot-Embed/*.obj
-/ext/Parrot-Embed/*.old
-/ext/Parrot-Embed/*.pdb
-/ext/Parrot-Embed/*.pdb
-/ext/Parrot-Embed/*.so
-/ext/Parrot-Embed/*.tmp
-/ext/Parrot-Embed/*.xs
-/ext/Parrot-Embed/Build
-/ext/Parrot-Embed/Build.bat
-/ext/Parrot-Embed/Makefile
-/ext/Parrot-Embed/Makefile.PL
-/ext/Parrot-Embed/_build
-/ext/Parrot-Embed/blib
-/ext/Parrot-Embed/dll.base
-/ext/Parrot-Embed/pm_to_blib
-/ext/Parrot-Embed/lib/Parrot/*.c
-/ext/Parrot-Embed/lib/Parrot/*.obj
-/ext/Parrot-Embed/t/*.pbc
 /ext/nqp-rx/src/stage0/nqp-setting.pir
 /frontend/parrot/main.o
+/frontend/parrot2/main.o
+/frontend/parrot2/prt0.pbc
+/frontend/parrot2/prt0.pbc.c
+/frontend/parrot2/prt0.pbc.o
 /frontend/parrot_debugger/main.o
 /frontend/pbc_disassemble/main.o
 /frontend/pbc_dump/main.o
@@ -240,6 +220,7 @@
 /runtime/parrot/dynext/*.bundle
 /runtime/parrot/dynext/*.def
 /runtime/parrot/dynext/*.dll
+/runtime/parrot/dynext/*.dll.a
 /runtime/parrot/dynext/*.dylib
 /runtime/parrot/dynext/*.exe
 /runtime/parrot/dynext/*.exp
@@ -324,6 +305,7 @@
 /src/dynoplibs/*.bundle
 /src/dynoplibs/*.c
 /src/dynoplibs/*.dll
+/src/dynoplibs/*.dll.a
 /src/dynoplibs/*.exp
 /src/dynoplibs/*.h
 /src/dynoplibs/*.ilk
@@ -339,6 +321,7 @@
 /src/dynpmc/*.c
 /src/dynpmc/*.def
 /src/dynpmc/*.dll
+/src/dynpmc/*.dll.a
 /src/dynpmc/*.dump
 /src/dynpmc/*.dylib
 /src/dynpmc/*.exe
@@ -385,6 +368,7 @@
 /src/string/charset/*.obj
 /src/string/encoding/*.o
 /src/string/encoding/*.obj
+/t/archive/parrot_test_run.tar.gz
 /t/benchmark/*.pasm
 /t/benchmark/*.pir
 /t/compilers/data_json/*.pbc
@@ -449,9 +433,14 @@
 /t/pmc/*_pbcexe*
 /t/pmc/testlib/*.pbc
 /t/src/*_*.c
+/t/src/*.exe
+/t/src/*.lib
+/t/src/*.exp
 /t/src/*.gcov
 /t/src/*.gcdada
 /t/src/embed/*.c
+/t/src/embed*.o
+/t/src/extend*.o
 /t/stress/*.out
 /t/stress/*.pasm
 /t/stress/*.pbc

.travis.yml

@@ -0,0 +1,45 @@
+language: "perl"
+perl:
+#    - "5.10"
+    - "5.14"
+install: "echo"
+before_script:
+    - sudo apt-get install libffi-dev libicu-dev libgmp3-dev clang llvm-dev zlib1g-dev gcc-multilib
+# No, we are not going to run the tests for all these dependencies on every commit
+    - cpanm -n LWP::UserAgent TAP::Harness::Archive TAP::Harness::ReportByDescription
+# This stuff used to be required, but was rolled into the Travis CI perl support.
+#    - curl -L http://cpanmin.us | sudo perl - --self-upgrade
+#    - export CI_USER=$USER
+#    - mkdir ~/perl5 && perl -Mlocal::lib >> /tmp/local_lib_junk.sh && source /tmp/local_lib_junk.sh
+#    - sudo chown -R $CI_USER ~/.cpanm
+#    - sudo chown -R $CI_USER ~/perl5
+
+# Don't run Configure.pl tests, for now
+#script: "perl Configure.pl --test=build $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+script: "perl Configure.pl $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+branches:
+   only:
+     - master
+notifications:
+  recipients:
+    - parrot-ci@lists.parrot.org
+  email:
+    on_success: change
+    on_failure: always
+  irc:
+    channels:
+      - "irc.parrot.org#parrot"
+    on_success: change
+    on_failure: change
+env:
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="clang"
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE=""           PARROT_TEST="smoke" CC="clang"
+    - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="clang"
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="gcc"
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE=""           PARROT_TEST="smoke" CC="gcc"
+    - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="gcc"
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="g++"
+    - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE=""           PARROT_TEST="smoke" CC="g++"
+    - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="g++"

CREDITS

@@ -8,7 +8,7 @@
     grepping and beautification by scripts.
     The fields are: name (N), email (E), web-address (W),
     description (D), main username (U), alias usernames (A)
-    and snail-mail address (S).
+    and geographic location (S).
 
         Thanks,
 
@@ -18,6 +18,13 @@
         PPPS: To turn this file into a author map for git-svn, see tools/dev/mk_author_map.pl
 
 ----------
+N: Aaron Faanes
+E: dafrito@gmail.com
+W: http://www.dafrito.com
+D: make_html_docs revisions
+U: dafrito
+S: Richardson, TX
+
 N: Aaron Sherman
 U: ajs
 E: ajs@ajs.com
@@ -69,6 +76,13 @@ D: Architect (0.4.6 - 2.8.0) & Lead Developer
 E: allison@parrot.org
 U: allison
 
+N: Alvis Yardley
+D: Documentation Shepherd (3.9.0 - Present)
+D: Release manger for 4.1.0
+E: ac.yardley@gmail.com
+U: alvis
+S: Ft. Worth, Texas
+
 N: Amir Karger
 U: amirkarger
 D: editor bugfixes
@@ -100,7 +114,7 @@ E: yDNA@cpan.org
 N: Andrew Whitworth
 D: Internals development
 D: Documentation
-D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0 and 3.3.0
+D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0, 3.3.0, 3.10.0 and 4.0.0
 E: wknight8111@gmail.com
 U: Whiteknight
 
@@ -447,6 +461,12 @@ A: gerd
 E: pokorra@uni-siegen.de
 D: Release manager for 1.9.0, 2.3.0, 2.5.0, 2.8.0, 2.9.0, 3.2.0 and 3.4.0
 
+N: Gerhard R.
+U: gerdr
+A: not_gerd
+W: http://gerdr.github.com/on-parrot/
+D: MSYS fixes
+
 N: Goplat
 D: Win98 and other fixes.
 
@@ -508,7 +528,7 @@ D: lot of general hints and patches to improve portability
 
 N: Jason Gloudon
 
-N: Jay Emmerson
+N: Jay Emerson
 E: john.emerson@yale.edu
 U: jay
 
@@ -572,10 +592,16 @@ D: coding standard tests
 N: John Paul Wallington
 D: pir-mode.el: fix for xemacs plus bugfixes and cleanups
 
+N: Jonathan Gentle
+E: atrodo@atrodo.org
+U: atrodo
+A: atrodo
+S: Ohio, USA
+
 N: Jonathan "Duke" Leto
 E: jonathan@leto.net
-W: http://leto.net
-D: Release manager for 1.7.0
+W: http://dukeleto.pl
+D: Release manager for 1.7.0, 3.9.0,4.2.0 GCI/GSoC Org Admin/Mentor
 U: dukeleto
 A: leto
 A: Duke Leto
@@ -655,7 +681,7 @@ N: Kevin Falcone
 N: Kevin Polulak
 U: soh_cah_toa
 E: kpolulak@gmail.com
-D: HBDB debugger
+D: HBDB debugger, release manager for 3.8.0
 S: New Jersey, USA
 
 N: Kevin Tew
@@ -796,6 +822,11 @@ D: tracwiki additions
 D: Release manager for 2.7.0, 3.1.0
 E: mike.hind@gmail.com
 
+N: Michael Schroeder
+U: mls
+D: subprof profiling runcore
+E: mls@suse.de
+
 N: Michael G. Schwern
 
 N: Michael Scott
@@ -929,6 +960,9 @@ D: The Second Perl 6 Summarizer after Bryan C. Warnock
 E: pdcawley@bofh.org.uk
 W: http://www.bofh.org.uk:8080/
 
+N: Piotr Fusik
+D: Fixed typos
+
 N: Reini Urban
 U: rurban
 E: rurban@cpan.org
@@ -1031,6 +1065,13 @@ E: stefanor@cox.net
 D: Perl 5 interoperability, Blizkost
 U: sorear
 
+N: Stefan Seifert
+U: nine
+E: nine@detonation.org
+D: Continuation of Chandler's work on tasks
+S: Linz, Austria
+W: http://niner.name
+
 N: Stéphane Payrard
 D: Various code fixes and improvements