Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance ability to troubleshoot batch tools that CALL other batch tools and/or use PUSHD/POPD. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ba6fd1cb4b869ea7c98f20554619748f |
| User & Date: | mistachkin 2012-03-31 16:00:21 |
Context
|
2012-03-31
| ||
| 16:54 | Final doc updates for release 1.0.80.0. check-in: b2b7c9a91a user: mistachkin tags: trunk | |
| 16:00 | Enhance ability to troubleshoot batch tools that CALL other batch tools and/or use PUSHD/POPD. check-in: ba6fd1cb4b user: mistachkin tags: trunk | |
| 15:19 | Modify post-build tasks for Visual Studio 2005/2008 to avoid copying the native interop assembly for other platforms. Also, modify the release preparation tool to avoid zipping native interop assemblies for other platforms. check-in: 8d9f17bed8 user: mistachkin tags: trunk | |
Changes
Changes to Setup/archive.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO2=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET ROOT=%~dp0\.. ................................................................................ 25 26 SET TOOLS=%TOOLS:~0,-1% 26 27 27 28 %_VECHO% Root = '%ROOT%' 28 29 %_VECHO% Tools = '%TOOLS%' 29 30 30 31 CALL :fn_ResetErrorLevel 31 32 32 -%__ECHO% PUSHD "%ROOT%" 33 +%__ECHO2% PUSHD "%ROOT%" 33 34 34 35 IF ERRORLEVEL 1 ( 35 36 ECHO Could not change directory to "%ROOT%". 36 37 GOTO errors 37 38 ) 38 39 39 40 FOR /F "delims=" %%V IN ('find.exe "AssemblyVersion" System.Data.SQLite\AssemblyInfo.cs') DO ( ................................................................................ 78 79 %__ECHO% zip.exe -v -r Setup\Output\sqlite-netFx-source-%VERSION%.zip * -x @exclude_src.txt 79 80 80 81 IF ERRORLEVEL 1 ( 81 82 ECHO Failed to archive source files. 82 83 GOTO errors 83 84 ) 84 85 85 -%__ECHO% POPD 86 +%__ECHO2% POPD 86 87 87 88 IF ERRORLEVEL 1 ( 88 89 ECHO Could not restore directory. 89 90 GOTO errors 90 91 ) 91 92 92 93 GOTO no_errors
Changes to Setup/bake_all.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 22 23 SET TOOLS=%TOOLS:~0,-1% 23 24 24 25 %_VECHO% Tools = '%TOOLS%' 25 26 26 27 CALL :fn_ResetErrorLevel 27 28 28 -%__ECHO% CALL "%TOOLS%\vsSp.bat" 29 +%__ECHO3% CALL "%TOOLS%\vsSp.bat" 29 30 30 31 IF ERRORLEVEL 1 ( 31 32 ECHO Could not detect Visual Studio. 32 33 GOTO errors 33 34 ) 34 35 35 -%__ECHO% CALL "%TOOLS%\set_common.bat" 36 +%__ECHO3% CALL "%TOOLS%\set_common.bat" 36 37 37 38 IF ERRORLEVEL 1 ( 38 39 ECHO Could not set common variables. 39 40 GOTO errors 40 41 ) 41 42 42 43 IF NOT DEFINED BAKE_CONFIGURATIONS ( ................................................................................ 56 57 ) 57 58 58 59 %_VECHO% Years = '%YEARS%' 59 60 60 61 FOR %%C IN (%BAKE_CONFIGURATIONS%) DO ( 61 62 FOR %%P IN (%PROCESSORS%) DO ( 62 63 FOR %%Y IN (%YEARS%) DO ( 63 - %__ECHO% CALL "%TOOLS%\set_%%C_%%P_%%Y.bat" 64 + %__ECHO3% CALL "%TOOLS%\set_%%C_%%P_%%Y.bat" 64 65 65 66 IF ERRORLEVEL 1 ( 66 67 ECHO Could not set variables for %%C/%%P/%%Y. 67 68 GOTO errors 68 69 ) 69 70 70 - %__ECHO% CALL "%TOOLS%\bake.bat" 71 + %__ECHO3% CALL "%TOOLS%\bake.bat" 71 72 72 73 IF ERRORLEVEL 1 ( 73 74 ECHO Could not bake setup for %%C/%%P/%%Y. 74 75 GOTO errors 75 76 ) 76 77 ) 77 78 )
Changes to Setup/build.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO2=ECHO 16 +REM SET __ECHO3=ECHO 15 17 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 18 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 19 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 20 19 21 %_AECHO% Running %0 %* 20 22 21 23 SET ROOT=%~dp0\.. ................................................................................ 50 52 51 53 %_VECHO% Tools = '%TOOLS%' 52 54 53 55 IF EXIST "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" ( 54 56 CALL :fn_ResetErrorLevel 55 57 56 58 %_AECHO% Running "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"... 57 - %__ECHO% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" 59 + %__ECHO3% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" 58 60 59 61 IF ERRORLEVEL 1 ( 60 62 ECHO File "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" failed. 61 63 GOTO errors 62 64 ) 63 65 ) 64 66 ................................................................................ 126 128 ) 127 129 128 130 %_VECHO% Year = '%YEAR%' 129 131 %_VECHO% FrameworkDir = '%FRAMEWORKDIR%' 130 132 131 133 CALL :fn_ResetErrorLevel 132 134 133 -%__ECHO% PUSHD "%ROOT%" 135 +%__ECHO2% PUSHD "%ROOT%" 134 136 135 137 IF ERRORLEVEL 1 ( 136 138 ECHO Could not change directory to "%ROOT%". 137 139 GOTO errors 138 140 ) 139 141 140 142 SET PATH=%FRAMEWORKDIR%;%PATH% ................................................................................ 196 198 %__ECHO% MSBuild.exe "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %MSBUILD_ARGS% 197 199 198 200 IF ERRORLEVEL 1 ( 199 201 ECHO Build failed. 200 202 GOTO errors 201 203 ) 202 204 203 -%__ECHO% POPD 205 +%__ECHO2% POPD 204 206 205 207 IF ERRORLEVEL 1 ( 206 208 ECHO Could not restore directory. 207 209 GOTO errors 208 210 ) 209 211 210 212 GOTO no_errors
Changes to Setup/build_all.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 22 23 SET TOOLS=%TOOLS:~0,-1% 23 24 24 25 %_VECHO% Tools = '%TOOLS%' 25 26 26 27 CALL :fn_ResetErrorLevel 27 28 28 -%__ECHO% CALL "%TOOLS%\vsSp.bat" 29 +%__ECHO3% CALL "%TOOLS%\vsSp.bat" 29 30 30 31 IF ERRORLEVEL 1 ( 31 32 ECHO Could not detect Visual Studio. 32 33 GOTO errors 33 34 ) 34 35 35 -%__ECHO% CALL "%TOOLS%\set_common.bat" 36 +%__ECHO3% CALL "%TOOLS%\set_common.bat" 36 37 37 38 IF ERRORLEVEL 1 ( 38 39 ECHO Could not set common variables. 39 40 GOTO errors 40 41 ) 41 42 42 43 IF NOT DEFINED BUILD_CONFIGURATIONS ( ................................................................................ 56 57 ) 57 58 58 59 %_VECHO% Years = '%YEARS%' 59 60 60 61 FOR %%C IN (%BUILD_CONFIGURATIONS%) DO ( 61 62 FOR %%P IN (%PLATFORMS%) DO ( 62 63 FOR %%Y IN (%YEARS%) DO ( 63 - %__ECHO% CALL "%TOOLS%\set_%%Y.bat" 64 + %__ECHO3% CALL "%TOOLS%\set_%%Y.bat" 64 65 65 66 IF ERRORLEVEL 1 ( 66 67 ECHO Could not set variables for %%Y. 67 68 GOTO errors 68 69 ) 69 70 70 - %__ECHO% CALL "%TOOLS%\build.bat" %%C %%P 71 + %__ECHO3% CALL "%TOOLS%\build.bat" %%C %%P 71 72 72 73 IF ERRORLEVEL 1 ( 73 74 ECHO Could not build binaries for %%C/%%P/%%Y. 74 75 GOTO errors 75 76 ) 76 77 ) 77 78 )
Changes to Setup/build_ce.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 ................................................................................ 28 29 SET PLATFORMS="Pocket PC 2003 (ARMV4)" 29 30 SET PROCESSORS=arm 30 31 SET YEARS=2008 31 32 SET BASE_PLATFORM=PocketPC 32 33 33 34 CALL :fn_ResetErrorLevel 34 35 35 -%__ECHO% CALL "%TOOLS%\build_all.bat" 36 +%__ECHO3% CALL "%TOOLS%\build_all.bat" 36 37 37 38 IF ERRORLEVEL 1 ( 38 39 ECHO Failed to build PocketPC binaries. 39 40 GOTO errors 40 41 ) 41 42 42 43 :fn_ResetErrorLevel
Changes to Setup/release.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO2=ECHO 16 +REM SET __ECHO3=ECHO 15 17 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 18 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 19 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 20 19 21 %_AECHO% Running %0 %* 20 22 21 23 SET TOOLS=%~dp0 ................................................................................ 78 80 ) 79 81 ) 80 82 81 83 %_VECHO% Type = '%TYPE%' 82 84 83 85 CALL :fn_ResetErrorLevel 84 86 85 -%__ECHO% CALL "%TOOLS%\set_common.bat" 87 +%__ECHO3% CALL "%TOOLS%\set_common.bat" 86 88 87 89 IF ERRORLEVEL 1 ( 88 90 ECHO Could not set common variables. 89 91 GOTO errors 90 92 ) 91 93 92 94 IF NOT DEFINED FRAMEWORK ( ................................................................................ 106 108 SET TOOLS=%TOOLS:~0,-1% 107 109 108 110 %_VECHO% Root = '%ROOT%' 109 111 %_VECHO% Tools = '%TOOLS%' 110 112 111 113 CALL :fn_ResetErrorLevel 112 114 113 -%__ECHO% PUSHD "%ROOT%" 115 +%__ECHO2% PUSHD "%ROOT%" 114 116 115 117 IF ERRORLEVEL 1 ( 116 118 ECHO Could not change directory to "%ROOT%". 117 119 GOTO errors 118 120 ) 119 121 120 122 FOR /F "delims=" %%V IN ('find.exe "AssemblyVersion" System.Data.SQLite\AssemblyInfo.cs') DO ( ................................................................................ 177 179 %__ECHO% zip.exe -v -j -r "Setup\Output\sqlite-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%PLATFORM%\%CONFIGURATION%%CONFIGURATIONSUFFIX%" -x @exclude_bin.txt 178 180 179 181 IF ERRORLEVEL 1 ( 180 182 ECHO Failed to archive binary files. 181 183 GOTO errors 182 184 ) 183 185 184 -%__ECHO% POPD 186 +%__ECHO2% POPD 185 187 186 188 IF ERRORLEVEL 1 ( 187 189 ECHO Could not restore directory. 188 190 GOTO errors 189 191 ) 190 192 191 193 GOTO no_errors
Changes to Setup/release_all.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 22 23 SET TOOLS=%TOOLS:~0,-1% 23 24 24 25 %_VECHO% Tools = '%TOOLS%' 25 26 26 27 CALL :fn_ResetErrorLevel 27 28 28 -%__ECHO% CALL "%TOOLS%\vsSp.bat" 29 +%__ECHO3% CALL "%TOOLS%\vsSp.bat" 29 30 30 31 IF ERRORLEVEL 1 ( 31 32 ECHO Could not detect Visual Studio. 32 33 GOTO errors 33 34 ) 34 35 35 -%__ECHO% CALL "%TOOLS%\set_common.bat" 36 +%__ECHO3% CALL "%TOOLS%\set_common.bat" 36 37 37 38 IF ERRORLEVEL 1 ( 38 39 ECHO Could not set common variables. 39 40 GOTO errors 40 41 ) 41 42 42 43 IF NOT DEFINED RELEASE_CONFIGURATIONS ( ................................................................................ 56 57 ) 57 58 58 59 %_VECHO% Years = '%YEARS%' 59 60 60 61 FOR %%C IN (%RELEASE_CONFIGURATIONS%) DO ( 61 62 FOR %%P IN (%PLATFORMS%) DO ( 62 63 FOR %%Y IN (%YEARS%) DO ( 63 - %__ECHO% CALL "%TOOLS%\release.bat" %%C %%P %%Y 64 + %__ECHO3% CALL "%TOOLS%\release.bat" %%C %%P %%Y 64 65 65 66 IF ERRORLEVEL 1 ( 66 67 ECHO Could not build release archive for %%C/%%P/%%Y. 67 68 GOTO errors 68 69 ) 69 70 ) 70 71 )
Changes to Setup/release_ce.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 ................................................................................ 29 30 SET PROCESSORS=arm 30 31 SET YEARS=2008 31 32 SET BASE_PLATFORM=PocketPC 32 33 SET TYPE=binary 33 34 34 35 CALL :fn_ResetErrorLevel 35 36 36 -%__ECHO% CALL "%TOOLS%\release_all.bat" 37 +%__ECHO3% CALL "%TOOLS%\release_all.bat" 37 38 38 39 IF ERRORLEVEL 1 ( 39 40 ECHO Failed to build PocketPC release files. 40 41 GOTO errors 41 42 ) 42 43 43 44 :fn_ResetErrorLevel
Changes to Setup/release_static.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO3=ECHO 15 16 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 17 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 18 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 19 19 20 %_AECHO% Running %0 %* 20 21 21 22 SET TOOLS=%~dp0 ................................................................................ 24 25 %_VECHO% Tools = '%TOOLS%' 25 26 26 27 SET CONFIGURATIONSUFFIX=Static 27 28 SET TYPE_PREFIX=static- 28 29 29 30 CALL :fn_ResetErrorLevel 30 31 31 -%__ECHO% CALL "%TOOLS%\release_all.bat" 32 +%__ECHO3% CALL "%TOOLS%\release_all.bat" 32 33 33 34 IF ERRORLEVEL 1 ( 34 35 ECHO Failed to build static release files. 35 36 GOTO errors 36 37 ) 37 38 38 39 :fn_ResetErrorLevel
Changes to Setup/test_all.bat.
8 8 :: Written by Joe Mistachkin. 9 9 :: Released to the public domain, use at your own risk! 10 10 :: 11 11 12 12 SETLOCAL 13 13 14 14 REM SET __ECHO=ECHO 15 +REM SET __ECHO2=ECHO 16 +REM SET __ECHO3=ECHO 15 17 IF NOT DEFINED _AECHO (SET _AECHO=REM) 16 18 IF NOT DEFINED _CECHO (SET _CECHO=REM) 17 19 IF NOT DEFINED _VECHO (SET _VECHO=REM) 18 20 19 21 %_AECHO% Running %0 %* 20 22 21 23 SET DUMMY2=%1 ................................................................................ 40 42 SET TOOLS=%~dp0 41 43 SET TOOLS=%TOOLS:~0,-1% 42 44 43 45 %_VECHO% Tools = '%TOOLS%' 44 46 45 47 CALL :fn_ResetErrorLevel 46 48 47 -%__ECHO% CALL "%TOOLS%\vsSp.bat" 49 +%__ECHO3% CALL "%TOOLS%\vsSp.bat" 48 50 49 51 IF ERRORLEVEL 1 ( 50 52 ECHO Could not detect Visual Studio. 51 53 GOTO errors 52 54 ) 53 55 54 -%__ECHO% CALL "%TOOLS%\set_common.bat" 56 +%__ECHO3% CALL "%TOOLS%\set_common.bat" 55 57 56 58 IF ERRORLEVEL 1 ( 57 59 ECHO Could not set common variables. 58 60 GOTO errors 59 61 ) 60 62 61 63 IF NOT DEFINED YEARS ( ................................................................................ 75 77 IF NOT DEFINED PLATFORM ( 76 78 ECHO Unsupported platform. 77 79 GOTO errors 78 80 ) 79 81 80 82 %_VECHO% Platform = '%PLATFORM%' 81 83 82 -%__ECHO% PUSHD "%ROOT%" 84 +%__ECHO2% PUSHD "%ROOT%" 83 85 84 86 IF ERRORLEVEL 1 ( 85 87 ECHO Could not change directory to "%ROOT%". 86 88 GOTO errors 87 89 ) 88 90 89 91 FOR %%Y IN (%YEARS%) DO ( ................................................................................ 146 148 IF ERRORLEVEL 1 ( 147 149 ECHO Testing of "%%Y" mixed-mode assembly failed. 148 150 GOTO errors 149 151 ) 150 152 ) 151 153 ) 152 154 153 -%__ECHO% POPD 155 +%__ECHO2% POPD 154 156 155 157 IF ERRORLEVEL 1 ( 156 158 ECHO Could not restore directory. 157 159 GOTO errors 158 160 ) 159 161 160 162 GOTO no_errors