Permalink
Browse files

[nqp]: Add initial nqp-setting library to Parrot.

git-svn-id: https://svn.parrot.org/parrot/trunk@46617 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
pmichaud committed May 14, 2010
1 parent 8a678c8 commit cbb51e049b559c4c38b2082ac15e6d54d734074d
View
@@ -292,6 +292,7 @@ runtime/parrot/library/dumper.pbc [main]
runtime/parrot/library/libpcre.pbc [main]
runtime/parrot/library/ncurses.pbc [main]
runtime/parrot/library/nqp-rx.pbc [nqp]
+runtime/parrot/library/nqp-setting.pbc [nqp]
runtime/parrot/library/osutils.pbc [main]
runtime/parrot/library/parrotlib.pbc [main]
runtime/parrot/library/pcore.pbc [main]
View
@@ -3,6 +3,7 @@ NQPRX_LIB_PBCS = \
$(LIBRARY_DIR)/HLL.pbc \
$(LIBRARY_DIR)/P6Regex.pbc \
$(LIBRARY_DIR)/nqp-rx.pbc \
+ $(LIBRARY_DIR)/nqp-setting.pbc \
$(LIBRARY_DIR)/P6object.pbc \
$(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
$(LIBRARY_DIR)/PCT/PAST.pbc
View
@@ -1,16 +1,23 @@
## XXX does not cover .includes of core .pasm files
-$(LIBRARY_DIR)/Regex.pbc: ext/nqp-rx/src/stage0/Regex-s0.pir $(PARROT)
- $(PARROT) -o $@ ext/nqp-rx/src/stage0/Regex-s0.pir
+NQP_STAGE0_DIR = ext/nqp-rx/src/stage0
-$(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)/Regex.pbc: $(NQP_STAGE0_DIR)/Regex-s0.pir $(PARROT)
+ $(PARROT) -o $@ $(NQP_STAGE0_DIR)/Regex-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)/HLL.pbc: $(NQP_STAGE0_DIR)/HLL-s0.pir $(PARROT)
+ $(PARROT) -o $@ $(NQP_STAGE0_DIR)/HLL-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
+$(LIBRARY_DIR)/P6Regex.pbc: $(NQP_STAGE0_DIR)/P6Regex-s0.pir $(PARROT)
+ $(PARROT) -o $@ $(NQP_STAGE0_DIR)/P6Regex-s0.pir
+
+$(LIBRARY_DIR)/nqp-rx.pbc: $(NQP_STAGE0_DIR)/NQP-s0.pir $(PARROT)
+ $(PARROT) -o $@ $(NQP_STAGE0_DIR)/NQP-s0.pir
+
+## eventually nqp should be able to generate .pbc files directly
+$(LIBRARY_DIR)/nqp-setting.pbc: $(NQP_STAGE0_DIR)/nqp-setting.pm $(LIBRARY_DIR)/nqp-rx.pbc $(NQPRX_LIB_PBCS)
+ $(PARROT) $(LIBRARY_DIR)/nqp-rx.pbc --target=pir -o $(NQP_STAGE0_DIR)/nqp-setting.pir $(NQP_STAGE0_DIR)/nqp-setting.pm
+ $(PARROT) -o $@ $(NQP_STAGE0_DIR)/nqp-setting.pir
## TT #1398 - pbc_to_exe cannot generate a specified target file
parrot-nqp.pbc : $(LIBRARY_DIR)/nqp-rx.pbc
@@ -21,3 +28,6 @@ $(NQP_RX) : $(NQPRX_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc
$(INSTALLABLENQP) : $(NQPRX_LIB_PBCS) src/install_config$(O) $(PBC_TO_EXE) parrot-nqp.pbc
$(PBC_TO_EXE) parrot-nqp.pbc --install
+
+
+
Oops, something went wrong.

0 comments on commit cbb51e0

Please sign in to comment.