Author: particle
Date: Tue Mar 21 08:00:59 2006
New Revision: 11965
Modified:
trunk/config/gen/makefiles/pge.in
trunk/config/gen/makefiles/punie.in
Log:
[perl #38775] Changes to compilers/pge/rulec.pir broke punie [and PGE]
~ fix punie and pge makefiles to work with modified pge rule compiler
~ remove trailing slash from punie makefile,
which converts to a line continuation char on windows (yuck)
Modified: trunk/config/gen/makefiles/pge.in
==============================================================================
--- trunk/config/gen/makefiles/pge.in (original)
+++ trunk/config/gen/makefiles/pge.in Tue Mar 21 08:00:59 2006
@@ -19,9 +19,9 @@
PGE.pbc: PGE.pir PGE/Exp.pir PGE/Match.pir PGE/Rule.pir PGE/P6Rule.pir
PGE/TokenHash.pir PGE/OPTable.pir PGE/P5Regexp.pir rulec.pir library.pge
$(PERL) -e "" >PGE/Library.pir
- $(PARROT) -o PGE.pbc --output-pbc PGE.pir
- $(PARROT) rulec.pir --compiler=p6rules library.pge >PGE/Library.pir
- $(PARROT) -o PGE.pbc --output-pbc PGE.pir
+ $(PARROT) -o PGE.pbc --output-pbc PGE.pir
+ $(PARROT) rulec.pir --output=PGE/Library.pir library.pge
+ $(PARROT) -o PGE.pbc --output-pbc PGE.pir
# This is a listing of all targets, that are meant to be called by users
help:
@@ -53,8 +53,8 @@
$(RM_RF) "../../t/compilers/pge/*.pbc" \
"../../t/compilers/pge/p5regexp/*.pbc" \
"../../t/compilers/pge/p6rules/*.pbc"
- $(RM_RF) "../../t/p6rules/*.pir"
- $(RM_RF) "../../t/p6rules/*.pbc"
+ $(RM_RF) "../../t/p6rules/*.pir"
+ $(RM_RF) "../../t/p6rules/*.p"
clean: testclean
$(RM_RF) PGE.pbc $(PARROT_LIBRARY)@[EMAIL PROTECTED] PGE/Library.pir
Modified: trunk/config/gen/makefiles/punie.in
==============================================================================
--- trunk/config/gen/makefiles/punie.in (original)
+++ trunk/config/gen/makefiles/punie.in Tue Mar 21 08:00:59 2006
@@ -5,14 +5,14 @@
PERL = @perl@
RM_F = @rm_f@
PARROT = [EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@
-PGE_DIR = [EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@
+PGE_DIR = [EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@pge
CP = @cp@
# the default target
all: punie.pbc
lib/PunieGrammar.pbc: lib/PunieGrammar.pir lib/punie.g
- $(PARROT) $(PGE_DIR)rulec.pir lib/punie.g > lib/punie_grammar_gen.pir
+ $(PARROT) $(PGE_DIR)@[EMAIL PROTECTED]
--output=lib/punie_grammar_gen.pir lib/punie.g
$(PARROT) -o lib/PunieGrammar.pbc --output-pbc lib/PunieGrammar.pir
punie.pbc: lib/PunieGrammar.pbc punie.pir
