[svn:parrot] r43315 - in branches/one_make: . compilers/data_json compilers/tge config/gen config/gen/makefiles
coke at svn.parrot.org
coke at svn.parrot.org
Wed Dec 30 04:37:42 UTC 2009
Author: coke
Date: Wed Dec 30 04:37:24 2009
New Revision: 43315
URL: https://trac.parrot.org/parrot/changeset/43315
Log:
convert data_json's recursive make to an include.
Last element of the dummy compiler target.
Added:
branches/one_make/compilers/data_json/Makefile.mak
Deleted:
branches/one_make/config/gen/makefiles/data_json.in
Modified:
branches/one_make/MANIFEST
branches/one_make/MANIFEST.SKIP
branches/one_make/compilers/data_json/ (props changed)
branches/one_make/compilers/tge/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 Wed Dec 30 04:16:23 2009 (r43314)
+++ branches/one_make/MANIFEST Wed Dec 30 04:37:24 2009 (r43315)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 30 00:50:24 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 30 04:30:22 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -28,6 +28,7 @@
RESPONSIBLE_PARTIES [main]doc
TODO []
VERSION [devel]
+compilers/data_json/Makefile.mak [data_json]
compilers/data_json/data_json.pir [data_json]
compilers/data_json/data_json/grammar.pg [data_json]
compilers/data_json/data_json/pge2pir.tg [data_json]
@@ -318,7 +319,6 @@
config/gen/crypto/digest_t.in []
config/gen/makefiles.pm []
config/gen/makefiles/CFLAGS.in []
-config/gen/makefiles/data_json.in []
config/gen/makefiles/docs.in []
config/gen/makefiles/dynoplibs.in []
config/gen/makefiles/dynoplibs_pl.in []
Modified: branches/one_make/MANIFEST.SKIP
==============================================================================
--- branches/one_make/MANIFEST.SKIP Wed Dec 30 04:16:23 2009 (r43314)
+++ branches/one_make/MANIFEST.SKIP Wed Dec 30 04:37:24 2009 (r43315)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 30 00:50:24 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 30 04:30:22 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -150,8 +150,6 @@
^vtable\.dump$
^vtable\.dump/
# generated from svn:ignore of 'compilers/data_json/'
-^compilers/data_json/Makefile$
-^compilers/data_json/Makefile/
^compilers/data_json/data_json\.pbc$
^compilers/data_json/data_json\.pbc/
# generated from svn:ignore of 'compilers/data_json/data_json/'
Added: branches/one_make/compilers/data_json/Makefile.mak
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/one_make/compilers/data_json/Makefile.mak Wed Dec 30 04:37:24 2009 (r43315)
@@ -0,0 +1,12 @@
+DATA_JSON_LIB_PBCS := compilers/data_json/data_json.pbc
+
+compilers/data_json/data_json.pbc : $(PARROT) \
+ compilers/data_json/data_json/grammar.pbc \
+ compilers/data_json/data_json/pge2pir.pbc \
+ compilers/data_json/data_json.pir
+
+compilers/data_json/data_json/grammar.pir : compilers/data_json/data_json/grammar.pg $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
+ $(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/data_json/data_json/grammar.pg
+
+compilers/data_json/data_json/pge2pir.pir : compilers/data_json/data_json/pge2pir.tg $(PARROT) compilers/tge/tgc.pbc
+ $(PARROT) compilers/tge/tgc.pbc --output=$@ compilers/data_json/pge2pir.tg
Modified: branches/one_make/compilers/tge/Makefile.mak
==============================================================================
--- branches/one_make/compilers/tge/Makefile.mak Wed Dec 30 04:16:23 2009 (r43314)
+++ branches/one_make/compilers/tge/Makefile.mak Wed Dec 30 04:37:24 2009 (r43315)
@@ -1,5 +1,5 @@
-TGE_LIB_PBCS := $(LIBRARY_DIR)/TGE.pbc
+TGE_LIB_PBCS := $(LIBRARY_DIR)/TGE.pbc compilers/tge/tgc.pbc
$(LIBRARY_DIR)/TGE.pbc: \
$(LIBRARY_DIR)/PGE.pbc \
@@ -13,7 +13,9 @@
compilers/tge/TGE/Tree.pir
$(PARROT) -o $@ compilers/tge/TGE.pir
+compilers/tge/tgc.pbc : $(LIBRARY_DIR)/TGE.pbc $(LIBRARY_DIR)/Getopt/Obj.pbc
+
compilers/tge/TGE/Parser.pir: $(PARROT) \
compilers/tge/TGE/Parser.pg \
- $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc
+ $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc
$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/tge/TGE/Parser.pg
Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm Wed Dec 30 04:16:23 2009 (r43314)
+++ branches/one_make/config/gen/makefiles.pm Wed Dec 30 04:37:24 2009 (r43315)
@@ -38,8 +38,6 @@
'compilers/ncigen/Makefile' =>
{ SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
- 'compilers/data_json/Makefile' =>
- { SOURCE => 'config/gen/makefiles/data_json.in' },
'compilers/pirc/Makefile' =>
{ SOURCE => 'config/gen/makefiles/pirc.in' },
'src/dynpmc/Makefile' =>
Deleted: branches/one_make/config/gen/makefiles/data_json.in
==============================================================================
--- branches/one_make/config/gen/makefiles/data_json.in Wed Dec 30 04:37:24 2009 (r43314)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,60 +0,0 @@
-# Copyright (C) 2006-2009, Parrot Foundation.
-# $Id$
-
-PERL := @perl@
-RM_F := @rm_f@
-PARROT := ../../parrot at exe@
-
-TOOL_DIR := ../..
-PGE_DIR := ../../compilers/pge
-TGE_DIR := ../../compilers/tge
-
-# the default target
-all: data_json.pbc
-
-# 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: data_json.pbc"
- @echo " This is the default."
- @echo "Testing:"
- @echo " test: Run the test suite."
- @echo " testclean: Clean up test results and temporary files."
- @echo ""
- @echo "Cleaning:"
- @echo " clean: Basic cleaning up."
- @echo ""
- @echo "Misc:"
- @echo " help: Print this help message."
- @echo ""
-
-test: all
- cd $(TOOL_DIR) && prove -r t/compilers/json
-
-testclean:
- $(RM_F) "../../t/compilers/json/*.pir"
-
-data_json.pbc : data_json/grammar.pbc data_json/pge2pir.pbc data_json.pir
- $(PARROT) --output=data_json.pbc data_json.pir
-
-data_json/grammar.pbc : data_json/grammar.pir
- $(PARROT) --output=data_json/grammar.pbc data_json/grammar.pir
-
-data_json/grammar.pir : data_json/grammar.pg
- $(PARROT) $(TOOL_DIR)/runtime/parrot/library/PGE/Perl6Grammar.pbc --output=data_json/grammar.pir data_json/grammar.pg
-
-data_json/pge2pir.pbc : data_json/pge2pir.pir
- $(PARROT) --output=data_json/pge2pir.pbc data_json/pge2pir.pir
-
-data_json/pge2pir.pir : data_json/pge2pir.tg
- $(PARROT) $(TGE_DIR)/tgc.pir --output=data_json/pge2pir.pir data_json/pge2pir.tg
-
-clean : testclean
- $(RM_F) "data_json/*.pbc" "data_json/*.pir" data_json.pbc
-
-# 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 Wed Dec 30 04:16:23 2009 (r43314)
+++ branches/one_make/config/gen/makefiles/root.in Wed Dec 30 04:37:24 2009 (r43315)
@@ -149,7 +149,6 @@
GEN_MAKEFILES := \
Makefile \
docs/Makefile \
- compilers/data_json/Makefile \
compilers/ncigen/Makefile \
editor/Makefile \
ext/Makefile \
@@ -602,7 +601,6 @@
corevm \
docs \
#IF(has_glut): $(LIBGLUTCB_SO) \
- compilers \
$(DIS) \
$(PARROT_CONFIG) \
$(PBC_TO_EXE) \
@@ -763,9 +761,6 @@
@echo " dynoplibs-test: Proxy for target 'test' of src/dynoplibs/Makefile"
@echo " dynoplibs-clean: Proxy for target 'clean' of src/dynoplibs/Makefile"
@echo ""
- @echo "Language implementations:"
- @echo " compilers: Proxy for default target of various compilers"
- @echo ""
@echo "Fetch from source repository:"
@echo " update: svn update."
@echo " status: svn status."
@@ -1697,13 +1692,7 @@
#
###############################################################################
-compilers : compilers.dummy
-
-compilers.dummy : $(PARROT) $(GEN_LIBRARY)
- $(MAKE) compilers/data_json
-
compilers-clean :
- $(MAKE) compilers/data_json clean
$(MAKE) compilers/pirc clean
ext-clean:
@@ -2602,6 +2591,7 @@
include compilers/pge/Makefile.mak
include compilers/pct/Makefile.mak
include compilers/tge/Makefile.mak
+include compilers/data_json/Makefile.mak
include compilers/json/Makefile.mak
include ext/nqp-rx/Makefile.mak
More information about the parrot-commits
mailing list