Browse Source

Attempts to convert setup.py/setup-raw.py to setup.sh/setup-raw.sh for
php-senthot and php-silex.

Was unable to get php-senthot to run test, confirmed that it did not complete
in round 9 testing. Left the setup.py file intact in the event further
research will be done.

php-silex completed with warnings, but php-silex-raw failed all tests but
json. Confirmed that Round 9 testing did not complete. Removed .py files
as the tests ran, just failed.

Lita Gratrix 10 years ago
parent
commit
9732233479

+ 1 - 1
frameworks/PHP/php-senthot/bash_profile.sh

@@ -4,4 +4,4 @@ export PHP_HOME=${IROOT}/php-5.5.17
 
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+export NGINX_HOME=${IROOT}/nginx

+ 10 - 0
frameworks/PHP/php-senthot/setup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sed -i "s|'DB_HOST' => 'localhost'|'DB_HOST' => '\"${DBHOST}\"'|g" app/Conf/config.php
+sed -i 's|root .*/FrameworkBenchmarks/php-senthot|root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
+
+export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+
+$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

+ 1 - 1
frameworks/PHP/php-silex/bash_profile.sh

@@ -6,4 +6,4 @@ export PHP_FPM=$PHP_HOME/sbin/php-fpm
 
 export COMPOSER_HOME=${IROOT}/php-composer
 
-export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+export NGINX_HOME=${IROOT}/nginx

+ 0 - 31
frameworks/PHP/php-silex/setup.py

@@ -1,31 +0,0 @@
-import subprocess
-import sys
-import setup_util
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("php-silex/web/index.php", "192.168.100.102", "" + args.database_host + "")
-  setup_util.replace_text("php-silex/deploy/php-silex", "\".*\/FrameworkBenchmarks/php-silex", "\"" + args.troot)
-  setup_util.replace_text("php-silex/deploy/php-silex", "Directory .*\/FrameworkBenchmarks/php-silex", "Directory " + args.troot)
-  setup_util.replace_text("php-silex/deploy/nginx.conf", "root .*\/FrameworkBenchmarks/php-silex", "root " + args.troot)
-
-  try:
-    #subprocess.check_call("sudo cp cake/deploy/cake /etc/apache2/sites-available/", shell=True)
-    #subprocess.check_call("sudo a2ensite cake", shell=True)
-    #subprocess.check_call("sudo chown -R www-data:www-data cake", shell=True)
-    #subprocess.check_call("sudo /etc/init.d/apache2 start", shell=True)
-    subprocess.check_call("composer.phar install --optimize-autoloader", shell=True, cwd="php-silex", stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/deploy/nginx.conf", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop(logfile, errfile):
-  try:
-    subprocess.call("sudo /usr/local/nginx/sbin/nginx -s stop", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.call("sudo kill -QUIT $( cat $TROOT/deploy/php-fpm.pid )", shell=True, stderr=errfile, stdout=logfile)
-    #subprocess.check_call("sudo a2dissite cake", shell=True)
-    #subprocess.check_call("sudo /etc/init.d/apache2 stop", shell=True)
-    #subprocess.check_call("sudo chown -R $USER:$USER cake", shell=True)    
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

+ 13 - 0
frameworks/PHP/php-silex/setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sed -i 's|192.168.100.102|'"${DBHOST}"'|g' web/index.php
+sed -i 's|".*\FrameworkBenchmarks/php-silex|"'"${TROOT}"'|g' deploy/php-silex
+sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' deploy/php-silex
+sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
+
+export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+
+composer.phar install --optimize-autoloader
+$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf

+ 0 - 25
frameworks/PHP/php-silex/setup_raw.py

@@ -1,25 +0,0 @@
-import subprocess
-import sys
-import setup_util
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("php-silex/web/index_raw.php", "192.168.100.102", "" + args.database_host + "")
-  setup_util.replace_text("php-silex/deploy/php-silex", "\".*\/FrameworkBenchmarks/php-silex", "\"" + args.troot)
-  setup_util.replace_text("php-silex/deploy/php-silex", "Directory .*\/FrameworkBenchmarks/php-silex", "Directory " + args.troot)
-  setup_util.replace_text("php-silex/deploy/nginx.conf", "root .*\/FrameworkBenchmarks/php-silex", "root " + args.troot)
-
-  try:
-    subprocess.check_call("composer.phar install --optimize-autoloader", shell=True, cwd="php-silex", stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/deploy/nginx_raw.conf", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-
-def stop(logfile, errfile):
-  try:
-    subprocess.call("sudo /usr/local/nginx/sbin/nginx -s stop", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.call("sudo kill -QUIT $( cat $TROOT/deploy/php-fpm.pid )", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

+ 13 - 0
frameworks/PHP/php-silex/setup_raw.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sed -i 's|192.168.100.102|'"${DBHOST}"'|g' web/index_raw.php
+sed -i 's|".*\FrameworkBenchmarks/php-silex|"'"${TROOT}"'|g' deploy/php-silex
+sed -i 's|Directory .*/FrameworkBenchmarks/php-silex|Directory '"${TROOT}"'|g' deploy/php-silex
+sed -i 's|root .*/FrameworkBenchmarks/php-silex|root '"${TROOT}"'|g' deploy/nginx_raw.conf
+sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx_raw.conf
+
+export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+
+composer.phar install --optimize-autoloader
+$PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+$NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx_raw.conf