From: Brian Warner <warner@allmydata.com>
Date: Mon, 24 Sep 2007 19:38:59 +0000 (-0700)
Subject: setup.py use sys.executable instead of hard-coded 'python' to run make-version.py
X-Git-Tag: allmydata-tahoe-0.6.0~5
X-Git-Url: https://git.rkrishnan.org/simplejson/encoder.py.html?a=commitdiff_plain;h=a9bb0814e6cf9f80627588da4e3c05560c1e40af;p=tahoe-lafs%2Ftahoe-lafs.git

setup.py use sys.executable instead of hard-coded 'python' to run make-version.py
---

diff --git a/setup.py b/setup.py
index 33b52c23..c8c2ed6f 100644
--- a/setup.py
+++ b/setup.py
@@ -65,9 +65,15 @@ trove_classifiers=[
     ]
 
 
+# Build _version.py before trying to extract a version from it. If we aren't
+# running from a darcs checkout, this will leave any pre-existing _version.py
+# alone.
 try:
-    import os
-    os.system("python misc/make-version.py \"allmydata-tahoe\" \"src/allmydata/_version.py\"")
+    os.system(" ".join([sys.executable,
+                       "misc/make-version.py",
+                       "allmydata-tahoe",
+                       '"src/allmydata/_version.py"', # cygwin vs slashes
+                        ]))
 except Exception, le:
     pass
 VERSIONFILE = "src/allmydata/_version.py"