Browse Source

cleanup perl frameworks installation scripts, see #966

Joel Berger 11 years ago
parent
commit
d9449f1591

+ 3 - 0
dancer/install.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 fw_depends perl
+
+perl-5.18/bin/cpanm --notest --no-man-page Dancer Dancer::Plugin::Database DBI DBD::mysql JSON::XS Plack Starman
+echo installed Dancer app dependencies

+ 3 - 0
kelp/install.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 fw_depends perl
+
+perl-5.18/bin/cpanm --notest --no-man-page Kelp DBI DBD::mysql Kelp::Module::JSON::XS Plack Starman
+echo installed Kelp app dependencies

+ 0 - 5
mojolicious/install.sh

@@ -2,10 +2,5 @@
 
 fw_depends perl
 
-# Ensure Mango and Mojolicious are installed
-fw_get http://cpanmin.us -O cpanminus.pl
-echo Got cpanm
-perl-5.18/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
-echo installed cpanm
 perl-5.18/bin/cpanm --notest --no-man-page --installdeps ../mojolicious
 echo installed Mojolicious app dependencies

+ 3 - 0
plack/install.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 fw_depends perl
+
+perl-5.18/bin/cpanm --notest --no-man-page --installdeps ../plack
+echo installed Plack app dependencies

+ 0 - 2
plack/setup.py

@@ -12,8 +12,6 @@ def start(args, logfile, errfile):
   setup_util.replace_text("plack/nginx.conf", "USR", getpass.getuser())
   setup_util.replace_text("plack/nginx.conf", "server unix:.*\/FrameworkBenchmarks", "server unix:" + home + "/FrameworkBenchmarks")
   try:
-    subprocess.check_call("curl -L http://cpanmin.us | perl - App::cpanminus", shell=True, cwd="plack", stderr=errfile, stdout=logfile)
-    subprocess.check_call("cpanm --notest --no-man-pages --installdeps "+home+"/FrameworkBenchmarks/plack", shell=True, cwd="plack", stderr=errfile, stdout=logfile)
     subprocess.Popen("start_server --backlog=16384 --pid-file="+home+"/FrameworkBenchmarks/plack/app.pid --path="+home+"/FrameworkBenchmarks/plack/app.sock -- plackup -E production -s Starlet --max-keepalive-reqs 1000 --max-reqs-per-child 50000 --min-reqs-per-child 40000 --max-workers=" + str(args.max_threads+4) + " -a "+home+"/FrameworkBenchmarks/plack/app.psgi", shell=True, cwd="plack", stderr=errfile, stdout=logfile)
     subprocess.check_call("/usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/plack/nginx.conf", shell=True,stderr=errfile, stdout=logfile)
     return 0

+ 3 - 1
toolset/setup/linux/languages/perl.sh

@@ -8,4 +8,6 @@ perl perl-build.pl -DDEBUGGING=-g 5.18.2 perl-5.18
 
 fw_get http://cpanmin.us -O cpanminus.pl
 perl-5.18/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
-perl-5.18/bin/cpanm -f --notest --no-man-page DBI DBD::mysql Kelp Dancer Mojolicious Mango Kelp::Module::JSON::XS Dancer::Plugin::Database Starman Plack JSON Web::Simple DBD::Pg JSON::XS EV HTTP::Parser::XS Monoceros EV IO::Socket::IP IO::Socket::SSL Memoize
+# Install only a bare-bones of Perl modules
+# Install others in the per-framework install script or cpanfile
+perl-5.18/bin/cpanm -f --notest --no-man-page JSON JSON::XS IO::Socket::IP IO::Socket::SSL

+ 1 - 1
web-simple/README.md

@@ -7,7 +7,7 @@
 # Requirements
 
 * Web::Simple
-* DBD::pg
+* DBD::mysql
 * Starman (if using Starman as web server)
 * Plack (for plackup)
 * nginx (if you want to front Dancer with nginx, nginx.conf provided)

+ 3 - 0
web-simple/install.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 fw_depends perl
+
+perl-5.18/bin/cpanm --notest --no-man-page Web::Simple DBI DBD::mysql Plack Starman JSON::XS
+echo installed Web::Simple app dependencies