From 31977c5ae3c5ec7eb352a547f9cdff78103fed58 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 15 Mar 2014 17:18:57 +0100 Subject: Add --gen-moar option to Configure.pl. --- Configure.pl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index 829023c..4840abf 100644 --- a/Configure.pl +++ b/Configure.pl @@ -1,5 +1,5 @@ #! perl -# Copyright (C) 2009 The Perl Foundation +# Copyright (C) 2009-2014 The Perl Foundation use 5.008; use strict; @@ -33,7 +33,7 @@ MAIN: { my %options; GetOptions(\%options, 'help!', 'prefix=s', 'backends=s', 'no-clean!', - 'gen-nqp:s', + 'gen-nqp:s', 'gen-moar:s', 'gen-parrot:s', 'parrot-option=s@', 'parrot-make-option=s@', 'make-install!', 'makefile-timing!', @@ -64,7 +64,7 @@ MAIN: { $options{prefix} ||= 'install'; $options{prefix} = File::Spec->rel2abs($options{prefix}); my $prefix = $options{'prefix'}; - my %known_backends = (parrot => 1, jvm => 1); + my %known_backends = (parrot => 1, jvm => 1, moar => 1); my %letter_to_backend; my $default_backend; for (keys %known_backends) { @@ -223,14 +223,17 @@ Configure.pl - $lang Configure General Options: --help Show this text --prefix=dir Install files in dir; also look for executables there - --backends=parrot,jvm Which backend(s) to use + --backends=parrot,jvm,moar + Which backend(s) to use + --gen-moar[=branch] + Download and build a copy of MoarVM --gen-nqp[=branch] Download and build a copy of NQP - --gen-parrot[=branch] + --gen-parrot[=branch] Download and build a copy of Parrot - --parrot-option='--option' + --parrot-option='--option' Options to pass to Parrot's Configure.pl - --parrot-make-option='--option' + --parrot-make-option='--option' Options to pass to Parrot's make, for example: --parrot-make-option='--jobs=4' --makefile-timing Enable timing of individual makefile commands -- cgit v1.1 From db73a21ffa2c426e2891297bb6ef53212180569a Mon Sep 17 00:00:00 2001 From: jnthn Date: Sat, 15 Mar 2014 18:47:53 +0100 Subject: Try to get --gen-moar working. --- Configure.pl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index 4840abf..fe665c8 100644 --- a/Configure.pl +++ b/Configure.pl @@ -32,7 +32,7 @@ MAIN: { my %options; GetOptions(\%options, 'help!', 'prefix=s', - 'backends=s', 'no-clean!', + 'backends=s', 'no-clean!', 'gen-nqp:s', 'gen-moar:s', 'gen-parrot:s', 'parrot-option=s@', 'parrot-make-option=s@', @@ -88,8 +88,7 @@ MAIN: { } else { for my $l (sort keys %letter_to_backend) { - # TODO: needs .exe/.bat magic on windows? - if (-x "$prefix/bin/nqp-$l") { + if (-x "$prefix/bin/nqp-$l" || -x "$prefix/bin/nqp-$l.bat" || -x "$prefix/bin/nqp-$l.exe") { my $b = $letter_to_backend{$l}; print "Found $prefix/bin/nqp-$l (backend $b)\n"; $backends{$b} = 1; @@ -97,12 +96,17 @@ MAIN: { } } unless (%backends) { - $backends{parrot} = 1; + if (defined $options{'gen-moar'}) { + $backends{moar} = 1; + } + else { + $backends{parrot} = 1; + } } } unless ($backends{parrot}) { - warn "JVM-only builds are currently not supported, and might go wrong.\n"; + warn "JVM/Moar-only builds are currently not supported, and might go wrong.\n"; } # Save options in config.status -- 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. --- Configure.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index fe665c8..02972e9 100644 --- a/Configure.pl +++ b/Configure.pl @@ -98,13 +98,22 @@ MAIN: { unless (%backends) { if (defined $options{'gen-moar'}) { $backends{moar} = 1; + $default_backend = 'moar'; } else { $backends{parrot} = 1; + $default_backend = 'parrot'; } } } + $config{backend_exes} = join ' ', map + { '$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } + keys %backends; + $config{default_backend_exe} = '$(PERL6_' . + uc(substr $default_backend, 0, 1) . + '_EXE)'; + unless ($backends{parrot}) { warn "JVM/Moar-only builds are currently not supported, and might go wrong.\n"; } @@ -123,6 +132,7 @@ MAIN: { $config{'stagestats'} = '--stagestats' if $options{'makefile-timing'}; $config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':'; $config{'shell'} = $^O eq 'MSWin32' ? 'cmd' : 'sh'; + $config{'bat'} = $^O eq 'MSWin32' ? '.bat' : ''; my $make = $config{'make'} = $^O eq 'MSWin32' ? 'nmake' : 'make'; my @prefixes = sort map substr($_, 0, 1), keys %backends; -- 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. --- Configure.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index 02972e9..7ecc750 100644 --- a/Configure.pl +++ b/Configure.pl @@ -108,11 +108,11 @@ MAIN: { } $config{backend_exes} = join ' ', map - { '$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } + { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . - '_EXE)'; + '_INSTALL)'; unless ($backends{parrot}) { warn "JVM/Moar-only builds are currently not supported, and might go wrong.\n"; -- 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. --- Configure.pl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index 7ecc750..c24cd6b 100644 --- a/Configure.pl +++ b/Configure.pl @@ -110,6 +110,9 @@ MAIN: { $config{backend_exes} = join ' ', map { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; + $config{backend_module_install} = join ' ', map + { 'module-install-' . uc(substr $_, 0, 1) } + keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . '_INSTALL)'; -- cgit v1.1 From dda5873b9651c1c8d3d32a5b1a52ad9156fad5b1 Mon Sep 17 00:00:00 2001 From: Timo Paulssen Date: Mon, 17 Mar 2014 00:59:04 +0100 Subject: Mouq++ found this --- Configure.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index c24cd6b..d9bca6a 100644 --- a/Configure.pl +++ b/Configure.pl @@ -111,7 +111,7 @@ MAIN: { { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; $config{backend_module_install} = join ' ', map - { 'module-install-' . uc(substr $_, 0, 1) } + { 'module-install-' . lc(substr $_, 0, 1) } keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . -- 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 --- Configure.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index d9bca6a..604d015 100644 --- a/Configure.pl +++ b/Configure.pl @@ -110,8 +110,8 @@ MAIN: { $config{backend_exes} = join ' ', map { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; - $config{backend_module_install} = join ' ', map - { 'module-install-' . lc(substr $_, 0, 1) } + $config{backend_modules_install} = join ' ', map + { 'modules-install-' . lc(substr $_, 0, 1) } keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . -- 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 --- Configure.pl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Configure.pl') diff --git a/Configure.pl b/Configure.pl index 604d015..0611b5f 100644 --- a/Configure.pl +++ b/Configure.pl @@ -113,6 +113,9 @@ MAIN: { $config{backend_modules_install} = join ' ', map { 'modules-install-' . lc(substr $_, 0, 1) } keys %backends; + $config{backend_modules_test} = join ' ', map + { 'modules-test-' . lc(substr $_, 0, 1) } + keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . '_INSTALL)'; -- cgit v1.1