Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | In the build automation, attempt to automatically detect if Visual Studio 2008 and/or 2010 are installed. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | build-enhancements |
| Files: | files | file ages | folders |
| SHA1: |
c7f8f5e266da89e20da6d3342d7ac973 |
| User & Date: | mistachkin 2011-06-30 23:22:03 |
Context
|
2011-07-01
| ||
| 02:23 | Add automation to produce a source archive. Remove superfluous README files. check-in: 7e5e4c3562 user: mistachkin tags: build-enhancements | |
|
2011-06-30
| ||
| 23:22 | In the build automation, attempt to automatically detect if Visual Studio 2008 and/or 2010 are installed. check-in: c7f8f5e266 user: mistachkin tags: build-enhancements | |
| 06:17 | Update the VS property files to SQLite version 3.7.7.1. check-in: f10d138b59 user: mistachkin tags: build-enhancements | |
Changes
Changes to Setup/bake_all.bat.
18 18 19 19 %_AECHO% Running %0 %* 20 20 21 21 SET TOOLS=%~dp0 22 22 SET TOOLS=%TOOLS:~0,-1% 23 23 24 24 %_VECHO% Tools = '%TOOLS%' 25 + 26 +%_ECHO% CALL "%TOOLS%\vsSp.bat" 27 + 28 +IF ERRORLEVEL 1 ( 29 + ECHO Could not detect Visual Studio. 30 + GOTO errors 31 +) 25 32 26 33 %_ECHO% CALL "%TOOLS%\set_common.bat" 27 34 28 35 IF ERRORLEVEL 1 ( 29 36 ECHO Could not set common variables. 30 37 GOTO errors 31 38 )
Changes to Setup/build_all.bat.
18 18 19 19 %_AECHO% Running %0 %* 20 20 21 21 SET TOOLS=%~dp0 22 22 SET TOOLS=%TOOLS:~0,-1% 23 23 24 24 %_VECHO% Tools = '%TOOLS%' 25 + 26 +%_ECHO% CALL "%TOOLS%\vsSp.bat" 27 + 28 +IF ERRORLEVEL 1 ( 29 + ECHO Could not detect Visual Studio. 30 + GOTO errors 31 +) 25 32 26 33 %_ECHO% CALL "%TOOLS%\set_common.bat" 27 34 28 35 IF ERRORLEVEL 1 ( 29 36 ECHO Could not set common variables. 30 37 GOTO errors 31 38 )
Changes to Setup/set_common.bat.
27 27 SET PLATFORMS=Win32 x64 28 28 ) 29 29 30 30 IF NOT DEFINED PROCESSORS ( 31 31 SET PROCESSORS=x86 x64 32 32 ) 33 33 34 -IF NOT DEFINED YEARS ( 35 - SET YEARS=2008 2010 34 +IF DEFINED YEARS GOTO end_of_file 35 + 36 +IF DEFINED VS2008SP ( 37 + SET YEARS=%YEARS% 2008 38 +) 39 + 40 +IF DEFINED VS2010SP ( 41 + SET YEARS=%YEARS% 2010 36 42 ) 43 + 44 +:end_of_file
Added Setup/vsSp.bat.
1 +@ECHO OFF 2 + 3 +:: 4 +:: vsSp.bat -- 5 +:: 6 +:: Visual Studio 2008/2010 Service Pack Detection Tool 7 +:: 8 +:: Written by Joe Mistachkin. 9 +:: Released to the public domain, use at your own risk! 10 +:: 11 + 12 +SETLOCAL 13 + 14 +REM SET _ECHO=ECHO 15 +IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 +IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 +IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 + 19 +%_AECHO% Running %0 %* 20 + 21 +SET DUMMY2=%1 22 + 23 +IF DEFINED DUMMY2 ( 24 + GOTO usage 25 +) 26 + 27 +REM 28 +REM NOTE: Build the command that we will use to query for Visual Studio 2008. 29 +REM Visual Studio 2008 is 32-bit only; therefore, when not running on an 30 +REM x86 platform, look in the WoW64 registry hive. 31 +REM 32 +IF "%PROCESSOR_ARCHITECTURE%" == "x86" ( 33 + SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Microsoft\DevDiv\VS\Servicing\9.0" /v SP 34 +) ELSE ( 35 + SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevDiv\VS\Servicing\9.0" /v SP 36 +) 37 + 38 +FOR /F "eol=; tokens=1,2,3*" %%I IN ('%GET_SP_CMD% 2^> NUL') DO ( 39 + IF {%%I} == {SP} ( 40 + IF {%%J} == {REG_DWORD} ( 41 + %_AECHO% Found Visual Studio 2008 Service Pack "%%K". 42 + SET VS2008SP=%%K 43 + ) 44 + ) 45 +) 46 + 47 +REM 48 +REM NOTE: Build the command that we will use to query for Visual Studio 2010. 49 +REM Visual Studio 2010 is 32-bit only; therefore, when not running on an 50 +REM x86 platform, look in the WoW64 registry hive. 51 +REM 52 +IF "%PROCESSOR_ARCHITECTURE%" == "x86" ( 53 + SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Microsoft\DevDiv\VS\Servicing\10.0" /v SP 54 +) ELSE ( 55 + SET GET_SP_CMD=reg.exe QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevDiv\VS\Servicing\10.0" /v SP 56 +) 57 + 58 +FOR /F "eol=; tokens=1,2,3*" %%I IN ('%GET_SP_CMD% 2^> NUL') DO ( 59 + IF {%%I} == {SP} ( 60 + IF {%%J} == {REG_DWORD} ( 61 + %_AECHO% Found Visual Studio 2010 Service Pack "%%K". 62 + SET VS2010SP=%%K 63 + ) 64 + ) 65 +) 66 + 67 +GOTO no_errors 68 + 69 +:fn_ResetErrorLevel 70 + VERIFY > NUL 71 + GOTO :EOF 72 + 73 +:fn_SetErrorLevel 74 + VERIFY MAYBE 2> NUL 75 + GOTO :EOF 76 + 77 +:usage 78 + ECHO. 79 + ECHO Usage: %~nx0 80 + ECHO. 81 + GOTO errors 82 + 83 +:errors 84 + CALL :fn_SetErrorLevel 85 + ENDLOCAL 86 + GOTO end_of_file 87 + 88 +:no_errors 89 + CALL :fn_ResetErrorLevel 90 + ENDLOCAL && ( 91 + SET VS2008SP=%VS2008SP% 92 + SET VS2010SP=%VS2010SP% 93 + ) 94 + GOTO end_of_file 95 + 96 +:end_of_file 97 +EXIT /B %ERRORLEVEL%