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