@@ -32,8 +32,8 @@ RM_F := @rm_f@ RM_RF := @rm_rf@ POD2MAN := pod2man #IF(parrot_is_shared and not(cygwin or win32)):export LD_RUN_PATH := @blib_dir@:$(LD_RUN_PATH) -PARROT := ../../parrot@exe@ -PBC_TO_EXE := ../../pbc_to_exe@exe@ +PARROT := $(BIN_DIR)/parrot@exe@ +PBC_TO_EXE := $(BIN_DIR)/pbc_to_exe@exe@ #IF(darwin): #IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking #IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@ @@ -50,6 +50,19 @@ BUILTINS_PIR := \ DOCS := README +BUILD_CLEANUPS := \ + gil.pbc \ + "src/gen_*.pir" \ + "*.c" \ + "*$(O)" \ + gil@exe@ \ +#IF(win32): parrot-gil.exe \ +#IF(win32): parrot-gil.iss \ +#IF(win32): "setup-parrot-*.exe" \ + installable_gil@exe@ + +TEST_CLEANUPS := + # the default target build: gil.pbc @@ -66,7 +79,7 @@ src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg --output=src/gen_grammar.pir \ src/parser/grammar.pg -src/gen_actions.pir: $(NQP) $(PCT) src/parser/actions.pm +src/gen_actions.pir: $(NQP) src/parser/actions.pm $(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \ --target=pir src/parser/actions.pm @@ -78,7 +91,6 @@ installable: installable_gil@exe@ installable_gil@exe@: gil.pbc $(PBC_TO_EXE) gil.pbc --install -# regenerate the Makefile Makefile: config/makefiles/root.in $(PERL) Configure.pl @@ -89,12 +101,14 @@ help: @echo "" @echo " build: gil.pbc" @echo " This is the default." - @echo " all: gil.pbc gil@exe@ installable Makefile" + @echo " gil@exe@ Self-hosting binary not to be installed." + @echo " all: gil.pbc gil@exe@ installable" @echo " installable: Create libs and self-hosting binaries to be installed." @echo " install: Install the installable targets and docs." @echo "" @echo "Testing:" @echo " test: Run the test suite." + @echo " test-installable: Test self-hosting targets." @echo " testclean: Clean up test results." @echo "" @echo "Cleaning:" @@ -107,7 +121,11 @@ help: @echo "" test: build - $(PERL) t/harness + $(PERL) -I$(LIB_DIR)/tools/lib t/harness + +# basic run for missing libs +test-installable: installable + echo "1" | ./installable_gil@exe@ install: installable $(CP) installable_gil@exe@ $(BIN_DIR)/parrot-gil@exe@ @@ -131,27 +149,17 @@ win32-inno-installer: installable # -$(MKPATH) man/html # pod2html --infile doc/running.pod --outfile man/html/parrot-gil.html $(CP) installable_gil@exe@ parrot-gil.exe - $(PERL) @build_dir@/tools/dev/mk_inno_language.pl gil + $(PERL) -I$(LIB_DIR)/tools/lib $(LIB_DIR)/tools/dev/mk_inno_language.pl gil iscc parrot-gil.iss testclean: + $(RM_F) $(TEST_CLEANUPS) -CLEANUPS := \ - gil.pbc \ - "src/gen_*.pir" \ - "*.c" \ - "*$(O)" \ - gil@exe@ \ -#IF(win32): parrot-gil.exe \ -#IF(win32): parrot-gil.iss \ -#IF(win32): "setup-parrot-*.exe" \ - installable_gil@exe@ - -clean: testclean - $(RM_F) $(CLEANUPS) +clean: + $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) -realclean: testclean - $(RM_F) $(CLEANUPS) Makefile +realclean: + $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) Makefile distclean: realclean config/makefiles/root.in df3216e5cacf06d8a4a04affcd74515bc22ce0ab Francois Perrad francois.perrad@gadz.org http://github.com/tene/gil/commit/4b0c6a807258822bce2d4096fb160ca15a45e11f 4b0c6a807258822bce2d4096fb160ca15a45e11f 2009-03-16T16:38:12-07:00 2009-03-14T10:14:09-07:00 re-run mk_language_shell.pl Signed-off-by: Stephen Weeks <tene@allalone.org> ac0aa81b89f55e3719730c3ae7908e52ddf2a045 Stephen Weeks tene@allalone.org