Convert module-install to read modules from MODULES.txt .

2 files changed, 8 insertions, 35 deletions

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 733793b..1309d23 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 2006-2012, The Perl Foundation.
 # $Id$
 
-PARROT = parrot-4.6.0
-NQP    = nqp-2012.08
-RAKUDO = rakudo-2012.08
+PARROT = parrot
+NQP    = nqp
+RAKUDO = rakudo
 STAR_VERSION = 2012.08
 
 PARROT_ARGS      =
@@ -50,34 +50,7 @@ LINKARGS         = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@
 PERL6_EXE      = perl6$(EXE)
 PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6
 
-# This list must be kept in order, modules always coming after their
-# dependencies
-MODULES = \
-  modules/zavolaj \
-  modules/xml-writer \
-  modules/svg \
-  modules/svg-plot \
-  modules/Math-RungeKutta \
-  modules/Math-Model \
-  modules/perl6-Term-ANSIColor \
-  modules/test-mock \
-  modules/Grammar-Profiler-Simple \
-  modules/grammar-debugger \
-  modules/Perl6-MIME-Base64 \
-  modules/uri \
-  modules/perl6-lwp-simple \
-  modules/json \
-  modules/perl6-digest-md5 \
-  modules/perl6-File-Tools \
-  modules/panda \
-  modules/perl6-http-status \
-  modules/perl6-http-easy \
-  modules/Template-Mojo \
-  modules/Bailador \
-  modules/DBIish \
-  modules/jsonrpc \
-  modules/Pod-To-HTML \
-  modules/doc \
+MODULES = modules/MODULES.txt
 
 all: rakudo
 
diff --git a/tools/build/module-install.pl b/tools/build/module-install.pl
index 8d69c78..a76bfc9 100644
--- a/tools/build/module-install.pl
+++ b/tools/build/module-install.pl
@@ -12,10 +12,10 @@ my $perl6lib = shift @ARGV;
 
 my @pmfiles;
 my @mod_pms;
-while (@ARGV) {
-    my $module = shift @ARGV;
-    print "== Installing module $module\n";
-    our $mlib  = "$module/lib";
+while (<>) {
+    my ($module) = /(\S+)/;
+    print "== Installing modules/$module\n";
+    our $mlib  = "modules/$module/lib";
     
     @mod_pms = ();
     find({ no_chdir=>1, wanted => \&libcopy }, $mlib);