diff options
| author | pmichaud <pmichaud@pobox.com> | 2012-08-28 08:20:21 -0500 |
|---|---|---|
| committer | pmichaud <pmichaud@pobox.com> | 2012-08-28 08:20:21 -0500 |
| commit | 8ef7e1567153dfcb1a47eec880e6fb27e1f19570 (patch) | |
| tree | c85a2075b323530e652b4551facac7c95ef664fa | |
| parent | 180c59079892d3ee2c178c40992c4bd3b148e554 (diff) | |
Remove out-of-date Perl6-MIME-Base64 (step 1 of 2).
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | modules/zavolaj | 0 | ||||
| -rw-r--r-- | tools/build/Makefile.in | 28 |
3 files changed, 17 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules index 888c850..a796ee8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,9 +37,6 @@ [submodule "modules/json"] path = modules/json url = git://github.com/moritz/json -[submodule "modules/Perl6-MIME-Base64"] - path = modules/Perl6-MIME-Base64 - url = git://github.com/snarkyboojum/Perl6-MIME-Base64 [submodule "modules/perl6-digest-md5"] path = modules/perl6-digest-md5 url = git://github.com/cosimo/perl6-digest-md5 diff --git a/modules/zavolaj b/modules/zavolaj -Subproject 3d6ee457af19c5b53a4a5853537662a461f0308 +Subproject 3228da6deef132df61500fb1382a99c14595786 diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 1309d23..185a9f7 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 2006-2012, The Perl Foundation. # $Id$ -PARROT = parrot -NQP = nqp -RAKUDO = rakudo +PARROT_DIR = parrot +NQP_DIR = nqp +RAKUDO_DIR = rakudo STAR_VERSION = 2012.08 PARROT_ARGS = @@ -35,7 +35,7 @@ CHMOD = $(PERL) -MExtUtils::Command -e chmod POD2MAN = @pod2man@ # locations of parrot resources -PARROT = $(PARROT_BIN_DIR)/parrot$(EXE) +PARROT_EXE = $(PARROT_BIN_DIR)/parrot$(EXE) NQP_EXE = $(PARROT_BIN_DIR)/nqp$(EXE) PBC_TO_EXE = $(PARROT_BIN_DIR)/pbc_to_exe$(EXE) PARROT_CONFIG = $(PARROT_BIN_DIR)/parrot_config$(EXE) @@ -54,16 +54,16 @@ MODULES = modules/MODULES.txt all: rakudo -rakudo: $(RAKUDO)/$(PERL6_EXE) -$(RAKUDO)/$(PERL6_EXE): +rakudo: $(RAKUDO_DIR)/$(PERL6_EXE) +$(RAKUDO_DIR)/$(PERL6_EXE): @echo "== Configuring and building Rakudo" - cd $(RAKUDO) && $(PERL) Configure.pl --with-nqp=$(NQP_EXE) && $(MAKE) + cd $(RAKUDO_DIR) && $(PERL) Configure.pl --with-nqp=$(NQP_EXE) && $(MAKE) rakudo-test: rakudo - cd $(RAKUDO) && $(MAKE) test + cd $(RAKUDO_DIR) && $(MAKE) test rakudo-spectest: rakudo - cd $(RAKUDO) && $(MAKE) spectest + cd $(RAKUDO_DIR) && $(MAKE) spectest rakudo-install: rakudo - cd $(RAKUDO) && $(MAKE) install + cd $(RAKUDO_DIR) && $(MAKE) install @win32_libparrot_copy@ $(CP) $(DESTDIR)$(PARROT_BIN_DIR)/$(PERL6_EXE) . $(CHMOD) 755 $(PERL6_EXE) @@ -88,11 +88,17 @@ test: ## cleaning clean: $(RM_F) $(CLEANUPS) + cd $(RAKUDO_DIR) && make clean + cd $(NQP_DIR) && make clean + cd $(PARROT_DIR) && make clean distclean: realclean realclean: clean $(RM_F) Makefile + cd $(RAKUDO_DIR) && make realclean + cd $(NQP_DIR) && make realclean + cd $(PARROT_DIR) && make realclean testclean: @@ -119,7 +125,7 @@ help: config: $(PERL) Configure.pl -$(PARROT): +$(PARROT_EXE): CRITIC_FILES=Configure.pl tools/build/ |