diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/Makefile.in | 6 | ||||
| -rw-r--r-- | tools/star/Makefile | 8 | ||||
| -rw-r--r-- | tools/star/release-guide.pod | 20 |
3 files changed, 21 insertions, 13 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 961877e..e4352a6 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -43,8 +43,11 @@ PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) +<<<<<<< HEAD +======= MODULES = modules/MODULES.txt +>>>>>>> origin/tristar all: rakudo rakudo: @backend_exes@ @@ -73,6 +76,8 @@ modules-install-p: @echo "== Installing binaries for Parrot" $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) p modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc +<<<<<<< HEAD +======= modules-install-j: @echo "== Installing modules for JVM" $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @@ -96,6 +101,7 @@ modules-test-j: modules-test-m: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt +>>>>>>> origin/tristar install: rakudo-install modules-install test: diff --git a/tools/star/Makefile b/tools/star/Makefile index 76c5dd7..772bfeb 100644 --- a/tools/star/Makefile +++ b/tools/star/Makefile @@ -1,7 +1,7 @@ -RAKUDO_VER = 2014.01 -NQP_VER = 2014.01 -PARROT_VER = 5.9.0 -MOAR_VER = 2014.01 +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 diff --git a/tools/star/release-guide.pod b/tools/star/release-guide.pod index 58f62ec..2e77810 100644 --- a/tools/star/release-guide.pod +++ b/tools/star/release-guide.pod @@ -94,13 +94,15 @@ for the Star release. To bring all modules up to the current # pull master in each submodule dir $ git submodule foreach git pull origin master -B<ATTENTION!> Currently, the Perl6::MIME::Base64 repo needs to be kept at a -specific commit, due to breakage on Rakudo's part. The above command will have -incorrectly merged commits. To fix this, run these commands from the top of the -star repo: - - $ cd modules/Perl6-MIME-Base64 - $ git checkout 76fd9decc7c1445390b0ab5a1296e9d244f8e1fd +B<ATTENTION!> Currently, the perl6-lwp-simple repo needs to be kept at a +specific fork/branch, due to changes of a wiki page that get fetched in tests. +See: https://github.com/cosimo/perl6-lwp-simple/pull/28 +To fix this, run these commands from the top of the star repo: + + $ cd modules/perl6-lwp-simple + $ git remote add froggs git@github.com:FROGGS/perl6-lwp-simple.git + $ git checkout -b patch-5 + $ git pull froggs patch-5 $ cd - Then you may commit your update of the submodules: @@ -229,8 +231,7 @@ You're done! Celebrate with the appropriate amount of fun. Release Release manager ======= =============== - 2014.03 (jnthn) - 2014.04 (unknown yet) + 2014.04 jnthn =head2 List of Previous Star Releases @@ -269,6 +270,7 @@ You're done! Celebrate with the appropriate amount of fun. 2013.11 moritz 2013.12 lue 2014.01 tadzik + 2014.03 FROGGS =cut |