[svn:parrot] r43295 - in branches/one_make: . compilers/pct compilers/pge config/gen config/gen/makefiles
coke at svn.parrot.org
coke at svn.parrot.org
Tue Dec 29 02:18:29 UTC 2009
Author: coke
Date: Tue Dec 29 02:18:28 2009
New Revision: 43295
URL: https://trac.parrot.org/parrot/changeset/43295
Log:
Convert pge's recursive make into an included one.
Added:
branches/one_make/compilers/pge/Makefile.mak
Deleted:
branches/one_make/config/gen/makefiles/pge.in
Modified:
branches/one_make/MANIFEST
branches/one_make/compilers/pct/Makefile.mak
branches/one_make/config/gen/makefiles.pm
branches/one_make/config/gen/makefiles/root.in
Modified: branches/one_make/MANIFEST
==============================================================================
--- branches/one_make/MANIFEST Tue Dec 29 01:25:56 2009 (r43294)
+++ branches/one_make/MANIFEST Tue Dec 29 02:18:28 2009 (r43295)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 21:54:22 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 29 02:02:34 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -132,6 +132,7 @@
compilers/pct/src/PCT/Node.pir [pct]
compilers/pct/src/POST/Compiler.pir [pct]
compilers/pct/src/POST/Node.pir [pct]
+compilers/pge/Makefile.mak [pge]
compilers/pge/P6Rule.grammar [pge]
compilers/pge/PGE.pir [pge]
compilers/pge/PGE/Exp.pir [pge]
@@ -325,7 +326,6 @@
config/gen/makefiles/nqp.in []
config/gen/makefiles/parrot_embed_pl.in []
config/gen/makefiles/parrot_pc.in []
-config/gen/makefiles/pge.in []
config/gen/makefiles/pirc.in []
config/gen/makefiles/root.in []
config/gen/makefiles/tge.in []
Modified: branches/one_make/compilers/pct/Makefile.mak
==============================================================================
--- branches/one_make/compilers/pct/Makefile.mak Tue Dec 29 01:25:56 2009 (r43294)
+++ branches/one_make/compilers/pct/Makefile.mak Tue Dec 29 02:18:28 2009 (r43295)
@@ -1,7 +1,5 @@
## XXX does not cover .includes of core .pasm files
-## XXX compilers.dummy in this section is a stopgap.
-
PCT_LIB_PBCS := \
$(LIBRARY_DIR)/PCT.pbc \
$(LIBRARY_DIR)/PCT/PAST.pbc \
@@ -22,14 +20,13 @@
compilers/pct/src/POST/Compiler.pir
$(PARROT) -o $@ compilers/pct/src/PAST.pir
-## depends on $(LIBRARY_DIR)/PGE.pbc $(LIBRARY_DIR)/PGE/Util.pbc
$(LIBRARY_DIR)/PCT/Grammar.pbc : compilers/pct/src/PCT/Grammar.pir $(PARROT) \
- compilers.dummy
+ $(LIBRARY_DIR)/PGE.pbc $(LIBRARY_DIR)/PGE/Util.pbc
$(PARROT) -o $@ compilers/pct/src/PCT/Grammar.pir
-## depends on $(LIBRARY_DIR)/PGE/Dumper.pbc
$(LIBRARY_DIR)/PCT/HLLCompiler.pbc : compilers/pct/src/PCT/HLLCompiler.pir \
$(PARROT) \
+ $(LIBRARY_DIR)/PGE/Dumper.pbc \
$(LIBRARY_DIR)/P6object.pbc \
$(LIBRARY_DIR)/Parrot/Exception.pbc \
$(LIBRARY_DIR)/config.pir \
Added: branches/one_make/compilers/pge/Makefile.mak
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/one_make/compilers/pge/Makefile.mak Tue Dec 29 02:18:28 2009 (r43295)
@@ -0,0 +1,20 @@
+# the default target
+
+PGE_LIB_PBCS := $(LIBRARY_DIR)/PGE.pbc
+
+## Two-stage build that reuses builtins_gen.pir
+
+$(LIBRARY_DIR)/PGE.pbc: $(PARROT) \
+ $(LIBRARY_DIR)/PGE/Perl6Grammar.pir \
+ compilers/pge/PGE.pir \
+ compilers/pge/PGE/Exp.pir \
+ compilers/pge/PGE/Match.pir \
+ compilers/pge/PGE/Regex.pir \
+ compilers/pge/PGE/Perl6Regex.pir \
+ compilers/pge/PGE/OPTable.pir \
+ compilers/pge/PGE/P5Regex.pir \
+ compilers/pge/PGE/builtins.pg
+ $(PERL) -e "" > compilers/pge/PGE/builtins_gen.pir
+ $(PARROT) -o $@ compilers/pge/PGE.pir
+ $(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir --output=compilers/pge/PGE/builtins_gen.pir compilers/pge/PGE/builtins.pg
+ $(PARROT) -o $@ compilers/pge/PGE.pir
Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm Tue Dec 29 01:25:56 2009 (r43294)
+++ branches/one_make/config/gen/makefiles.pm Tue Dec 29 02:18:28 2009 (r43295)
@@ -40,8 +40,6 @@
{ SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
'compilers/nqp/Makefile' =>
{ SOURCE => 'config/gen/makefiles/nqp.in' },
- 'compilers/pge/Makefile' =>
- { SOURCE => 'config/gen/makefiles/pge.in' },
'compilers/tge/Makefile' =>
{ SOURCE => 'config/gen/makefiles/tge.in' },
'compilers/json/Makefile' =>
Deleted: branches/one_make/config/gen/makefiles/pge.in
==============================================================================
--- branches/one_make/config/gen/makefiles/pge.in Tue Dec 29 02:18:28 2009 (r43294)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,84 +0,0 @@
-# Copyright (C) 2004-2009, Parrot Foundation.
-# $Id$
-
-# Setup some commands
-PERL := @perl@
-CP := @cp@
-RM_F := @rm_f@
-PARROT := ../../parrot at exe@
-
-TOOL_DIR := ../..
-
-# Where to put things
-PARROT_LIBRARY := ../../runtime/parrot/library
-
-# the default target
-all: $(PARROT_LIBRARY)/PGE.pbc
-
-SOURCES := \
- PGE.pir \
- PGE/Exp.pir \
- PGE/Match.pir \
- PGE/Regex.pir \
- PGE/Perl6Regex.pir \
- PGE/OPTable.pir \
- PGE/P5Regex.pir \
- PGE/builtins.pg
-
-$(PARROT_LIBRARY)/PGE.pbc: PGE.pbc
- $(CP) PGE.pbc $(PARROT_LIBRARY)
-
-PGE.pbc: $(PARROT) $(SOURCES)
- $(RM_F) PGE.pbc $(PARROT_LIBRARY)/PGE.pbc
- $(PERL) -e "" >PGE/builtins_gen.pir
- $(PARROT) -o PGE.pbc --output-pbc PGE.pir
- $(PARROT) $(PARROT_LIBRARY)/PGE/Perl6Grammar.pir --output=PGE/builtins_gen.pir PGE/builtins.pg
- $(RM_F) PGE.pbc
- $(PARROT) -o PGE.pbc --output-pbc PGE.pir
-
-# This is a listing of all targets, that are meant to be called by users
-help:
- @echo ""
- @echo "Following targets are available for the user:"
- @echo ""
- @echo " all: PGE.pbc"
- @echo " This is the default."
- @echo "Testing:"
- @echo " test: Run the test suite."
- @echo " testclean: Clean up test results."
- @echo ""
- @echo "Cleaning:"
- @echo " clean: Basic cleaning up."
- @echo " realclean: Removes also files generated by 'Configure.pl'"
- @echo " distclean: Removes also anything built, in theory"
- @echo ""
- @echo "Misc:"
- @echo " help: Print this help message."
- @echo ""
-
-test: all
- cd $(TOOL_DIR) && prove -r t/compilers/pge
-
-testclean:
- $(RM_F) "../../t/compilers/pge/*.pir" \
- "../../t/compilers/pge/p5regex/*.pir" \
- "../../t/compilers/pge/perl6regex/*.pir" \
- "../../t/compilers/pge/*.pbc" \
- "../../t/compilers/pge/p5regex/*.pbc" \
- "../../t/compilers/pge/perl6regex/*.pbc"
-
-clean: testclean
- $(RM_F) \
- PGE.pbc \
- $(PARROT_LIBRARY)/PGE.pbc \
- PGE/builtins_gen.pir
-
-realclean: clean
- $(RM_F) Makefile
-
-distclean: realclean
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in Tue Dec 29 01:25:56 2009 (r43294)
+++ branches/one_make/config/gen/makefiles/root.in Tue Dec 29 02:18:28 2009 (r43295)
@@ -153,7 +153,6 @@
compilers/json/Makefile \
compilers/ncigen/Makefile \
compilers/nqp/Makefile \
- compilers/pge/Makefile \
compilers/tge/Makefile \
editor/Makefile \
ext/Makefile \
@@ -258,6 +257,7 @@
lib/Parrot/OpLib/core.pm
GEN_LIBRARY := \
+ $(PGE_LIB_PBCS) \
$(PCT_LIB_PBCS) \
$(LIBRARY_DIR)/CGI/QueryHash.pbc \
$(LIBRARY_DIR)/Crow.pbc \
@@ -968,6 +968,7 @@
$(PBC_TO_EXE) pbc_to_exe.pbc --install
+include compilers/pge/Makefile.mak
include compilers/pct/Makefile.mak
include ext/nqp-rx/Makefile.mak
@@ -1841,14 +1842,12 @@
compilers : compilers.dummy
compilers.dummy : $(PARROT) $(GEN_LIBRARY)
- $(MAKE) compilers/pge
$(MAKE) compilers/tge
$(MAKE) compilers/nqp
$(MAKE) compilers/json
$(MAKE) compilers/data_json
compilers-clean :
- $(MAKE) compilers/pge clean
$(MAKE) compilers/tge clean
$(MAKE) compilers/nqp clean
$(MAKE) compilers/json clean
More information about the parrot-commits
mailing list