Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Make PATH handling more robust in the batch tools for MSBuild. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
d9a9e0836244b8c1fe06a7cc82c585a1 |
| User & Date: | mistachkin 2017-02-27 17:20:29 |
Context
|
2017-03-13
| ||
| 21:22 | For the design-time components installer tool, make sure that verbose mode is honored for mock registry keys even in the event that a parameter has an invalid value. check-in: d1111b2d68 user: mistachkin tags: trunk | |
|
2017-02-27
| ||
| 17:56 | Prepare for the proposed hash algorithm changes in Fossil 2.0. check-in: 5c2462c16b user: mistachkin tags: fossil-2.0 | |
| 17:20 | Make PATH handling more robust in the batch tools for MSBuild. check-in: d9a9e08362 user: mistachkin tags: trunk | |
|
2017-02-18
| ||
| 00:56 | Feature the link to the news page more prominently on the landing page. check-in: ee8701edb5 user: mistachkin tags: trunk | |
Changes
Changes to Setup/bake.bat.
35 35 ) ELSE ( 36 36 SET FRAMEWORK=netFx20 37 37 ) 38 38 ) 39 39 40 40 %_VECHO% Framework = '%FRAMEWORK%' 41 41 42 -IF "%PROCESSOR_ARCHITECTURE%"=="x86" GOTO set_path_32 43 -SET PATH=%ProgramFiles(x86)%\Inno Setup 5;%PATH% 42 +IF "%PROCESSOR_ARCHITECTURE%" == "x86" GOTO set_path_x86 43 + 44 +SET INNOSETUPPATH=%ProgramFiles(x86)%\Inno Setup 5 44 45 GOTO set_path_done 45 -:set_path_32 46 -SET PATH=%ProgramFiles%\Inno Setup 5;%PATH% 46 + 47 +:set_path_x86 48 + 49 +SET INNOSETUPPATH=%ProgramFiles%\Inno Setup 5 50 + 47 51 :set_path_done 48 52 53 +CALL :fn_PrependToPath INNOSETUPPATH 54 + 55 +%_VECHO% InnoSetupPath = '%INNOSETUPPATH%' 49 56 %_VECHO% Path = '%PATH%' 50 57 51 58 %__ECHO% ISCC.exe "%TOOLS%\data\SQLite.iss" "/dAppId=%APPID%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppConfiguration=%CONFIGURATION%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%" "/dFramework=%FRAMEWORK%" "/dYear=%YEAR%" 52 59 53 60 IF %ERRORLEVEL% NEQ 0 ( 54 61 ECHO Failed to compile setup. 55 62 GOTO errors ................................................................................ 63 70 FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( 64 71 SET VALUE=%%V 65 72 ) 66 73 ENDLOCAL && ( 67 74 SET %1=%VALUE% 68 75 ) 69 76 GOTO :EOF 77 + 78 +:fn_PrependToPath 79 + IF NOT DEFINED %1 GOTO :EOF 80 + SETLOCAL 81 + SET __ECHO_CMD=ECHO %%%1%% 82 + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( 83 + SET VALUE=%%V 84 + ) 85 + SET VALUE=%VALUE:"=% 86 + REM " 87 + ENDLOCAL && SET PATH=%VALUE%;%PATH% 88 + GOTO :EOF 70 89 71 90 :fn_ResetErrorLevel 72 91 VERIFY > NUL 73 92 GOTO :EOF 74 93 75 94 :fn_SetErrorLevel 76 95 VERIFY MAYBE 2> NUL
Changes to Setup/build.bat.
281 281 %__ECHO2% PUSHD "%ROOT%" 282 282 283 283 IF ERRORLEVEL 1 ( 284 284 ECHO Could not change directory to "%ROOT%". 285 285 GOTO errors 286 286 ) 287 287 288 -SET PATH=%BUILDTOOLDIR%;%PATH% 288 +CALL :fn_PrependToPath BUILDTOOLDIR 289 289 290 290 %_VECHO% Path = '%PATH%' 291 291 292 292 IF NOT DEFINED SOLUTION ( 293 293 IF DEFINED COREONLY ( 294 294 %_AECHO% Building core managed project... 295 295 SET SOLUTION=.\System.Data.SQLite\System.Data.SQLite.%YEAR%.csproj ................................................................................ 601 601 FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( 602 602 SET VALUE=%%V 603 603 ) 604 604 SET VALUE=%VALUE:"=% 605 605 REM " 606 606 ENDLOCAL && SET %1=%VALUE% 607 607 GOTO :EOF 608 + 609 +:fn_PrependToPath 610 + IF NOT DEFINED %1 GOTO :EOF 611 + SETLOCAL 612 + SET __ECHO_CMD=ECHO %%%1%% 613 + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( 614 + SET VALUE=%%V 615 + ) 616 + SET VALUE=%VALUE:"=% 617 + REM " 618 + ENDLOCAL && SET PATH=%VALUE%;%PATH% 619 + GOTO :EOF 608 620 609 621 :fn_CopyVariable 610 622 IF NOT DEFINED %1 GOTO :EOF 611 623 IF "%2" == "" GOTO :EOF 612 624 SETLOCAL 613 625 SET __ECHO_CMD=ECHO %%%1%% 614 626 FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
Changes to Setup/test_ce_200x.bat.
31 31 %_VECHO% Root = '%ROOT%' 32 32 33 33 SET TOOLS=%~dp0 34 34 SET TOOLS=%TOOLS:~0,-1% 35 35 36 36 %_VECHO% Tools = '%TOOLS%' 37 37 38 -SET PATH=%ROOT%\Externals\Eagle\bin;%PATH% 38 +SET EAGLEBINDIR=%ROOT%\Externals\Eagle\bin 39 39 40 +CALL :fn_PrependToPath EAGLEBINDIR 41 + 42 +%_VECHO% EagleBinDir = '%EAGLEBINDIR%' 40 43 %_VECHO% Path = '%PATH%' 41 44 42 45 %__ECHO3% CALL "%TOOLS%\vsSp.bat" 43 46 44 47 IF ERRORLEVEL 1 ( 45 48 ECHO Could not detect Visual Studio. 46 49 GOTO errors ................................................................................ 133 136 ENDLOCAL 134 137 SET %VALUE%= 135 138 ) ELSE ( 136 139 ENDLOCAL 137 140 ) 138 141 CALL :fn_ResetErrorLevel 139 142 GOTO :EOF 143 + 144 +:fn_PrependToPath 145 + IF NOT DEFINED %1 GOTO :EOF 146 + SETLOCAL 147 + SET __ECHO_CMD=ECHO %%%1%% 148 + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( 149 + SET VALUE=%%V 150 + ) 151 + SET VALUE=%VALUE:"=% 152 + REM " 153 + ENDLOCAL && SET PATH=%VALUE%;%PATH% 154 + GOTO :EOF 140 155 141 156 :fn_ResetErrorLevel 142 157 VERIFY > NUL 143 158 GOTO :EOF 144 159 145 160 :fn_SetErrorLevel 146 161 VERIFY MAYBE 2> NUL