[svn:parrot] r43278 - in branches/one_make: . config/gen config/gen/makefiles ext/nqp-rx
coke at svn.parrot.org
coke at svn.parrot.org
Mon Dec 28 15:26:11 UTC 2009
Author: coke
Date: Mon Dec 28 15:26:10 2009
New Revision: 43278
URL: https://trac.parrot.org/parrot/changeset/43278
Log:
Eliminate nqp-rx's Makefile, avoid unnecessary copying of PBCs.
NQP-rx depends on PCT, however, so parrot-nqp still depends on a dummy target.
Deleted:
branches/one_make/config/gen/makefiles/nqp-rx.in
Modified:
branches/one_make/MANIFEST
branches/one_make/MANIFEST.SKIP
branches/one_make/config/gen/makefiles.pm
branches/one_make/config/gen/makefiles/root.in
branches/one_make/ext/nqp-rx/ (props changed)
Modified: branches/one_make/MANIFEST
==============================================================================
--- branches/one_make/MANIFEST Mon Dec 28 15:24:19 2009 (r43277)
+++ branches/one_make/MANIFEST Mon Dec 28 15:26:10 2009 (r43278)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:31:13 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 14:25:09 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -321,7 +321,6 @@
config/gen/makefiles/editor.in []
config/gen/makefiles/ext.in []
config/gen/makefiles/json.in []
-config/gen/makefiles/nqp-rx.in []
config/gen/makefiles/nqp.in []
config/gen/makefiles/parrot_embed_pl.in []
config/gen/makefiles/parrot_pc.in []
Modified: branches/one_make/MANIFEST.SKIP
==============================================================================
--- branches/one_make/MANIFEST.SKIP Mon Dec 28 15:24:19 2009 (r43277)
+++ branches/one_make/MANIFEST.SKIP Mon Dec 28 15:26:10 2009 (r43278)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:31:13 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Dec 28 14:36:14 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -461,11 +461,6 @@
# generated from svn:ignore of 'ext/Parrot-Embed/t/'
^ext/Parrot-Embed/t/.*\.pbc$
^ext/Parrot-Embed/t/.*\.pbc/
-# generated from svn:ignore of 'ext/nqp-rx/'
-^ext/nqp-rx/.*\.pbc$
-^ext/nqp-rx/.*\.pbc/
-^ext/nqp-rx/Makefile$
-^ext/nqp-rx/Makefile/
# generated from svn:ignore of 'include/parrot/'
^include/parrot/.*\.tmp$
^include/parrot/.*\.tmp/
Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm Mon Dec 28 15:24:19 2009 (r43277)
+++ branches/one_make/config/gen/makefiles.pm Mon Dec 28 15:26:10 2009 (r43278)
@@ -36,8 +36,6 @@
conditioned_lines => 1,
},
- 'ext/nqp-rx/Makefile' => { SOURCE => 'config/gen/makefiles/nqp-rx.in' },
-
'compilers/ncigen/Makefile' =>
{ SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
'compilers/nqp/Makefile' =>
Deleted: branches/one_make/config/gen/makefiles/nqp-rx.in
==============================================================================
--- branches/one_make/config/gen/makefiles/nqp-rx.in Mon Dec 28 15:26:10 2009 (r43277)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,63 +0,0 @@
-# Copyright (C) 2009, Parrot Foundation.
-# $Id$
-
-# Setup some commands
-PERL := @perl@
-CP := @cp@
-RM_F := @rm_f@
-PARROT := ../../parrot at exe@
-
-PARROT_LIBRARY := @build_dir@/runtime/parrot/library
-
-NQP_LIB_PBCS := Regex.pbc HLL.pbc P6Regex.pbc nqp-rx.pbc
-
-all: $(NQP_LIB_PBCS)
- $(CP) $(NQP_LIB_PBCS) $(PARROT_LIBRARY)
-
-Regex.pbc: src/stage0/Regex-s0.pir
- $(PARROT) $(PARROT_ARGS) -o Regex.pbc src/stage0/Regex-s0.pir
-
-HLL.pbc: src/stage0/HLL-s0.pir
- $(PARROT) $(PARROT_ARGS) -o HLL.pbc src/stage0/HLL-s0.pir
-
-P6Regex.pbc: src/stage0/P6Regex-s0.pir
- $(PARROT) $(PARROT_ARGS) -o P6Regex.pbc src/stage0/P6Regex-s0.pir
-
-nqp-rx.pbc: src/stage0/NQP-s0.pir
- $(PARROT) $(PARROT_ARGS) -o nqp-rx.pbc src/stage0/NQP-s0.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: nqp.pbc"
- @echo " This is the default."
- @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 ""
-
-# this target has nothing to do
-testclean:
-
-CLEANUPS := \
- $(NQP_LIB_PBCS)
-
-clean:
- $(RM_F) $(CLEANUPS)
-
-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 15:24:19 2009 (r43277)
+++ branches/one_make/config/gen/makefiles/root.in Mon Dec 28 15:26:10 2009 (r43278)
@@ -158,7 +158,6 @@
compilers/tge/Makefile \
editor/Makefile \
ext/Makefile \
- ext/nqp-rx/Makefile \
src/dynoplibs/Makefile \
src/dynpmc/Makefile
@@ -868,10 +867,6 @@
$(CP) compilers/pirc/pirc$(EXE) $(PIRC)
$(CHMOD) 0755 $(PIRC)
-$(NQP) : $(PBC_TO_EXE) compilers.dummy
- $(CP) runtime/parrot/library/nqp-rx.pbc parrot-nqp.pbc
- $(PBC_TO_EXE) parrot-nqp.pbc
-
$(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
$(LINK) @ld_out@$@ $(SRC_DIR)/main$(O) $(SRC_DIR)/null_config$(O) \
@@ -972,8 +967,43 @@
$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) $(SRC_DIR)/install_config$(O)
$(PBC_TO_EXE) pbc_to_exe.pbc --install
-$(INSTALLABLENQP) : runtime/parrot/library/nqp-rx.pbc $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE)
+#
+# 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
#
@@ -1852,7 +1882,6 @@
$(MAKE) compilers/nqp
$(MAKE) compilers/json
$(MAKE) compilers/data_json
- $(MAKE) ext/nqp-rx
compilers-clean :
$(MAKE) compilers/pct clean
@@ -1864,12 +1893,7 @@
$(MAKE) compilers/pirc clean
ext-clean:
- $(MAKE) ext/nqp-rx clean
- $(RM_RF) runtime/parrot/library/HLL.pbc \
- runtime/parrot/library/P6Regex.pbc \
- runtime/parrot/library/Regex.pbc \
- runtime/parrot/library/nqp-rx.pbc \
- parrot-nqp*
+ $(RM_RF) $(NQP_LIB_PBCS) parrot-nqp*
###############################################################################
#
More information about the parrot-commits
mailing list