Author: coke
Date: Fri Dec 5 21:51:39 2008
New Revision: 33539
Added:
trunk/languages/perl6/build/gen_builtins_pir.pl
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/languages/perl6/config/makefiles/root.in
trunk/languages/perl6/src/builtins/misc.pir
Log:
[perl6] Convert src/gen_builtins.pir to be .include instead of inline copies.
(This makes IMCC report line numbers you can fix instead of lines in a copy of
a file you shouldn't edit.)
Only issue preventing this was a missing =cut tag in one of the builtins.
Also fixup manifest.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Fri Dec 5 21:51:39 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Dec 6 04:35:31 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Dec 6 05:46:39 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -2096,6 +2096,7 @@
languages/perl6/README [perl6]
languages/perl6/ROADMAP [perl6]
languages/perl6/Test.pm [perl6]
+languages/perl6/build/gen_builtins_pir.pl [perl6]
languages/perl6/build/gen_junction_pir.pl [perl6]
languages/perl6/build/gen_objectref_pmc.pl [perl6]
languages/perl6/config/makefiles/root.in [perl6]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Fri Dec 5 21:51:39 2008
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools\dev\mk_manifest_and_skip.pl Tue Dec 2 10:07:56 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Dec 6 05:46:39 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -1050,6 +1050,8 @@
^languages/perl6/src/gen_.*\.pir$
^languages/perl6/src/gen_.*\.pir/
# generated from svn:ignore of 'languages/perl6/src/ops/'
+^languages/perl6/src/ops/.*\.bundle$
+^languages/perl6/src/ops/.*\.bundle/
^languages/perl6/src/ops/.*\.c$
^languages/perl6/src/ops/.*\.c/
^languages/perl6/src/ops/.*\.dll$
Added: trunk/languages/perl6/build/gen_builtins_pir.pl
==============================================================================
--- (empty file)
+++ trunk/languages/perl6/build/gen_builtins_pir.pl Fri Dec 5 21:51:39 2008
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+# Copyright (C) 2008, The Perl Foundation.
+# $Id: gen_junction_pir.pl 32768 2008-11-17 16:19:41Z infinoid $
+
+use strict;
+use warnings;
+
+my @files = @ARGV;
+
+print <<"END_PRELUDE";
+# This file automatically generated by $0.
+
+END_PRELUDE
+
+foreach my $file (@files) {
+ print ".include '$file'\n";
+}
+
Modified: trunk/languages/perl6/config/makefiles/root.in
==============================================================================
--- trunk/languages/perl6/config/makefiles/root.in (original)
+++ trunk/languages/perl6/config/makefiles/root.in Fri Dec 5 21:51:39 2008
@@ -113,7 +113,7 @@
$(PBC_TO_EXE) perl6.pbc
# the default target
-perl6.pbc: $(PARROT) $(SOURCES)
+perl6.pbc: $(PARROT) $(SOURCES) $(BUILTINS_PIR)
$(PARROT) $(PARROT_ARGS) -o perl6.pbc perl6.pir
installable_perl6$(EXE): perl6.pbc
@@ -131,8 +131,8 @@
$(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \
--encoding=fixed_8 --target=pir src/parser/actions.pm
-src/gen_builtins.pir: $(BUILTINS_PIR)
- $(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
+src/gen_builtins.pir: build/gen_builtins_pir.pl
+ $(PERL) build/gen_builtins_pir.pl $(BUILTINS_PIR) > src/gen_builtins.pir
src/gen_junction.pir: build/gen_junction_pir.pl
$(PERL) build/gen_junction_pir.pl src/gen_junction.pir
Modified: trunk/languages/perl6/src/builtins/misc.pir
==============================================================================
--- trunk/languages/perl6/src/builtins/misc.pir (original)
+++ trunk/languages/perl6/src/builtins/misc.pir Fri Dec 5 21:51:39 2008
@@ -30,6 +30,8 @@
=back
+=cut
+
# Local Variables:
# mode: pir
# fill-column: 100
