[svn:parrot] r43294 - in branches/one_make: . compilers/pct compilers/pct/src config/gen config/gen/makefiles ext/nqp-rx

coke at svn.parrot.org coke at svn.parrot.org
Tue Dec 29 01:25:59 UTC 2009


Author: coke
Date: Tue Dec 29 01:25:56 2009
New Revision: 43294
URL: https://trac.parrot.org/parrot/changeset/43294

Log:
convert pct.in to an include'd makefile, including it in the main makefile.
break out the nqp-rx into an include-able makefile.

Added:
   branches/one_make/compilers/pct/Makefile.mak
   branches/one_make/ext/nqp-rx/Makefile.mak
Deleted:
   branches/one_make/config/gen/makefiles/pct.in
Modified:
   branches/one_make/MANIFEST
   branches/one_make/MANIFEST.SKIP
   branches/one_make/compilers/pct/   (props changed)
   branches/one_make/compilers/pct/src/PAST.pir
   branches/one_make/config/gen/makefiles.pm
   branches/one_make/config/gen/makefiles/root.in

Modified: branches/one_make/MANIFEST
==============================================================================
--- branches/one_make/MANIFEST	Mon Dec 28 23:54:32 2009	(r43293)
+++ branches/one_make/MANIFEST	Tue Dec 29 01:25:56 2009	(r43294)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 14:25:09 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 21:54:22 2009 UT
 #
 # See below for documentation on the format of this file.
 #
@@ -120,6 +120,7 @@
 compilers/nqp/t/29-self.t                                   [test]
 compilers/nqp/t/30-subclass.t                               [test]
 compilers/nqp/t/harness                                     [test]
+compilers/pct/Makefile.mak                                  [pct]
 compilers/pct/PCT.pir                                       [pct]
 compilers/pct/README.pod                                    []doc
 compilers/pct/src/PAST.pir                                  [pct]
@@ -324,7 +325,6 @@
 config/gen/makefiles/nqp.in                                 []
 config/gen/makefiles/parrot_embed_pl.in                     []
 config/gen/makefiles/parrot_pc.in                           []
-config/gen/makefiles/pct.in                                 []
 config/gen/makefiles/pge.in                                 []
 config/gen/makefiles/pirc.in                                []
 config/gen/makefiles/root.in                                []
@@ -943,6 +943,7 @@
 ext/nqp-rx/.gitignore                                       []
 ext/nqp-rx/CREDITS                                          []
 ext/nqp-rx/LICENSE                                          []
+ext/nqp-rx/Makefile.mak                                     []
 ext/nqp-rx/README                                           []doc
 ext/nqp-rx/STATUS                                           []
 ext/nqp-rx/src/stage0/HLL-s0.pir                            []

Modified: branches/one_make/MANIFEST.SKIP
==============================================================================
--- branches/one_make/MANIFEST.SKIP	Mon Dec 28 23:54:32 2009	(r43293)
+++ branches/one_make/MANIFEST.SKIP	Tue Dec 29 01:25:56 2009	(r43294)
@@ -1,6 +1,6 @@
 # ex: set ro:
 # $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 14:36:14 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 21:12:47 2009 UT
 #
 # This file should contain a transcript of the svn:ignore properties
 # of the directories in the Parrot subversion repository. (Needed for
@@ -217,11 +217,6 @@
 # generated from svn:ignore of 'compilers/nqp/src/'
 ^compilers/nqp/src/Grammar_gen\.pir$
 ^compilers/nqp/src/Grammar_gen\.pir/
-# generated from svn:ignore of 'compilers/pct/'
-^compilers/pct/.*\.pbc$
-^compilers/pct/.*\.pbc/
-^compilers/pct/Makefile$
-^compilers/pct/Makefile/
 # generated from svn:ignore of 'compilers/pct/src/POST/'
 ^compilers/pct/src/POST/Grammar_gen\.pir$
 ^compilers/pct/src/POST/Grammar_gen\.pir/

