System.Data.SQLite: Check-in [f909e1b7b1]

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
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	f909e1b7b15407de6a7ad30a9c3657cc5843d002
User & Date:	mistachkin 2012-01-04 07:15:51.291

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	95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110	- - + +	Lowest = 0x1, Lower = 0x2, Low = 0x4, Medium = 0x8, High = 0x10, Higher = 0x20, Highest = 0x40, ~~Debug = Medium, Trace = Medium~~ Debug = Medium, /* NOTE: Default for debug messages. / Trace = Medium / NOTE: Default for trace messages. */ } #endregion /////////////////////////////////////////////////////////////////////////// #region Installer Class internal static class Installer
︙
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 414 415 416 417 418 419 420 421 422 423 424	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 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432	+ + + + + + + + - - - - + + + +	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. // ~~#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) { // // NOTE: Write the message to all the active trace // listeners. // Trace.WriteLine(message, category); Trace.Flush(); } } ///////////////////////////////////////////////////////////////////
︙
490 491 492 493 494 495 496 ~~497 498~~ 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 ~~516 517~~ 518 519 520 521 522 523 524	498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534	- - + + + - - + + +	// // NOTE: If not specified, use the default debug callback. // if (debugCallback == null) debugCallback = DebugCore; // ~~// NOTE: ~~Write~~ the formatted ~~message to all the active~~ // ~~debug listen~~ers.~~ // 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. // if (tracePriority >= TracePriority) { // // NOTE: If not specified, use the default trace callback. // if (traceCallback == null) traceCallback = TraceCore; // ~~// NOTE: ~~Write~~ the formatted ~~message to all the active~~ // ~~trace listen~~ers.~~ // NOTE: Invoke the trace callback with the formatted // message and the category specified by the // caller. // traceCallback(formatted, category); } return message; } #endregion
︙
942 943 944 945 946 947 948 ~~949~~ 950 951 952 953 954 955 956	952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967	- + +	#region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw / { if (!disposed) return; ~~throw new ObjectDisposedException(~~typeof(MockRegistryKey).Name);~~~~ throw new ObjectDisposedException( typeof(MockRegistryKey).Name); } /////////////////////////////////////////////////////////////////// private / protected virtual */ void Dispose( bool disposing )
︙
1088 1089 1090 1091 1092 1093 1094 ~~1095 1096~~ 1097 1098 1099 1100 1101 1102 1103	1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114	- - + +	bool verbose ) { if (rootKey == null) return null; if (verbose) ~~TraceOps.DebugAndTrace( ~~writable ?~~ TracePriority.Highest : TracePriority.Higher,~~ 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
︙
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	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	- - + + + - - + +	{ if (rootKey == null) return null; if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( ~~"rootKey = {0}, subKeyName = {1}", ~~ForDisplay(rootKey),~~ ForDisplay(subKeyName)), ~~traceCategory);~~~~ "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~~ // 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);
︙
1172 1173 1174 1175 1176 1177 1178 ~~1179 1180~~ 1181 1182 1183 1184 1185 1186 1187	1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200	- - + + +	{ if (rootKey == null) return; if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( ~~"rootKey = {0}, subKeyName = {1}", ~~ForDisplay(rootKey),~~ ForDisplay(subKeyName)), ~~traceCategory);~~~~ "rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey), ForDisplay(subKeyName)), traceCategory); if (!whatIf) rootKey.DeleteSubKey(subKeyName); subKeysDeleted++; }
︙
1196 1197 1198 1199 1200 1201 1202 ~~1203 1204~~ 1205 1206 1207 1208 1209 1210 1211	1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225	- - + + +	{ if (rootKey == null) return; if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( ~~"rootKey = {0}, subKeyName = {1}", ~~ForDisplay(rootKey),~~ ForDisplay(subKeyName)), ~~traceCategory);~~~~ "rootKey = {0}, subKeyName = {1}", ForDisplay(rootKey), ForDisplay(subKeyName)), traceCategory); if (!whatIf) rootKey.DeleteSubKeyTree(subKeyName); subKeysDeleted++; }
︙
1263 1264 1265 1266 1267 1268 1269 ~~1270 1271~~ 1272 1273 1274 1275 1276 1277 1278	1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293	- - + + +	{ 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);~~~~ "key = {0}, name = {1}, value = {2}", ForDisplay(key), ForDisplay(name), ForDisplay(value)), traceCategory); if (!whatIf) key.SetValue(name, value); keyValuesSet++; }
︙
1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 ~~1698~~ 1699 ~~1700 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 ~~1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764~~ 1765 ~~1766 1767 1768 1769 1770 1771~~ 1772 ~~1773 1774~~ 1775 ~~1776 1777~~ 1778 ~~1779 1780~~ 1781 ~~1782~~ 1783 ~~1784 1785~~ 1786 ~~1787 1788~~ 1789 ~~1790 1791~~ 1792 ~~1793~~ 1794 ~~1795 1796~~ 1797 ~~1798 1799~~ 1800 ~~1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829~~ 1830 ~~1831 1832 1833 1834 1835 1836 1837 1838~~ 1839 ~~1840 1841~~ 1842 ~~1843 1844~~ 1845 ~~1846 1847 1848 1849 1850 1851 1852~~ 1853 ~~1854 1855 1856 1857 1858 1859 1860 1861~~ 1862 ~~1863 1864~~ 1865 ~~1866 1867~~ 1868 ~~1869 1870 1871 1872 1873 1874~~ 1875 ~~1876 1877 1878 1879 1880 1881 1882 1883~~ 1884 ~~1885 1886~~ 1887 ~~1888 1889~~ 1890 ~~1891 1892 1893 1894 1895 1896~~ 1897 ~~1898 1899 1900 1901 1902 1903 1904~~ 1905 ~~1906 1907~~ 1908 ~~1909 1910~~ 1911 ~~1912 1913 1914 1915 1916~~ 1917 ~~1918 1919 1920 1921 1922 1923 1924 1925~~ 1926 ~~1927 1928~~ 1929 ~~1930 1931~~ 1932 ~~1933 1934 1935 1936 1937~~ 1938 ~~1939 1940 1941 1942 1943 1944 1945 1946~~ 1947 ~~1948 1949~~ 1950 ~~1951 1952~~ 1953 ~~1954 1955 1956 1957 1958~~ 1959 ~~1960 1961 1962 1963 1964 1965 1966 1967~~ 1968 ~~1969 1970~~ 1971 ~~1972 1973~~ 1974 ~~1975 1976 1977 1978 1979~~ 1980 ~~1981 1982 1983 1984 1985 1986 1987 1988~~ 1989 ~~1990 1991~~ 1992 ~~1993 1994~~ 1995 ~~1996 1997 1998 1999 2000~~ 2001 ~~2002 2003 2004 2005 2006 2007 2008 2009~~ 2010 ~~2011 2012~~ 2013 ~~2014 2015~~ 2016 ~~2017 2018 2019 2020 2021~~ 2022 ~~2023 2024 2025 2026 2027 2028 2029 2030~~ 2031 ~~2032 2033~~ 2034 ~~2035 2036~~ 2037 ~~2038 2039 2040 2041 2042~~ 2043 ~~2044 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~~ 2136 ~~2137 2138~~ 2139 ~~2140 2141~~ 2142 ~~2143 2144 2145 2146 2147~~ 2148 ~~2149 2150 2151 2152 2153 2154 2155 2156~~ 2157 ~~2158 2159~~ 2160 ~~2161 2162~~ 2163 ~~2164 2165 2166 2167 2168~~ 2169 ~~2170 2171 2172 2173 2174 2175 2176 2177~~ 2178 ~~2179 2180~~ 2181 ~~2182 2183~~ 2184 ~~2185~~ ~~2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197~~ 2198 2199 2200 2201 2202 2203 ~~2204~~ 2205 2206 2207 2208 2209 2210 2211	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 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 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 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 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 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	+ + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - - +	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))~~ 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++; // // 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 (index >= length) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Missing value for option: {0}", ForDisplay(arg)), traceCategory); if (index >= length) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Missing value for option: {0}", ForDisplay(arg)), traceCategory); ~~if (strict) return false;~~ if (strict) return false; ~~break; }~~ break; } // // NOTE: Grab the textual value of this command line // option. // string text = args[index]; // // NOTE: Grab the textual value of this command line // option. // string text = args[index]; // // 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, "strict")) { bool? value = ParseBoolean(text); // // 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, "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 (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;~~ if (strict) return false; ~~continue; }~~ 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; } else if (MatchOption(newArg, "directory")) { configuration.directory = text; // // 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; } else if (MatchOption(newArg, "directory")) { configuration.directory = text; // // NOTE: SPECIAL Must refresh the file names // here because the underlying directory // has changed. // string coreFileName = configuration.coreFileName; // // NOTE: SPECIAL Must refresh the file names // here because the underlying directory // has changed. // string coreFileName = configuration.coreFileName; ~~if (!String.IsNullOrEmpty(coreFileName)) coreFileName = Path.GetFileName(coreFileName);~~ if (!String.IsNullOrEmpty(coreFileName)) coreFileName = Path.GetFileName(coreFileName); ~~if (String.IsNullOrEmpty(coreFileName)) coreFileName = Installer.CoreFileName;~~ if (String.IsNullOrEmpty(coreFileName)) coreFileName = Installer.CoreFileName; ~~configuration.coreFileName = Path.Combine( configuration.directory, coreFileName);~~ configuration.coreFileName = Path.Combine( configuration.directory, coreFileName); ~~string linqFileName = configuration.linqFileName;~~ string linqFileName = configuration.linqFileName; ~~if (!String.IsNullOrEmpty(linqFileName)) linqFileName = Path.GetFileName(linqFileName);~~ if (!String.IsNullOrEmpty(linqFileName)) linqFileName = Path.GetFileName(linqFileName); ~~if (String.IsNullOrEmpty(linqFileName)) linqFileName = Installer.LinqFileName;~~ if (String.IsNullOrEmpty(linqFileName)) linqFileName = Installer.LinqFileName; ~~configuration.linqFileName = Path.Combine( configuration.directory, linqFileName);~~ configuration.linqFileName = Path.Combine( configuration.directory, linqFileName); ~~string designerFileName = configuration.designerFileName;~~ string designerFileName = configuration.designerFileName; ~~if (!String.IsNullOrEmpty(designerFileName)) designerFileName = Path.GetFileName(designerFileName);~~ if (!String.IsNullOrEmpty(designerFileName)) designerFileName = Path.GetFileName(designerFileName); ~~if (String.IsNullOrEmpty(designerFileName)) designerFileName = Installer.DesignerFileName;~~ if (String.IsNullOrEmpty(designerFileName)) designerFileName = Installer.DesignerFileName; configuration.designerFileName = Path.Combine( configuration.directory, designerFileName); } else if (MatchOption(newArg, "coreFileName")) { configuration.coreFileName = text; } else if (MatchOption(newArg, "linqFileName")) { configuration.linqFileName = text; } else if (MatchOption(newArg, "designerFileName")) { configuration.designerFileName = text; } else if (MatchOption(newArg, "debugFormat")) { configuration.debugFormat = text; TraceOps.DebugFormat = configuration.debugFormat; } else if (MatchOption(newArg, "traceFormat")) { configuration.traceFormat = text; TraceOps.TraceFormat = configuration.traceFormat; } else if (MatchOption(newArg, "debugPriority")) { object value = ParseEnum( typeof(TracePriority), text, true); configuration.designerFileName = Path.Combine( configuration.directory, designerFileName); } else if (MatchOption(newArg, "coreFileName")) { configuration.coreFileName = text; } else if (MatchOption(newArg, "linqFileName")) { configuration.linqFileName = text; } else if (MatchOption(newArg, "designerFileName")) { configuration.designerFileName = text; } else if (MatchOption(newArg, "debugFormat")) { configuration.debugFormat = text; TraceOps.DebugFormat = configuration.debugFormat; } else if (MatchOption(newArg, "traceFormat")) { configuration.traceFormat = text; TraceOps.TraceFormat = configuration.traceFormat; } 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 (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); ~~if (strict) return false;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.debugPriority = (TracePriority)value; TraceOps.DebugPriority = configuration.debugPriority; } else if (MatchOption(newArg, "tracePriority")) { object value = ParseEnum( typeof(TracePriority), text, true); configuration.debugPriority = (TracePriority)value; TraceOps.DebugPriority = configuration.debugPriority; } 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 (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid {0} value: {1}", ForDisplay(arg), ForDisplay(text)), traceCategory); ~~if (strict) return false;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.tracePriority = (TracePriority)value; TraceOps.TracePriority = configuration.tracePriority; } else if (MatchOption(newArg, "install")) { bool? value = ParseBoolean(text); configuration.tracePriority = (TracePriority)value; TraceOps.TracePriority = configuration.tracePriority; } else if (MatchOption(newArg, "install")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.install = (bool)value; } else if (MatchOption(newArg, "installFlags")) { object value = ParseEnum( typeof(InstallFlags), text, true); configuration.install = (bool)value; } else if (MatchOption(newArg, "installFlags")) { object value = ParseEnum( typeof(InstallFlags), text, true); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid install flags value: {0}", ForDisplay(text)), traceCategory); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid install flags value: {0}", ForDisplay(text)), traceCategory); ~~if (strict) return false;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.installFlags = (InstallFlags)value; } else if (MatchOption(newArg, "noRuntimeVersion")) { bool? value = ParseBoolean(text); configuration.installFlags = (InstallFlags)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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noRuntimeVersion = (bool)value; } else if (MatchOption(newArg, "whatIf")) { bool? value = ParseBoolean(text); configuration.noRuntimeVersion = (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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.whatIf = (bool)value; } else if (MatchOption(newArg, "verbose")) { bool? value = ParseBoolean(text); configuration.whatIf = (bool)value; } 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.verbose = (bool)value; } else if (MatchOption(newArg, "confirm")) { bool? value = ParseBoolean(text); configuration.verbose = (bool)value; } else 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.confirm = (bool)value; } else if (MatchOption(newArg, "noDesktop")) { bool? value = ParseBoolean(text); configuration.confirm = (bool)value; } else if (MatchOption(newArg, "noDesktop")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noDesktop = (bool)value; } else if (MatchOption(newArg, "noCompact")) { bool? value = ParseBoolean(text); configuration.noDesktop = (bool)value; } 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noCompact = (bool)value; } else if (MatchOption(newArg, "noNetFx20")) { bool? value = ParseBoolean(text); configuration.noCompact = (bool)value; } else if (MatchOption(newArg, "noNetFx20")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noNetFx20 = (bool)value; } else if (MatchOption(newArg, "noNetFx40")) { bool? value = ParseBoolean(text); configuration.noNetFx20 = (bool)value; } else if (MatchOption(newArg, "noNetFx40")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noNetFx40 = (bool)value; } else if (MatchOption(newArg, "noVs2008")) { bool? value = ParseBoolean(text); configuration.noNetFx40 = (bool)value; } else if (MatchOption(newArg, "noVs2008")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noVs2008 = (bool)value; } else if (MatchOption(newArg, "noVs2010")) { bool? value = ParseBoolean(text); configuration.noVs2008 = (bool)value; } else if (MatchOption(newArg, "noVs2010")) { 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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noVs2010 = (bool)value; } else if (MatchOption(newArg, "noTrace")) { bool? value = ParseBoolean(text); configuration.noVs2010 = (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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noTrace = (bool)value; } else if (MatchOption(newArg, "noConsole")) { bool? value = ParseBoolean(text); configuration.noTrace = (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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } configuration.noConsole = (bool)value; } else if (MatchOption(newArg, "noLog")) { bool? value = ParseBoolean(text); configuration.noConsole = (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 (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;~~ if (strict) return false; ~~continue; }~~ continue; } ~~configuration.noLog = (bool)value;~~ configuration.noLog = (bool)value; } ~~else~~ { ~~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 ~~argume~~nt: {0}",~~ "Unsupported command line option: {0}", ForDisplay(arg)), traceCategory); if (strict) return false; } }
︙
4943 4944 4945 4946 4947 4948 4949 ~~4950 4951 4952 4953~~ 4954 4955 4956 4957 4958 4959 4960	4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994	- - - - + + + +	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); TraceOps.ShowMessage(TracePriority.Highest, debugCallback, traceCallback, thisAssembly, error, traceCategory, MessageBoxButtons.OK, MessageBoxIcon.Error); return 1; /* FAILURE */ } #endregion ///////////////////////////////////////////////////////////////////
︙