Browse Source

Install resin with gcc-6 in separate directory (#3189)

Radoslav Petrov 7 years ago
parent
commit
d967f73f8e

+ 1 - 1
frameworks/Java/servlet/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "servlet",
   "tests": [{
     "default": {
-      "setup_file": "setup",
+      "setup_file": "setup-resin-gcc-6",
       "json_url": "/servlet/json",
       "plaintext_url": "/servlet/plaintext",
       "port": 8080,

+ 8 - 0
frameworks/Java/servlet/setup-resin-gcc-6.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+fw_depends java resingcc6 maven
+
+mvn clean install
+rm -rf $RESIN_HOME/webapps/*
+cp target/servlet.war $RESIN_HOME/webapps/
+resinctl start

+ 29 - 0
toolset/setup/linux/webservers/resin/resingcc6.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+fw_depends java gcc-6
+
+fw_installed resingcc6 && return 0
+
+RVER=4.0.55
+RESIN=resingcc6-$RVER
+RESIN_HOME=$IROOT/$RESIN
+
+fw_get -O http://www.caucho.com/download/resin-$RVER.tar.gz
+fw_untar resin-$RVER.tar.gz
+# We need separate folder so not to clash with the normal resin folder
+mv resin-$RVER resingcc6-$RVER
+cd resingcc6-$RVER
+./configure --prefix=`pwd`
+make
+make install
+
+mv conf/resin.properties conf/resin.properties.orig
+cat $FWROOT/toolset/setup/linux/webservers/resin/resin.properties > conf/resin.properties
+
+mv conf/resin.xml conf/resin.xml.orig
+cat $FWROOT/toolset/setup/linux/webservers/resin/resin.xml > conf/resin.xml
+
+echo "export RESIN_HOME=${RESIN_HOME}" > $IROOT/resingcc6.installed
+echo -e "export PATH=\$RESIN_HOME/bin:\$PATH" >> $IROOT/resingcc6.installed
+
+source $IROOT/resingcc6.installed