Commits

gabriele renzi  committed 354f600

fix root.in

  • Participants
  • Parent commits dac4469

Comments (0)

Files changed (2)

 	cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
 
+# regenerate the Makefile
+Makefile: config/makefiles/root.in
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=shakespeare
+
 # This is a listing of all targets, that are meant to be called by users
 help:
 	@echo ""
 
 fulltest: all test extest
 
-
 # this target has nothing to do
 testclean:
 

File config/makefiles/root.in

 
 PMC_DIR       = src/pmc
 
-all: z2.pbc
+all: shakespeare.pbc
 
-Z2_GROUP = $(PMC_DIR)/z2_group$(LOAD_EXT)
+shakespeare_GROUP = $(PMC_DIR)/shakespeare_group$(LOAD_EXT)
 
-SOURCES = z2.pir \
+SOURCES = shakespeare.pir \
   src/gen_grammar.pir \
   src/gen_actions.pir \
   src/gen_builtins.pir \
-#  $(Z2_GROUP)
+#  $(shakespeare_GROUP)
 
 BUILTINS_PIR = \
-  src/builtins/say.pir \
+  src/builtins/base.pir \
 
-# PMCS = z2
-# PMC_SOURCES = $(PMC_DIR)/z2.pmc
+# PMCS = shakespeare
+# PMC_SOURCES = $(PMC_DIR)/shakespeare.pmc
 
 # the default target
-z2.pbc: $(PARROT) $(SOURCES)
-	$(PARROT) $(PARROT_ARGS) -o z2.pbc z2.pir
+shakespeare.pbc: $(PARROT) $(SOURCES)
+	$(PARROT) $(PARROT_ARGS) -o shakespeare.pbc shakespeare.pir
 
-src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg src/parser/grammar-oper.pg
+src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg src/parser/words.pg
 	$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
 	    --output=src/gen_grammar.pir \
 	    src/parser/grammar.pg \
-	    src/parser/grammar-oper.pg \
+	    src/parser/words.pg \
 
 src/gen_actions.pir: $(NQP) $(PCT) src/parser/actions.pm
 	$(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \
 src/gen_builtins.pir: $(BUILTINS_PIR)
 	$(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
 
-$(Z2_GROUP): $(PARROT) $(PMC_SOURCES)
+$(shakespeare_GROUP): $(PARROT) $(PMC_SOURCES)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) generate $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) compile $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
-	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=z2
+	cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=shakespeare
 
 # 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:               z2.pbc"
+	@echo "  all:               shakespeare.pbc"
 	@echo "                     This is the default."
 	@echo "Testing:"
 	@echo "  test:              Run the test suite."
+	@echo "  extest:            Run the test suite for examples."
+	@echo "  fulltest:          Run both."
 	@echo "  testclean:         Clean up test results."
 	@echo ""
 	@echo "Cleaning:"
 test: all
 	$(PERL) t/harness
 
+extest: all 
+	$(PERL) t/example_harness
+
+fulltest: all test extest
+
 # this target has nothing to do
 testclean:
 
 CLEANUPS = \
-  z2.pbc \
+  shakespeare.pbc \
   src/gen_grammar.pir \
   src/gen_actions.pir \
   src/gen_builtins.pir \