Skip to content
Permalink
Browse files

Added submodule initialization at startup

- Fixed the order of configurations
  • Loading branch information...
vrurg committed Apr 6, 2019
1 parent 7960454 commit b619b560d85fe25d6f9d968bb40b0ba1aaed22ee
Showing with 26 additions and 2,006 deletions.
  1. +16 −2 Configure.pl
  2. +0 −1,108 tools/lib/NQP/Config.pm
  3. +0 −264 tools/lib/NQP/Config/NQP.pm
  4. +10 −2 tools/lib/NQP/Config/Rakudo.pm
  5. +0 −630 tools/lib/NQP/Macros.pm
@@ -8,8 +8,22 @@
use Getopt::Long;
use File::Spec;
use Cwd;
use lib 'tools/lib';
use Data::Dumper;

BEGIN {
print "Updating nqp-configure submodule";
my $msg = qx{git submodule sync --quiet 3rdparty/nqp-configure && git submodule --quiet update --init 3rdparty/nqp-configure 2>&1};
if ($? >> 8 == 0) { print "OK\n" }
else {
if ($msg =~ /[']([^']+)[']\s+already exists and is not an empty/) {
print "\n===SORRY=== ERROR: Cannot update submodule because directory exists and is not empty.\n" .
">>> Please delete the following folder and try again:\n$1\n\n";
exit 1;
}
}
}

use lib qw<tools/lib 3rdparty/nqp-configure/lib>;
use NQP::Config;

$| = 1;
@@ -57,8 +71,8 @@
"===WARNING!===\nErrors are being ignored.\nIn the case of any errors the script may behave unexpectedly.\n";
}

$cfg->configure_prefix;
$cfg->configure_from_options;
$cfg->configure_prefix;
$cfg->configure_relocatability;
$cfg->configure_repo_urls;
$cfg->configure_commands;

0 comments on commit b619b56

Please sign in to comment.
You can’t perform that action at this time.