diff --git a/dist/adodotnet/adapt_SQLite.Interop.2008.xq.in b/dist/adodotnet/adapt_SQLite.Interop.2008.xq.in deleted file mode 100644 index 3d4271f42..000000000 --- a/dist/adodotnet/adapt_SQLite.Interop.2008.xq.in +++ /dev/null @@ -1,105 +0,0 @@ -(: -* This template is for changing SQLite.Interop/SQLite.Interop.vcproj -* of ADO.NET -:) -declare variable $WINDOWS_PROJ_URL := '@BDB_PATH@/build_windows/VS8/db.vcproj'; -declare variable $WINDOWS_FILES := fn:document($WINDOWS_PROJ_URL)/VisualStudioProject/Files; - -(: Copy File List and adapt it :) -declare function local:getFileList($fileList) -{ - copy $newFileList := $fileList - modify ( - (: Remove build_windows files, e.g.: libdb.def and libdb.rc :) - delete node $newFileList/File[fn:contains(@RelativePath, 'build_windows')], - (: Remove useless lang files, e.g.: lang\cxx :) - delete node $newFileList/File[fn:contains(@RelativePath, '..\lang')], - (: Change file path :) - for $filePath in $newFileList/File/@RelativePath - return replace value of node $filePath - with fn:replace($filePath, '..\\..\\src', $WIN_SRC) - ) - return $newFileList -}; - -let $root := VisualStudioProject -let $fileList := $WINDOWS_FILES -let $cflags := $WINDOWS_FLAGS -let $includes := $WINDOWS_INCLUDE -let $inputLib := $WINDOWS_INPUT_LIB -return -( - (: Add BDB Files :) - ( - let $newFileList := local:getFileList($fileList) - for $fileEntry in $root/Files/Filter[@Name="Source Files"] - for $fileItem in $newFileList/File - return insert node $fileItem as last into $fileEntry - ), - - (: Update Configurations :) - ( - for $config in $root/Configurations/Configuration - let $VCCLCompilerTool := $config/Tool[@Name="VCCLCompilerTool"] - let $VCLinkerTool := $config/Tool[@Name="VCLinkerTool"] - let $VCManifestTool := $config/Tool[@Name="VCManifestTool"] - let $PreprocessorDefinitions := $VCCLCompilerTool/@PreprocessorDefinitions - let $AdditionalIncludeDirectories := $VCCLCompilerTool/@AdditionalIncludeDirectories - let $WarningLevel := $VCCLCompilerTool/@WarningLevel - let $AdditionalDependencies := $VCLinkerTool/@AdditionalDependencies - return - ( - (: For Win32/x64 :) - if (fn:contains($config/@Name, "Win32") or - fn:contains($config/@Name, "x64")) then ( - - (: Update PreprocessorDefinitions :) - ( - for $node in $PreprocessorDefinitions - let $additionalFlags := - if (fn:contains($config/@Name, 'Debug')) then ( - $DEBUG_ADDITIONAL_FLAGS - ) else () - let $combinedFlags := - fn:concat($node/string(), $cflags, $additionalFlags) - return replace value of node $node with $combinedFlags - ), - - (: Update AdditionalIncludeDirectories :) - ( - if (fn:exists($AdditionalIncludeDirectories)) then ( - (: Update the attribute if exist:) - replace value of node $AdditionalIncludeDirectories - with fn:concat($AdditionalIncludeDirectories/string(), ' ', $includes) - ) else ( - (: Insert the attribute otherwise :) - insert node attribute AdditionalIncludeDirectories {$includes} - into $VCCLCompilerTool - ) - ), - - (: Update AdditionalDependencies :) - ( - if (fn:exists($AdditionalDependencies)) then ( - (: Update the attribute if exist:) - replace value of node $AdditionalDependencies - with fn:concat($AdditionalDependencies/string(), ' ', $inputLib) - ) else if ($inputLib != '') then ( - (: Insert the attribute otherwise :) - insert node attribute AdditionalDependencies {$inputLib} - into $VCLinkerTool - ) else () - ), - - (: Update WarningLevel :) - ( - for $node in $WarningLevel - return - replace value of node $node with '3' - ) - - ) else () - ) - ) -) - diff --git a/dist/adodotnet/adapt_SQLite.Interop.2010.xq.in b/dist/adodotnet/adapt_SQLite.Interop.2010.xq.in deleted file mode 100644 index 1151c6bd6..000000000 --- a/dist/adodotnet/adapt_SQLite.Interop.2010.xq.in +++ /dev/null @@ -1,89 +0,0 @@ -(: -* This template is only for changing SQLite.Interop/SQLite.Interop.vcproj -* of ADO.NET -:) -declare variable $WINDOWS_PROJ_URL := '@BDB_PATH@/build_windows/VS10/db.vcxproj'; -declare variable $WINDOWS_FILES := fn:document($WINDOWS_PROJ_URL)/Project/ItemGroup/ClCompile/parent::*; - -(: Copy File List and adapt it :) -declare function local:getFileList($fileList) -{ - copy $newFileList := $fileList - modify ( - (: Remove useless lang files from the list, e.g.: lang\cxx :) - delete node $newFileList//ClCompile[fn:contains(@Include, '..\lang')], - (: Change file path :) - for $filePath in ($newFileList//ClCompile/@Include, $newFileList//ClCompile/@Condition) - return replace value of node $filePath - with fn:replace($filePath, '..\\..\\src', $WIN_SRC) - ) - return $newFileList -}; - -let $root := Project -let $fileList := $WINDOWS_FILES -let $cflags := $WINDOWS_FLAGS -let $includes := fn:replace($WINDOWS_INCLUDE, ',', ';') (: VS2010 use ';' as separator :) -let $inputLib := fn:concat($WINDOWS_INPUT_LIB, ';advapi32.lib') -return -( - (: Add BDB Files :) - ( - let $newFileList := local:getFileList($fileList) - for $fileEntry in $root - for $fileItem in $newFileList - (:return $fileEntry:) - return insert node $fileItem as last into $fileEntry - (:return $fileItem:) - ), - - (: Update PreprocessorDefinitions :) - ( - for $node in $root//PreprocessorDefinitions[fn:contains(string(), 'WIN32;')] - let $additionalFlags := - if (fn:contains($node/../../@Condition, 'Debug')) then ( - $DEBUG_ADDITIONAL_FLAGS - ) else () - let $combinedFlags := fn:concat($node/string(), $cflags, $additionalFlags) - return replace value of node $node with $combinedFlags - ), - - (: Update/add AdditionalIncludeDirectories after PreprocessorDefinitions :) - ( - for $node in $root//PreprocessorDefinitions[fn:contains(string(), 'WIN32;')] - let $ClCompile := $node/parent::* - let $AdditionalIncludeDirectories := $ClCompile/AdditionalIncludeDirectories - return - if (exists($AdditionalIncludeDirectories)) then ( - replace value of node $AdditionalIncludeDirectories - with fn:concat($AdditionalIncludeDirectories/string(), ' ', $includes) - ) else ( - insert node {$includes} - into $ClCompile - ) - ), - - (: Update AdditionalDependencies :) - ( - for $node in $root//ItemDefinitionGroup/Link - let $dependcies := $node/AdditionalDependencies - let $group := $node/parent::* - return - if (fn:contains($group/@Condition, "Win32") or - fn:contains($group/@Condition, "x64")) then ( - if (exists($dependcies)) then ( - replace value of node $dependcies with fn:concat($inputLib, ';', $dependcies/string()) - ) else ( - insert node {$inputLib} - into $node - ) - ) else () - ), - - (: Update WarningLevel :) - ( - for $node in $root//WarningLevel - return replace value of node $node with "Level3" - ) -) - diff --git a/dist/adodotnet/adapt_common.xq.in b/dist/adodotnet/adapt_common.xq.in deleted file mode 100644 index 7e35bdc2f..000000000 --- a/dist/adodotnet/adapt_common.xq.in +++ /dev/null @@ -1,32 +0,0 @@ -(: -* Common part of XQuery scripts -:) -declare boundary-space preserve; - -declare variable $COMMON_FLAGS := fn:concat( - '_WINDOWS;', - '_LIB;', - 'SQLITE_HAS_CODEC;', - 'SQLITE_EXPORTS;', - 'SQLITE_CORE;', - 'UNICODE;', - '_UNICODE;', - '_USRDLL;', - 'HAVE_ERRNO_H;'); - -declare variable $WINDOWS_FLAGS := fn:concat(';', - $COMMON_FLAGS, - '_CRT_SECURE_NO_DEPRECATE;', - '_CRT_NONSTDC_NO_DEPRECATE;', - 'DB_CREATE_DLL;'); - -declare variable $DEBUG_ADDITIONAL_FLAGS := fn:concat( - 'DIAGNOSTIC;', - '_DEBUG;', - 'CONFIG_TEST'); - -(: Win32/x64 variables :) -declare variable $WINDOWS_INCLUDE := '..\@BDB_NAME@\build_windows,..\@BDB_NAME@\src'; -declare variable $WIN_SRC := '..\\@BDB_NAME@\\src'; -declare variable $WINDOWS_INPUT_LIB := 'ws2_32.lib'; - diff --git a/dist/adodotnet/adodotnet.patch b/dist/adodotnet/adodotnet.patch deleted file mode 100644 index 235c1139d..000000000 --- a/dist/adodotnet/adodotnet.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- orginal/src/win/interop.c 2010-04-17 13:14:08 +0800 -+++ SQLite.Interop/src/win/interop.c 2010-11-18 12:59:06 +0800 -@@ -1,6 +1,5 @@ - #include "../core/sqlite3.c" - #include "../contrib/extension-functions.c" --#include "crypt.c" - - extern int RegisterExtensionFunctions(sqlite3 *db); - -@@ -393,7 +392,7 @@ - int n; - int ret = -1; - -- sqlite3_mutex_enter(db->mutex); -+ /* sqlite3_mutex_enter(db->mutex); - for (n = 0; n < p->nCursor && p->apCsr[n] != NULL; n++) - { - if (p->apCsr[n]->isTable == FALSE) continue; -@@ -405,7 +404,7 @@ - } - } - sqlite3_mutex_leave(db->mutex); -- -+*/ - return ret; - } - ---- orginal/src/contrib/extension-functions.c 2009-04-28 08:01:14 +0800 -+++ SQLite.Interop/src/contrib/extension-functions.c 2010-11-18 12:26:06 +0800 -@@ -120,6 +120,7 @@ - #ifndef _WIN32_WCE - #include /* LMH 2007-03-25 */ - #else -+#undef errno - int errno; - #define strerror(x) "" - #endif -@@ -134,8 +135,8 @@ - - typedef signed char int8_t; - typedef unsigned char uint8_t; --typedef signed int int16_t; --typedef unsigned int uint16_t; -+typedef signed short int16_t; -+typedef unsigned short uint16_t; - typedef signed long int int32_t; - typedef unsigned long int uint32_t; - typedef signed long long int int64_t; ---- orginal/test/TestCases.cs 2011-04-27 17:27:26.000000000 +0800 -+++ test/TestCases.cs 2011-05-17 17:53:26.000000000 +0800 -@@ -1204,7 +1204,8 @@ - CheckLocked(); - } - -- [Test(Sequence = 60)] -+ // Skip below test due to difference between SQLite and DBSQL." -+ // [Test(Sequence = 60)] - internal void LockTest() - { - CheckSQLite(); -@@ -1289,7 +1290,8 @@ - internal int value; - } - -- [Test(Sequence=11)] -+ // Skip below test due to difference between SQLite and DBSQL." -+ // [Test(Sequence=11)] - internal void MultithreadingTest() - { - using (DbCommand cmd = _cnn.CreateCommand()) ---- orginal/testce/TestCases.cs 2011-04-27 17:27:26.000000000 +0800 -+++ testce/TestCases.cs 2011-05-17 17:52:26.000000000 +0800 -@@ -103,8 +103,9 @@ - try { VerifyBinaryData(cnn); frm.WriteLine("SUCCESS - VerifyBinaryData"); } - catch (Exception) { frm.WriteLine("FAIL - VerifyBinaryData"); } - -- try { LockTest(cnn); frm.WriteLine("SUCCESS - LockTest"); } -- catch (Exception) { frm.WriteLine("FAIL - LockTest"); } -+ // Skip below test due to difference between SQLite and DBSQL." -+ // try { LockTest(cnn); frm.WriteLine("SUCCESS - LockTest"); } -+ // catch (Exception) { frm.WriteLine("FAIL - LockTest"); } - - try { ParameterizedInsertMissingParams(cnn); frm.WriteLine("FAIL - ParameterizedInsertMissingParams"); } - catch (Exception) { frm.WriteLine("SUCCESS - ParameterizedInsertMissingParams"); } ---- orginal/System.Data.SQLite/SQLiteConnection.cs 2011-04-27 17:27:26.000000000 +0800 -+++ System.Data.SQLite/SQLiteConnection.cs 2011-05-17 17:58:36.000000000 +0800 -@@ -880,9 +880,10 @@ - cmd.ExecuteNonQuery(); - } - -- defValue = FindKey(opts, "Legacy Format", Boolean.FalseString); -- cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA legacy_file_format={0}", SQLiteConvert.ToBoolean(defValue) == true ? "ON" : "OFF"); -- cmd.ExecuteNonQuery(); -+ // DBSQL does not support "PRAGMA legacy_file_format", ignore this operation. -+ // defValue = FindKey(opts, "Legacy Format", Boolean.FalseString); -+ // cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA legacy_file_format={0}", SQLiteConvert.ToBoolean(defValue) == true ? "ON" : "OFF"); -+ // cmd.ExecuteNonQuery(); - - defValue = FindKey(opts, "Synchronous", "Normal"); - if (String.Compare(defValue, "Full", StringComparison.OrdinalIgnoreCase) != 0) -@@ -901,8 +902,9 @@ - defValue = FindKey(opts, "Journal Mode", "Delete"); - if (String.Compare(defValue, "Default", StringComparison.OrdinalIgnoreCase) != 0) - { -- cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA journal_mode={0}", defValue); -- cmd.ExecuteNonQuery(); -+ // DBSQL does not support "PRAGMA journal_mode", ignore this operation. -+ // cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA journal_mode={0}", defValue); -+ // cmd.ExecuteNonQuery(); - } - - defValue = FindKey(opts, "Foreign Keys", Boolean.FalseString); diff --git a/dist/adodotnet/test.2008.csproj.user b/dist/adodotnet/test.2008.csproj.user deleted file mode 100644 index 300184a2e..000000000 --- a/dist/adodotnet/test.2008.csproj.user +++ /dev/null @@ -1,8 +0,0 @@ - - - ..\..\..\bin\Win32\ReleaseNativeOnly - - - ..\..\..\bin\Win32\DebugNativeOnly - -