aboutsummaryrefslogtreecommitdiff
path: root/tools/star
diff options
context:
space:
mode:
authorMoritz Lenz <moritz@faui2k3.org>2014-04-01 19:40:30 +0200
committerMoritz Lenz <moritz@faui2k3.org>2014-04-01 19:40:30 +0200
commita1e13d679c5311fc5cfb9a33a577f52187b4286c (patch)
treedfaae6c5c392ccf83082b85f6d8cb3bde8f83662 /tools/star
parent6363be3b2438a93af3a19366960c69e23fe6934e (diff)
parentf2236b4d8ff36dd6810ac85f24d69dd22f23933b (diff)
Merge remote-tracking branch 'origin/tristar'
Conflicts: tools/build/Makefile.in tools/star/Makefile tools/star/release-guide.pod
Diffstat (limited to 'tools/star')
-rw-r--r--tools/star/Makefile16
-rw-r--r--tools/star/release-guide.pod12
2 files changed, 21 insertions, 7 deletions
diff --git a/tools/star/Makefile b/tools/star/Makefile
index e13c2a2..772bfeb 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -1,6 +1,7 @@
RAKUDO_VER = 2014.03.01
NQP_VER = 2014.03
PARROT_VER = 6.1.0
+MOAR_VER = 2014.03
STAR_REL = rakudo-star-$(VERSION)
STAR_TGZ = $(STAR_REL).tar.gz
@@ -16,12 +17,15 @@ NQP_SRC = $(SRC_DIR)/$(NQP_TGZ)
PARROT_TGZ = parrot-$(PARROT_VER).tar.gz
PARROT_URL = http://ftp.parrot.org/releases/all/$(PARROT_VER)/$(PARROT_TGZ)
PARROT_SRC = $(SRC_DIR)/$(PARROT_TGZ)
+MOAR_TGZ = MoarVM-$(MOAR_VER).tar.gz
+MOAR_URL = http://www.moarvm.org/releases/$(MOAR_TGZ)
+MOAR_SRC = $(SRC_DIR)/$(MOAR_TGZ)
PERL = perl
PREFIX = $(PERL) $(CURDIR)/tools/star/prefix.pl
WGET = wget --no-check-certificate
-all: rakudo nqp parrot manifest
+all: rakudo nqp parrot moar manifest
always:
@@ -32,7 +36,7 @@ $(RAKUDO_SRC):
mkdir -p $(SRC_DIR)
$(WGET) $(RAKUDO_URL) -O $(RAKUDO_SRC)
-nqp: parrot $(NQP_SRC)
+nqp: parrot moar $(NQP_SRC)
tar --xform 's!nqp-[^/]*!nqp!' -xvzf $(NQP_SRC)
$(NQP_SRC):
@@ -46,6 +50,13 @@ $(PARROT_SRC):
mkdir -p $(SRC_DIR)
$(WGET) $(PARROT_URL) -O $(PARROT_SRC)
+moar: $(MOAR_SRC)
+ tar --xform 's!MoarVM-[^/]*!MoarVM!' -xvzf $(MOAR_SRC)
+
+$(MOAR_SRC):
+ mkdir -p $(SRC_DIR)
+ $(WGET) $(MOAR_URL) -O $(MOAR_SRC)
+
modules/zavolaj/lib:
@echo "Updating submodules"
git submodule init
@@ -56,6 +67,7 @@ manifest: modules/zavolaj/lib
git ls-files >>MANIFEST
$(PREFIX) rakudo/ rakudo/MANIFEST >>MANIFEST
$(PREFIX) nqp/ nqp/MANIFEST >>MANIFEST
+ $(PREFIX) MoarVM/ MoarVM/MANIFEST >>MANIFEST
cut -d' ' -f1 parrot/MANIFEST | $(PREFIX) parrot/ >>MANIFEST
git submodule foreach --quiet 'git ls-files | $(PREFIX) $$path/' >>MANIFEST
grep -v -f tools/star/MANIFEST.exclude MANIFEST >MANIFEST.1
diff --git a/tools/star/release-guide.pod b/tools/star/release-guide.pod
index c255150..2e77810 100644
--- a/tools/star/release-guide.pod
+++ b/tools/star/release-guide.pod
@@ -11,7 +11,8 @@ are also free to choose older releases of the compiler, NQP, and/or
Parrot. The goal is to balance end-user stability needs with
progress being made on the compiler, modules, and other runtime
components. Currently Star is on a monthly release cycle; we
-expect to slow down to quarterly releases again sometime in 2013.
+expect to slow down to quarterly releases again sometime in the
+future.
=head2 Steps to create a release
@@ -50,12 +51,13 @@ reports a clean repository.
Change to the star repository directory, and edit the first three
lines of tools/star/Makefile to indicate the desired releases of
-Rakudo, NQP, and Parrot to use.
+Rakudo, NQP, MoarVM, and Parrot to use.
Usually that means the last Rakudo release, the NQP version that is in the
-released Rakudo's F<tools/build/NQP_REVISION> file, and the parrot version
-in the F<tools/build/PARROT_REVISION> file that is include in the NQP
-release.
+released Rakudo's F<tools/build/NQP_REVISION> file, the MoarVM version that
+is in the F<tools/build/MOAR_REVISION> file that is included in the NQP
+release, and the Parrot version in the F<tools/build/PARROT_REVISION> file
+that is include in the NQP release.
$ cd star
$ vi tools/star/Makefile