Locate VS installation dir from environment, so that it works with the express edition.
This commit is contained in:
parent
acfd8ed0cd
commit
03dc56cd17
|
@ -836,17 +836,11 @@ def extract_msvcr71():
|
||||||
installer.FileVersion("msvcr71.dll", 1)
|
installer.FileVersion("msvcr71.dll", 1)
|
||||||
|
|
||||||
def extract_msvcr90():
|
def extract_msvcr90():
|
||||||
import _winreg
|
# Find the redistributable files
|
||||||
# Find the location of the merge modules
|
dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\x86\Microsoft.VC90.CRT")
|
||||||
k = _winreg.OpenKey(
|
|
||||||
_winreg.HKEY_LOCAL_MACHINE,
|
|
||||||
r"Software\Microsoft\VisualStudio\9.0\Setup\VS")
|
|
||||||
prod_dir = _winreg.QueryValueEx(k, "ProductDir")[0]
|
|
||||||
_winreg.CloseKey(k)
|
|
||||||
|
|
||||||
result = []
|
result = []
|
||||||
installer = msilib.MakeInstaller()
|
installer = msilib.MakeInstaller()
|
||||||
dir = os.path.join(prod_dir, r'VC\redist\x86\Microsoft.VC90.CRT')
|
|
||||||
# omit msvcm90 and msvcp90, as they aren't really needed
|
# omit msvcm90 and msvcp90, as they aren't really needed
|
||||||
files = ["Microsoft.VC90.CRT.manifest", "msvcr90.dll"]
|
files = ["Microsoft.VC90.CRT.manifest", "msvcr90.dll"]
|
||||||
for f in files:
|
for f in files:
|
||||||
|
|
Loading…
Reference in New Issue