Added: branches/one_make/compilers/pct/Makefile.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/pct/Makefile.mak	Tue Dec 29 01:25:56 2009	(r43294)
@@ -0,0 +1,42 @@
+## 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 \
+    $(LIBRARY_DIR)/PCT/Grammar.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
+    $(LIBRARY_DIR)/PCT/Dumper.pbc 
+
+$(LIBRARY_DIR)/PCT.pbc : $(PARROT) compilers/pct/PCT.pir \
+    $(LIBRARY_DIR)/PCT/Grammar.pbc $(LIBRARY_DIR)/PCT/PAST.pbc
+	$(PARROT) -o $@ compilers/pct/PCT.pir
+
+$(LIBRARY_DIR)/PCT/PAST.pbc : compilers/pct/src/PAST.pir $(PARROT) \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
+    compilers/pct/src/PCT/Node.pir \
+    compilers/pct/src/PAST/Node.pir \
+    compilers/pct/src/PAST/Compiler.pir \
+    compilers/pct/src/POST/Node.pir \
+    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
+	$(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)/P6object.pbc \
+    $(LIBRARY_DIR)/Parrot/Exception.pbc \
+    $(LIBRARY_DIR)/config.pir \
+    $(LIBRARY_DIR)/Getopt/Obj.pbc \
+    $(LIBRARY_DIR)/dumper.pbc \
+    $(LIBRARY_DIR)/PCT/Dumper.pbc
+	$(PARROT) -o $@ compilers/pct/src/PCT/HLLCompiler.pir
+
+$(LIBRARY_DIR)/PCT/Dumper.pbc : compilers/pct/src/PCT/Dumper.pir $(PARROT)
+	$(PARROT) -o $@ compilers/pct/src/PCT/Dumper.pir

Modified: branches/one_make/compilers/pct/src/PAST.pir
==============================================================================
--- branches/one_make/compilers/pct/src/PAST.pir	Mon Dec 28 23:54:32 2009	(r43293)
+++ branches/one_make/compilers/pct/src/PAST.pir	Tue Dec 29 01:25:56 2009	(r43294)
@@ -11,15 +11,15 @@
 
 =cut
 
-.include 'src/PCT/Node.pir'
+.include 'compilers/pct/src/PCT/Node.pir'
 
-.include 'src/PAST/Node.pir'
+.include 'compilers/pct/src/PAST/Node.pir'
 
-.include 'src/PAST/Compiler.pir'
+.include 'compilers/pct/src/PAST/Compiler.pir'
 
-.include 'src/POST/Node.pir'
+.include 'compilers/pct/src/POST/Node.pir'
 
