瀏覽代碼

update format of php-phpixie's install.sh, update documentation

Lita Gratrix 10 年之前
父節點
當前提交
38f2a73743
共有 4 個文件被更改,包括 17 次插入14 次删除
  1. 12 1
      frameworks/PHP/php-phpixie/install.sh
  2. 3 9
      frameworks/Perl/README.md
  3. 0 2
      frameworks/Python/README.md
  4. 2 2
      toolset/setup/linux/setup_util.py

+ 12 - 1
frameworks/PHP/php-phpixie/install.sh

@@ -1 +1,12 @@
-#!/bin/bash

export PHP_HOME=${IROOT}/php-5.5.17
export COMPOSER_HOME=${IROOT}/php-composer
export PHP_FPM=${PHP_HOME}/sbin/php-fpm
export NGINX_HOME=${IROOT}/nginx

fw_depends php nginx composer

${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
  --no-interaction --working-dir $TROOT \
  --no-progress --optimize-autoloader 
+#!/bin/bash
+
+export PHP_HOME=${IROOT}/php-5.5.17
+export COMPOSER_HOME=${IROOT}/php-composer
+export PHP_FPM=${PHP_HOME}/sbin/php-fpm
+export NGINX_HOME=${IROOT}/nginx
+
+fw_depends php nginx composer
+
+${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
+  --no-interaction --working-dir $TROOT \
+  --no-progress --optimize-autoloader 

+ 3 - 9
frameworks/Perl/README.md

@@ -4,6 +4,8 @@ In order to declare that your framework requires Perl, you should have an `insta
 that contains at least
 
     #!/bin/bash
+    export PERL_HOME=${IROOT}/perl-5.18
+    export PATH="$PERL_HOME/bin:$PATH"
 
     fw_depends perl
 
@@ -12,15 +14,7 @@ The `install.sh` file should then install any required perl modules or other sup
 applications.
 
 Perl is installed in the `$IROOT` directory. Currently, the Perl interpreter
-used by the test is in version 5.18 family. It is highly recommended that
-you have a `bash_profile.sh` in your app's directory that contains at least
-
-    #!/bin/bash
-
-    export PERL_HOME=${IROOT}/perl-5.18
-    export PATH="$PERL_HOME/bin:$PATH"
-
-This will provide the `$PERL_HOME` path - should you need it - and 
+used by the test is in version 5.18 family. This will provide the `$PERL_HOME` path - should you need it - and 
 allow all apps installed by Perl to be used directly.
 
 # Dependency Management

+ 0 - 2
frameworks/Python/README.md

@@ -99,8 +99,6 @@ You can see Flask's files to know how to write new test.
 virtualenv is installed on Python 2 and PyPy.  Use `$IROOT/py3/bin/python3 -m venv $TROOT/py3`
 for Python 3.
 
-`bash_profile.sh` is evaluated when running test.  You can set environment variables here.
-
 `bechmark_config` is json file to define test.
 See [here](http://frameworkbenchmarks.readthedocs.org/en/latest/Codebase/Framework-Files/#benchmark-config-file)
 

+ 2 - 2
toolset/setup/linux/setup_util.py

@@ -95,8 +95,8 @@ def get_fwroot():
 # Assumes path is underneath FWROOT, not above
 # 
 # Useful for clean presentation of paths 
-# e.g. /foo/bar/benchmarks/go/bash_profile.sh
-# v.s. FWROOT/go/bash_profile.sh 
+# e.g. /foo/bar/benchmarks/go/install.sh
+# v.s. FWROOT/go/install.sh 
 def path_relative_to_root(path):
     # Requires bash shell parameter expansion
     return subprocess.check_output("D=%s && printf \"${D#%s}\""%(path, get_fwroot()), shell=True, executable='/bin/bash')