These environment variables are used to control several features of +

+ These environment variables are used to control several features of the System.Data.SQLite library. All of these environment variables - are optional. + are optional. If a particular environment variable is not present, + the XML configuration file "System.Data.SQLite.dll.config" + in the directory containing the currently executing assembly (i.e. + the one containing all the managed components for System.Data.SQLite) + will also be consulted. If present, the XML configuration file should + be structured as follows: +

+        <?xml version="1.0"?>
+        <configuration>
+          <appSettings>
+            <add key="A_Setting" value="String Value" />
+            <add key="Another_Setting" value="%ENV_VALUE%" />
+          </appSettings>
+        </configuration>
+

+ All references to existing environment variables will be expanded to + their corresponding values within the returned settings values unless + either the "No_Expand" or "No_Expand_<name>" + environment variable is set [to anything].

None of these environment variables are supported by the Compact Framework builds of System.Data.SQLite, due to limitations imposed - by the platform itself. + by the platform itself; however, the XML configuration file mentioned + above may be used instead.

@@ -66,13 +88,13 @@ application domain unloading issues. @@ -104,10 +126,19 @@ + + + +

Name
No_PreLoadSQLite	If this environment variable is set [to anything], the native - library pre-loading functionality will be disabled. By default, - the native library pre-loading will attempt to load the native - SQLite library from architecture-specific (e.g. "x86", + library pre-loading code will be disabled. By default, the native + library pre-loading code will attempt to load the native SQLite + library from architecture-specific (e.g. "x86", "amd64", "x64") or platform-specific (e.g. "Win32") directories that reside underneath the application base directory.
If this environment variable is set [to anything], it will be used instead of the processor architecture value contained in the PROCESSOR_ARCHITECTURE environment variable to help build the path of the native library to pre-load.
PreLoadSQLite_SearchForDirectory	If this environment variable is set [to anything], the native + library pre-loading code will conduct a search for the native library + to pre-load, starting in the location of the currently executing + assembly (i.e. the one containing all the managed components for + System.Data.SQLite) and then falling back to the application domain + base directory.
PreLoadSQLite_UseAssemblyDirectory	If this environment variable is set [to anything], the location of the currently executing assembly (i.e. the one containing all the managed components for System.Data.SQLite) will be used as the basis Index: Doc/Extra/version.html ================================================================== --- Doc/Extra/version.html +++ Doc/Extra/version.html @@ -41,10 +41,14 @@

Version History

1.0.91.0 - February XX, 2014 (release scheduled)

Modify the native library pre-loader to support reading settings from an XML configuration file and to be capable of checking more than one directory. Persuant to [f0246d1817].

1.0.90.0 - December 23, 2013

Updated to SQLite 3.8.2.
Add Visual Studio 2013 support to all the applicable solution/project files, their associated supporting files, and the test suite.
Add Visual Studio 2013 support to the redesigned designer support installer.

Distributing the Binaries (Compact Framework)

Both the System.Data.SQLite.DLL and SQLite.Interop.XXX.DLL files must be deployed on the Compact Framework. The XXX is the build number of - the System.Data.SQLite library (e.g. "090"). The + the System.Data.SQLite library (e.g. "091"). The SQLite.Interop.XXX.DLL file is a fully native assembly compiled for the ARM processor, and System.Data.SQLite is the fully-managed Compact Framework assembly.

Index: Externals/Eagle/lib/Eagle1.0/test.eagle ================================================================== --- Externals/Eagle/lib/Eagle1.0/test.eagle +++ Externals/Eagle/lib/Eagle1.0/test.eagle @@ -1954,22 +1954,70 @@ # # NOTE: Cannot use "-nocase" option here because Tcl 8.4 does not # support it (i.e. because it is pre-TIP #241). # switch -exact -- [string tolower $machine] { - amd64 { - return x64 - } intel { if {!$architecture && \ [info exists ::tcl_platform(platform)] && \ $::tcl_platform(platform) eq "windows"} then { return Win32 } else { return x86 } } + arm { + return arm + } + ia64 { + return itanium + } + msil { + return clr + } + amd64 { + return x64 + } + ia32_on_win64 { + return wow64 + } + default { + return unknown + } + } + } + + proc architectureForPlatform { platform } { + # + # NOTE: Cannot use "-nocase" option here because Tcl 8.4 does not + # support it (i.e. because it is pre-TIP #241). + # + switch -exact -- [string tolower $platform] { + intel - + win32 - + x86 { + return x86 + } + arm { + return arm + } + ia64 - + itanium { + return ia64 + } + msil - + clr { + return msil + } + amd64 - + x64 { + return x64 + } + ia32_on_win64 - + wow64 { + return ia32_on_win64 + } default { return unknown } } } Index: Externals/Eagle/lib/Test1.0/prologue.eagle ================================================================== --- Externals/Eagle/lib/Test1.0/prologue.eagle +++ Externals/Eagle/lib/Test1.0/prologue.eagle @@ -1968,11 +1968,11 @@ # NOTE: Has checking for the extra files needed by various tests been # disabled? # if {![info exists no(checkForFile)]} then { # - # NOTE: For tests "benchmark-1.38" and "benchmark-1.39". + # NOTE: For tests "benchmark-1.3[89]" and "benchmark-1.40". # if {![info exists no(benchmark.txt)]} then { checkForFile $test_channel [file join $test_path benchmark.txt] } Index: SQLite.Beta.nuspec ================================================================== --- SQLite.Beta.nuspec +++ SQLite.Beta.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite.Beta System.Data.SQLite (x86/x64) Beta - 1.0.90.0 + 1.0.91.0 SQLite Development Team The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. en-US http://system.data.sqlite.org/ http://system.data.sqlite.org/images/sqlite32.png Index: SQLite.Designer/AssemblyInfo.cs ================================================================== --- SQLite.Designer/AssemblyInfo.cs +++ SQLite.Designer/AssemblyInfo.cs @@ -41,7 +41,7 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.90.0")] -[assembly: AssemblyFileVersion("1.0.90.0")] +[assembly: AssemblyVersion("1.0.91.0")] +[assembly: AssemblyFileVersion("1.0.91.0")] Index: SQLite.Designer/source.extension.vsixmanifest ================================================================== --- SQLite.Designer/source.extension.vsixmanifest +++ SQLite.Designer/source.extension.vsixmanifest @@ -1,11 +1,11 @@ System.Data.SQLite Designer http://system.data.sqlite.org/ - 1.0.90.0 + 1.0.91.0 ADO.NET Data Designer for SQLite 1033 false Index: SQLite.Interop/props/SQLite.Interop.2005.vsprops ================================================================== --- SQLite.Interop/props/SQLite.Interop.2005.vsprops +++ SQLite.Interop/props/SQLite.Interop.2005.vsprops @@ -17,26 +17,26 @@ Value="2005" PerformEnvironmentSet="true" /> 2010 - 090 + 091 1.0 - 1.0.90.0 - 1,0,90,0 + 1.0.91.0 + 1,0,91,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1 Index: SQLite.Interop/props/SQLite.Interop.2012.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.2012.props +++ SQLite.Interop/props/SQLite.Interop.2012.props @@ -8,14 +8,14 @@ * --> 2012 - 090 + 091 1.0 - 1.0.90.0 - 1,0,90,0 + 1.0.91.0 + 1,0,91,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1 Index: SQLite.Interop/props/SQLite.Interop.2013.props ================================================================== --- SQLite.Interop/props/SQLite.Interop.2013.props +++ SQLite.Interop/props/SQLite.Interop.2013.props @@ -8,14 +8,14 @@ * --> 2013 - 090 + 091 1.0 - 1.0.90.0 - 1,0,90,0 + 1.0.91.0 + 1,0,91,0 src\core INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1 INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1 Index: SQLite.Interop/src/win/interop.h ================================================================== --- SQLite.Interop/src/win/interop.h +++ SQLite.Interop/src/win/interop.h @@ -4,11 +4,11 @@ * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ #ifndef INTEROP_VERSION -#define INTEROP_VERSION "1.0.90.0" +#define INTEROP_VERSION "1.0.91.0" #endif #ifndef INTEROP_SOURCE_ID #define INTEROP_SOURCE_ID "0000000000000000000000000000000000000000" #endif Index: SQLite.MSIL.nuspec ================================================================== --- SQLite.MSIL.nuspec +++ SQLite.MSIL.nuspec @@ -8,11 +8,11 @@ * --> System.Data.SQLite.MSIL - 1.0.90.0 + 1.0.91.0 SQLite Development Team An ADO.NET provider for SQLite (managed-only). en-US http://system.data.sqlite.org/ http://system.data.sqlite.org/images/sqlite32.png Index: SQLite.NET.Settings.targets ================================================================== --- SQLite.NET.Settings.targets +++ SQLite.NET.Settings.targets @@ -443,10 +443,16 @@ NOTE: Enable tracing of events related to the native library pre-loading code? By default, this is enabled. --> true + + true + false Index: SQLite.nuspec ================================================================== --- SQLite.nuspec +++ SQLite.nuspec @@ -9,11 +9,11 @@ --> System.Data.SQLite System.Data.SQLite (x86/x64) - 1.0.90.0 + 1.0.91.0 SQLite Development Team The official SQLite database engine for both x86 and x64 along with the ADO.NET provider. en-US http://system.data.sqlite.org/ http://system.data.sqlite.org/images/sqlite32.png Index: SQLite.x64.nuspec ================================================================== --- SQLite.x64.nuspec +++ SQLite.x64.nuspec @@ -8,11 +8,11 @@ * --> System.Data.SQLite.x64 - 1.0.90.0 + 1.0.91.0 SQLite Development Team The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x64. en-US http://system.data.sqlite.org/ http://system.data.sqlite.org/images/sqlite32.png Index: SQLite.x86.nuspec ================================================================== --- SQLite.x86.nuspec +++ SQLite.x86.nuspec @@ -8,11 +8,11 @@ * --> System.Data.SQLite.x86 - 1.0.90.0 + 1.0.91.0 SQLite Development Team The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x86. en-US http://system.data.sqlite.org/ http://system.data.sqlite.org/images/sqlite32.png Index: Setup/verify.lst ================================================================== --- Setup/verify.lst +++ Setup/verify.lst @@ -352,10 +352,11 @@ System.Data.SQLite/System.Data.SQLite.Module.2010.csproj System.Data.SQLite/System.Data.SQLite.Module.2012.csproj System.Data.SQLite/System.Data.SQLite.Module.2013.csproj System.Data.SQLite/System.Data.SQLite.Properties.targets System.Data.SQLite/System.Data.SQLite.References.targets + System.Data.SQLite/System.Data.SQLite.dll.config System.Data.SQLite/System.Data.SQLite.snk System.Data.SQLite/UnsafeNativeMethods.cs System.Data.SQLite.Linq/ System.Data.SQLite.Linq/AssemblyInfo.cs System.Data.SQLite.Linq/Properties/ @@ -539,10 +540,11 @@ # NOTE: This is the list of core files that should be present in all binary # archives that support the desktop versions of the .NET Framework. # set sds_manifests(binaryCore) { System.Data.SQLite.dll + System.Data.SQLite.dll.config System.Data.SQLite.pdb System.Data.SQLite.xml } ############################################################################### @@ -612,10 +614,11 @@ {{app}\readme.htm} {{app}\bin\System.Data.SQLite.pdb} {{app}\doc\SQLite.NET.chm} {{app}\bin\SQLite.Designer.dll} {{app}\bin\SQLite.Designer.pdb} + {{app}\bin\System.Data.SQLite.dll.config} {{app}\bin\Installer.exe} {{app}\bin\Installer.pdb} {{app}\bin\test.exe} {{app}\bin\test.pdb} {{app}\bin\test.exe.config} Index: System.Data.SQLite.Linq/AssemblyInfo.cs ================================================================== --- System.Data.SQLite.Linq/AssemblyInfo.cs +++ System.Data.SQLite.Linq/AssemblyInfo.cs @@ -46,7 +46,7 @@ // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.90.0")] -[assembly: AssemblyFileVersion("1.0.90.0")] +[assembly: AssemblyVersion("1.0.91.0")] +[assembly: AssemblyFileVersion("1.0.91.0")] Index: System.Data.SQLite/AssemblyInfo.cs ================================================================== --- System.Data.SQLite/AssemblyInfo.cs +++ System.Data.SQLite/AssemblyInfo.cs @@ -65,9 +65,9 @@ // Build Number // Revision // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.90.0")] +[assembly: AssemblyVersion("1.0.91.0")] #if !PLATFORM_COMPACTFRAMEWORK -[assembly: AssemblyFileVersion("1.0.90.0")] +[assembly: AssemblyFileVersion("1.0.91.0")] #endif Index: System.Data.SQLite/SQLite3.cs ================================================================== --- System.Data.SQLite/SQLite3.cs +++ System.Data.SQLite/SQLite3.cs @@ -55,11 +55,11 @@ "b621ddff5d844727418956997f475eb829429e411aff3e93f97b70de698b972640925bdd44280df0" + "a25a843266973704137cbb0e7441c1fe7cae4e2440ae91ab8cde3933febcb1ac48dd33b40e13c421" + "d8215c18a4349a436dd499e3c385cc683015f886f6c10bd90115eb2bd61b67750839e3a19941dc9c"; #if !PLATFORM_COMPACTFRAMEWORK - internal const string DesignerVersion = "1.0.90.0"; + internal const string DesignerVersion = "1.0.91.0"; #endif ///

/// The opaque pointer returned to us by the sqlite provider ///

Index: System.Data.SQLite/SQLiteConnection.cs ================================================================== --- System.Data.SQLite/SQLiteConnection.cs +++ System.Data.SQLite/SQLiteConnection.cs @@ -1621,15 +1621,13 @@ // First split into semi-colon delimited values. string error = null; string[] arParts; -#if !PLATFORM_COMPACTFRAMEWORK - if (Environment.GetEnvironmentVariable("No_SQLiteConnectionNewParser") != null) + if (UnsafeNativeMethods.GetSettingValue("No_SQLiteConnectionNewParser", null) != null) arParts = SQLiteConvert.Split(s, ';'); else -#endif arParts = SQLiteConvert.NewSplit(s, ';', true, ref error); if (arParts == null) { throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, Index: System.Data.SQLite/SQLiteDefineConstants.cs ================================================================== --- System.Data.SQLite/SQLiteDefineConstants.cs +++ System.Data.SQLite/SQLiteDefineConstants.cs @@ -109,10 +109,14 @@ #endif #if TRACE_PRELOAD "TRACE_PRELOAD", #endif + +#if TRACE_SHARED + "TRACE_SHARED", +#endif #if TRACE_STATEMENT "TRACE_STATEMENT", #endif Index: System.Data.SQLite/SQLiteFunction.cs ================================================================== --- System.Data.SQLite/SQLiteFunction.cs +++ System.Data.SQLite/SQLiteFunction.cs @@ -655,11 +655,11 @@ #if !PLATFORM_COMPACTFRAMEWORK // // NOTE: If the "No_SQLiteFunctions" environment variable is set, // skip all our special code and simply return. // - if (Environment.GetEnvironmentVariable("No_SQLiteFunctions") != null) + if (UnsafeNativeMethods.GetSettingValue("No_SQLiteFunctions", null) != null) return; SQLiteFunctionAttribute at; System.Reflection.Assembly[] arAssemblies = System.AppDomain.CurrentDomain.GetAssemblies(); int w = arAssemblies.Length; Index: System.Data.SQLite/SQLiteLog.cs ================================================================== --- System.Data.SQLite/SQLiteLog.cs +++ System.Data.SQLite/SQLiteLog.cs @@ -150,11 +150,11 @@ // prevent all non-default AppDomains from registering a // log handler unless the "Force_SQLiteLog" environment // variable is used to manually override this safety check. // if (!AppDomain.CurrentDomain.IsDefaultAppDomain() && - Environment.GetEnvironmentVariable("Force_SQLiteLog") == null) + UnsafeNativeMethods.GetSettingValue("Force_SQLiteLog", null) == null) { return; } #endif Index: System.Data.SQLite/System.Data.SQLite.Files.targets ================================================================== --- System.Data.SQLite/System.Data.SQLite.Files.targets +++ System.Data.SQLite/System.Data.SQLite.Files.targets @@ -12,10 +12,13 @@ ** Core Files (Common) ** ****************************************************************************** --> + + Always + Index: System.Data.SQLite/System.Data.SQLite.Properties.targets ================================================================== --- System.Data.SQLite/System.Data.SQLite.Properties.targets +++ System.Data.SQLite/System.Data.SQLite.Properties.targets @@ -218,10 +218,14 @@ $(DefineConstants);TRACE_PRELOAD + + + $(DefineConstants);TRACE_SHARED + $(DefineConstants);TRACE_STATEMENT ADDED System.Data.SQLite/System.Data.SQLite.dll.config Index: System.Data.SQLite/System.Data.SQLite.dll.config ================================================================== --- /dev/null +++ System.Data.SQLite/System.Data.SQLite.dll.config @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: System.Data.SQLite/UnsafeNativeMethods.cs ================================================================== --- System.Data.SQLite/UnsafeNativeMethods.cs +++ System.Data.SQLite/UnsafeNativeMethods.cs @@ -27,10 +27,12 @@ using System.Runtime.InteropServices; #if !PLATFORM_COMPACTFRAMEWORK || COUNT_HANDLE using System.Threading; #endif + + using System.Xml; #if !PLATFORM_COMPACTFRAMEWORK && !DEBUG [SuppressUnmanagedCodeSecurity] #endif internal static class UnsafeNativeMethods @@ -52,10 +54,230 @@ #endif #endregion ///////////////////////////////////////////////////////////////////////// + #region Shared Native SQLite Library Pre-Loading Code + private static readonly string DllFileExtension = ".dll"; + private static readonly string ConfigFileExtension = ".config"; + + ///////////////////////////////////////////////////////////////////////// + + // + // NOTE: This is the name of the XML configuration file specific to the + // System.Data.SQLite assembly. + // + private static readonly string XmlConfigFileName = + typeof(UnsafeNativeMethods).Namespace + DllFileExtension + + ConfigFileExtension; + + ///////////////////////////////////////////////////////////////////////// + ///

+ /// Queries and returns the XML configuration file name for the assembly + /// containing the managed System.Data.SQLite components. + ///

+ /// + /// The XML configuration file name -OR- null if it cannot be determined + /// or does not exist. + /// + private static string GetXmlConfigFileName() + { + string directory; + string fileName; + +#if !PLATFORM_COMPACTFRAMEWORK + directory = AppDomain.CurrentDomain.BaseDirectory; + fileName = Path.Combine(directory, XmlConfigFileName); + + if (File.Exists(fileName)) + return fileName; +#endif + + directory = GetAssemblyDirectory(); + fileName = Path.Combine(directory, XmlConfigFileName); + + if (File.Exists(fileName)) + return fileName; + + return null; + } + + ///////////////////////////////////////////////////////////////////////// + ///

+ /// Queries and returns the value of the specified setting, using the XML + /// configuration file and/or the environment variables for the current + /// process and/or the current system, when available. + ///

+ /// + /// The name of the setting. + /// + /// + /// The value to be returned if the setting has not been set explicitly + /// or cannot be determined. + /// + /// + /// The value of the setting -OR- the default value specified by + /// if it has not been set explicitly or + /// cannot be determined. By default, all references to existing + /// environment variables will be expanded to their corresponding values + /// within the value to be returned unless either the "No_Expand" or + /// "No_Expand_" environment variable is set [to + /// anything]. + /// + internal static string GetSettingValue( + string name, /* in */ + string @default /* in */ + ) + { + if (name == null) + return @default; + + string value = null; + +#if !PLATFORM_COMPACTFRAMEWORK + bool expand = true; + + if (Environment.GetEnvironmentVariable("No_Expand") != null) + { + expand = false; + } + else if (Environment.GetEnvironmentVariable(String.Format( + "No_Expand_{0}", name)) != null) + { + expand = false; + } + + value = Environment.GetEnvironmentVariable(name); + + if (expand && !String.IsNullOrEmpty(value)) + value = Environment.ExpandEnvironmentVariables(value); + + if (value != null) + return value; +#endif + + try + { + string fileName = GetXmlConfigFileName(); + + if (fileName == null) + return @default; + + XmlDocument document = new XmlDocument(); + + document.Load(fileName); + + XmlElement element = document.SelectSingleNode(String.Format( + "/configuration/appSettings/add[@key='{0}']", name)) as + XmlElement; + + if (element != null) + { + if (element.HasAttribute("value")) + value = element.GetAttribute("value"); + +#if !PLATFORM_COMPACTFRAMEWORK + if (expand && !String.IsNullOrEmpty(value)) + value = Environment.ExpandEnvironmentVariables(value); +#endif + + if (value != null) + return value; + } + } +#if !NET_COMPACT_20 && TRACE_SHARED + catch (Exception e) +#else + catch (Exception) +#endif + { +#if !NET_COMPACT_20 && TRACE_SHARED + try + { + Trace.WriteLine(String.Format( + CultureInfo.CurrentCulture, + "Native library pre-loader failed to get setting " + + "\"{0}\" value: {1}", name, e)); /* throw */ + } + catch + { + // do nothing. + } +#endif + } + + return @default; + } + + ///////////////////////////////////////////////////////////////////////// + ///

+ /// Queries and returns the directory for the assembly currently being + /// executed. + ///

+ /// + /// The directory for the assembly currently being executed -OR- null if + /// it cannot be determined. + /// + private static string GetAssemblyDirectory() + { + try + { + Assembly assembly = Assembly.GetExecutingAssembly(); + + if (assembly == null) + return null; + + string fileName; + +#if PLATFORM_COMPACTFRAMEWORK + AssemblyName assemblyName = assembly.GetName(); + + if (assemblyName == null) + return null; + + fileName = assemblyName.CodeBase; +#else + fileName = assembly.Location; +#endif + + if (String.IsNullOrEmpty(fileName)) + return null; + + string directory = Path.GetDirectoryName(fileName); + + if (String.IsNullOrEmpty(directory)) + return null; + + return directory; + } +#if !NET_COMPACT_20 && TRACE_SHARED + catch (Exception e) +#else + catch (Exception) +#endif + { +#if !NET_COMPACT_20 && TRACE_SHARED + try + { + Trace.WriteLine(String.Format( + CultureInfo.CurrentCulture, + "Native library pre-loader failed to get directory " + + "for currently executing assembly: {0}", e)); /* throw */ + } + catch + { + // do nothing. + } +#endif + } + + return null; + } + #endregion + + ///////////////////////////////////////////////////////////////////////// + #region Optional Native SQLite Library Pre-Loading Code // // NOTE: If we are looking for the standard SQLite DLL ("sqlite3.dll"), // the interop DLL ("SQLite.Interop.dll"), or we are running on the // .NET Compact Framework, we should include this code (only if the @@ -68,22 +290,16 @@ // // NOTE: Only compile in the native library pre-load code if the feature // has been enabled for this build. // #if PRELOAD_NATIVE_LIBRARY -#if !PLATFORM_COMPACTFRAMEWORK ///

/// The name of the environment variable containing the processor /// architecture of the current process. ///

private static readonly string PROCESSOR_ARCHITECTURE = "PROCESSOR_ARCHITECTURE"; -#endif - - ///////////////////////////////////////////////////////////////////////// - - private static readonly string DllFileExtension = ".dll"; ///////////////////////////////////////////////////////////////////////// ///

/// This is the P/Invoke method that wraps the native Win32 LoadLibrary /// function. See the MSDN documentation for full details on what it @@ -178,14 +394,20 @@ ///

private static Dictionary processorArchitecturePlatforms; ///////////////////////////////////////////////////////////////////////// ///

+ /// The native module file name for the native SQLite library or null. + ///

+ private static string _SQLiteNativeModuleFileName = null; + + ///////////////////////////////////////////////////////////////////////// + ///

/// The native module handle for the native SQLite library or the value /// IntPtr.Zero. ///

- private static IntPtr _SQLiteModule = IntPtr.Zero; + private static IntPtr _SQLiteNativeModuleHandle = IntPtr.Zero; ///////////////////////////////////////////////////////////////////////// ///

/// For now, this method simply calls the Initialize method. ///

@@ -199,18 +421,16 @@ /// Attempts to initialize this class by pre-loading the native SQLite /// library for the processor architecture of the current process. /// internal static void Initialize() { -#if !PLATFORM_COMPACTFRAMEWORK // // NOTE: If the "No_PreLoadSQLite" environment variable is set (to // anything), skip all our special code and simply return. // - if (Environment.GetEnvironmentVariable("No_PreLoadSQLite") != null) + if (GetSettingValue("No_PreLoadSQLite", null) != null) return; -#endif lock (staticSyncRoot) { // // TODO: Make sure this list is updated if the supported @@ -239,13 +459,109 @@ } // // BUGBUG: What about other application domains? // - if (_SQLiteModule == IntPtr.Zero) - _SQLiteModule = PreLoadSQLiteDll(null, null); + if (_SQLiteNativeModuleHandle == IntPtr.Zero) + { + string baseDirectory = null; + string processorArchitecture = null; + + /* IGNORED */ + SearchForDirectory( + ref baseDirectory, ref processorArchitecture); + + // + // NOTE: Attempt to pre-load the SQLite core library (or + // interop assembly) and store both the file name + // and native module handle for later usage. + // + /* IGNORED */ + PreLoadSQLiteDll( + baseDirectory, processorArchitecture, + ref _SQLiteNativeModuleFileName, + ref _SQLiteNativeModuleHandle); + } + } + } + + ///////////////////////////////////////////////////////////////////////// + ///

+ /// Searches for the native SQLite library in the directory containing + /// the assembly currently being executed as well as the base directory + /// for the current application domain. + ///

+ /// + /// Upon success, this parameter will be modified to refer to the base + /// directory containing the native SQLite library. + /// + /// + /// Upon success, this parameter will be modified to refer to the name + /// of the immediate directory (i.e. the offset from the base directory) + /// containing the native SQLite library. + /// + /// + /// Non-zero (success) if the native SQLite library was found; otherwise, + /// zero (failure). + /// + private static bool SearchForDirectory( + ref string baseDirectory, /* out */ + ref string processorArchitecture /* out */ + ) + { + if (GetSettingValue( + "PreLoadSQLite_SearchForDirectory", null) == null) + { + return false; /* DISABLED */ + } + + // + // NOTE: Build the list of base directories and processor/platform + // names. These lists will be used to help locate the native + // SQLite core library (or interop assembly) to pre-load into + // this process. + // + string[] directories = { + GetAssemblyDirectory(), +#if !PLATFORM_COMPACTFRAMEWORK + AppDomain.CurrentDomain.BaseDirectory, +#endif + }; + + string[] subDirectories = { + GetProcessorArchitecture(), GetPlatformName(null) + }; + + foreach (string directory in directories) + { + if (directory == null) + continue; + + foreach (string subDirectory in subDirectories) + { + if (subDirectory == null) + continue; + + string fileName = FixUpDllFileName(Path.Combine( + Path.Combine(directory, subDirectory), SQLITE_DLL)); + + // + // NOTE: If the SQLite DLL file exists, return success. + // Prior to returning, set the base directory and + // processor architecture to reflect the location + // where it was found. + // + if (File.Exists(fileName)) + { + baseDirectory = directory; + processorArchitecture = subDirectory; + return true; /* FOUND */ + } + } } + + return false; /* NOT FOUND */ } ///////////////////////////////////////////////////////////////////////// ///

/// Queries and returns the base directory of the current application @@ -255,75 +571,48 @@ /// The base directory for the current application domain -OR- null if it /// cannot be determined. /// private static string GetBaseDirectory() { -#if !PLATFORM_COMPACTFRAMEWORK // // NOTE: If the "PreLoadSQLite_BaseDirectory" environment variable // is set, use it verbatim for the base directory. // - string directory = Environment.GetEnvironmentVariable( - "PreLoadSQLite_BaseDirectory"); + string directory = GetSettingValue("PreLoadSQLite_BaseDirectory", + null); if (directory != null) return directory; +#if !PLATFORM_COMPACTFRAMEWORK // // NOTE: If the "PreLoadSQLite_UseAssemblyDirectory" environment - // variable is set (to anything), attempt to use the directory - // containing the currently executing assembly (i.e. - // System.Data.SQLite) intsead of the application domain base - // directory. - // - if (Environment.GetEnvironmentVariable( - "PreLoadSQLite_UseAssemblyDirectory") != null) - { - try - { - Assembly assembly = Assembly.GetExecutingAssembly(); - - if (assembly != null) - { - directory = Path.GetDirectoryName(assembly.Location); - - if (!String.IsNullOrEmpty(directory)) - return directory; - } - } - catch - { - // do nothing. - } + // variable is set (to anything), then attempt to use the + // directory containing the currently executing assembly + // (i.e. System.Data.SQLite) intsead of the application + // domain base directory. + // + if (GetSettingValue( + "PreLoadSQLite_UseAssemblyDirectory", null) != null) + { + directory = GetAssemblyDirectory(); + + if (directory != null) + return directory; } // // NOTE: Otherwise, fallback on using the base directory of the // current application domain. // return AppDomain.CurrentDomain.BaseDirectory; #else - Assembly assembly = Assembly.GetExecutingAssembly(); - - if (assembly == null) - return null; - - AssemblyName assemblyName = assembly.GetName(); - - if (assemblyName == null) - return null; - - try - { - return Path.GetDirectoryName(assemblyName.CodeBase); - } - catch - { - // do nothing. - } - - return null; + // + // NOTE: Otherwise, fallback on using the directory containing + // the currently executing assembly. + // + return GetAssemblyDirectory(); #endif } ///////////////////////////////////////////////////////////////////////// ///

@@ -336,11 +625,11 @@ /// /// The dynamic link library file name, possibly modified to include an /// extension. /// private static string FixUpDllFileName( - string fileName + string fileName /* in */ ) { if (!String.IsNullOrEmpty(fileName)) { PlatformID platformId = Environment.OSVersion.Platform; @@ -370,28 +659,29 @@ /// The processor architecture of the current process -OR- null if it /// cannot be determined. /// private static string GetProcessorArchitecture() { -#if !PLATFORM_COMPACTFRAMEWORK // // NOTE: If the "PreLoadSQLite_ProcessorArchitecture" environment // variable is set, use it verbatim for the current processor // architecture. // - string processorArchitecture = Environment.GetEnvironmentVariable( - "PreLoadSQLite_ProcessorArchitecture"); + string processorArchitecture = GetSettingValue( + "PreLoadSQLite_ProcessorArchitecture", null); if (processorArchitecture != null) return processorArchitecture; // // BUGBUG: Will this always be reliable? // - processorArchitecture = Environment.GetEnvironmentVariable( - PROCESSOR_ARCHITECTURE); + processorArchitecture = GetSettingValue(PROCESSOR_ARCHITECTURE, null); + ///////////////////////////////////////////////////////////////////// + +#if !PLATFORM_COMPACTFRAMEWORK // // HACK: Check for an "impossible" situation. If the pointer size // is 32-bits, the processor architecture cannot be "AMD64". // In that case, we are almost certainly hitting a bug in the // operating system and/or Visual Studio that causes the @@ -417,61 +707,77 @@ // the "x86" processor architecture; therefore, return // "x86" when the pointer size is 32-bits. // processorArchitecture = "x86"; - // - // NOTE: Show that we hit a fairly unusual situation (i.e. the - // "wrong" processor architecture was detected). - // -#if !NET_COMPACT_20 && TRACE_PRELOAD - Trace.WriteLine(String.Format( - CultureInfo.CurrentCulture, - "Detected {0}-bit pointer size with processor architecture " + - "\"{1}\", using processor architecture \"{2}\" instead...", - IntPtr.Size * 8 /* bits */, savedProcessorArchitecture, - processorArchitecture)); -#endif - } - - return processorArchitecture; -#else - // - // NOTE: On the .NET Compact Framework, attempt to use the native - // Win32 API function (via P/Invoke) that can provide us with - // the processor architecture. - // - try - { - // - // NOTE: The output of the GetSystemInfo function will be placed - // here. Only the processor architecture field is used by - // this method. - // - SYSTEM_INFO systemInfo; - - // - // NOTE: Query the system information via P/Invoke, thus filling - // the structure. - // - GetSystemInfo(out systemInfo); - - // - // NOTE: Return the processor architecture value as a string. - // - return systemInfo.wProcessorArchitecture.ToString(); - } - catch - { - // do nothing. - } - - // - // NOTE: Upon failure, return an empty string. - // - return String.Empty; -#endif +#if !NET_COMPACT_20 && TRACE_PRELOAD + try + { + // + // NOTE: Show that we hit a fairly unusual situation (i.e. + // the "wrong" processor architecture was detected). + // + Trace.WriteLine(String.Format( + CultureInfo.CurrentCulture, + "Native library pre-loader detected {0}-bit pointer " + + "size with processor architecture \"{1}\", using " + + "processor architecture \"{2}\" instead...", + IntPtr.Size * 8 /* bits */, savedProcessorArchitecture, + processorArchitecture)); /* throw */ + } + catch + { + // do nothing. + } +#endif + } +#else + if (processorArchitecture == null) + { + // + // NOTE: On the .NET Compact Framework, attempt to use the native + // Win32 API function (via P/Invoke) that can provide us + // with the processor architecture. + // + try + { + // + // NOTE: The output of the GetSystemInfo function will be + // placed here. Only the processor architecture field + // is used by this method. + // + SYSTEM_INFO systemInfo; + + // + // NOTE: Query the system information via P/Invoke, thus + // filling the structure. + // + GetSystemInfo(out systemInfo); + + // + // NOTE: Return the processor architecture value as a string. + // + processorArchitecture = + systemInfo.wProcessorArchitecture.ToString(); + } + catch + { + // do nothing. + } + + // + // NOTE: Upon failure, return an empty string. This will prevent + // the calling method from considering this method call a + // "failure". + // + processorArchitecture = String.Empty; + } +#endif + + ///////////////////////////////////////////////////////////////////// + + return processorArchitecture; } ///////////////////////////////////////////////////////////////////////// ///

/// Given the processor architecture, returns the name of the platform. @@ -482,13 +788,16 @@ /// /// The platform name for the specified processor architecture -OR- null /// if it cannot be determined. /// private static string GetPlatformName( - string processorArchitecture + string processorArchitecture /* in */ ) { + if (processorArchitecture == null) + processorArchitecture = GetProcessorArchitecture(); + if (String.IsNullOrEmpty(processorArchitecture)) return null; lock (staticSyncRoot) { @@ -510,50 +819,62 @@ ///////////////////////////////////////////////////////////////////////// ///

/// Attempts to load the native SQLite library based on the specified /// directory and processor architecture. ///

- /// + /// /// The base directory to use, null for default (the base directory of /// the current application domain). This directory should contain the /// processor architecture specific sub-directories. /// /// /// The requested processor architecture, null for default (the /// processor architecture of the current process). This caller should /// almost always specify null for this parameter. /// + /// + /// The candidate native module file name to load will be stored here, + /// if necessary. + /// + /// + /// The native module handle as returned by LoadLibrary will be stored + /// here, if necessary. This value will be IntPtr.Zero if the call to + /// LoadLibrary fails. + /// /// - /// The native module handle as returned by LoadLibrary -OR- IntPtr.Zero - /// if the loading fails for any reason. + /// Non-zero if the native module was loaded successfully; otherwise, + /// zero. /// - private static IntPtr PreLoadSQLiteDll( - string directory, - string processorArchitecture + private static bool PreLoadSQLiteDll( + string baseDirectory, /* in */ + string processorArchitecture, /* in */ + ref string nativeModuleFileName, /* out */ + ref IntPtr nativeModuleHandle /* out */ ) { // - // NOTE: If the specified base directory is null, use the default. + // NOTE: If the specified base directory is null, use the default + // (i.e. attempt to automatically detect it). // - if (directory == null) - directory = GetBaseDirectory(); + if (baseDirectory == null) + baseDirectory = GetBaseDirectory(); // // NOTE: If we failed to query the base directory, stop now. // - if (directory == null) - return IntPtr.Zero; + if (baseDirectory == null) + return false; // // NOTE: If the native SQLite library exists in the base directory // itself, stop now. // - string fileName = FixUpDllFileName(Path.Combine(directory, + string fileName = FixUpDllFileName(Path.Combine(baseDirectory, SQLITE_DLL)); if (File.Exists(fileName)) - return IntPtr.Zero; + return false; // // NOTE: If the specified processor architecture is null, use the // default. // @@ -562,17 +883,17 @@ // // NOTE: If we failed to query the processor architecture, stop now. // if (processorArchitecture == null) - return IntPtr.Zero; + return false; // // NOTE: Build the full path and file name for the native SQLite // library using the processor architecture name. // - fileName = FixUpDllFileName(Path.Combine(Path.Combine(directory, + fileName = FixUpDllFileName(Path.Combine(Path.Combine(baseDirectory, processorArchitecture), SQLITE_DLL)); // // NOTE: If the file name based on the processor architecture name // is not found, try using the associated platform name. @@ -587,45 +908,55 @@ // // NOTE: If we failed to translate the platform name, stop now. // if (platformName == null) - return IntPtr.Zero; + return false; // // NOTE: Build the full path and file name for the native SQLite // library using the platform name. // - fileName = FixUpDllFileName(Path.Combine(Path.Combine(directory, - platformName), SQLITE_DLL)); + fileName = FixUpDllFileName(Path.Combine(Path.Combine( + baseDirectory, platformName), SQLITE_DLL)); // // NOTE: If the file does not exist, skip trying to load it. // if (!File.Exists(fileName)) - return IntPtr.Zero; + return false; } try { - // - // NOTE: Show exactly where we are trying to load the native - // SQLite library from. - // #if !NET_COMPACT_20 && TRACE_PRELOAD - Trace.WriteLine(String.Format( - CultureInfo.CurrentCulture, - "Trying to load native SQLite library \"{0}\"...", - fileName)); + try + { + // + // NOTE: Show exactly where we are trying to load the native + // SQLite library from. + // + Trace.WriteLine(String.Format( + CultureInfo.CurrentCulture, + "Native library pre-loader is trying to load native " + + "SQLite library \"{0}\"...", fileName)); /* throw */ + } + catch + { + // do nothing. + } #endif // // NOTE: Attempt to load the native library. This will either // return a valid native module handle, return IntPtr.Zero, // or throw an exception. // - return LoadLibrary(fileName); + nativeModuleFileName = fileName; + nativeModuleHandle = LoadLibrary(fileName); + + return (nativeModuleHandle != IntPtr.Zero); } #if !NET_COMPACT_20 && TRACE_PRELOAD catch (Exception e) #else catch (Exception) @@ -635,31 +966,31 @@ try { // // NOTE: First, grab the last Win32 error number. // - int lastError = Marshal.GetLastWin32Error(); + int lastError = Marshal.GetLastWin32Error(); /* throw */ // // NOTE: Show where we failed to load the native SQLite // library from along with the Win32 error code and // exception information. // Trace.WriteLine(String.Format( CultureInfo.CurrentCulture, - "Failed to load native SQLite library \"{0}\" " + - "(getLastError = {1}): {2}", + "Native library pre-loader failed to load native " + + "SQLite library \"{0}\" (getLastError = {1}): {2}", fileName, lastError, e)); /* throw */ } catch { // do nothing. } #endif } - return IntPtr.Zero; + return false; } #endif #endif #endregion @@ -671,11 +1002,11 @@ // be used because it provides several workarounds to .NET Compact // Framework limitations important for proper operation of the core // System.Data.SQLite functionality (e.g. being able to bind // parameters and handle column values of types Int64 and Double). // - internal const string SQLITE_DLL = "SQLite.Interop.090.dll"; + internal const string SQLITE_DLL = "SQLite.Interop.091.dll"; #elif SQLITE_STANDARD // // NOTE: Otherwise, if the standard SQLite library is enabled, use it. // internal const string SQLITE_DLL = "sqlite3"; @@ -2327,11 +2658,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( - "CloseConnection: {0}", localHandle)); + "CloseConnection: {0}", localHandle)); /* throw */ } catch { } #endif @@ -2362,11 +2693,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( "CloseConnection: {0}, exception: {1}", - handle, e)); + handle, e)); /* throw */ } catch { } #endif @@ -2513,11 +2844,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( - "FinalizeStatement: {0}", localHandle)); + "FinalizeStatement: {0}", localHandle)); /* throw */ } catch { } #endif @@ -2548,11 +2879,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( "FinalizeStatement: {0}, exception: {1}", - handle, e)); + handle, e)); /* throw */ } catch { } #endif @@ -2684,11 +3015,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( - "FinishBackup: {0}", localHandle)); + "FinishBackup: {0}", localHandle)); /* throw */ } catch { } #endif @@ -2719,11 +3050,11 @@ #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(String.Format( "FinishBackup: {0}, exception: {1}", - handle, e)); + handle, e)); /* throw */ } catch { } #endif Index: Tests/common.eagle ================================================================== --- Tests/common.eagle +++ Tests/common.eagle @@ -499,18 +499,18 @@ # return "" } } - proc getBuildFileName { fileName } { + proc getBuildFileName { fileName {platform ""} } { # # NOTE: Returns the specified file name as if it were located in the # build directory, discarding any directory information present # in the file name as provided by our caller. # return [file nativename \ - [file join [getBuildDirectory] [file tail $fileName]]] + [file join [getBuildDirectory] $platform [file tail $fileName]]] } proc getBinaryDirectory {} { # # NOTE: This procedure returns the directory where the test application @@ -529,43 +529,58 @@ } else { return [info binary] } } - proc getBinaryFileName { fileName } { + proc getBinaryFileName { fileName {platform ""} } { # # NOTE: Returns the specified file name as if it were located in the # binary directory, discarding any directory information present # in the file name as provided by our caller. # return [file nativename \ - [file join [getBinaryDirectory] [file tail $fileName]]] + [file join [getBinaryDirectory] $platform [file tail $fileName]]] } - proc getCoreBinaryFileName { {standard false} } { + proc getCoreBinaryFileName { {platform ""} {standard false} } { # - # NOTE: Returns the full path for the file containing the core SQLite - # library code for this platform. + # NOTE: Returns the full path for the file containing the SQLite core + # native library code for this platform. First, check and see if + # the SQLite core native library has already been loaded. Next, + # fallback to what the full path should be, based on whether the + # mixed-mode assembly is being used and the name of the current + # platform. # + if {[catch {object invoke -flags +NonPublic \ + System.Data.SQLite.UnsafeNativeMethods \ + _SQLiteNativeModuleFileName} fileName] == 0 && \ + [string length $fileName] > 0} then { + # + # NOTE: The SQLite core native library has already been loaded via + # the native library pre-loader. Return that file name now. + # + return $fileName + } + if {[hasRuntimeOption native]} then { # # NOTE: Return the mixed-mode assembly file name. # return [file nativename \ - [file join [getBinaryDirectory] System.Data.SQLite.dll]] + [file join [getBinaryDirectory] $platform System.Data.SQLite.dll]] } elseif {$standard} then { # # NOTE: Return the native-only standard SQLite library file name. # return [file nativename \ - [file join [getBinaryDirectory] sqlite3.dll]] + [file join [getBinaryDirectory] $platform sqlite3.dll]] } else { # # NOTE: Return the native-only interop assembly file name. # return [file nativename \ - [file join [getBinaryDirectory] SQLite.Interop.dll]] + [file join [getBinaryDirectory] $platform SQLite.Interop.dll]] } } proc getCommonDirectory {} { # @@ -741,12 +756,12 @@ object invoke Interpreter.GetActive AddRuntimeOption native } } [getTestOverridesPreamble [list path test_channel]] $suffix]]] } - proc tryCopyBinaryFile { fileName {newFileName ""} } { - set sourceFileName [getBinaryFileName $fileName] + proc tryCopyBinaryFile { fileName {platform ""} {newFileName ""} } { + set sourceFileName [getBinaryFileName $fileName $platform] if {![file exists $sourceFileName]} then { tputs $::test_channel [appendArgs \ "---- skipped copying binary file \"" $sourceFileName \ "\", it does not exist\n"] @@ -753,13 +768,13 @@ return } if {[string length $newFileName] > 0} then { - set targetFileName [getBuildFileName $newFileName] + set targetFileName [getBuildFileName $newFileName $platform] } else { - set targetFileName [getBuildFileName $fileName] + set targetFileName [getBuildFileName $fileName $platform] } if {[catch { file copy -force $sourceFileName $targetFileName}] == 0} then { tputs $::test_channel [appendArgs \ @@ -770,12 +785,12 @@ "---- failed to copy binary file from \"" $sourceFileName \ "\" to \"" $targetFileName \"\n] } } - proc tryCopyBuildFile { fileName {newFileName ""} } { - set sourceFileName [getBuildFileName $fileName] + proc tryCopyBuildFile { fileName {platform ""} {newFileName ""} } { + set sourceFileName [getBuildFileName $fileName $platform] if {![file exists $sourceFileName]} then { tputs $::test_channel [appendArgs \ "---- skipped copying build file \"" $sourceFileName \ "\", it does not exist\n"] @@ -782,13 +797,13 @@ return } if {[string length $newFileName] > 0} then { - set targetFileName [getBinaryFileName $newFileName] + set targetFileName [getBinaryFileName $newFileName $platform] } else { - set targetFileName [getBinaryFileName $fileName] + set targetFileName [getBinaryFileName $fileName $platform] } if {[catch { file copy -force $sourceFileName $targetFileName}] == 0} then { tputs $::test_channel [appendArgs \ @@ -799,12 +814,12 @@ "---- failed to copy build file from \"" $sourceFileName \ "\" to \"" $targetFileName \"\n] } } - proc tryDeleteBinaryFile { fileName } { - set fileName [getBinaryFileName $fileName] + proc tryDeleteBinaryFile { fileName {platform ""} } { + set fileName [getBinaryFileName $fileName $platform] if {![file exists $fileName]} then { tputs $::test_channel [appendArgs \ "---- skipped deleting binary file \"" $fileName \ "\", it does not exist\n"] @@ -819,12 +834,12 @@ tputs $::test_channel [appendArgs \ "---- failed to delete binary file \"" $fileName \"\n] } } - proc tryDeleteBuildFile { fileName } { - set fileName [getBuildFileName $fileName] + proc tryDeleteBuildFile { fileName {platform ""} } { + set fileName [getBuildFileName $fileName $platform] if {![file exists $fileName]} then { tputs $::test_channel [appendArgs \ "---- skipped deleting build file \"" $fileName \ "\", it does not exist\n"] @@ -839,28 +854,30 @@ tputs $::test_channel [appendArgs \ "---- failed to delete build file \"" $fileName \"\n] } } - proc tryCopyAssembly { fileName {pdb true} } { - tryCopyBuildFile $fileName - - if {$pdb} then { - tryCopyBuildFile [appendArgs [file rootname $fileName] .pdb] - } - } - - proc tryDeleteAssembly { fileName {pdb true} } { - tryDeleteBinaryFile $fileName - - if {$pdb} then { - tryDeleteBinaryFile [appendArgs [file rootname $fileName] .pdb] - } - } - - proc tryLoadAssembly { fileName } { - set fileName [getBinaryFileName $fileName] + proc tryCopyAssembly { fileName {platform ""} {pdb true} } { + tryCopyBuildFile $fileName $platform + + if {$pdb} then { + tryCopyBuildFile [appendArgs \ + [file rootname $fileName] .pdb] $platform + } + } + + proc tryDeleteAssembly { fileName {platform ""} {pdb true} } { + tryDeleteBinaryFile $fileName $platform + + if {$pdb} then { + tryDeleteBinaryFile [appendArgs \ + [file rootname $fileName] .pdb] $platform + } + } + + proc tryLoadAssembly { fileName {platform ""} } { + set fileName [getBinaryFileName $fileName $platform] if {[catch {set assembly \ [object load -loadtype File -alias $fileName]}] == 0} then { # # NOTE: Now, add the necessary test constraint. @@ -2190,24 +2207,41 @@ # # NOTE: Skip all System.Data.SQLite related file handling (deleting, # copying, and loading) if we are so instructed. # if {![info exists ::no(sqliteFiles)]} then { + # + # NOTE: Determine the name for the current native platform. + # + set platform [architectureForPlatform [getBuildPlatform true]] + + # + # NOTE: Show the platform that will be used to help locate native + # build files. + # + tputs $::test_channel [appendArgs \ + "---- platform for locating native build files is \"" \ + $platform \"\n] + # # NOTE: Skip trying to delete any files if we are so instructed. # if {![info exists ::no(deleteSqliteFiles)]} then { tryDeleteAssembly sqlite3.dll - removeConstraint file_sqlite3.dll - tryDeleteAssembly SQLite.Interop.dll - removeConstraint file_SQLite.Interop.dll - tryDeleteAssembly System.Data.SQLite.dll - removeConstraint file_System.Data.SQLite.dll - tryDeleteAssembly System.Data.SQLite.Linq.dll + + if {[string length $platform] > 0} then { + tryDeleteAssembly sqlite3.dll $platform + tryDeleteAssembly SQLite.Interop.dll $platform + tryDeleteAssembly System.Data.SQLite.dll $platform + } + + removeConstraint file_sqlite3.dll + removeConstraint file_SQLite.Interop.dll + removeConstraint file_System.Data.SQLite.dll removeConstraint file_System.Data.SQLite.Linq.dll } # # NOTE: Check for the "autoSelect" runtime option. If present, @@ -2255,46 +2289,68 @@ # # NOTE: Skip trying to copy any files if we are so instructed. # if {![info exists ::no(copySqliteFiles)]} then { + tryCopyBuildFile System.Data.SQLite.dll.config + tryCopyAssembly sqlite3.dll tryCopyAssembly SQLite.Interop.dll tryCopyAssembly System.Data.SQLite.dll tryCopyAssembly System.Data.SQLite.Linq.dll + + if {[string length $platform] > 0} then { + tryCopyAssembly sqlite3.dll $platform + tryCopyAssembly SQLite.Interop.dll $platform + tryCopyAssembly System.Data.SQLite.dll $platform + } } # # NOTE: Skip trying to load any files if we are so instructed. # if {![info exists ::no(loadSqliteFiles)]} then { tryLoadAssembly System.Data.SQLite.dll tryLoadAssembly System.Data.SQLite.Linq.dll + + if {[string length $platform] > 0} then { + tryLoadAssembly System.Data.SQLite.dll $platform + } } + # + # NOTE: Build a list of auxiliary Managed Debugging Assistants (MDA) + # configuration files that may need to be deleted or copied. + # + set mdaConfigFileNames [list \ + Installer.exe.mda.config test.exe.mda.config \ + testlinq.exe.mda.config] + # # NOTE: Skip trying to delete external files if we are so instructed. # if {![info exists ::no(deleteSqliteExternalFiles)]} then { - tryDeleteBuildFile Installer.exe.mda.config - tryDeleteBuildFile test.exe.mda.config - tryDeleteBuildFile testlinq.exe.mda.config + foreach mdaConfigFileName $mdaConfigFileNames { + tryDeleteBuildFile $mdaConfigFileName + } } # # NOTE: Skip trying to copy external files if we are so instructed. # if {![info exists ::no(copySqliteExternalFiles)]} then { # - # NOTE: Copy the MDA configuration file for the Eagle shell to the - # build output directory; however, use the name of the legacy - # test executable. This will make sure that the legacy tests - # run with the same set of MDAs configured. - # - tryCopyBinaryFile EagleShell.exe.mda.config Installer.exe.mda.config - tryCopyBinaryFile EagleShell.exe.mda.config test.exe.mda.config - tryCopyBinaryFile EagleShell.exe.mda.config testlinq.exe.mda.config + # NOTE: Copy the Managed Debugging Assistants (MDA) configuration + # file for the Eagle shell to the build output directory, + # while using each of the names of the various legacy test + # executables. This will help to make sure that all the + # legacy tests run with exactly the same set of Managed + # Debugging Assistants configured. + # + foreach mdaConfigFileName $mdaConfigFileNames { + tryCopyBinaryFile EagleShell.exe.mda.config "" $mdaConfigFileName + } } } catch { tputs $::test_channel [appendArgs \ @@ -2317,10 +2373,33 @@ catch { tputs $::test_channel [appendArgs \ "---- file version of \"System.Data.SQLite.Linq.dll\"... " \ [file version [getBinaryFileName System.Data.SQLite.Linq.dll]] \n] } + + if {[string length $platform] > 0} then { + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $platform \ + "/sqlite3.dll\"... " [file version \ + [getBinaryFileName sqlite3.dll $platform]] \n] + } + + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $platform \ + "/SQLite.Interop.dll\"... " [file version \ + [getBinaryFileName SQLite.Interop.dll $platform]] \n] + } + + catch { + tputs $::test_channel [appendArgs \ + "---- file version of \"" $platform \ + "/System.Data.SQLite.dll\"... " [file version \ + [getBinaryFileName System.Data.SQLite.dll $platform]] \n] + } + } set assemblies [object invoke AppDomain.CurrentDomain GetAssemblies] object foreach assembly $assemblies { if {[string match \{System.Data.SQLite* $assembly]} then { @@ -2414,12 +2493,12 @@ INTEROP_EXTENSION_FUNCTIONS INTEROP_LEGACY_CLOSE INTEROP_LOG \ INTEROP_TEST_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \ NET_40 NET_45 NET_451 NET_COMPACT_20 PLATFORM_COMPACTFRAMEWORK \ PRELOAD_NATIVE_LIBRARY RETARGETABLE SQLITE_STANDARD \ THROW_ON_DISPOSED TRACE TRACE_CONNECTION TRACE_HANDLE \ - TRACE_PRELOAD TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \ - USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] { + TRACE_PRELOAD TRACE_SHARED TRACE_STATEMENT TRACE_WARNING \ + TRACK_MEMORY_BYTES USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] { # # NOTE: Check if the compile-time option is listed in the list of # "define constants" kept track of by the managed assembly. # checkForSQLiteDefineConstant $::test_channel $defineConstant Index: Tests/version.eagle ================================================================== --- Tests/version.eagle +++ Tests/version.eagle @@ -27,11 +27,11 @@ # numbers must be manually kept synchronized with the version numbers for # the source code files, the built binaries, and the release packages. # set version(major) 1 set version(minor) 0 -set version(build) 90; # NOTE: Incremented with each release. +set version(build) 91; # NOTE: Incremented with each release. set version(revision) 0 ############################################################################### # ********************* END VOLATILE VERSION INFORMATION ********************** ############################################################################### Index: readme.htm ================================================================== --- readme.htm +++ readme.htm @@ -3,11 +3,11 @@ ADO.NET SQLite Data Provider
-Version 1.0.90.0 December 23, 2013
+Version 1.0.91.0 February XX, 2014 (release scheduled)
Using SQLite 3.8.2
Originally written by Robert Simpson
Released to the public domain, use at your own risk!
Official provider website: http://system.data.sqlite.org/
Legacy versions: http://sqlite.phxsoftware.com/
@@ -184,10 +184,16 @@

Version History

+ 1.0.91.0 - February XX, 2014 (release scheduled) +

Modify the native library pre-loader to support reading settings from an XML configuration file and to be capable of checking more than one directory. Persuant to [f0246d1817].

1.0.90.0 - December 23, 2013

Updated to SQLite 3.8.2.

- +

- + Index: testlinq/2010/App.config ================================================================== --- testlinq/2010/App.config +++ testlinq/2010/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2012/App.config ================================================================== --- testlinq/2012/App.config +++ testlinq/2012/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/2013/App.config ================================================================== --- testlinq/2013/App.config +++ testlinq/2013/App.config @@ -1,11 +1,11 @@ - + Index: testlinq/Properties/AssemblyInfo.cs ================================================================== --- testlinq/Properties/AssemblyInfo.cs +++ testlinq/Properties/AssemblyInfo.cs @@ -39,7 +39,7 @@ // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.90.0")] -[assembly: AssemblyFileVersion("1.0.90.0")] +[assembly: AssemblyVersion("1.0.91.0")] +[assembly: AssemblyFileVersion("1.0.91.0")] Index: tools/install/Properties/AssemblyInfo.cs ================================================================== --- tools/install/Properties/AssemblyInfo.cs +++ tools/install/Properties/AssemblyInfo.cs @@ -26,7 +26,7 @@ // Major Version // Minor Version // Build Number // Revision // -[assembly: AssemblyVersion("1.0.90.0")] -[assembly: AssemblyFileVersion("1.0.90.0")] +[assembly: AssemblyVersion("1.0.91.0")] +[assembly: AssemblyFileVersion("1.0.91.0")] Index: www/news.wiki ================================================================== --- www/news.wiki +++ www/news.wiki @@ -1,9 +1,15 @@ News Version History +

+ 1.0.91.0 - February XX, 2014 (release scheduled) +

Modify the native library pre-loader to support reading settings from an XML configuration file and to be capable of checking more than one directory. Persuant to [f0246d1817].

1.0.90.0 - December 23, 2013

Updated to [http://www.sqlite.org/releaselog/3_8_2.html|SQLite 3.8.2].