瀏覽代碼

Ruby: Indicate sinatra needs maven (for compiling jruby)

Hamilton Turner 11 年之前
父節點
當前提交
a4f7ddea69
共有 3 個文件被更改,包括 6 次插入5 次删除
  1. 1 1
      frameworks/Ruby/sinatra/install.sh
  2. 1 2
      toolset/benchmark/benchmarker.py
  3. 4 2
      toolset/setup/linux/systools/maven.sh

+ 1 - 1
frameworks/Ruby/sinatra/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm nginx java
+fw_depends rvm nginx java maven
 
 rvm install ruby-2.0.0-p0
 rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile

+ 1 - 2
toolset/benchmark/benchmarker.py

@@ -466,11 +466,10 @@ class Benchmarker:
     else:
       logging.debug("Executing __run_tests on Linux")
 
-      logging.info("Running %s" % tests)
       # Setup a nice progressbar and ETA indicator
       widgets = [self.mode, ': ',  progressbar.Percentage(), 
                  ' ', progressbar.Bar(),
-                 ' Full ', progressbar.ETA()]
+                 ' Rough ', progressbar.ETA()]
       pbar = progressbar.ProgressBar(widgets=widgets, maxval=len(tests)).start()
       pbar_test = 0
 

+ 4 - 2
toolset/setup/linux/systools/maven.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists /usr/bin/mvn)
+RETCODE=$(fw_exists maven.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-sudo apt-get -y install maven -qq
+sudo apt-get -y install maven
 mvn -version
+
+touch maven.installed