Changeset 2395

Timestamp:

Feb 23, 2010 3:29:35 PM (11 years ago)

Author:

wehart

Message:

Update due to changes with pyutilib.virtualenv.

File:

• coopr.misc/trunk/util/coopr_install (modified) (4 diffs)

coopr.misc/trunk/util/coopr_install

@@ -3097 +3097 @@
                     self.run([self.python, 'setup.py', 'install'], dir=dir)
                 else:
-                    self.run([self.easy_install_path, '-q', self.pypi])
+                    self.run([self.python, self.easy_install_path, '-q', self.pypi])
             elif preinstall: 
                 if not os.path.exists(dir):
-                    self.run([self.easy_install_path, '-q', '--editable', '--build-directory', '.', self.pypi], dir=os.path.dirname(dir))
+                    self.run([self.python, self.easy_install_path, '-q', '--editable', '--build-directory', '.', self.pypi], dir=os.path.dirname(dir))
         except OSError, err:
             print "-----------------------------------------------------------------"
@@ -3107 +3107 @@
 
     def easy_upgrade(self):
-        self.run([self.easy_install_path, '-q', '--upgrade', self.pypi])
+        self.run([self.python, self.easy_install_path, '-q', '--upgrade', self.pypi])
 
     def run(self, cmd, dir=None):
@@ -3121 +3121 @@
 
 if sys.platform.startswith('win'):
-   Repository.python += '.exe'
-   Repository.svn += '.exe'
+    if not is_jython:
+        Repository.python += '.exe'
+    Repository.svn += '.exe'
 
 
@@ -3557 +3558 @@
             bindir = join(self.abshome_dir,"bin")
         Repository.easy_install_path = os.path.abspath(join(bindir, 'easy_install'))
-        Repository.python = os.path.abspath(join(bindir, 'python'))
+        if is_jython:
+            Repository.python = os.path.abspath(join(bindir, 'jython.bat'))
+        else:
+            Repository.python = os.path.abspath(join(bindir, 'python'))
         #
         # Install the related packages