Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add more trace priorities and adjust those used by some of the log messages. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
93f4a6f6746c316d5692aa8be635f8ca |
| User & Date: | mistachkin 2012-01-05 10:02:04 |
Context
|
2012-01-06
| ||
| 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 | |
| 09:16 | Modularize the way test files / databases are cleaned up. Log the overall result of the VS designer components installer. Also, use the 'Higher' trace priority more consistently. check-in: 33948813dd user: mistachkin tags: trunk | |
Changes
Changes to Tests/installer.eagle.
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 ... 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 ... 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority High -install true \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority High -install false \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority High -install true \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority High -install false \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
|
| | | | | | | | |
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 ... 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 ... 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx40 true -noVs2010 true \
-whatIf true -verbose true -confirm true -install false \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install true \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
................................................................................
cleanupFile $fileName
} -body {
set output ""
set code [catch {
testClrExec $installerExeFile [list -eventflags Wait -stdout output \
-success 0] -debugPriority Lowest -tracePriority MediumHigh \
-noRuntimeVersion true -noCompact true -noNetFx20 true -noVs2008 true \
-whatIf true -verbose true -confirm true -install false \
-logFileName [appendArgs \" [file nativename $fileName] \"] \
-traceFormat [appendArgs \" "#{0}: {2}" \"]
} error]
tlog "---- BEGIN STDOUT OUTPUT\n"
tlog $output
tlog "\n---- END STDOUT OUTPUT\n"
|
Changes to tools/install/Installer.cs.
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 .... 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 .... 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 .... 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 .... 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 .... 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 .... 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 .... 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 .... 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 |
[Flags()]
public enum TracePriority
{
None = 0x0,
Lowest = 0x1,
Lower = 0x2,
Low = 0x4,
Medium = 0x8,
High = 0x10,
Higher = 0x20,
Highest = 0x40,
Default = Medium
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
................................................................................
//
// NOTE: Show where we are running from and how we were
// invoked.
//
string location = assembly.Location;
TraceOps.DebugAndTrace(TracePriority.Medium,
debugCallback, traceCallback, String.Format(
"Running executable is: {0}", ForDisplay(location)),
traceCategory);
TraceOps.DebugAndTrace(TracePriority.Medium,
debugCallback, traceCallback, String.Format(
"Original command line is: {0}",
Environment.CommandLine), traceCategory);
if (!configuration.whatIf)
{
//
// NOTE: If the debugger is attached and What-If mode
// is [now] disabled, issue a warning.
//
if (Debugger.IsAttached)
TraceOps.DebugAndTrace(TracePriority.Medium,
debugCallback, traceCallback,
"Forced to disable \"what-if\" mode with " +
"debugger attached.", traceCategory);
}
else
{
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback,
"No actual changes will be made to this " +
"system because \"what-if\" mode is enabled.",
traceCategory);
}
//
................................................................................
directory = Path.Combine(directory, "Config");
if (!Directory.Exists(directory))
{
TraceOps.DebugAndTrace(TracePriority.Low,
debugCallback, traceCallback, String.Format(
".NET Framework {0} directory {1} does not exist, " +
"skipping...", ForDisplay(frameworkVersion),
ForDisplay(directory)), traceCategory);
continue;
}
string fileName = Path.Combine(directory, "machine.config");
................................................................................
configuration, true, ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref saved, ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
///////////////////////////////////////////////////////////
#region Log Summary
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, String.Format(
"subKeysCreated = {0}, subKeysDeleted = {1}, " +
"keyValuesSet = {2}, keyValuesDeleted = {3}",
ForDisplay(RegistryHelper.SubKeysCreated),
ForDisplay(RegistryHelper.SubKeysDeleted),
ForDisplay(RegistryHelper.KeyValuesSet),
ForDisplay(RegistryHelper.KeyValuesDeleted)),
traceCategory);
#endregion
///////////////////////////////////////////////////////////
TraceOps.DebugAndTrace(TracePriority.High,
debugCallback, traceCallback, "Success.",
traceCategory);
return 0; /* SUCCESS */
}
}
catch (Exception e)
|
> | > | | | | | | | | | | | | | | | | | |
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 .... 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 .... 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 .... 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 .... 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 .... 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 .... 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 .... 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 .... 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 |
[Flags()]
public enum TracePriority
{
None = 0x0,
Lowest = 0x1,
Lower = 0x2,
Low = 0x4,
MediumLow = 0x8,
Medium = 0x10,
MediumHigh = 0x20,
High = 0x40,
Higher = 0x80,
Highest = 0x100,
Default = Medium
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
................................................................................
//
// NOTE: Show where we are running from and how we were
// invoked.
//
string location = assembly.Location;
TraceOps.DebugAndTrace(TracePriority.MediumLow,
debugCallback, traceCallback, String.Format(
"Running executable is: {0}", ForDisplay(location)),
traceCategory);
TraceOps.DebugAndTrace(TracePriority.MediumLow,
debugCallback, traceCallback, String.Format(
"Original command line is: {0}",
Environment.CommandLine), traceCategory);
if (!configuration.whatIf)
{
//
// NOTE: If the debugger is attached and What-If mode
// is [now] disabled, issue a warning.
//
if (Debugger.IsAttached)
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback,
"Forced to disable \"what-if\" mode with " +
"debugger attached.", traceCategory);
}
else
{
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback,
"No actual changes will be made to this " +
"system because \"what-if\" mode is enabled.",
traceCategory);
}
//
................................................................................
directory = Path.Combine(directory, "Config");
if (!Directory.Exists(directory))
{
TraceOps.DebugAndTrace(TracePriority.Low,
debugCallback, traceCallback, String.Format(
".NET Framework {0} directory {1} does not " +
"exist, skipping...", ForDisplay(frameworkVersion),
ForDisplay(directory)), traceCategory);
continue;
}
string fileName = Path.Combine(directory, "machine.config");
................................................................................
configuration, true, ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref saved, ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
................................................................................
ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Failure.",
traceCategory);
return 1; /* FAILURE */
}
}
#endregion
///////////////////////////////////////////////////////////
#region Log Summary
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, String.Format(
"subKeysCreated = {0}, subKeysDeleted = {1}, " +
"keyValuesSet = {2}, keyValuesDeleted = {3}",
ForDisplay(RegistryHelper.SubKeysCreated),
ForDisplay(RegistryHelper.SubKeysDeleted),
ForDisplay(RegistryHelper.KeyValuesSet),
ForDisplay(RegistryHelper.KeyValuesDeleted)),
traceCategory);
#endregion
///////////////////////////////////////////////////////////
TraceOps.DebugAndTrace(TracePriority.MediumHigh,
debugCallback, traceCallback, "Success.",
traceCategory);
return 0; /* SUCCESS */
}
}
catch (Exception e)
|