Author: bernhard
Date: Sun Mar 30 01:58:30 2008
New Revision: 26639
Modified:
trunk/config/gen/makefiles/languages.in
trunk/config/gen/makefiles/root.in
trunk/languages/hq9plus/config/makefiles/root.in
Log:
[HQ9+]
Clean up files generated during testing.
Remove DYNPMC support in Makefile.
Modified: trunk/config/gen/makefiles/languages.in
==============================================================================
--- trunk/config/gen/makefiles/languages.in (original)
+++ trunk/config/gen/makefiles/languages.in Sun Mar 30 01:58:30 2008
@@ -13,7 +13,7 @@
LANGUAGES = \
APL \
BASIC \
- HQ9plus \
+ hq9plus \
PIR \
WMLScript \
Zcode \
@@ -95,7 +95,7 @@
clean: \
APL.clean \
BASIC.clean \
- HQ9plus.clean \
+ hq9plus.clean \
PIR.clean \
WMLScript.clean \
Zcode.clean \
@@ -130,6 +130,7 @@
realclean: \
dotnet.realclean \
eclectus.realclean \
+ hq9plus.realclean \
unlambda.realclean \
jako.realclean
@@ -264,13 +265,15 @@
forth.clean:
- $(MAKE) forth clean
-HQ9plus: HQ9plus.dummy
-HQ9plus.dummy:
- - $(MAKE) HQ9plus
-HQ9plus.test:
- - $(MAKE) HQ9plus test
-HQ9plus.clean:
- - $(MAKE) HQ9plus clean
+hq9plus: hq9plus.dummy
+hq9plus.dummy:
+ - $(MAKE) hq9plus
+hq9plus.test:
+ - $(MAKE) hq9plus test
+hq9plus.clean:
+ - $(MAKE) hq9plus clean
+hq9plus.realclean:
+ - $(MAKE) hq9plus realclean
jako: jako.dummy
jako.dummy:
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Sun Mar 30 01:58:30 2008
@@ -162,7 +162,6 @@
languages/cola/Makefile \
languages/ecmascript/Makefile \
languages/forth/Makefile \
- languages/HQ9plus/Makefile \
languages/jako/Makefile \
languages/lazy-k/Makefile \
languages/lisp/Makefile \
Modified: trunk/languages/hq9plus/config/makefiles/root.in
==============================================================================
--- trunk/languages/hq9plus/config/makefiles/root.in (original)
+++ trunk/languages/hq9plus/config/makefiles/root.in Sun Mar 30 01:58:30 2008
@@ -5,37 +5,26 @@
## configuration settings
BUILD_DIR = @build_dir@
-LOAD_EXT = @load_ext@
-O = @o@
## Setup some commands
-LN_S = @lns@
PERL = @perl@
RM_RF = @rm_rf@
-CP = @cp@
PARROT = ../../[EMAIL PROTECTED]@
CAT = $(PERL) -MExtUtils::Command -e cat
-BUILD_DYNPMC = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
RECONFIGURE = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
## places to look for things
-PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
PGE_LIBRARY = $(BUILD_DIR)/runtime/parrot/library/PGE
PERL6GRAMMAR = $(PGE_LIBRARY)/Perl6Grammar.pbc
NQP = $(BUILD_DIR)/compilers/nqp/nqp.pbc
PCT = $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
-PMC_DIR = src/pmc
-
all: hq9plus.pbc
-HQ9PLUS_GROUP = $(PMC_DIR)/hq9plus_group$(LOAD_EXT)
-
SOURCES = hq9plus.pir \
src/gen_grammar.pir \
src/gen_actions.pir \
src/gen_builtins.pir \
-# $(HQ9PLUS_GROUP)
BUILTINS_PIR = \
src/builtins/hello.pir \
@@ -43,9 +32,6 @@
src/builtins/nintynine_bottles_of_beer.pir \
src/builtins/plus.pir \
-# PMCS = hq9plus
-# PMC_SOURCES = $(PMC_DIR)/hq9plus.pmc
-
# the default target
hq9plus.pbc: $(PARROT) $(SOURCES)
$(PARROT) $(PARROT_ARGS) -o hq9plus.pbc hq9plus.pir
@@ -62,12 +48,6 @@
src/gen_builtins.pir: $(BUILTINS_PIR)
$(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
-$(HQ9PLUS_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)
- 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=hq9plus
@@ -103,16 +83,8 @@
src/gen_grammar.pir \
src/gen_actions.pir \
src/gen_builtins.pir \
- $(PMC_DIR)/*.h \
- $(PMC_DIR)/*.c \
- $(PMC_DIR)/*.dump \
- $(PMC_DIR)/*$(O) \
- $(PMC_DIR)/*$(LOAD_EXT) \
- $(PMC_DIR)/*.exp \
- $(PMC_DIR)/*.ilk \
- $(PMC_DIR)/*.manifest \
- $(PMC_DIR)/*.pdb \
- $(PMC_DIR)/*.lib \
+ t/*.HQ9plus \
+ t/*.out
clean:
@@ -122,5 +94,3 @@
$(RM_RF) Makefile
distclean: realclean
-
-
