From 7e4162201d370b1cd1ebb7ff8012306572530577 Mon Sep 17 00:00:00 2001 From: jnthn Date: Sat, 15 Mar 2014 17:50:22 +0100 Subject: The Rakudo debugger binary is built by Rakudo now. Don't need to handle it specially in Star any more. --- tools/build/Makefile.in | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 0bbc23d..540e9dd 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -1,10 +1,10 @@ -# Copyright (C) 2006-2012, The Perl Foundation. +# Copyright (C) 2006-2014, The Perl Foundation. # $Id$ PARROT_DIR = parrot NQP_DIR = nqp RAKUDO_DIR = rakudo -STAR_VERSION = 2014.01 +STAR_VERSION = 2014.03 # values from parrot_config PREFIX_DIR = @prefix@ @@ -30,12 +30,6 @@ PERL6_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_EXE) MODULES = modules/MODULES.txt -# rakudo-debugger -RD_DIR = modules/rakudo-debugger -RD_PIR = $(RD_DIR)/perl6-debug.pir -RD_PBC = $(RD_DIR)/perl6-debug.pbc -RD_EXE = $(RD_DIR)/perl6-debug$(EXE) - all: rakudo rakudo: $(RAKUDO_DIR)/$(PERL6_EXE) @@ -61,22 +55,7 @@ modules-install: rakudo-install modules-test: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt -perl6-debug: $(RD_EXE) - -$(RD_EXE): modules-install - $(P_NQP_EXE) --vmlibs=perl6_ops --target=pir \ - --dynext=$(DESTDIR)$(PARROT_LIB_DIR)/dynext/ \ - --module-path=$(DESTDIR)$(PARROT_LIB_DIR)/languages/nqp/lib \ - --output=$(RD_PIR) $(RD_DIR)/bin/perl6-debug.nqp - $(PARROT_EXE) --dynext $(DESTDIR)$(PARROT_LIB_DIR)/dynext/ -o $(RD_PBC) $(RD_PIR) - $(PBC_TO_EXE) $(RD_PBC) - $(CHMOD) 755 $(RD_EXE) - -perl6-debug-install: perl6-debug - $(CP) $(RD_EXE) $(DESTDIR)$(PARROT_BIN_DIR) - $(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/perl6-debug$(EXE) - -install: rakudo-install modules-install perl6-debug-install +install: rakudo-install modules-install test: @echo "" -- cgit v1.1 From 16df5398e60973992eb76fac04246bd942f5e137 Mon Sep 17 00:00:00 2001 From: jnthn Date: Sat, 15 Mar 2014 19:21:23 +0100 Subject: Remove unused symbols. --- tools/build/Makefile.in | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 540e9dd..e2f1d98 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -19,11 +19,6 @@ RM_F = $(PERL) -MExtUtils::Command -e rm_f MKPATH = $(PERL) -MExtUtils::Command -e mkpath CHMOD = $(PERL) -MExtUtils::Command -e chmod -# locations of parrot resources -PARROT_EXE = $(PARROT_BIN_DIR)/parrot$(EXE) -P_NQP_EXE = $(PARROT_BIN_DIR)/nqp-p$(EXE) -PBC_TO_EXE = $(PARROT_BIN_DIR)/pbc_to_exe$(EXE) - PERL6_EXE = perl6-p$(EXE) PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 PERL6_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_EXE) @@ -111,8 +106,6 @@ help: config: $(PERL) Configure.pl -$(PARROT_EXE): - CRITIC_FILES=Configure.pl tools/build/ perlcritic: -- cgit v1.1 From 45ea83817352fa1ef9caa86aa1b4157e6c765905 Mon Sep 17 00:00:00 2001 From: jnthn Date: Sun, 16 Mar 2014 19:45:18 +0100 Subject: Work towards multi-backend build/install. This gets closer to handling the Rakudo build/install itself on other backends, though not the module install. --- tools/build/Makefile.in | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index e2f1d98..6e9acc6 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -1,45 +1,67 @@ # Copyright (C) 2006-2014, The Perl Foundation. # $Id$ -PARROT_DIR = parrot -NQP_DIR = nqp -RAKUDO_DIR = rakudo +PARROT_DIR = parrot +MOAR_DIR = moarvm +NQP_DIR = nqp +RAKUDO_DIR = rakudo STAR_VERSION = 2014.03 -# values from parrot_config +# install location PREFIX_DIR = @prefix@ + +# values from parrot_config PARROT_BIN_DIR = @bindir@ PARROT_VERSION = @versiondir@ PARROT_LIB_DIR = @libdir@$(PARROT_VERSION) +# JVM install location +JVM_BIN_DIR = $(PREFIX)/bin + +# MoarVM install location +MOAR_BIN_DIR = $(PREFIX)/bin + EXE = @exe@ +BAT = @bat@ PERL = @perl@ CP = $(PERL) -MExtUtils::Command -e cp RM_F = $(PERL) -MExtUtils::Command -e rm_f MKPATH = $(PERL) -MExtUtils::Command -e mkpath CHMOD = $(PERL) -MExtUtils::Command -e chmod -PERL6_EXE = perl6-p$(EXE) -PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 -PERL6_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_EXE) +PERL6_P_EXE = perl6-p$(EXE) +PERL6_P_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 +PERL6_P_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_P_EXE) + +PERL6_J_EXE = perl6-j$(BAT) +PERL6_J_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_J_INSTALL = $(JVM_BIN_DIR)/$(PERL6_J_EXE) + +PERL6_M_EXE = perl6-m$(BAT) +PERL6_M_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) MODULES = modules/MODULES.txt all: rakudo -rakudo: $(RAKUDO_DIR)/$(PERL6_EXE) -$(RAKUDO_DIR)/$(PERL6_EXE): +rakudo: @backend_exes@ + +@backend_exes@: @echo "== Configuring and building Rakudo" cd $(RAKUDO_DIR) && $(PERL) Configure.pl --prefix=$(PREFIX_DIR) && $(MAKE) + rakudo-test: rakudo cd $(RAKUDO_DIR) && $(MAKE) test + rakudo-spectest: rakudo cd $(RAKUDO_DIR) && $(MAKE) spectest + rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install + $(CP) $(DESTDIR)$(PERL6_INSTALL) @default_backend_exe@ + $(CHMOD) 755 @default_backend_exe@ @win32_libparrot_copy@ - $(CP) $(DESTDIR)$(PERL6_INSTALL) $(PERL6_EXE) - $(CHMOD) 755 $(PERL6_EXE) modules-install: rakudo-install @echo "== Installing modules" -- cgit v1.1 From 3488b6c547b7613c8a9b5e8bf6c6c343bc5c93cb Mon Sep 17 00:00:00 2001 From: jnthn Date: Sun, 16 Mar 2014 22:25:11 +0100 Subject: Some fixes to get tri-Star build/test working. --- tools/build/Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 6e9acc6..4d9a307 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -41,6 +41,8 @@ PERL6_M_EXE = perl6-m$(BAT) PERL6_M_LANG_DIR = $(PREFIX)/languages/perl6 PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) +PERL6_EXE = perl6$(EXE) + MODULES = modules/MODULES.txt all: rakudo @@ -59,8 +61,8 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(DESTDIR)$(PERL6_INSTALL) @default_backend_exe@ - $(CHMOD) 755 @default_backend_exe@ + $(CP) $(DESTDIR)@default_backend_exe@ $(PERL6_EXE) + $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ modules-install: rakudo-install @@ -79,7 +81,7 @@ test: @echo "To run the Rakudo compiler tests, use '$(MAKE) rakudo-test'" @echo "To run the Perl 6 spectests, use '$(MAKE) rakudo-spectest'" @echo "" - @echo "To run tests for individual modules, try:" + @echo "To run tests for individual modules, install and then try:" @echo " prove -e ./perl6 -r modules//t" @echo "" -- cgit v1.1 From ae704363e4b1b2d3a5c5ba6d925f4b1904f314c8 Mon Sep 17 00:00:00 2001 From: Timo Paulssen Date: Mon, 17 Mar 2014 00:52:46 +0100 Subject: baby steps towards tri-module-install. --- tools/build/Makefile.in | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 4d9a307..25adc43 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -65,11 +65,25 @@ rakudo-install: rakudo $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ -modules-install: rakudo-install - @echo "== Installing modules" - $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_INSTALL) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES) - @echo "== Installing binaries" - $(PERL) tools/build/bin-install.pl $(PERL6_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc +modules-install: @backend_modules_install@ + +modules-install-p: + @echo "== Installing modules for Parrot" + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) + @echo "== Installing binaries for Parrot" + $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p + +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) + @echo "== Installing binaries for JVM" + $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j + +modules-install-m: + @echo "== Installing modules for MoarVM" + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) + @echo "== Installing binaries for MoarVM" + $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m modules-test: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt -- cgit v1.1 From 7be70fd12493ac438f1f492255c51b00a80ef32a Mon Sep 17 00:00:00 2001 From: Timo Paulssen Date: Mon, 17 Mar 2014 01:55:13 +0100 Subject: fix some more problems --- tools/build/Makefile.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 25adc43..ac73ab5 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -61,7 +61,7 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(DESTDIR)@default_backend_exe@ $(PERL6_EXE) + $(CP) $(PREFIX_DIR)@default_backend_exe@ $(PERL6_EXE) $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ @@ -69,24 +69,24 @@ modules-install: @backend_modules_install@ modules-install-p: @echo "== Installing modules for Parrot" - $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_P_INSTALL) $(PREFIX_DIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) @echo "== Installing binaries for Parrot" - $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p + $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(PREFIX_DIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc 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) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_J_INSTALL) $(PREFIX_DIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @echo "== Installing binaries for JVM" - $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j + $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(PREFIX_DIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc modules-install-m: @echo "== Installing modules for MoarVM" - $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_M_INSTALL) $(PREFIX_DIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) @echo "== Installing binaries for MoarVM" - $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m + $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(PREFIX_DIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc modules-test: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(PREFIX_DIR)$(PERL6_INSTALL) modules/MODULES.txt install: rakudo-install modules-install -- cgit v1.1 From 786ece4752468ddedd333ac5ee42de992848fa47 Mon Sep 17 00:00:00 2001 From: Mouq Date: Sun, 16 Mar 2014 21:15:24 -0400 Subject: fix some less problems DESTDIR should still be there, by de facto Makefile law, AFAICT --- tools/build/Makefile.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index ac73ab5..27e1199 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -16,10 +16,10 @@ PARROT_VERSION = @versiondir@ PARROT_LIB_DIR = @libdir@$(PARROT_VERSION) # JVM install location -JVM_BIN_DIR = $(PREFIX)/bin +JVM_BIN_DIR = $(PREFIX_DIR)/bin # MoarVM install location -MOAR_BIN_DIR = $(PREFIX)/bin +MOAR_BIN_DIR = $(PREFIX_DIR)/bin EXE = @exe@ BAT = @bat@ @@ -34,11 +34,11 @@ PERL6_P_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 PERL6_P_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_P_EXE) PERL6_J_EXE = perl6-j$(BAT) -PERL6_J_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_J_LANG_DIR = $(PREFIX_DIR)/languages/perl6 PERL6_J_INSTALL = $(JVM_BIN_DIR)/$(PERL6_J_EXE) PERL6_M_EXE = perl6-m$(BAT) -PERL6_M_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_M_LANG_DIR = $(PREFIX_DIR)/languages/perl6 PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) @@ -61,7 +61,7 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(PREFIX_DIR)@default_backend_exe@ $(PERL6_EXE) + $(CP) $(DESTDIR)@default_backend_exe@ $(PERL6_EXE) $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ @@ -69,24 +69,24 @@ modules-install: @backend_modules_install@ modules-install-p: @echo "== Installing modules for Parrot" - $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_P_INSTALL) $(PREFIX_DIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) @echo "== Installing binaries for Parrot" - $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(PREFIX_DIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc + $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p modules-install-j: @echo "== Installing modules for JVM" - $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_J_INSTALL) $(PREFIX_DIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @echo "== Installing binaries for JVM" - $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(PREFIX_DIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc + $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j modules-install-m: @echo "== Installing modules for MoarVM" - $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_M_INSTALL) $(PREFIX_DIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) @echo "== Installing binaries for MoarVM" - $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(PREFIX_DIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc + $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m modules-test: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(PREFIX_DIR)$(PERL6_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt install: rakudo-install modules-install -- cgit v1.1 From 4a394218f093b51c8137904488cbae4188d68ced Mon Sep 17 00:00:00 2001 From: Mouq Date: Sun, 16 Mar 2014 23:14:04 -0400 Subject: Let ufo, panda, and p6doc figure out what they're running on --- tools/build/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 27e1199..1a4928f 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -71,19 +71,19 @@ modules-install-p: @echo "== Installing modules for Parrot" $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) @echo "== Installing binaries for Parrot" - $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p + $(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 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) @echo "== Installing binaries for JVM" - $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j + $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc modules-install-m: @echo "== Installing modules for MoarVM" $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) @echo "== Installing binaries for MoarVM" - $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m + $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc modules-test: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt -- cgit v1.1 From 7ef34d18ad0507ae58c79ccbd137e8440e83cdb1 Mon Sep 17 00:00:00 2001 From: Tobias Leich Date: Sat, 29 Mar 2014 11:44:56 +0100 Subject: support modules-test for all backends --- tools/build/Makefile.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 1a4928f..d3063a9 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -85,8 +85,16 @@ modules-install-m: @echo "== Installing binaries for MoarVM" $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc -modules-test: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt +modules-test: @backend_modules_test@ + +modules-test-p: + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PARROT_BIN_DIR) modules/MODULES.txt + +modules-test-j: + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(JVM_BIN_DIR) modules/MODULES.txt + +modules-test-m: + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt install: rakudo-install modules-install -- cgit v1.1 From a5ffea1cd34e714e500ed9cc7fe6ea2735dbe98a Mon Sep 17 00:00:00 2001 From: Tobias Leich Date: Sat, 29 Mar 2014 13:11:41 +0100 Subject: fix modules testing by using correct -j/-p runner --- tools/build/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index d3063a9..961877e 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -88,10 +88,10 @@ modules-install-m: modules-test: @backend_modules_test@ modules-test-p: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PARROT_BIN_DIR) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_P_INSTALL) modules/MODULES.txt modules-test-j: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(JVM_BIN_DIR) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) modules/MODULES.txt modules-test-m: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt -- cgit v1.1