Permalink
Browse files

Merge branch 'master' into nwellnhof/gc_dynamic_threshold

Conflicts:
	frontend/parrot/main.c
	include/parrot/gc_api.h
	include/parrot/pmc.h
	src/gc/api.c
  • Loading branch information...
nwellnhof committed Jan 23, 2011
2 parents efba30e + a823c01 commit 400feaed625fd50c0226aeee86c7edd113107234
Showing 641 changed files with 33,728 additions and 25,861 deletions.
View
@@ -1,11 +1,19 @@
-# ex: set ro:
-# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl
-# .gitignore
-#
-# Ignore any remaining SVN directories
+# Ignore SVN, if people are using the SVN Github interface (danger!)
/\B.svn\b
+
+# Ignore core files
+/core*
+
+# Ignore patch-related stuff
+*.rej
+*.orig
+*.patch
+*.diff
+
# ports/ should not go into release tarballs
+*.obj
+*.rc
+*.res
/ports
/*.core
/*.def
@@ -37,6 +45,7 @@
/blib
/config_lib.pir
/cover_db
+/generated_hello.pbc
/install_config.fpmc
/installable*
/libparrot.def
@@ -213,9 +222,6 @@
/include/parrot/has_header.h
/include/parrot/opsenum.h
/include/parrot/pbcversion.h
-/include/parrot/platform.h
-/include/parrot/platform_interface.h
-/include/parrot/platform_limits.h
/include/parrot/vtable.h
/include/pmc/*.h
/lib/DumbLink.pm
@@ -286,6 +292,7 @@
/src/*.str
/src/asmfun.*
/src/core_pmcs.c
+/src/embed/*.o
/src/exec_cpu.c
/src/exec_dep.c
/src/exec_dep.h
@@ -302,8 +309,7 @@
/src/null_config.c
/src/parrot_config.c
/src/parrot_config.h
-/src/platform.c
-/src/platform_asm.s
+/src/platform/*/*.o
/src/revision.c
/src/atomic/*.o
/src/call/*.o
@@ -442,6 +448,7 @@
/t/src/*_*
/t/src/*.gcov
/t/src/*.gcdada
+/t/src/embed/*.c
/t/stress/*.out
/t/stress/*.pasm
/t/stress/*.pbc
View
33 CREDITS
@@ -57,7 +57,7 @@ U: heimdall
E: Nattfodd@gmail.com
N: Allison Randal
-D: Architect (0.4.6...) & Lead Developer
+D: Architect (0.4.6 - 2.8.0) & Lead Developer
E: allison@parrot.org
U: allison
@@ -224,8 +224,8 @@ U: creiss
E: creiss@cc.gatech.edu
N: Chip Salzenberg
-D: Release manager emeritus (0.4.6-0.4.7)
-D: Architect emeritus (0.1.2-0.4.5)
+D: Release manager emeritus (0.4.6 - 0.4.7)
+D: Architect emeritus (0.1.2 - 0.4.5)
U: chip
E: chip@pobox.com
@@ -243,12 +243,11 @@ D: Rakudo patches
N: Christoph Otto
U: cotto
-D: Patch for key flags in pdd08
+D: Architect (2.9.0 - current)
D: Range check in Env PMC
A: christoph_googleacct@mksig.org
A: christop...@mksig.org
A: Christoph Otto
-D: Pipp, Lorito taskmaster
E: christoph@mksig.org
N: chromatic
@@ -299,9 +298,13 @@ N: Damian Miles Knopp
U: dmknopp
E: dmknopp@loyola.edu
+N: Daniel Kang
+U: jumpyshoes
+D: improve pbc_disassemble's test coverage
+
N: Dan Sugalski
U: dan
-D: Architect emeritus (0.0.1-0.1.1)
+D: Architect emeritus (0.0.1 - 0.1.1)
E: dan@sidhe.org
W: http://www.sidhe.org/~dan/blog/
@@ -323,6 +326,11 @@ N: Dave Woldrich
D: Win32 build fixes
E: dave@woldrich.com
+N: David Czech
+U: kapace
+E: davidczech510@gmail.com
+D: increasing EventHandler test coverage
+
N: David M. Lloyd
U: dmlloyd
E: dmlloyd@tds.net
@@ -674,6 +682,10 @@ U: LylePerl
D: Win32 and CGI testing
W: http://perl.bristolbath.org/blog/lyle/
+N: Mariano Wahlmann
+E: dichoso@gmail.com
+A: bluescreen
+
N: Marcelo Serra Castilhos
E: mhelix@terra.com.br
D: Bug fix
@@ -712,7 +724,9 @@ N: Matt Kennedy
D: Some Env PMC method implementations and tests
N: Matt Rajca
-D: Code refactoring
+E: mattmatt.rajca@me.com
+A: mattrajca
+D: Code refactoring, increasing test coverage
N: Mattia Barbon
D: Win32 fixes, dynamic PMC creation and loading
@@ -1047,6 +1061,11 @@ D: Nicer command line handling in ops2c.pl
N: Tony Payne
D: Example hanoi.pasm
+N: Tony Young
+E: rofflwaffls@gmail.com
+U: rfw
+D: increasing PMC test coverage
+
N: Tyler Curtis
U: tcurtis
E: tyler.l.curtis@gmail.com
View
@@ -1,8 +1,12 @@
#1 $Id$
+2011.01.18 cotto
+ * Released 3.0.0
+ See NEWS for more.
+
2010.12.21 Whiteknight
- * Released 2.11.0
- See NEWS for more.
+ * Released 2.11.0
+ See NEWS for more.
2010.11.16 tcurtis
* Released 2.10.0
View
@@ -5,6 +5,7 @@
use 5.008;
use strict;
use warnings;
+use Data::Dumper;$Data::Dumper::Indent=1;
use lib 'lib';
use Parrot::Configure;
@@ -41,6 +42,7 @@
}
);
exit(1) unless defined $args;
+#print STDERR Dumper $args;
my $opttest = Parrot::Configure::Options::Test->new($args);
@@ -51,7 +53,8 @@
my $parrot_version = $Parrot::Configure::Options::Conf::parrot_version;
# from Parrot::Configure::Messages
-print_introduction($parrot_version);
+print_introduction($parrot_version)
+ unless $args->{silent};
# Update revision number if needed
Parrot::Revision::update();
@@ -79,7 +82,7 @@
my $make = $conf->data->get('make');
# from Parrot::Configure::Messages
-( print_conclusion( $conf, $make ) ) ? exit 0 : exit 1;
+( print_conclusion( $conf, $make, $args ) ) ? exit 0 : exit 1;
################### DOCUMENTATION ###################
@@ -198,7 +201,7 @@ =head2 General Options
=item C<--coveragedir>
-In preparation for calling C<make quickcover> to perform coverage analysis,
+In preparation for calling C<make cover> to perform coverage analysis,
provide a user-specified directory for top level of HTML output.
=item Operating system-specific configuration options
@@ -355,18 +358,10 @@ =head2 Parrot Options
Use the given ops files.
-=item C<--jitcapable>
-
-Use JIT system.
-
=item C<--buildframes>
Dynamically build NCI call frames.
-=item C<--execcapable>
-
-Use JIT to emit a native executable.
-
=back
=head2 International Components For Unicode (ICU) Options
@@ -553,7 +548,7 @@ =head1 CONFIGURATION-FILE INTERFACE
...
init::hints verbose-step
- init::headers
+ ...
inter::progs fatal-step
...
auto::gcc verbose-step
@@ -600,7 +595,6 @@ =head2 Example
init::defaults
init::install
init::hints verbose-step
- init::headers
inter::progs
inter::make
inter::lex
@@ -645,11 +639,11 @@ =head2 Example
auto::ctags
auto::revision
auto::icu
+ auto::platform
gen::config_h
gen::core_pmcs
gen::opengl
gen::makefiles
- gen::platform
gen::config_pm
=cut
Oops, something went wrong.

0 comments on commit 400feae

Please sign in to comment.