[svn:parrot] r48646 - in branches/tt677_toolsdirs: . config/gen/makefiles docs/project lib/Parrot/Docs/Section ports/debian tools/dev tools/release
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Tue Aug 24 23:32:34 UTC 2010
Author: jkeenan
Date: Tue Aug 24 23:32:32 2010
New Revision: 48646
URL: https://trac.parrot.org/parrot/changeset/48646
Log:
Correct re-placement of dump_pbc.pl; update MANIFEST. Inside files, update mentions of paths under tools/.
Added:
branches/tt677_toolsdirs/tools/dev/dump_pbc.pl
- copied, changed from r48645, branches/tt677_toolsdirs/tools/release/dump_pbc.pl
Deleted:
branches/tt677_toolsdirs/tools/release/dump_pbc.pl
Modified:
branches/tt677_toolsdirs/MANIFEST
branches/tt677_toolsdirs/config/gen/makefiles/root.in
branches/tt677_toolsdirs/docs/project/release_manager_guide.pod
branches/tt677_toolsdirs/lib/Parrot/Docs/Section/Tools.pm
branches/tt677_toolsdirs/ports/debian/rules
branches/tt677_toolsdirs/tools/dev/addopstags.pl
branches/tt677_toolsdirs/tools/dev/headerizer.pl
branches/tt677_toolsdirs/tools/dev/ncidef2pasm.pl
branches/tt677_toolsdirs/tools/dev/perlcritic.conf
branches/tt677_toolsdirs/tools/dev/update_copyright.pl
branches/tt677_toolsdirs/tools/release/crow.pir
branches/tt677_toolsdirs/tools/release/gen_release_info.pl
Modified: branches/tt677_toolsdirs/MANIFEST
==============================================================================
--- branches/tt677_toolsdirs/MANIFEST Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/MANIFEST Tue Aug 24 23:32:32 2010 (r48646)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Aug 24 22:57:38 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Aug 24 23:10:21 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -2109,6 +2109,7 @@
tools/dev/checkdepend.pl []
tools/dev/create_language.pl [devel]
tools/dev/debian_docs.sh []
+tools/dev/dump_pbc.pl []
tools/dev/faces.pl []
tools/dev/fetch_languages.pl []
tools/dev/gen_charset_tables.pl []
@@ -2170,7 +2171,6 @@
tools/install/smoke_languages.pl []
tools/release/README []doc
tools/release/crow.pir []
-tools/release/dump_pbc.pl []
tools/release/gen_release_info.pl []
tools/release/inc_ver.pir []
tools/release/release.json []
Modified: branches/tt677_toolsdirs/config/gen/makefiles/root.in
==============================================================================
--- branches/tt677_toolsdirs/config/gen/makefiles/root.in Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/config/gen/makefiles/root.in Tue Aug 24 23:32:32 2010 (r48646)
@@ -47,8 +47,13 @@
# where we're building parrot from (needed for pbc_to_exe)
BUILD_DIR = @build_dir@
-# directory for build tools
+# directory for build tools:
+# programs, templates, configuration files invoked by 'make all'
+# (with or without command-line options)
BUILD_TOOLS_DIR = tools/build
+# directory for developers' tools
+# programs, templates, configuration files NOT invoked by 'make all'
+DEV_TOOLS_DIR = tools/dev
# directory for header files
INC_DIR = @inc@
@@ -116,7 +121,7 @@
NONGEN_HEADERS = @TEMP_nongen_headers@
# The headerizer
-HEADERIZER = $(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl
+HEADERIZER = $(PERL) $(DEV_TOOLS_DIR)/headerizer.pl
include src/dynpmc/Defines.mak
include src/dynoplibs/Defines.mak
@@ -857,8 +862,8 @@
$(PROVE) : parrot-prove.pbc $(PARROT) $(PBC_TO_EXE)
$(PBC_TO_EXE) parrot-prove.pbc
-$(PARROT_CONFIG) : tools/util/parrot-config.pir $(PARROT) $(PBC_TO_EXE)
- $(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
+$(PARROT_CONFIG) : tools/dev/parrot-config.pir $(PARROT) $(PBC_TO_EXE)
+ $(PARROT) -o parrot_config.pbc tools/dev/parrot-config.pir
$(PARROT) pbc_to_exe.pbc parrot_config.pbc
$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
@@ -968,7 +973,7 @@
$(INSTALLABLECONFIG) : src/install_config$(O) $(PARROT_CONFIG) $(PBC_TO_EXE)
- $(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
+ $(PARROT) -o parrot_config.pbc tools/dev/parrot-config.pir
$(PBC_TO_EXE) parrot_config.pbc --install
$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) src/install_config$(O)
@@ -2512,7 +2517,7 @@
--languages=c,perl --langmap=c:+.h,c:+.pmc,c:+.ops \
-I NOTNULL,NULLOK,ARGIN,ARGMOD,ARGOUT,ARGINOUT,ARGIN_NULLOK,ARGOUT_NULLOK,ARGMOD_NULLOK,ARGFREE,ARGFREE_NOTNULL \
.
- $(PERL) $(BUILD_TOOLS_DIR)/addopstags.pl $(OPS_FILES)
+ $(PERL) $(DEV_TOOLS_DIR)/addopstags.pl $(OPS_FILES)
tags.vi.dummy:
@@ -2524,12 +2529,12 @@
CRITIC_FILES = 'lib/Parrot'
perlcritic:
- perlcritic --profile tools/util/perlcritic.conf $(CRITIC_FILES)
+ perlcritic --profile tools/dev/perlcritic.conf $(CRITIC_FILES)
# Andy's extra-cranky Perl::Critic checking for cage cleaners
cagecritic:
@perl -MPerl::Critic::Bangs -e'$$min=q{1.04};die qq{You need Bangs $$min} unless $$Perl::Critic::Bangs::VERSION ge $$min'
- perlcritic -1 --profile tools/util/perlcritic-cage.conf $(CRITIC_FILES)
+ perlcritic -1 --profile tools/dev/perlcritic-cage.conf $(CRITIC_FILES)
# This target will eventually create all the headers automatically. If you
# are having problems with linkage in Win32 (or elsewhere), because something
Modified: branches/tt677_toolsdirs/docs/project/release_manager_guide.pod
==============================================================================
--- branches/tt677_toolsdirs/docs/project/release_manager_guide.pod Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/docs/project/release_manager_guide.pod Tue Aug 24 23:32:32 2010 (r48646)
@@ -84,7 +84,7 @@
=item c
-Update release-related information in F<tools/util/release.json>. This will be
+Update release-related information in F<tools/release/release.json>. This will be
used later when making release announcements. There are a few essential
fields that must be updated at each release:
@@ -251,11 +251,11 @@
=item 9.
-Compose the release announcement. Use F<tools/util/crow.pir> to make
+Compose the release announcement. Use F<tools/release/crow.pir> to make
this part easier. You can specify the format of your announcements like so:
- $ ./parrot tools/util/crow.pir --type=text
- $ ./parrot tools/util/crow.pir --type=html
+ $ ./parrot tools/release/crow.pir --type=text
+ $ ./parrot tools/release/crow.pir --type=html
Take the screen output and paste it into the application you need. HTML
works well for use Perl and PerlMonks, and text for the rest. It is not a
Modified: branches/tt677_toolsdirs/lib/Parrot/Docs/Section/Tools.pm
==============================================================================
--- branches/tt677_toolsdirs/lib/Parrot/Docs/Section/Tools.pm Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/lib/Parrot/Docs/Section/Tools.pm Tue Aug 24 23:32:32 2010 (r48646)
@@ -85,7 +85,7 @@
$self->new_item( '', 'tools/dev/list_unjitted.pl' ),
$self->new_item( '', 'tools/dev/gen_class.pl' ),
$self->new_item( '', 'tools/dev/nm.pl' ),
- $self->new_item( '', 'tools/util/ncidef2pasm.pl' ),
+ $self->new_item( '', 'tools/dev/ncidef2pasm.pl' ),
$self->new_item( '', 'tools/dev/pbc_header.pl' ),
),
$self->new_group(
Modified: branches/tt677_toolsdirs/ports/debian/rules
==============================================================================
--- branches/tt677_toolsdirs/ports/debian/rules Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/ports/debian/rules Tue Aug 24 23:32:32 2010 (r48646)
@@ -42,7 +42,7 @@
dh_testdir
$(MAKE) installable LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}`pwd`/blib/lib
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" docs/running.pod debian/parrot.1
- pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/util/parrot-config.pir debian/parrot_config.1
+ pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/dev/parrot-config.pir debian/parrot_config.1
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_dump.c debian/pbc_dump.1
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_disassemble.c debian/pbc_disassemble.1
pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/parrot_debugger.c debian/parrot_debugger.1
Modified: branches/tt677_toolsdirs/tools/dev/addopstags.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/dev/addopstags.pl Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/dev/addopstags.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -8,11 +8,11 @@
=head1 NAME
-tools/build/addopstags.pl - add src/ops/*.ops to tags
+tools/dev/addopstags.pl - add src/ops/*.ops to tags
=head1 SYNOPSIS
- perl tools/build/addopstags.pl src/ops/*.ops
+ perl tools/dev/addopstags.pl src/ops/*.ops
=head1 DESCRIPTION
Copied and modified: branches/tt677_toolsdirs/tools/dev/dump_pbc.pl (from r48645, branches/tt677_toolsdirs/tools/release/dump_pbc.pl)
==============================================================================
--- branches/tt677_toolsdirs/tools/release/dump_pbc.pl Tue Aug 24 22:58:05 2010 (r48645, copy source)
+++ branches/tt677_toolsdirs/tools/dev/dump_pbc.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -5,11 +5,11 @@
=head1 NAME
-tools/util/dump_pbc.pl - Weave together PBC disassembly with PIR source
+tools/dev/dump_pbc.pl - Weave together PBC disassembly with PIR source
=head1 SYNOPSIS
- perl tools/util/dump_pbc.pl foo.pbc
+ perl tools/dev/dump_pbc.pl foo.pbc
=head1 DESCRIPTION
Modified: branches/tt677_toolsdirs/tools/dev/headerizer.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/dev/headerizer.pl Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/dev/headerizer.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -4,12 +4,12 @@
=head1 NAME
-tools/build/headerizer.pl - Generates the function header parts of .h
+tools/dev/headerizer.pl - Generates the function header parts of .h
files from .c files
=head1 SYNOPSIS
- $ perl tools/build/headerizer.pl [object files]
+ $ perl tools/dev/headerizer.pl [object files]
Generates C function declarations based on the function definitions in
the C source code.
Modified: branches/tt677_toolsdirs/tools/dev/ncidef2pasm.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/dev/ncidef2pasm.pl Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/dev/ncidef2pasm.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -5,11 +5,11 @@
=head1 NAME
-tools/util/ncidef2asm.pl - Turn an NCI library definition file into PASM
+tools/dev/ncidef2asm.pl - Turn an NCI library definition file into PASM
=head1 SYNOPSIS
- perl tools/util/ncidef2asm.pl path/to/from_file [ path/to/to_file ]
+ perl tools/dev/ncidef2asm.pl path/to/from_file [ path/to/to_file ]
=head1 DESCRIPTION
Modified: branches/tt677_toolsdirs/tools/dev/perlcritic.conf
==============================================================================
--- branches/tt677_toolsdirs/tools/dev/perlcritic.conf Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/dev/perlcritic.conf Tue Aug 24 23:32:32 2010 (r48646)
@@ -18,7 +18,7 @@
add_themes = parrot
[CodeLayout::RequireTidyCode]
-perltidyrc = tools/util/perltidy.conf
+perltidyrc = tools/dev/perltidy.conf
add_themes = extra
[CodeLayout::UseParrotCoda]
Modified: branches/tt677_toolsdirs/tools/dev/update_copyright.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/dev/update_copyright.pl Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/dev/update_copyright.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -9,7 +9,7 @@
=head1 NAME
-F<tools/util/update_copyright.pl>
+F<tools/dev/update_copyright.pl>
=head1 DESCRIPTION
Modified: branches/tt677_toolsdirs/tools/release/crow.pir
==============================================================================
--- branches/tt677_toolsdirs/tools/release/crow.pir Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/release/crow.pir Tue Aug 24 23:32:32 2010 (r48646)
@@ -15,7 +15,7 @@
=head1 SYNOPSIS
# see
- % parrot tools/util/crow.pir --help
+ % parrot tools/release/crow.pir --help
=cut
@@ -39,7 +39,7 @@
got_opts:
.local pmc templates
- templates = 'get_json'('tools/util/templates.json')
+ templates = 'get_json'('tools/release/templates.json')
.local string template, type
type = opts['type']
@@ -50,7 +50,7 @@
template = 'get_template'(templates, type)
.local pmc data
- data = 'get_json'('tools/util/release.json')
+ data = 'get_json'('tools/release/release.json')
.local string version
version = data['release.version']
Deleted: branches/tt677_toolsdirs/tools/release/dump_pbc.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/release/dump_pbc.pl Tue Aug 24 23:32:32 2010 (r48645)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,125 +0,0 @@
-#! perl
-
-# Copyright (C) 2008, Parrot Foundation.
-# $Id$
-
-=head1 NAME
-
-tools/util/dump_pbc.pl - Weave together PBC disassembly with PIR source
-
-=head1 SYNOPSIS
-
- perl tools/util/dump_pbc.pl foo.pbc
-
-=head1 DESCRIPTION
-
-dump_pbc.pl uses Parrot's F<pbc_disassemble> program to disassemble the opcodes
-in a PBC (Parrot ByteCode) file, then weaves the disassembly together with
-the original PIR source file(s). This makes it easier to see how the PIR
-syntactic sugar is desugared into raw Parrot opcodes.
-
-=head1 BUGS
-
-This program has only been tested for a few simple cases. Also, the name
-might suggest a different use than its actual purpose.
-
-While it is not a bug in F<dump_pbc.pl> per se, there is a line numbering
-bug for some PBC opcode sequences that will result in the disassembled
-opcodes appearing just before the source lines they represent, rather
-than just after. There does not appear to be consensus yet about where
-this bug actually resides.
-
-=cut
-
-use strict;
-use warnings;
-use Cwd;
-use FindBin;
-
-my ($PARROT_ROOT, $RUNTIME_DIR);
-BEGIN {
- $PARROT_ROOT = Cwd::abs_path("$FindBin::Bin/../..");
- $RUNTIME_DIR = "$PARROT_ROOT/runtime/parrot";
-}
-
-use lib "$PARROT_ROOT/lib";
-use Parrot::Config '%PConfig';
-
-my $DISASSEMBLER = "$PConfig{build_dir}$PConfig{slash}pbc_disassemble$PConfig{exe}";
-
-go(@ARGV);
-
-sub go {
- my $pbc = shift;
-
- # The following mess brought to you by Win32, where pipe open doesn't work,
- # and thus its greater security and cleaner error handling are unavailable.
-
- -f $pbc && -r _
- or die "PBC file '$pbc' does not exist or is not readable.\n";
-
- -f $DISASSEMBLER && -x _
- or die "Can't find disassembler '$DISASSEMBLER';"
- . "did you remember to make parrot first?\n";
-
- my @dis = `$DISASSEMBLER $pbc`;
- die "No disassembly; errors: $?, $!" unless @dis;
-
- my $cur_file = '';
- my $cur_line = -1;
- my %cache;
-
- foreach (@dis) {
- if (/^(?:# )?Current Source Filename (.*)/) {
- my $found = $1;
- $found =~ s/^'//;
- $found =~ s/'$//;
- if ($cur_file ne $found) {
- $cur_file = $found;
- $cache{$cur_file} ||= slurp_file($cur_file);
- $cur_line = -1;
-
- print "\n#### $cur_file\n";
- }
- }
- elsif (my ($info, $seq, $pc, $line, $code) = /^((\d+)-(\d+) (\d+): )(.*)/) {
- my $int_line = int $line;
- my $len_line = length $line;
- if ($cur_line != $int_line) {
- $cur_line = 0 if $cur_line == -1;
- print "\n";
- foreach my $i ($cur_line + 1 .. $int_line) {
- my $source_code = $cache{$cur_file}[$i-1];
- # next unless $source_code =~ /\S/;
- printf "# %*d: %s", $len_line, $i, $source_code;
- print "\n" if $source_code =~ /^\.end/;
- }
- $cur_line = $int_line;
- }
-
- print ' ' x ($len_line + 4), "$code\n";
- }
- }
-}
-
-sub slurp_file {
- my $file = shift;
- my $source;
-
- open $source, '<', $file
- or open $source, '<', "$PARROT_ROOT/$file"
- or open $source, '<', "$RUNTIME_DIR/$file"
- or die "Could not open source file '$file': $!";
-
- my @lines = <$source>;
-
- return \@lines;
-}
-
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Modified: branches/tt677_toolsdirs/tools/release/gen_release_info.pl
==============================================================================
--- branches/tt677_toolsdirs/tools/release/gen_release_info.pl Tue Aug 24 22:58:05 2010 (r48645)
+++ branches/tt677_toolsdirs/tools/release/gen_release_info.pl Tue Aug 24 23:32:32 2010 (r48646)
@@ -7,7 +7,7 @@
=head1 NAME
-tools/util/gen_release_info.pl - generate release info for graphs and charts
+tools/release/gen_release_info.pl - generate release info for graphs and charts
=head1 DESCRIPTION
More information about the parrot-commits
mailing list