Changeset 2436


Ignore:
Timestamp:
Mar 12, 2010 3:43:53 AM (9 years ago)
Author:
wehart
Message:

Merged revisions 2389-2435 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.misc/trunk

........

r2395 | wehart | 2010-02-23 13:29:35 -0700 (Tue, 23 Feb 2010) | 2 lines


Update due to changes with pyutilib.virtualenv.

........

Location:
coopr.misc/stable/2.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • coopr.misc/stable/2.2

  • coopr.misc/stable/2.2/util/coopr_install

    r2389 r2436  
    30973097                    self.run([self.python, 'setup.py', 'install'], dir=dir)
    30983098                else:
    3099                     self.run([self.easy_install_path, '-q', self.pypi])
     3099                    self.run([self.python, self.easy_install_path, '-q', self.pypi])
    31003100            elif preinstall:
    31013101                if not os.path.exists(dir):
    3102                     self.run([self.easy_install_path, '-q', '--editable', '--build-directory', '.', self.pypi], dir=os.path.dirname(dir))
     3102                    self.run([self.python, self.easy_install_path, '-q', '--editable', '--build-directory', '.', self.pypi], dir=os.path.dirname(dir))
    31033103        except OSError, err:
    31043104            print "-----------------------------------------------------------------"
     
    31073107
    31083108    def easy_upgrade(self):
    3109         self.run([self.easy_install_path, '-q', '--upgrade', self.pypi])
     3109        self.run([self.python, self.easy_install_path, '-q', '--upgrade', self.pypi])
    31103110
    31113111    def run(self, cmd, dir=None):
     
    31213121
    31223122if sys.platform.startswith('win'):
    3123    Repository.python += '.exe'
    3124    Repository.svn += '.exe'
     3123    if not is_jython:
     3124        Repository.python += '.exe'
     3125    Repository.svn += '.exe'
    31253126
    31263127
     
    35573558            bindir = join(self.abshome_dir,"bin")
    35583559        Repository.easy_install_path = os.path.abspath(join(bindir, 'easy_install'))
    3559         Repository.python = os.path.abspath(join(bindir, 'python'))
     3560        if is_jython:
     3561            Repository.python = os.path.abspath(join(bindir, 'jython.bat'))
     3562        else:
     3563            Repository.python = os.path.abspath(join(bindir, 'python'))
    35603564        #
    35613565        # Install the related packages
Note: See TracChangeset for help on using the changeset viewer.