diff options
| author | pmichaud <pmichaud@pobox.com> | 2010-07-27 17:45:18 -0500 |
|---|---|---|
| committer | pmichaud <pmichaud@pobox.com> | 2010-07-27 17:45:18 -0500 |
| commit | ad2c8bdbd7685e35703ab69315cf3ebe40128f4b (patch) | |
| tree | 7ab812f61ef993d8e78641998d52db45fe6c6f64 | |
| parent | 3d63808fe750acf7fd7ba319ddc284e8d1e50c38 (diff) | |
More Makefile updates.
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | build/Makefile.in | 27 |
2 files changed, 37 insertions, 14 deletions
@@ -1,7 +1,7 @@ PARROT_VER = 2.6.0 RAKUDO_TAG = master -DISTDIR = dist +DISTDIR = rakudo-star-$(VERSION) PARROT = parrot-$(PARROT_VER) PARROT_TGZ = $(PARROT).tar.gz @@ -20,8 +20,9 @@ DISTTARGETS = \ $(BUILD_DIR) \ $(BUILD_DIR)/PARROT_REVISION \ $(DISTDIR)/Configure.pl \ + $(DISTDIR)/MANIFEST \ -$(DISTDIR): $(DISTTARGETS) +$(DISTDIR): version_check $(DISTTARGETS) $(PARROT_DIR): $(PARROT_TGZ) mkdir -p $(DISTDIR) @@ -33,9 +34,6 @@ $(RAKUDO_DIR): git clone git@github.com:rakudo/rakudo.git $(RAKUDO_DIR) cd $(RAKUDO_DIR); git checkout $(RAKUDO_VER) -$(DISTDIR)/Configure.pl: build/Configure.pl - cp build/Configure.pl $(DISTDIR) - $(BUILD_DIR): $(BUILD_FILES) mkdir -p $(BUILD_DIR) cp $(BUILD_FILES) $(BUILD_DIR) @@ -43,3 +41,19 @@ $(BUILD_DIR): $(BUILD_FILES) $(BUILD_DIR)/PARROT_REVISION: $(RAKUDO_DIR) $(RAKUDO_DIR)/build/PARROT_REVISION cp $(RAKUDO_DIR)/build/PARROT_REVISION $(BUILD_DIR) +$(DISTDIR)/Configure.pl: build/Configure.pl + cp build/Configure.pl $(DISTDIR) + +$(DISTDIR)/MANIFEST: + find dist -name '.*' -prune -o -type f -printf '%P\n' >$(DISTDIR)/MANIFEST + ## add the two dot-files from Parrot MANIFEST + echo "$(PARROT)/.gitignore" >>$(DISTDIR)/MANIFEST + echo "$(PARROT)/tools/dev/.gdbinit" >>$(DISTDIR)/MANIFEST + +version_check: + @[ -n "$(VERSION)" ] || ( echo "\nTry 'make VERSION=yyyy.mm'\n\n"; exit 1) + +release: $(DISTDIR) + perl -ne 'print "$(DISTDIR)/$$_"' $(DISTDIR)/MANIFEST |\ + tar -zcv -T - -f $(DISTDIR).tar.gz + diff --git a/build/Makefile.in b/build/Makefile.in index 055e20b..39d344b 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -48,6 +48,23 @@ PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 MANDIR = @mandir@ DOCDIR = @prefix@/share/doc +all: rakudo + +rakudo: rakudo/perl6 +rakudo/perl6: + cd rakudo && $(PERL) Configure.pl --parrot-config=$(PARROT_BIN_DIR)/parrot_config && make +rakudo-test: rakudo/perl6 + cd rakudo && make test +rakudo-install: rakudo + cd rakudo && make install + +modules-install: + @echo "Installing 'ufo'" + $(CP) ufo/ufo $(PARROT_BIN_DIR)/ufo + $(CHMOD) 755 $(PARROT_BIN_DIR)/ufo + +install: rakudo-install modules-install + ## cleaning clean: $(RM_F) $(CLEANUPS) @@ -92,15 +109,7 @@ CRITIC_FILES=Configure.pl t/harness build/ tools/ perlcritic: perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES) -manifest: - echo MANIFEST >MANIFEST - git ls-files | $(PERL) -ne '/^\./ || print' >>MANIFEST - rm -rf t/spec - svn export "http://svn.pugscode.org/pugs/t/spec" t/spec - find t/spec -type f >>MANIFEST - sort -u -o MANIFEST MANIFEST - -release: manifest +release: MANIFEST [ -n "$(VERSION)" ] || ( echo "\nTry 'make release VERSION=yyyy.mm'\n\n"; exit 1 ) [ -d rakudo-star-$(VERSION) ] || ln -s . rakudo-star-$(VERSION) $(PERL) -ne 'print "rakudo-star-$(VERSION)/$$_"' MANIFEST | \ |