Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a 'debug' command line option and refactor how trace messages are handled. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
47b1df5884fca39a7b5ccf43d3c6b872 |
User & Date: | mistachkin 2012-01-06 09:17:45.350 |
Context
2012-01-06
| ||
09:58 | When the setup package runs the VS designer component installer, make sure the generated log files contain as much diagnostic information as possible. check-in: 493e633c2d user: mistachkin tags: trunk | |
09:17 | Add a 'debug' command line option and refactor how trace messages are handled. check-in: 47b1df5884 user: mistachkin tags: trunk | |
2012-01-05
| ||
10:02 | Add more trace priorities and adjust those used by some of the log messages. check-in: 93f4a6f674 user: mistachkin tags: trunk | |
Changes
Changes to Tests/installer.eagle.
︙ | ︙ | |||
34 35 36 37 38 39 40 | Uninstaller_Test_Vs2008.log]] set testUninstallVs2010LogFile [file nativename [file join $path \ Uninstaller_Test_Vs2010.log]] # # NOTE: Setup the test constraints specific to the tests in this file. # | | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | Uninstaller_Test_Vs2008.log]] set testUninstallVs2010LogFile [file nativename [file join $path \ Uninstaller_Test_Vs2010.log]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $installerExeFile]]]} then { checkForFile $test_channel $installerExeFile } if {![haveConstraint [appendArgs file_ \ [file tail $testInstallVs2008LogFile]]]} then { checkForFile $test_channel $testInstallVs2008LogFile } |
︙ | ︙ | |||
61 62 63 64 65 66 67 | [file tail $testUninstallVs2010LogFile]]]} then { checkForFile $test_channel $testUninstallVs2010LogFile } ############################################################################### runTest {test installer-1.1 {installer tool / Visual Studio 2008} -setup { | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | [file tail $testUninstallVs2010LogFile]]]} then { checkForFile $test_channel $testUninstallVs2010LogFile } ############################################################################### runTest {test installer-1.1 {installer tool / Visual Studio 2008} -setup { set fileName [file join [getTemporaryPath] [file tail [string map [list \ .log [appendArgs _ [pid] .log]] $testInstallVs2008LogFile]]] cleanupFile $fileName } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ |
︙ | ︙ | |||
93 94 95 96 97 98 99 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2008 System.Data.SQLite.dll_v2.0.50727\ file_Installer.exe file_Installer_Test_Vs2008.log} -result {0 True}} ############################################################################### runTest {test installer-1.2 {uninstaller tool / Visual Studio 2008} -setup { | | | | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2008 System.Data.SQLite.dll_v2.0.50727\ file_Installer.exe file_Installer_Test_Vs2008.log} -result {0 True}} ############################################################################### runTest {test installer-1.2 {uninstaller tool / Visual Studio 2008} -setup { set fileName [file join [getTemporaryPath] [file tail [string map [list \ .log [appendArgs _ [pid] .log]] $testUninstallVs2008LogFile]]] cleanupFile $fileName } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ |
︙ | ︙ | |||
125 126 127 128 129 130 131 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2008 System.Data.SQLite.dll_v2.0.50727\ file_Installer.exe file_Uninstaller_Test_Vs2008.log} -result {0 True}} ############################################################################### runTest {test installer-1.3 {installer tool / Visual Studio 2010} -setup { | | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2008 System.Data.SQLite.dll_v2.0.50727\ file_Installer.exe file_Uninstaller_Test_Vs2008.log} -result {0 True}} ############################################################################### runTest {test installer-1.3 {installer tool / Visual Studio 2010} -setup { set fileName [file join [getTemporaryPath] [file tail [string map [list \ .log [appendArgs _ [pid] .log]] $testInstallVs2010LogFile]]] cleanupFile $fileName } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ |
︙ | ︙ | |||
157 158 159 160 161 162 163 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2010 System.Data.SQLite.dll_v4.0.30319\ file_Installer.exe file_Installer_Test_Vs2010.log} -result {0 True}} ############################################################################### runTest {test installer-1.4 {uninstaller tool / Visual Studio 2010} -setup { | | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | unset -nocomplain code output error fileName } -constraints {eagle visualStudio2010 System.Data.SQLite.dll_v4.0.30319\ file_Installer.exe file_Installer_Test_Vs2010.log} -result {0 True}} ############################################################################### runTest {test installer-1.4 {uninstaller tool / Visual Studio 2010} -setup { set fileName [file join [getTemporaryPath] [file tail [string map [list \ .log [appendArgs _ [pid] .log]] $testUninstallVs2010LogFile]]] cleanupFile $fileName } -body { set output "" set code [catch { testClrExec $installerExeFile [list -eventflags Wait -stdout output \ |
︙ | ︙ |
Changes to tools/install/Installer.cs.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | /* * Installer.cs -- * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ using System.Collections.Generic; using System.Diagnostics; using System.EnterpriseServices.Internal; using System.IO; using System.Reflection; using System.Runtime.CompilerServices; using System.Threading; | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | /* * Installer.cs -- * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ using System; using System.Collections.Generic; using System.Diagnostics; using System.EnterpriseServices.Internal; using System.IO; using System.Reflection; using System.Runtime.CompilerServices; using System.Threading; |
︙ | ︙ | |||
180 181 182 183 184 185 186 187 188 189 190 191 192 193 | /////////////////////////////////////////////////////////////////// #region Private Static Data private static object syncRoot = new object(); private static long nextDebugId; private static long nextTraceId; private static TracePriority debugPriority = TracePriority.Default; private static TracePriority tracePriority = TracePriority.Default; private static string debugFormat = DefaultDebugFormat; private static string traceFormat = DefaultTraceFormat; #endregion /////////////////////////////////////////////////////////////////// | > | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | /////////////////////////////////////////////////////////////////// #region Private Static Data private static object syncRoot = new object(); private static long nextDebugId; private static long nextTraceId; private static IList<TraceListener> debugListeners; private static TracePriority debugPriority = TracePriority.Default; private static TracePriority tracePriority = TracePriority.Default; private static string debugFormat = DefaultDebugFormat; private static string traceFormat = DefaultTraceFormat; #endregion /////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
223 224 225 226 227 228 229 | set { lock (syncRoot) { traceFormat = value; } } } #endregion /////////////////////////////////////////////////////////////////// #region Interactive Support Methods | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | set { lock (syncRoot) { traceFormat = value; } } } #endregion /////////////////////////////////////////////////////////////////// #region Interactive Support Methods public static DialogResult ShowMessage( TracePriority tracePriority, TraceCallback debugCallback, TraceCallback traceCallback, Assembly assembly, string message, string category, |
︙ | ︙ | |||
298 299 300 301 302 303 304 305 306 307 308 309 310 311 | return result; } #endregion /////////////////////////////////////////////////////////////////// #region Tracing Support Methods public static long NextDebugId() { return Interlocked.Increment(ref nextDebugId); } /////////////////////////////////////////////////////////////////// | > > > > > > > > > > | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | return result; } #endregion /////////////////////////////////////////////////////////////////// #region Tracing Support Methods public static void SetupDebugListeners() { if (debugListeners == null) debugListeners = new List<TraceListener>(); debugListeners.Add(new ConsoleTraceListener()); } /////////////////////////////////////////////////////////////////// public static long NextDebugId() { return Interlocked.Increment(ref nextDebugId); } /////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
390 391 392 393 394 395 396 | public static void DebugCore( string message, string category ) { lock (syncRoot) { | | < < > | < > | | < < < < < < < < < < > > | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | public static void DebugCore( string message, string category ) { lock (syncRoot) { if (debugListeners != null) { foreach (TraceListener listener in debugListeners) { listener.WriteLine(message, category); listener.Flush(); } } } } /////////////////////////////////////////////////////////////////// public static void TraceCore( string message, |
︙ | ︙ | |||
490 491 492 493 494 495 496 | // // NOTE: Format the message for display (once). // string formatted = String.Format("{0}: {1}", GetMethodName(stackTrace, level), message); // | > | | > | < < < < < < > | | > | < < < < < < | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 | // // NOTE: Format the message for display (once). // string formatted = String.Format("{0}: {1}", GetMethodName(stackTrace, level), message); // // NOTE: If the debug callback is invalid or the trace priority // of this message is less than what we currently want to // debug, skip it. // if ((debugCallback != null) && (tracePriority >= DebugPriority)) { // // NOTE: Invoke the debug callback with the formatted // message and the category specified by the // caller. // debugCallback(formatted, category); } // // NOTE: If the trace callback is invalid or the trace priority // of this message is less than what we currently want to // trace, skip it. // if ((traceCallback != null) && (tracePriority >= TracePriority)) { // // NOTE: Invoke the trace callback with the formatted // message and the category specified by the // caller. // traceCallback(formatted, category); } |
︙ | ︙ | |||
1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 | bool noVs2008, bool noVs2010, bool noTrace, bool noConsole, bool noLog, bool throwOnMissing, bool whatIf, bool verbose, bool confirm ) { this.assembly = assembly; this.logFileName = logFileName; this.directory = directory; | > | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 | bool noVs2008, bool noVs2010, bool noTrace, bool noConsole, bool noLog, bool throwOnMissing, bool whatIf, bool debug, bool verbose, bool confirm ) { this.assembly = assembly; this.logFileName = logFileName; this.directory = directory; |
︙ | ︙ | |||
1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 | this.noVs2008 = noVs2008; this.noVs2010 = noVs2010; this.noTrace = noTrace; this.noConsole = noConsole; this.noLog = noLog; this.throwOnMissing = throwOnMissing; this.whatIf = whatIf; this.verbose = verbose; this.confirm = confirm; } #endregion /////////////////////////////////////////////////////////////////// | > | 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 | this.noVs2008 = noVs2008; this.noVs2010 = noVs2010; this.noTrace = noTrace; this.noConsole = noConsole; this.noLog = noLog; this.throwOnMissing = throwOnMissing; this.whatIf = whatIf; this.debug = debug; this.verbose = verbose; this.confirm = confirm; } #endregion /////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1982 1983 1984 1985 1986 1987 1988 | return new Configuration(thisAssembly, null, directory, coreFileName, linqFileName, designerFileName, TraceOps.DebugFormat, TraceOps.TraceFormat, InstallFlags.Default, TracePriority.Default, TracePriority.Default, true, false, false, false, false, false, false, false, false, false, false, true, true, | | | 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 | return new Configuration(thisAssembly, null, directory, coreFileName, linqFileName, designerFileName, TraceOps.DebugFormat, TraceOps.TraceFormat, InstallFlags.Default, TracePriority.Default, TracePriority.Default, true, false, false, false, false, false, false, false, false, false, false, true, true, false, false, false); } /////////////////////////////////////////////////////////////////// public static bool FromArgs( string[] args, bool strict, |
︙ | ︙ | |||
2078 2079 2080 2081 2082 2083 2084 | // // NOTE: Figure out which command line option this is // (based on a partial name match) and then try // to interpret the textual value as the correct // type. // | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > | | > | > > | | > | | | 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 | // // NOTE: Figure out which command line option this is // (based on a partial name match) and then try // to interpret the textual value as the correct // type. // if (MatchOption(newArg, "confirm")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.confirm = (bool)value; } else if (MatchOption(newArg, "coreFileName")) { configuration.coreFileName = text; } else if (MatchOption(newArg, "debug")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.debug = (bool)value; } else if (MatchOption(newArg, "debugFormat")) { configuration.debugFormat = text; TraceOps.DebugFormat = configuration.debugFormat; } else if (MatchOption(newArg, "debugPriority")) { object value = ParseEnum( typeof(TracePriority), text, true); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.debugPriority = (TracePriority)value; TraceOps.DebugPriority = configuration.debugPriority; } else if (MatchOption(newArg, "designerFileName")) { configuration.designerFileName = text; } else if (MatchOption(newArg, "directory")) { configuration.directory = text; // // NOTE: *SPECIAL* Must refresh the file names |
︙ | ︙ | |||
2150 2151 2152 2153 2154 2155 2156 | if (String.IsNullOrEmpty(designerFileName)) designerFileName = Installer.DesignerFileName; configuration.designerFileName = Path.Combine( configuration.directory, designerFileName); } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 | if (String.IsNullOrEmpty(designerFileName)) designerFileName = Installer.DesignerFileName; configuration.designerFileName = Path.Combine( configuration.directory, designerFileName); } else if (MatchOption(newArg, "install")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( |
︙ | ︙ | |||
2260 2261 2262 2263 2264 2265 2266 | return false; continue; } configuration.installFlags = (InstallFlags)value; } | | > > > > > > > > | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < | 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 | return false; continue; } configuration.installFlags = (InstallFlags)value; } else if (MatchOption(newArg, "linqFileName")) { configuration.linqFileName = text; } else if (MatchOption(newArg, "logFileName")) { configuration.logFileName = text; } else if (MatchOption(newArg, "noCompact")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.noCompact = (bool)value; } else if (MatchOption(newArg, "noConsole")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.noConsole = (bool)value; } else if (MatchOption(newArg, "noDesktop")) { bool? value = ParseBoolean(text); if (value == null) { |
︙ | ︙ | |||
2386 2387 2388 2389 2390 2391 2392 | return false; continue; } configuration.noDesktop = (bool)value; } | | | | 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 | return false; continue; } configuration.noDesktop = (bool)value; } else if (MatchOption(newArg, "noLog")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.noLog = (bool)value; } else if (MatchOption(newArg, "noNetFx20")) { bool? value = ParseBoolean(text); if (value == null) { |
︙ | ︙ | |||
2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 | if (strict) return false; continue; } configuration.noNetFx40 = (bool)value; } else if (MatchOption(newArg, "noVs2008")) { bool? value = ParseBoolean(text); if (value == null) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 | if (strict) return false; continue; } configuration.noNetFx40 = (bool)value; } else if (MatchOption(newArg, "noRuntimeVersion")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.noRuntimeVersion = (bool)value; } else if (MatchOption(newArg, "noTrace")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.noTrace = (bool)value; } else if (MatchOption(newArg, "noVs2008")) { bool? value = ParseBoolean(text); if (value == null) { |
︙ | ︙ | |||
2491 2492 2493 2494 2495 2496 2497 | return false; continue; } configuration.noVs2010 = (bool)value; } | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < < < < < < < < < < < < < < < < < < < < | | 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 | return false; continue; } configuration.noVs2010 = (bool)value; } else if (MatchOption(newArg, "strict")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } // // NOTE: Allow the command line arguments to // override the "strictness" setting // provided by our caller. // strict = (bool)value; } else if (MatchOption(newArg, "throwOnMissing")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.throwOnMissing = (bool)value; } else if (MatchOption(newArg, "traceFormat")) { configuration.traceFormat = text; TraceOps.TraceFormat = configuration.traceFormat; } else if (MatchOption(newArg, "tracePriority")) { object value = ParseEnum( typeof(TracePriority), text, true); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.tracePriority = (TracePriority)value; TraceOps.TracePriority = configuration.tracePriority; } else if (MatchOption(newArg, "verbose")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.verbose = (bool)value; } else if (MatchOption(newArg, "whatIf")) { bool? value = ParseBoolean(text); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} boolean value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.whatIf = (bool)value; } else { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Unsupported command line option: {0}", |
︙ | ︙ | |||
2610 2611 2612 2613 2614 2615 2616 | } if (!configuration.noTrace) { if (!configuration.noLog && String.IsNullOrEmpty(configuration.logFileName)) { | > > > | > | > > > > > > > | < | | | | | < > > | 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 | } if (!configuration.noTrace) { if (!configuration.noLog && String.IsNullOrEmpty(configuration.logFileName)) { // // NOTE: Use the default log file name. // configuration.logFileName = GetLogFileName( "trace"); } /////////////////////////////////////////////////////// if (!configuration.noConsole) { // // NOTE: In verbose mode, debug output (that meets // the configured priority criteria) will be // displayed to the console; otherwise, trace // output (that meets the configured priority // criteria) will be displayed to the console. // if (configuration.debug) { // // NOTE: Add the console trace listener to the // list of trace listeners maintained by // the TraceOps class (i.e. only messages // that meet the debug priority will be // seen on the console). // TraceOps.SetupDebugListeners(); } else { // // NOTE: Add the console trace listener to the // list of built-in trace listeners (i.e. // only messages that meet the trace // priority will be seen on the console). // Trace.Listeners.Add(new ConsoleTraceListener()); } } /////////////////////////////////////////////////////// if (!configuration.noLog && !String.IsNullOrEmpty(configuration.logFileName)) { Trace.Listeners.Add(new TextWriterTraceListener( configuration.logFileName)); } |
︙ | ︙ | |||
2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 | traceCallback(String.Format(NameAndValueFormat, "ThrowOnMissing", ForDisplay(throwOnMissing)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "WhatIf", ForDisplay(whatIf)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "Verbose", ForDisplay(verbose)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "Confirm", ForDisplay(confirm)), traceCategory); } } #endregion /////////////////////////////////////////////////////////////////// #region Public Properties | > > > > > > > > > > > > > > > > > > > | 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 | traceCallback(String.Format(NameAndValueFormat, "ThrowOnMissing", ForDisplay(throwOnMissing)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "WhatIf", ForDisplay(whatIf)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "Debug", ForDisplay(debug)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "Verbose", ForDisplay(verbose)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "Confirm", ForDisplay(confirm)), traceCategory); /////////////////////////////////////////////////////////// if (assembly != null) { traceCallback(String.Format(NameAndValueFormat, "AssemblyTitle", ForDisplay(GetAssemblyTitle(assembly))), traceCategory); traceCallback(String.Format(NameAndValueFormat, "AssemblyConfiguration", ForDisplay(GetAssemblyConfiguration(assembly))), traceCategory); } } } #endregion /////////////////////////////////////////////////////////////////// #region Public Properties |
︙ | ︙ | |||
3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 | { get { return whatIf; } set { whatIf = value; } } /////////////////////////////////////////////////////////////////// private bool verbose; public bool Verbose { get { return verbose; } set { verbose = value; } } | > > > > > > > > > | 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 | { get { return whatIf; } set { whatIf = value; } } /////////////////////////////////////////////////////////////////// private bool debug; public bool Debug { get { return debug; } set { debug = value; } } /////////////////////////////////////////////////////////////////// private bool verbose; public bool Verbose { get { return verbose; } set { verbose = value; } } |
︙ | ︙ | |||
3359 3360 3361 3362 3363 3364 3365 | private static TraceCallback debugCallback = AppDebug; private static TraceCallback traceCallback = AppTrace; #endregion /////////////////////////////////////////////////////////////////////// #region Trace Handling | | > > | > > | | 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 | private static TraceCallback debugCallback = AppDebug; private static TraceCallback traceCallback = AppTrace; #endregion /////////////////////////////////////////////////////////////////////// #region Trace Handling private static string GetLogFileName( string typeName ) /* throw */ { string fileName = Path.GetTempFileName(); string directory = Path.GetDirectoryName(fileName); string fileNameOnly = Path.GetFileNameWithoutExtension(fileName); string newFileName = Path.Combine(directory, String.Format( "{0}{1}{2}", traceCategory, !String.IsNullOrEmpty(typeName) ? "." + typeName : String.Empty, "." + fileNameOnly + LogFileSuffix)); File.Move(fileName, newFileName); return newFileName; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 | type.IsSubclassOf(typeof(ValueType)) ? "{0}" : "\"{0}\"", result); } return result; } #endregion /////////////////////////////////////////////////////////////////////// #region .NET Framework Handling private static string GetImageRuntimeVersion( string fileName ) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 | type.IsSubclassOf(typeof(ValueType)) ? "{0}" : "\"{0}\"", result); } return result; } #endregion /////////////////////////////////////////////////////////////////////// #region Assembly Attribute Handling public static string GetAssemblyConfiguration( Assembly assembly ) { if (assembly != null) { try { if (assembly.IsDefined( typeof(AssemblyConfigurationAttribute), false)) { AssemblyConfigurationAttribute configuration = (AssemblyConfigurationAttribute) assembly.GetCustomAttributes( typeof(AssemblyConfigurationAttribute), false)[0]; return configuration.Configuration; } } catch { // do nothing. } } return null; } /////////////////////////////////////////////////////////////////////// public static string GetAssemblyTitle( Assembly assembly ) { if (assembly != null) { try { if (assembly.IsDefined( typeof(AssemblyTitleAttribute), false)) { AssemblyTitleAttribute title = (AssemblyTitleAttribute) assembly.GetCustomAttributes( typeof(AssemblyTitleAttribute), false)[0]; return title.Title; } } catch { // do nothing. } } return null; } #endregion /////////////////////////////////////////////////////////////////////// #region .NET Framework Handling private static string GetImageRuntimeVersion( string fileName ) |
︙ | ︙ |
Changes to tools/install/Properties/AssemblyInfo.cs.
1 | using System.Reflection; | < | 1 2 3 4 5 6 7 8 | using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("System.Data.SQLite Designer Installer")] [assembly: AssemblyDescription("ADO.NET Data Provider for SQLite")] |
︙ | ︙ |