change hard coded Visual Studio paths
authorRamakrishnan Muthukrishnan <ram@leastauthority.com>
Thu, 27 Nov 2014 16:29:48 +0000 (21:59 +0530)
committerDaira Hopwood <daira@jacaranda.org>
Thu, 30 Apr 2015 14:30:22 +0000 (15:30 +0100)
build-win7-x86-64.bat

index 7c58c55304602d1514b5aaa0a5a095e49034a8b5..b510bd387e4ee810274b4e7aadc622a446072577 100644 (file)
@@ -25,13 +25,13 @@ REM start /wait dependencies/pyOpenSSL-0.13.1.win-amd64-py2.7.exe
 REM open visual studio 2008 cmd prompt as Administrator (right click)
 REM  Run the "Windows SDK Configuration Tool", select v7.0 and click "Make Current".
 
-call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat"
+set VC_INSTALL_DIR=%VC90COMNTOOLS%..\..
+
+call %VC_INSTALL_DIR%\VC\bin\vcvars64.bat
 
 set MSSdk=1
 set DISTUTILS_USE_SDK=1
 
-set VC_INSTALL_DIR=%VC90COMNTOOLS%..\..
-
 regedit /s x64\VC_OBJECTS_PLATFORM_INFO.reg
 regedit /s x64\600dd186-2429-11d7-8bf6-00b0d03daa06.reg
 regedit /s x64\600dd187-2429-11d7-8bf6-00b0d03daa06.reg
@@ -41,8 +41,8 @@ regedit /s x64\656d875f-2429-11d7-8bf6-00b0d03daa06.reg
 regedit /s x64\656d8760-2429-11d7-8bf6-00b0d03daa06.reg
 regedit /s x64\656d8763-2429-11d7-8bf6-00b0d03daa06.reg
 regedit /s x64\656d8766-2429-11d7-8bf6-00b0d03daa06.reg
-copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\AMD64.VCPlatform.config" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\AMD64.VCPlatform.Express.config"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\Itanium.VCPlatform.config" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcpackages\Itanium.VCPlatform.Express.config"
+copy %VC_INSTALL_DIR%\VC\vcpackages\AMD64.VCPlatform.config %VC_INSTALL_DIR%\VC\vcpackages\AMD64.VCPlatform.Express.config
+copy %VC_INSTALL_DIR%\VC\vcpackages\Itanium.VCPlatform.config %VC_INSTALL_DIR%\VC\vcpackages\Itanium.VCPlatform.Express.config
 
 REM build tahoe-lafs
 c:\python27\python.exe setup.py build