Skip to content

Commit

Permalink
Sync the branch with trunk.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.parrot.org/parrot/branches/pmc_freeze_with_pmcs@43680 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
darbelo committed Feb 1, 2010
1 parent 52eeb12 commit 6f63883
Show file tree
Hide file tree
Showing 9 changed files with 938 additions and 46 deletions.
5 changes: 3 additions & 2 deletions MANIFEST
View file
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
# generated by tools/dev/mk_manifest_and_skip.pl Tue Jan 26 00:27:14 2010 UT
# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 1 01:27:58 2010 UT
#
# See below for documentation on the format of this file.
#
Expand Down Expand Up @@ -2132,10 +2132,12 @@ t/tools/pmc2cutils/README []doc
t/tools/testdata [test]
tools/build/addopstags.pl []
tools/build/c2str.pl []
tools/build/cc_flags.pl []
tools/build/dynpmc.pl []
tools/build/fixup_gen_file.pl []
tools/build/h2inc.pl []
tools/build/headerizer.pl []
tools/build/nativecall.pir []
tools/build/nativecall.pl []
tools/build/ops2c.pl [devel]
tools/build/ops2pm.pl []
Expand All @@ -2148,7 +2150,6 @@ tools/dev/.gdbinit []
tools/dev/as2c.pl []
tools/dev/bench_op.pir []
tools/dev/branch_status.pl []
tools/dev/cc_flags.pl []
tools/dev/checkdepend.pl []
tools/dev/create_language.pl [devel]
tools/dev/debian_docs.sh []
Expand Down
7 changes: 6 additions & 1 deletion MANIFEST.SKIP
View file
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
# generated by tools/dev/mk_manifest_and_skip.pl Wed Jan 27 09:57:54 2010 UT
# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 1 01:27:58 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
Expand Down Expand Up @@ -1041,6 +1041,11 @@
^t/tools/pmc2c\..*\.h/
^t/tools/pmc2c\..*\.pmc$
^t/tools/pmc2c\..*\.pmc/
# generated from svn:ignore of 'tools/build/'
^tools/build/dynoplibs\.pl$
^tools/build/dynoplibs\.pl/
^tools/build/dynpmc\.pl$
^tools/build/dynpmc\.pl/
# Local variables:
# mode: text
# buffer-read-only: t
Expand Down
8 changes: 4 additions & 4 deletions config/gen/makefiles/root.in
View file
Expand Up @@ -576,14 +576,14 @@ MAKE = @make_c@
# arguments (etc) injected in the middle.
# There is probably a better way to do this, but I can't work it out right now.
.c$(O) : # suffix rule (limited support)
@$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
@$(PERL) tools/build/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<

# XXX probably should detect assembler, but right now this is only used on Sparc

.s$(O) : # suffix rule (limited support)
@$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
@$(PERL) tools/build/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
#UNLESS(win32).S$(O) : # suffix rule (limited support)
#UNLESS(win32) @$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
#UNLESS(win32) @$(PERL) tools/build/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<