-.include 'src/POST/Compiler.pir'
+.include 'compilers/pct/src/POST/Compiler.pir'
 
 =head1 AUTHOR
 

Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm	Mon Dec 28 23:54:32 2009	(r43293)
+++ branches/one_make/config/gen/makefiles.pm	Tue Dec 29 01:25:56 2009	(r43294)
@@ -40,8 +40,6 @@
             { SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
         'compilers/nqp/Makefile'     =>
             { SOURCE => 'config/gen/makefiles/nqp.in' },
-        'compilers/pct/Makefile'     =>
-            { SOURCE => 'config/gen/makefiles/pct.in' },
         'compilers/pge/Makefile'     =>
             { SOURCE => 'config/gen/makefiles/pge.in' },
         'compilers/tge/Makefile'     =>

Deleted: branches/one_make/config/gen/makefiles/pct.in
==============================================================================
--- branches/one_make/config/gen/makefiles/pct.in	Tue Dec 29 01:25:56 2009	(r43293)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,83 +0,0 @@
-# Copyright (C) 2006-2009, Parrot Foundation.
-# $Id$
-
-# Setup some commands
-PERL     := @perl@
-CP       := @cp@
-RM_F     := @rm_f@
-PARROT   := ../../parrot at exe@
-
-TOOL_DIR := ../..
-PGE_DIR  := ../../compilers/pge
-TEST_DIR := ../../t/compilers/pct
-
-# Where to put things
-PARROT_LIBRARY := ../../runtime/parrot/library
-
-PCT_TARGETS := \
-  $(PARROT_LIBRARY)/PCT.pbc \
-  $(PARROT_LIBRARY)/PCT/PAST.pbc \
-  $(PARROT_LIBRARY)/PCT/Grammar.pbc \
-  $(PARROT_LIBRARY)/PCT/HLLCompiler.pbc \
-  $(PARROT_LIBRARY)/PCT/Dumper.pbc
-
-PCT_SOURCES := \
-  PCT.pir \
-  src/PCT/Dumper.pir \
-  src/PCT/Grammar.pir \
-  src/PCT/HLLCompiler.pir \
-  src/PCT/Node.pir \
-  src/PAST/Compiler.pir \
-  src/PAST/Node.pir \
-  src/POST/Compiler.pir \
-  src/POST/Node.pir
-
-# the default target
-all: $(PARROT_LIBRARY)/PCT.pbc
-
-$(PARROT_LIBRARY)/PCT.pbc: $(PARROT) $(PCT_SOURCES)
-	$(PARROT) -o $(PARROT_LIBRARY)/PCT.pbc --output-pbc PCT.pir
-	$(PARROT) -o $(PARROT_LIBRARY)/PCT/PAST.pbc --output-pbc src/PAST.pir
-	$(PARROT) -o $(PARROT_LIBRARY)/PCT/Grammar.pbc --output-pbc src/PCT/Grammar.pir
-	$(PARROT) -o $(PARROT_LIBRARY)/PCT/HLLCompiler.pbc --output-pbc src/PCT/HLLCompiler.pir
-	$(PARROT) -o $(PARROT_LIBRARY)/PCT/Dumper.pbc --output-pbc src/PCT/Dumper.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:               all PCT libraries"
-	@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/pct
-
-testclean:
-	$(RM_F) $(TEST_DIR)/*.pir \
-	    $(TEST_DIR)/*.pbc
-
-clean: testclean
-	$(RM_F) $(PCT_TARGETS)
-
-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	Mon Dec 28 23:54:32 2009	(r43293)
+++ branches/one_make/config/gen/makefiles/root.in	Tue Dec 29 01:25:56 2009	(r43294)
@@ -153,7 +153,6 @@
     compilers/json/Makefile \
     compilers/ncigen/Makefile \
     compilers/nqp/Makefile \
-    compilers/pct/Makefile \
     compilers/pge/Makefile \
     compilers/tge/Makefile \
     editor/Makefile \
@@ -174,7 +173,7 @@
     lib/Parrot/Config/Generated.pm \
     lib/Parrot/PMC.pm \
     runtime/parrot/include/config.fpmc \
-    runtime/parrot/library/config.pir \
+    $(LIBRARY_DIR)/config.pir \
     $(SRC_DIR)/platform.c \
 #IF(platform_asm):    $(SRC_DIR)/platform_asm.s \
 #IF(has_opengl):    config/gen/call_list/opengl.in \
@@ -211,7 +210,7 @@
 GEN_PASM_INCLUDES := \
     runtime/parrot/include/signal.pasm \
 #IF(has_opengl):    runtime/parrot/include/opengl_defines.pasm \
-#IF(has_opengl):    runtime/parrot/library/OpenGL_funcs.pir \
+#IF(has_opengl):    $(LIBRARY_DIR)/OpenGL_funcs.pir \
     @TEMP_gen_pasm_includes@
 
 CONFIGURE_GENERATED_FILES := \
@@ -259,6 +258,7 @@
     lib/Parrot/OpLib/core.pm
 
 GEN_LIBRARY := \
+    $(PCT_LIB_PBCS) \
     $(LIBRARY_DIR)/CGI/QueryHash.pbc \
     $(LIBRARY_DIR)/Crow.pbc \
     $(LIBRARY_DIR)/config.pbc \
@@ -967,44 +967,9 @@
 $(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) $(SRC_DIR)/install_config$(O)
 	$(PBC_TO_EXE) pbc_to_exe.pbc --install
 
-#
-# ext/nqp-rx -> parrot-nqp
-#
-
-NQP_LIB_PBCS := \
-        runtime/parrot/library/Regex.pbc \
-        runtime/parrot/library/HLL.pbc \
-        runtime/parrot/library/P6Regex.pbc \
-        runtime/parrot/library/nqp-rx.pbc \
-        runtime/parrot/library/P6object.pbc
-
-runtime/parrot/library/Regex.pbc: ext/nqp-rx/src/stage0/Regex-s0.pir $(PARROT)
-	$(PARROT) -o runtime/parrot/library/Regex.pbc ext/nqp-rx/src/stage0/Regex-s0.pir
-
-runtime/parrot/library/HLL.pbc: ext/nqp-rx/src/stage0/HLL-s0.pir $(PARROT)
-	$(PARROT) -o runtime/parrot/library/HLL.pbc ext/nqp-rx/src/stage0/HLL-s0.pir
-
-runtime/parrot/library/P6Regex.pbc: ext/nqp-rx/src/stage0/P6Regex-s0.pir $(PARROT)
-	$(PARROT) -o runtime/parrot/library/P6Regex.pbc ext/nqp-rx/src/stage0/P6Regex-s0.pir
-
-runtime/parrot/library/nqp-rx.pbc: ext/nqp-rx/src/stage0/NQP-s0.pir $(PARROT)
-	$(PARROT) -o runtime/parrot/library/nqp-rx.pbc ext/nqp-rx/src/stage0/NQP-s0.pir
-
-## TT #1398 - pbc_to_exe cannot generate a specified target file
-parrot-nqp.pbc : runtime/parrot/library/nqp-rx.pbc
-	$(CP) runtime/parrot/library/nqp-rx.pbc parrot-nqp.pbc
-
-## compilers.dummy here is a stopgap until these two deps can be added to
-## NQP_LIB_PBCS above.
-
-## runtime/parrot/library/PCT/HLLCompiler.pbc
-## runtime/parrot/library/PCT/PAST.pbc
-
-$(NQP) : $(NQP_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc compilers.dummy
-	$(PBC_TO_EXE) parrot-nqp.pbc
 
-$(INSTALLABLENQP) : $(NQP_LIB_PBCS) $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE) parrot-nqp.pbc compilers.dummy
-	$(PBC_TO_EXE) parrot-nqp.pbc --install
+include compilers/pct/Makefile.mak
+include ext/nqp-rx/Makefile.mak
 
 #
 # Parrot Debugger
@@ -1876,7 +1841,6 @@
 compilers : compilers.dummy
 
 compilers.dummy : $(PARROT) $(GEN_LIBRARY)
-	$(MAKE) compilers/pct
 	$(MAKE) compilers/pge
 	$(MAKE) compilers/tge
 	$(MAKE) compilers/nqp
@@ -1884,7 +1848,6 @@
 	$(MAKE) compilers/data_json
 
 compilers-clean :
-	$(MAKE) compilers/pct clean
 	$(MAKE) compilers/pge clean
 	$(MAKE) compilers/tge clean
 	$(MAKE) compilers/nqp clean

Added: branches/one_make/ext/nqp-rx/Makefile.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/ext/nqp-rx/Makefile.mak	Tue Dec 29 01:25:56 2009	(r43294)
@@ -0,0 +1,32 @@
+## XXX does not cover .includes of core .pasm files
+
+NQP_LIB_PBCS := \
+    $(LIBRARY_DIR)/Regex.pbc \
+    $(LIBRARY_DIR)/HLL.pbc \
+    $(LIBRARY_DIR)/P6Regex.pbc \
+    $(LIBRARY_DIR)/nqp-rx.pbc \
+    $(LIBRARY_DIR)/P6object.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
+    $(LIBRARY_DIR)/PCT/PAST.pbc
+
+$(LIBRARY_DIR)/Regex.pbc: ext/nqp-rx/src/stage0/Regex-s0.pir $(PARROT)
+	$(PARROT) -o $@ ext/nqp-rx/src/stage0/Regex-s0.pir
+
+$(LIBRARY_DIR)/HLL.pbc: ext/nqp-rx/src/stage0/HLL-s0.pir $(PARROT)
+	$(PARROT) -o $@ ext/nqp-rx/src/stage0/HLL-s0.pir
+
+$(LIBRARY_DIR)/P6Regex.pbc: ext/nqp-rx/src/stage0/P6Regex-s0.pir $(PARROT)
+	$(PARROT) -o $@ ext/nqp-rx/src/stage0/P6Regex-s0.pir
+
+$(LIBRARY_DIR)/nqp-rx.pbc: ext/nqp-rx/src/stage0/NQP-s0.pir $(PARROT)
+	$(PARROT) -o $@ ext/nqp-rx/src/stage0/NQP-s0.pir
+
+## TT #1398 - pbc_to_exe cannot generate a specified target file
+parrot-nqp.pbc : $(LIBRARY_DIR)/nqp-rx.pbc
+	$(CP) $(LIBRARY_DIR)/nqp-rx.pbc $@
+
+$(NQP) : $(NQP_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc
+	$(PBC_TO_EXE) parrot-nqp.pbc
+
+$(INSTALLABLENQP) : $(NQP_LIB_PBCS) $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE) parrot-nqp.pbc
+	$(PBC_TO_EXE) parrot-nqp.pbc --install


More information about the parrot-commits mailing list