Browse Source

remove references to bash_profile.sh in documentation and setup files

Lita Gratrix 10 years ago
parent
commit
3163630af8

+ 1 - 1
frameworks/Java/README.md

@@ -10,6 +10,6 @@ that contains at least
 This installs the OpenJDK 7 JVM.
 
 Frameworks can also choose to install Oracle Java 8 JVM by declaring a dependency on "java8"
-instead of java. In order to use Java 8 JVM frameworks need to add the following line in their "bash_profile.sh" file:
+instead of java. In order to use Java 8 JVM frameworks need to add the following line in their "setup.sh" file:
 
 export JAVA_HOME=/opt/java8

+ 3 - 3
frameworks/Ruby/README.md

@@ -2,7 +2,7 @@
 
 TFB uses rvm wherever possible to help ruby-based or
 jruby-based frameworks setup their environment. 
-In your framework's `bash_profile.sh`, put this: 
+In your framework's `install.sh`, put this prior to other statements: 
 
     #!/bin/bash
     
@@ -12,8 +12,8 @@ In your framework's `bash_profile.sh`, put this:
 Because TFB uses Python's `subprocess` module, which runs 
 all shell processes in a non-login mode, you must source the 
 `rvm` script before using `rvm` anywhere. Placing the `source`
-call in your `bash_profile.sh` ensures that it will be called 
-before running `install.sh` and before running `setup.py`
+call in your `insatll.sh` before other commands ensures that it 
+will be called before installation and before running `setup.py`
 
 For compatibility with how the framework rounds are executed, 
 you must use a single-user installation if you wish to run 

+ 1 - 3
toolset/benchmark/framework_test.py

@@ -162,9 +162,7 @@ class FrameworkTest:
   ############################################################
   def start(self, out, err):
     # Load profile for this installation
-    profile="%s/bash_profile.sh" % self.directory
-    if not os.path.exists(profile):
-      profile="$FWROOT/config/benchmark_profile"
+    profile="$FWROOT/config/benchmark_profile"
 
     # Setup variables for TROOT and IROOT
     setup_util.replace_environ(config=profile, 

+ 0 - 10
toolset/setup/linux/installer.py

@@ -107,16 +107,6 @@ class Installer:
       previousDir = os.getcwd()
       os.chdir(test_dir)
 
-      # Load profile for this installation
-      profile="%s/bash_profile.sh" % test_dir
-      if not os.path.exists(profile):
-        profile="$FWROOT/config/benchmark_profile"
-      else:
-        logging.info("Loading environment from %s (cwd=%s)", profile, test_dir)
-      setup_util.replace_environ(config=profile, 
-        command='export TROOT=%s && export IROOT=%s' %
-        (test_dir, test_install_dir))
-
       # Run test installation script
       #   FWROOT - Path of the FwBm root
       #   IROOT  - Path of this test's install directory