.pir.pbc : # suffix rule (limited support)
$(PARROT) -o $@ $<
Expand Down Expand Up @@ -805,7 +805,7 @@ installable: all $(INSTALLABLEPARROT) $(INSTALLABLEPDUMP) $(INSTALLABLEDIS) $(IN

flags_dummy :
@echo "Compiling with:"
@$(PERL) tools/dev/cc_flags.pl ./CFLAGS echo $(CC) $(CFLAGS) -I$(@D) @cc_o_out@ xx$(O) -c xx.c
@$(PERL) tools/build/cc_flags.pl ./CFLAGS echo $(CC) $(CFLAGS) -I$(@D) @cc_o_out@ xx$(O) -c xx.c

runtime/parrot/include/parrotlib.pbc: runtime/parrot/library/parrotlib.pir $(PARROT) $(GEN_PASM_INCLUDES)
$(PARROT) -o $@ runtime/parrot/library/parrotlib.pir
Expand Down
2 changes: 1 addition & 1 deletion lib/Parrot/Docs/Section/Tools.pm
View file
Expand Up @@ -45,7 +45,7 @@ sub new {
'Configuration',
'',
$self->new_item( '', 'tools/dev/as2c.pl' ),
$self->new_item( '', 'tools/dev/cc_flags.pl' ),
$self->new_item( '', 'tools/build/cc_flags.pl' ),
$self->new_item( '', 'tools/build/nativecall.pl' ),
$self->new_item( '', 'tools/build/vtable_h.pl' ),
$self->new_item( '', 'tools/build/vtable_extend.pl' ),
Expand Down
34 changes: 17 additions & 17 deletions src/packdump.c
View file
Expand Up @@ -138,7 +138,7 @@ pobj_flag_dump(PARROT_INTERP, long flags)
INTVAL idx = 0;
int printed_flag_p = 0;

Parrot_io_printf(interp, "\tFLAGS => 0x%04lx (", flags);
Parrot_io_printf(interp, "\t\tFLAGS => 0x%04lx (", flags);
while (flags) {
if (flags & 1) {
if (printed_flag_p)
Expand Down Expand Up @@ -284,9 +284,9 @@ PackFile_Constant_dump(PARROT_INTERP, ARGIN(const PackFile_ConstTable *ct),
const int n = VTABLE_get_integer(interp, pmc);
STRING* const out_buffer = VTABLE_get_repr(interp, pmc);
Parrot_io_printf(interp,
"\tclass => %Ss,\n"
"\telement count => %d,\n"
"\telements => %Ss,\n",
"\t\tclass => %Ss,\n"
"\t\telement count => %d,\n"
"\t\telements => %Ss,\n",
pmc->vtable->whoami,
n,
out_buffer);
Expand Down Expand Up @@ -318,15 +318,15 @@ PackFile_Constant_dump(PARROT_INTERP, ARGIN(const PackFile_ConstTable *ct),
namespace_description = null;
}
Parrot_io_printf(interp,
"\tclass => %Ss,\n"
"\tstart_offs => %d,\n"
"\tend_offs => %d,\n"
"\tname => '%Ss',\n"
"\tsubid => '%Ss',\n"
"\tmethod => '%Ss',\n"
"\tnsentry => '%Ss',\n"
"\tnamespace => %Ss\n"
"\tHLL_id => %d,\n",
"\t\tclass => %Ss,\n"
"\t\tstart_offs => %d,\n"
"\t\tend_offs => %d,\n"
"\t\tname => '%Ss',\n"
"\t\tsubid => '%Ss',\n"
"\t\tmethod => '%Ss',\n"
"\t\tnsentry => '%Ss',\n"
"\t\tnamespace => %Ss\n"
"\t\tHLL_id => %d,\n",
pmc->vtable->whoami,
sub->start_offs,
sub->end_offs,
Expand All @@ -339,15 +339,15 @@ PackFile_Constant_dump(PARROT_INTERP, ARGIN(const PackFile_ConstTable *ct),
break;
case enum_class_FixedIntegerArray:
Parrot_io_printf(interp,
"\tclass => %Ss,\n"
"\trepr => '%Ss'\n",
"\t\tclass => %Ss,\n"
"\t\trepr => '%Ss'\n",
pmc->vtable->whoami,
VTABLE_get_repr(interp, pmc));
break;
default:
Parrot_io_printf(interp, "\tno dump info for PMC %ld %Ss\n",
Parrot_io_printf(interp, "\t\tno dump info for PMC %ld %Ss\n",
pmc->vtable->base_type, pmc->vtable->whoami);
Parrot_io_printf(interp, "\tclass => %Ss,\n", pmc->vtable->whoami);
Parrot_io_printf(interp, "\t\tclass => %Ss,\n", pmc->vtable->whoami);
}
}
Parrot_io_printf(interp, " } ],\n");
Expand Down
15 changes: 12 additions & 3 deletions t/configure/033-step.t
View file
Expand Up @@ -139,7 +139,10 @@ like(

{
my %tf_params = ( UNLINK => 1, );
$tf_params{SUFFIX} = '.exe' if 'MSWin32' eq $^O;
$tf_params{SUFFIX} = '.exe' if (
( $^O eq 'MSWin32' ) ||
( $^O eq 'cygwin' )
);
my ( $tmpfile, $fname ) = tempfile(%tf_params);

local $ENV{PATH} = dirname($fname);
Expand All @@ -151,7 +154,10 @@ like(

{
my %tf_params = ( UNLINK => 1, );
$tf_params{SUFFIX} = '.exe' if 'MSWin32' eq $^O;
$tf_params{SUFFIX} = '.exe' if (
( $^O eq 'MSWin32' ) ||
( $^O eq 'cygwin' )
);
my ( $tmpfile, $fname ) = tempfile(%tf_params);

local $ENV{PATH} = dirname($fname);
Expand All @@ -173,7 +179,10 @@ like(

{
my %tf_params = ( UNLINK => 1, );
$tf_params{SUFFIX} = '.exe' if 'MSWin32' eq $^O;
$tf_params{SUFFIX} = '.exe' if (
( $^O eq 'MSWin32' ) ||
( $^O eq 'cygwin' )
);
my ( $tmpfile, $fname ) = tempfile(%tf_params);

local $ENV{PATH} = dirname($fname);
Expand Down
17 changes: 2 additions & 15 deletions tools/dev/cc_flags.pl → tools/build/cc_flags.pl
View file
Expand Up @@ -6,11 +6,11 @@

=head1 NAME
tools/dev/cc_flags.pl - Process compiler flags
tools/build/cc_flags.pl - Process compiler flags
=head1 SYNOPSIS
% perl tools/dev/cc_flags.pl transform compiler flags
% perl tools/build/cc_flags.pl transform compiler flags
=head1 DESCRIPTION
Expand All @@ -30,13 +30,6 @@ =head1 SEE ALSO
use strict;
use warnings;

my $verbose;

if ($ARGV[0] eq '-v') {
$verbose = 1;
shift;
}

my $cflags = shift;

open my $F, '<', $cflags or die "open $cflags: $!\n";
Expand Down Expand Up @@ -118,8 +111,6 @@ =head1 SEE ALSO
}
}
# print "@ARGV\n";
# Visual C++ already prints the source file name...
if ( $ARGV[0] =~ /cl(?:\.exe)?/i ) {
Expand All @@ -134,10 +125,6 @@ =head1 SEE ALSO
}
}
if ($verbose) {
print join ' ', @ARGV;
}
exit system(@ARGV) / 256;
# Local Variables:
Expand Down

0 comments on commit 6f63883

Please sign in to comment.