[svn:parrot] r43297 - in branches/one_make: . compilers/json compilers/pge compilers/tge config/gen config/gen/makefiles
coke at svn.parrot.org
coke at svn.parrot.org
Tue Dec 29 05:27:13 UTC 2009
Author: coke
Date: Tue Dec 29 05:27:11 2009
New Revision: 43297
URL: https://trac.parrot.org/parrot/changeset/43297
Log:
convert json's recursive make into a top level include
Added:
branches/one_make/compilers/json/Makefile.mak
Deleted:
branches/one_make/config/gen/makefiles/json.in
Modified:
branches/one_make/MANIFEST
branches/one_make/MANIFEST.SKIP
branches/one_make/compilers/json/ (props changed)
branches/one_make/compilers/pge/ (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 Tue Dec 29 04:42:24 2009 (r43296)
+++ branches/one_make/MANIFEST Tue Dec 29 05:27:11 2009 (r43297)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 29 04:07:54 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 29 04:54:55 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -61,6 +61,7 @@
compilers/json/JSON.pir [json]
compilers/json/JSON/grammar.pg [json]
compilers/json/JSON/pge2pir.tg [json]
+compilers/json/Makefile.mak [json]
compilers/ncigen/MAINTAINER [ncigen]
compilers/ncigen/NCIGEN.TODO [ncigen]
compilers/ncigen/NCIGENP6.pm [ncigen]
@@ -323,7 +324,6 @@
config/gen/makefiles/dynpmc_pl.in []
config/gen/makefiles/editor.in []
config/gen/makefiles/ext.in []
-config/gen/makefiles/json.in []
config/gen/makefiles/nqp.in []
config/gen/makefiles/parrot_embed_pl.in []
config/gen/makefiles/parrot_pc.in []
@@ -1231,6 +1231,7 @@
runtime/parrot/library/Iter.pir [library]
runtime/parrot/library/JSON.pir [library]
runtime/parrot/library/MIME/Base64.pir [library]
+runtime/parrot/library/Makefile.mak [library]
runtime/parrot/library/Math/Rand.pir [library]
runtime/parrot/library/Math/Random/mt19937ar.pir [library]
runtime/parrot/library/NCI/Utils.pir [library]
Modified: branches/one_make/MANIFEST.SKIP
==============================================================================
--- branches/one_make/MANIFEST.SKIP Tue Dec 29 04:42:24 2009 (r43296)
+++ branches/one_make/MANIFEST.SKIP Tue Dec 29 05:27:11 2009 (r43297)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 21:12:47 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 29 05:10:05 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -182,11 +182,6 @@
^compilers/imcc/imcparser\.h/
^compilers/imcc/imcparser\.output$
^compilers/imcc/imcparser\.output/
-# generated from svn:ignore of 'compilers/json/'
-^compilers/json/JSON\.pbc$
-^compilers/json/JSON\.pbc/
-^compilers/json/Makefile$
-^compilers/json/Makefile/
# generated from svn:ignore of 'compilers/json/JSON/'
^compilers/json/JSON/.*\.pbc$
^compilers/json/JSON/.*\.pbc/
@@ -221,12 +216,6 @@
^compilers/pct/src/POST/Grammar_gen\.pir$
^compilers/pct/src/POST/Grammar_gen\.pir/
# generated from svn:ignore of 'compilers/pge/'
-^compilers/pge/.*\.dylib$
-^compilers/pge/.*\.dylib/
-^compilers/pge/.*\.so$
-^compilers/pge/.*\.so/
-^compilers/pge/Makefile$
-^compilers/pge/Makefile/
^compilers/pge/PGE\.pbc$
^compilers/pge/PGE\.pbc/
# generated from svn:ignore of 'compilers/pge/PGE/'
@@ -260,9 +249,6 @@
^compilers/pirc/t/stmts_?\.pir/
^compilers/pirc/t/subflags_?\.pir$
^compilers/pirc/t/subflags_?\.pir/
-# generated from svn:ignore of 'compilers/tge/'
-^compilers/tge/Makefile$
-^compilers/tge/Makefile/
# generated from svn:ignore of 'compilers/tge/TGE/'
^compilers/tge/TGE/Parser\.pir$
^compilers/tge/TGE/Parser\.pir/
Added: branches/one_make/compilers/json/Makefile.mak
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/one_make/compilers/json/Makefile.mak Tue Dec 29 05:27:11 2009 (r43297)
@@ -0,0 +1,18 @@
+JSON_LIB_PBCS: compilers/json/JSON.pbc
+
+compilers/json/JSON.pbc : \
+ $(LIBRARY_DIR)/PGE.pbc \
+ $(LIBRARY_DIR)/PGE/Util.pbc \
+ $(LIBRARY_DIR)/TGE.pbc \
+ compilers/json/JSON/grammar.pbc \
+ compilers/json/JSON/pge2pir.pbc \
+ compilers/json/JSON.pir
+ $(PARROT) -o $@ compilers/json/JSON.pir
+
+compilers/json/JSON/grammar.pir : compilers/json/JSON/grammar.pg \
+ $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc
+ $(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/json/JSON/grammar.pg
+
+compilers/json/JSON/pge2pir.pir : compilers/json/JSON/pge2pir.tg \
+ $(LIBRARY_DIR)/TGE.pbc
+ $(PARROT) compilers/tge/tgc.pir --output=$@ compilers/json/JSON/pge2pir.tg
Modified: branches/one_make/compilers/tge/Makefile.mak
==============================================================================
--- branches/one_make/compilers/tge/Makefile.mak Tue Dec 29 04:42:24 2009 (r43296)
+++ branches/one_make/compilers/tge/Makefile.mak Tue Dec 29 05:27:11 2009 (r43297)
@@ -2,6 +2,9 @@
TGE_LIB_PBCS := $(LIBRARY_DIR)/TGE.pbc
$(LIBRARY_DIR)/TGE.pbc: \
+ $(LIBRARY_DIR)/PGE.pbc \
+ $(LIBRARY_DIR)/PGE/Util.pbc \
+ $(LIBRARY_DIR)/P6object.pbc \
compilers/tge/TGE.pir \
compilers/tge/TGE/Rule.pir \
compilers/tge/TGE/Parser.pir \
Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm Tue Dec 29 04:42:24 2009 (r43296)
+++ branches/one_make/config/gen/makefiles.pm Tue Dec 29 05:27:11 2009 (r43297)
@@ -40,8 +40,6 @@
{ SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
'compilers/nqp/Makefile' =>
{ SOURCE => 'config/gen/makefiles/nqp.in' },
- 'compilers/json/Makefile' =>
- { SOURCE => 'config/gen/makefiles/json.in' },
'compilers/data_json/Makefile' =>
{ SOURCE => 'config/gen/makefiles/data_json.in' },
'compilers/pirc/Makefile' =>
Deleted: branches/one_make/config/gen/makefiles/json.in
==============================================================================
--- branches/one_make/config/gen/makefiles/json.in Tue Dec 29 05:27:11 2009 (r43296)
+++ /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: 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: 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"
-
-JSON.pbc : JSON/grammar.pbc JSON/pge2pir.pbc JSON.pir
- $(PARROT) --output=JSON.pbc JSON.pir
-
-JSON/grammar.pbc : JSON/grammar.pir
- $(PARROT) --output=JSON/grammar.pbc JSON/grammar.pir
-
-JSON/grammar.pir : JSON/grammar.pg
- $(PARROT) $(TOOL_DIR)/runtime/parrot/library/PGE/Perl6Grammar.pbc --output=JSON/grammar.pir JSON/grammar.pg
-
-JSON/pge2pir.pbc : JSON/pge2pir.pir
- $(PARROT) --output=JSON/pge2pir.pbc JSON/pge2pir.pir
-
-JSON/pge2pir.pir : JSON/pge2pir.tg
- $(PARROT) $(TGE_DIR)/tgc.pir --output=JSON/pge2pir.pir JSON/pge2pir.tg
-
-clean : testclean
- $(RM_F) "JSON/*.pbc" "JSON/*.pir" 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 Tue Dec 29 04:42:24 2009 (r43296)
+++ branches/one_make/config/gen/makefiles/root.in Tue Dec 29 05:27:11 2009 (r43297)
@@ -150,7 +150,6 @@
Makefile \
docs/Makefile \
compilers/data_json/Makefile \
- compilers/json/Makefile \
compilers/ncigen/Makefile \
compilers/nqp/Makefile \
editor/Makefile \
@@ -259,6 +258,7 @@
$(TGE_LIB_PBCS) \
$(PGE_LIB_PBCS) \
$(PCT_LIB_PBCS) \
+ $(JSON_LIB_PBCS) \
$(LIBRARY_DIR)/CGI/QueryHash.pbc \
$(LIBRARY_DIR)/Crow.pbc \
$(LIBRARY_DIR)/config.pbc \
@@ -1838,12 +1838,10 @@
compilers.dummy : $(PARROT) $(GEN_LIBRARY)
$(MAKE) compilers/nqp
- $(MAKE) compilers/json
$(MAKE) compilers/data_json
compilers-clean :
$(MAKE) compilers/nqp clean
- $(MAKE) compilers/json clean
$(MAKE) compilers/data_json clean
$(MAKE) compilers/pirc clean
@@ -2744,9 +2742,10 @@
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
include runtime/parrot/library/Makefile.mak
-include compilers/tge/Makefile.mak
include compilers/pge/Makefile.mak
include compilers/pct/Makefile.mak
+include compilers/tge/Makefile.mak
+include compilers/json/Makefile.mak
include ext/nqp-rx/Makefile.mak
# Local variables:
More information about the parrot-commits
mailing list