Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove unnecessary nesting of 'if' blocks in the command line argument processing. Add comments and fixup some whitespace. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
f909e1b7b15407de6a7ad30a9c3657cc |
| User & Date: | mistachkin 2012-01-04 07:15:51 |
Context
|
2012-01-05
| ||
| 06:37 | Merge the VS installer integration fixes and changes to the trunk. check-in: 2db8c0b5a5 user: mistachkin tags: trunk | |
|
2012-01-04
| ||
| 09:41 | Add the VS designer components and the rewritten installer for them to the setup package. check-in: bcdca9ada5 user: mistachkin tags: VsSetupIntegration | |
| 07:15 | Remove unnecessary nesting of 'if' blocks in the command line argument processing. Add comments and fixup some whitespace. check-in: f909e1b7b1 user: mistachkin tags: trunk | |
| 05:55 | Fix an incorrect comment. check-in: 8887a9f786 user: mistachkin tags: trunk | |
Changes
Changes to tools/install/Installer.cs.
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 ... 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 ... 411 412 413 414 415 416 417 418 419 420 421 422 423 424 ... 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 ... 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 ... 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 .... 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 .... 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 .... 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 .... 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 .... 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 .... 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 .... 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 .... 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 .... 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 |
Lowest = 0x1,
Lower = 0x2,
Low = 0x4,
Medium = 0x8,
High = 0x10,
Higher = 0x20,
Highest = 0x40,
Debug = Medium,
Trace = Medium
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
internal static class Installer
................................................................................
public static void DebugCore(
string message,
string category
)
{
lock (syncRoot)
{
//
// NOTE: For a build without "DEBUG" defined, we cannot
// simply use the Debug class (i.e. it will do
// nothing); therefore, use the console directly
// instead.
//
#if DEBUG
Debug.WriteLine(message, category);
Debug.Flush();
#else
Console.WriteLine(String.Format("{1}: {0}", message,
category));
#endif
}
}
///////////////////////////////////////////////////////////////////
................................................................................
public static void TraceCore(
string message,
string category
)
{
lock (syncRoot)
{
Trace.WriteLine(message, category);
Trace.Flush();
}
}
///////////////////////////////////////////////////////////////////
................................................................................
//
// NOTE: If not specified, use the default debug callback.
//
if (debugCallback == null)
debugCallback = DebugCore;
//
// NOTE: Write the formatted message to all the active
// debug listeners.
//
debugCallback(formatted, category);
}
//
// NOTE: If the trace priority of this message is less than
// what we currently want to trace, skip it.
................................................................................
//
// NOTE: If not specified, use the default trace callback.
//
if (traceCallback == null)
traceCallback = TraceCore;
//
// NOTE: Write the formatted message to all the active
// trace listeners.
//
traceCallback(formatted, category);
}
return message;
}
#endregion
................................................................................
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
if (!disposed)
return;
throw new ObjectDisposedException(typeof(MockRegistryKey).Name);
}
///////////////////////////////////////////////////////////////////
private /* protected virtual */ void Dispose(
bool disposing
)
................................................................................
bool verbose
)
{
if (rootKey == null)
return null;
if (verbose)
TraceOps.DebugAndTrace(
writable ? TracePriority.Highest : TracePriority.Higher,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}, writable = {2}",
ForDisplay(rootKey), ForDisplay(subKeyName),
ForDisplay(writable)), traceCategory);
//
// HACK: Always forbid writable access when operating in
................................................................................
{
if (rootKey == null)
return null;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey),
ForDisplay(subKeyName)), traceCategory);
try
{
//
// HACK: Always open a key, rather than creating one when
// operating in 'what-if' mode.
//
if (whatIf)
{
//
// HACK: Attempt to open the specified sub-key. If
// this fails, we will simply return the root key
// itself since no writes are allowed in
// 'what-if' mode anyhow.
//
MockRegistryKey key = rootKey.OpenSubKey(subKeyName);
return (key != null) ?
key : new MockRegistryKey(
rootKey, subKeyName, true, false, false);
................................................................................
{
if (rootKey == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey),
ForDisplay(subKeyName)), traceCategory);
if (!whatIf)
rootKey.DeleteSubKey(subKeyName);
subKeysDeleted++;
}
................................................................................
{
if (rootKey == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey),
ForDisplay(subKeyName)), traceCategory);
if (!whatIf)
rootKey.DeleteSubKeyTree(subKeyName);
subKeysDeleted++;
}
................................................................................
{
if (key == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"key = {0}, name = {1}, value = {2}", ForDisplay(key),
ForDisplay(name), ForDisplay(value)), traceCategory);
if (!whatIf)
key.SetValue(name, value);
keyValuesSet++;
}
................................................................................
int length = args.Length;
for (int index = 0; index < length; index++)
{
string arg = args[index];
if (String.IsNullOrEmpty(arg))
continue;
string newArg = arg;
if (CheckOption(ref newArg))
{
//
// NOTE: All the supported command line options must
// have a value; therefore, attempt to advance
// to it now. If we fail, we are done.
//
index++;
................................................................................
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, "logFileName"))
{
configuration.logFileName = text;
}
................................................................................
{
error = TraceOps.DebugAndTrace(
TracePriority.Lowest, debugCallback,
traceCallback, String.Format(
"Unsupported command line option: {0}",
ForDisplay(arg)), traceCategory);
if (strict)
return false;
}
}
else
{
error = TraceOps.DebugAndTrace(
TracePriority.Lowest, debugCallback,
traceCallback, String.Format(
"Unsupported command line argument: {0}",
ForDisplay(arg)), traceCategory);
if (strict)
return false;
}
}
return true;
}
................................................................................
if (!Configuration.FromArgs(
args, true, ref configuration, ref error) ||
!Configuration.Process(
args, configuration, true, ref error) ||
!Configuration.CheckRuntimeVersion(
configuration, true, ref error))
{
TraceOps.ShowMessage(
TracePriority.Highest, debugCallback, traceCallback,
thisAssembly, error, traceCategory,
MessageBoxButtons.OK, MessageBoxIcon.Error);
return 1; /* FAILURE */
}
#endregion
///////////////////////////////////////////////////////////////////
|
| | > > > > > > > > < < < < > > > > | > | | > | | > | | | | > | | | | > | | > | | > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > | > | < < < < < < < < < < < < | | | | |
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 ... 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 ... 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 ... 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 ... 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 ... 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 .... 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 .... 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 .... 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 .... 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 .... 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 .... 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 .... 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 .... 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 .... 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 |
Lowest = 0x1,
Lower = 0x2,
Low = 0x4,
Medium = 0x8,
High = 0x10,
Higher = 0x20,
Highest = 0x40,
Debug = Medium, /* NOTE: Default for debug messages. */
Trace = Medium /* NOTE: Default for trace messages. */
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
internal static class Installer
................................................................................
public static void DebugCore(
string message,
string category
)
{
lock (syncRoot)
{
#if DEBUG
//
// NOTE: Write the message to all the active debug
// listeners.
//
Debug.WriteLine(message, category);
Debug.Flush();
#else
//
// NOTE: For a build without "DEBUG" defined, we cannot
// simply use the Debug class (i.e. it will do
// nothing); therefore, use the console directly
// instead.
//
Console.WriteLine(String.Format("{1}: {0}", message,
category));
#endif
}
}
///////////////////////////////////////////////////////////////////
................................................................................
public static void TraceCore(
string message,
string category
)
{
lock (syncRoot)
{
//
// NOTE: Write the message to all the active trace
// listeners.
//
Trace.WriteLine(message, category);
Trace.Flush();
}
}
///////////////////////////////////////////////////////////////////
................................................................................
//
// NOTE: If not specified, use the default debug callback.
//
if (debugCallback == null)
debugCallback = DebugCore;
//
// NOTE: Invoke the debug callback with the formatted
// message and the category specified by the
// caller.
//
debugCallback(formatted, category);
}
//
// NOTE: If the trace priority of this message is less than
// what we currently want to trace, skip it.
................................................................................
//
// NOTE: If not specified, use the default trace callback.
//
if (traceCallback == null)
traceCallback = TraceCore;
//
// NOTE: Invoke the trace callback with the formatted
// message and the category specified by the
// caller.
//
traceCallback(formatted, category);
}
return message;
}
#endregion
................................................................................
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
if (!disposed)
return;
throw new ObjectDisposedException(
typeof(MockRegistryKey).Name);
}
///////////////////////////////////////////////////////////////////
private /* protected virtual */ void Dispose(
bool disposing
)
................................................................................
bool verbose
)
{
if (rootKey == null)
return null;
if (verbose)
TraceOps.DebugAndTrace(writable ?
TracePriority.Highest : TracePriority.Higher,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}, writable = {2}",
ForDisplay(rootKey), ForDisplay(subKeyName),
ForDisplay(writable)), traceCategory);
//
// HACK: Always forbid writable access when operating in
................................................................................
{
if (rootKey == null)
return null;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}",
ForDisplay(rootKey), ForDisplay(subKeyName)),
traceCategory);
try
{
//
// HACK: Always open a key, rather than creating one when
// operating in 'what-if' mode.
//
if (whatIf)
{
//
// HACK: Attempt to open the specified sub-key. If
// this fails, we will simply return the root
// key itself since no writes are allowed in
// 'what-if' mode anyhow.
//
MockRegistryKey key = rootKey.OpenSubKey(subKeyName);
return (key != null) ?
key : new MockRegistryKey(
rootKey, subKeyName, true, false, false);
................................................................................
{
if (rootKey == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}",
ForDisplay(rootKey), ForDisplay(subKeyName)),
traceCategory);
if (!whatIf)
rootKey.DeleteSubKey(subKeyName);
subKeysDeleted++;
}
................................................................................
{
if (rootKey == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"rootKey = {0}, subKeyName = {1}",
ForDisplay(rootKey), ForDisplay(subKeyName)),
traceCategory);
if (!whatIf)
rootKey.DeleteSubKeyTree(subKeyName);
subKeysDeleted++;
}
................................................................................
{
if (key == null)
return;
if (verbose)
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"key = {0}, name = {1}, value = {2}",
ForDisplay(key), ForDisplay(name), ForDisplay(value)),
traceCategory);
if (!whatIf)
key.SetValue(name, value);
keyValuesSet++;
}
................................................................................
int length = args.Length;
for (int index = 0; index < length; index++)
{
string arg = args[index];
//
// NOTE: Skip any argument that is null (?) or an empty
// string.
//
if (String.IsNullOrEmpty(arg))
continue;
//
// NOTE: We are going to modify the original argument
// by removing any leading option characters;
// therefore, we use a new string to hold the
// modified argument.
//
string newArg = arg;
//
// NOTE: All the supported command line options must
// begin with an option character (e.g. a minus
// or forward slash); attempt to validate that
// now. If we fail in strict mode, we are done;
// otherwise, just skip this argument and advance
// to the next one.
//
if (!CheckOption(ref newArg))
{
error = TraceOps.DebugAndTrace(
TracePriority.Lowest, debugCallback,
traceCallback, String.Format(
"Unsupported command line argument: {0}",
ForDisplay(arg)), traceCategory);
if (strict)
return false;
continue;
}
//
// NOTE: All the supported command line options must
// have a value; therefore, attempt to advance
// to it now. If we fail, we are done.
//
index++;
................................................................................
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, "logFileName"))
{
configuration.logFileName = text;
}
................................................................................
{
error = TraceOps.DebugAndTrace(
TracePriority.Lowest, debugCallback,
traceCallback, String.Format(
"Unsupported command line option: {0}",
ForDisplay(arg)), traceCategory);
if (strict)
return false;
}
}
return true;
}
................................................................................
if (!Configuration.FromArgs(
args, true, ref configuration, ref error) ||
!Configuration.Process(
args, configuration, true, ref error) ||
!Configuration.CheckRuntimeVersion(
configuration, true, ref error))
{
TraceOps.ShowMessage(TracePriority.Highest,
debugCallback, traceCallback, thisAssembly,
error, traceCategory, MessageBoxButtons.OK,
MessageBoxIcon.Error);
return 1; /* FAILURE */
}
#endregion
///////////////////////////////////////////////////////////////////
|