Tolte impostazioni sulla libreria sqlite da usare e aggiunta sqlite3.dll
Leonardo Robol [2010-02-06 22:33]
Tolte impostazioni sulla libreria sqlite da usare e aggiunta sqlite3.dll
per i poveri utenti Windows che non se la trovano sul sistema.
diff --git a/Dizzy.csproj b/Dizzy.csproj
index 275a330..1ef8bed 100644
--- a/Dizzy.csproj
+++ b/Dizzy.csproj
@@ -77,6 +77,9 @@
<EmbeddedResource Include="gtk-gui\gui.stetic">
<LogicalName>gui.stetic</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="sqlite3.dll">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="gtk-gui\generated.cs" />
diff --git a/Dizzy.make b/Dizzy.make
index b1c48ac..fad8ed1 100644
--- a/Dizzy.make
+++ b/Dizzy.make
@@ -11,6 +11,7 @@ COMPILE_TARGET = exe
PROJECT_REFERENCES =
BUILD_DIR = bin/Debug
+SQLITE3_DLL_SOURCE=sqlite3.dll
TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
@@ -29,6 +30,7 @@ COMPILE_TARGET = exe
PROJECT_REFERENCES =
BUILD_DIR = bin/Release
+SQLITE3_DLL_SOURCE=sqlite3.dll
TAMIR_SHARPSSH_DLL_SOURCE=Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL_SOURCE=DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL_SOURCE=Org.Mentalis.Security.dll
@@ -41,6 +43,7 @@ AL=al2
SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
PROGRAMFILES = \
+ $(SQLITE3_DLL) \
$(TAMIR_SHARPSSH_DLL) \
$(DIFFIEHELLMAN_DLL) \
$(ORG_MENTALIS_SECURITY_DLL) \
@@ -65,14 +68,15 @@ FILES = \
FileTreeView.cs \
TaskTreeView.cs \
Protocol.cs \
- StartupDialog.cs \
- gtk-gui/Dizzy.StartupDialog.cs \
- GlobalConfig.cs
+ GlobalConfig.cs \
+ AuthDialog.cs \
+ gtk-gui/Dizzy.AuthDialog.cs
DATA_FILES =
RESOURCES = \
- gtk-gui/gui.stetic
+ gtk-gui/gui.stetic \
+ sqlite3.dll,Dizzy.sqlite3.dll
EXTRAS = \
app.desktop \
@@ -95,12 +99,14 @@ CLEANFILES = $(PROGRAMFILES) $(BINARIES)
include $(top_srcdir)/Makefile.include
+SQLITE3_DLL = $(BUILD_DIR)/sqlite3.dll
TAMIR_SHARPSSH_DLL = $(BUILD_DIR)/Tamir.SharpSSH.dll
DIFFIEHELLMAN_DLL = $(BUILD_DIR)/DiffieHellman.dll
ORG_MENTALIS_SECURITY_DLL = $(BUILD_DIR)/Org.Mentalis.Security.dll
SYSTEM_DATA_SQLITE_DLL = $(BUILD_DIR)/System.Data.SQLite.dll
DIZZY = $(BUILD_DIR)/dizzy
+$(eval $(call emit-deploy-target,SQLITE3_DLL))
$(eval $(call emit-deploy-target,TAMIR_SHARPSSH_DLL))
$(eval $(call emit-deploy-target,DIFFIEHELLMAN_DLL))
$(eval $(call emit-deploy-target,ORG_MENTALIS_SECURITY_DLL))
diff --git a/GlobalConfig.cs b/GlobalConfig.cs
index 382a01e..cd88acc 100644
--- a/GlobalConfig.cs
+++ b/GlobalConfig.cs
@@ -13,7 +13,7 @@ namespace Dizzy
public GlobalConfig ()
{
- conn = new SQLiteConnection ("Data Source=" + DataBaseName () + ";Version=3;");
+ conn = new SQLiteConnection ("Data Source=" + DataBaseName () + ";");
// Controlliamo che il database sia correttamente
// inizializzato.
Init ();