Changeset 2470 for coopr.misc/trunk


Ignore:
Timestamp:
Apr 1, 2010 1:11:11 PM (11 years ago)
Author:
wehart
Message:

Updating coopr_install to work better on MSWindows.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.misc/trunk/util/coopr_install

    r2395 r2470  
    27732773
    27742774    svn_get='checkout'
    2775     easy_install_path = "easy_install"
     2775    easy_install_path = ["easy_install"]
    27762776    python = "python"
    27772777    svn = "svn"
     
    30973097                    self.run([self.python, 'setup.py', 'install'], dir=dir)
    30983098                else:
    3099                     self.run([self.python, self.easy_install_path, '-q', self.pypi])
     3099                    self.run(self.easy_install_path + ['-q', self.pypi])
    31003100            elif preinstall:
    31013101                if not os.path.exists(dir):
    3102                     self.run([self.python, self.easy_install_path, '-q', '--editable', '--build-directory', '.', self.pypi], dir=os.path.dirname(dir))
     3102                    self.run(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.python, self.easy_install_path, '-q', '--upgrade', self.pypi])
     3109        self.run(self.easy_install_path + ['-q', '--upgrade', self.pypi])
    31103110
    31113111    def run(self, cmd, dir=None):
     
    35573557        else:
    35583558            bindir = join(self.abshome_dir,"bin")
    3559         Repository.easy_install_path = os.path.abspath(join(bindir, 'easy_install'))
    35603559        if is_jython:
    35613560            Repository.python = os.path.abspath(join(bindir, 'jython.bat'))
    35623561        else:
    35633562            Repository.python = os.path.abspath(join(bindir, 'python'))
     3563        if os.path.exists(os.path.abspath(join(bindir, 'easy_install'))):
     3564            Repository.easy_install_path = [Repository.python, os.path.abspath(join(bindir, 'easy_install'))]
     3565        else:
     3566            Repository.easy_install_path = [os.path.abspath(join(bindir, 'easy_install.exe'))]
    35643567        #
    35653568        # Install the related packages
Note: See TracChangeset for help on using the changeset viewer.