Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

stable setup: use platform agnostic path and folder separators (fixes #701)

Changeset 6d9d2452e11f…

Parent 572283a0d643…

by Steve Borho

Changes to one file · Browse files at 6d9d2452e11f Showing diff from parent 572283a0d643 Diff from another changeset...

Change 1 of 2 Show Entire File setup.py Stacked
 
148
149
150
151
152
 
 
 
 
 
153
154
155
 
157
158
159
160
 
161
162
163
 
148
149
150
 
 
151
152
153
154
155
156
157
158
 
160
161
162
 
163
164
165
166
@@ -148,8 +148,11 @@
  if not(self.force or newer(qrc_file, py_file)):   return   import PyQt4 - path = os.getenv('PATH') - os.putenv('PATH', path + ';' + os.path.dirname(PyQt4.__file__) + '\\bin') + origpath = os.getenv('PATH') + path = origpath.split(os.pathsep) + pyqtfolder = os.path.dirname(PyQt4.__file__) + path.append(os.path.join(pyqtfolder, 'bin')) + os.putenv('PATH', os.pathsep.join(path))   if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:   self.warn("Unable to generate python module %s for resource file %s"   % (py_file, qrc_file)) @@ -157,7 +160,7 @@
  raise SystemExit(1)   else:   log.info('compiled %s into %s' % (qrc_file, py_file)) - os.putenv('PATH', path) + os.putenv('PATH', origpath)     def _generate_qrc(self, qrc_file, srcfiles, prefix):   basedir = os.path.dirname(qrc_file)