diff --git a/Divan.sln b/Divan.sln index fdba3cd..5a371bd 100644 --- a/Divan.sln +++ b/Divan.sln @@ -1,36 +1,55 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Divan", "src\Divan.csproj", "{37AC0B66-5340-4B81-BC62-3EE80233A011}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trivial", "samples\Trivial\Trivial.csproj", "{CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Divan.Test", "Tests\Divan.Test.csproj", "{09FB3192-8F25-4112-A8BB-93C83F6C3DDD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {37AC0B66-5340-4B81-BC62-3EE80233A011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37AC0B66-5340-4B81-BC62-3EE80233A011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37AC0B66-5340-4B81-BC62-3EE80233A011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37AC0B66-5340-4B81-BC62-3EE80233A011}.Release|Any CPU.Build.0 = Release|Any CPU - {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Release|Any CPU.Build.0 = Release|Any CPU - {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - version = 0.1 - StartupItem = src\Divan.csproj - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Divan", "src\Divan.csproj", "{37AC0B66-5340-4B81-BC62-3EE80233A011}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trivial", "samples\Trivial\Trivial.csproj", "{CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Divan.Test", "Tests\Divan.Test.csproj", "{09FB3192-8F25-4112-A8BB-93C83F6C3DDD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09FB3192-8F25-4112-A8BB-93C83F6C3DDD}.Release|Any CPU.Build.0 = Release|Any CPU + {37AC0B66-5340-4B81-BC62-3EE80233A011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37AC0B66-5340-4B81-BC62-3EE80233A011}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37AC0B66-5340-4B81-BC62-3EE80233A011}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37AC0B66-5340-4B81-BC62-3EE80233A011}.Release|Any CPU.Build.0 = Release|Any CPU + {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDCC7924-F227-46DC-B2E6-2BBE06B84AF2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + version = 0.1 + StartupItem = src\Divan.csproj + Policies = $0 + $0.DotNetNamingPolicy = $1 + $1.DirectoryNamespaceAssociation = None + $1.ResourceNamePolicy = FileFormatDefault + $0.StandardHeader = $2 + $2.Text = + $2.inheritsSet = MITX11License + $0.TextStylePolicy = $3 + $3.FileWidth = 120 + $3.TabWidth = 4 + $3.TabsToSpaces = False + $3.NoTabsAfterNonTabs = False + $3.RemoveTrailingWhitespace = False + $3.EolMarker = Native + $0.ChangeLogPolicy = $4 + $4.UpdateMode = None + $4.MessageStyle = $5 + $5.LineAlign = 0 + $4.inheritsSet = Mono + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Makefile b/Makefile index f983a75..36db24c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -EXTRA_DIST = rules.make configure Makefile.include ../../../Divan/bin/Debug/Newtonsoft.Json.dll +EXTRA_DIST = rules.make configure Makefile.include lib/Newtonsoft.Json.dll lib/nunit.framework.dll all: all-recursive @@ -12,10 +12,10 @@ include $(top_srcdir)/rules.make #Warning: This is an automatically generated file, do not edit! ifeq ($(CONFIG),DEBUG) - SUBDIRS = src samples/Trivial + SUBDIRS = src samples/Trivial Tests endif ifeq ($(CONFIG),RELEASE) - SUBDIRS = src samples/Trivial + SUBDIRS = src samples/Trivial Tests endif diff --git a/Makefile.include b/Makefile.include index 899f71b..6470f69 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,4 +1,4 @@ -VALID_CULTURES = ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af fo hi sw gu ta te kn mr gl kok ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US fi-FI fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA fo-FO hi-IN sw-KE gu-IN ta-IN te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO es-AR ar-LB en-ZW es-EC ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT +VALID_CULTURES = ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af fo hi sw gu ta te kn mr gl kok ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US fi-FI fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA fo-FO hi-IN sw-KE gu-IN ta-IN te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO en-TT es-AR ar-LB en-ZW es-EC ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT s2q=$(subst \ ,?,$1) q2s=$(subst ?,\ ,$1) diff --git a/Tests/CouchTest.cs b/Tests/CouchTest.cs index 3dada4d..05de1dd 100644 --- a/Tests/CouchTest.cs +++ b/Tests/CouchTest.cs @@ -11,8 +11,11 @@ namespace Divan.Test { /// /// Unit tests for Divan. Operates in a separate CouchDB database called divan_unit_tests. + /// If you are not running a CouchDB on localhost:5984 you will need to edit + /// the Tests/App.config file. + /// /// Run from command line using something like: - /// nunit-console2 --labels -run=Divan.CouchTest src/bin/Debug/Divan.dll + /// nunit-console2 --labels -run=Divan.CouchTest Tests/bin/Debug/Tests.dll /// [TestFixture] public class CouchTest diff --git a/Tests/Divan.Test.csproj b/Tests/Divan.Test.csproj index 5e04720..96045da 100644 --- a/Tests/Divan.Test.csproj +++ b/Tests/Divan.Test.csproj @@ -1,5 +1,5 @@ - - + + Debug AnyCPU @@ -20,7 +20,12 @@ bin\Debug\ DEBUG;TRACE prompt - 4 + 3 + + + + + pdbonly @@ -31,16 +36,16 @@ 4 - + False ..\lib\Newtonsoft.Json.dll - + False ..\lib\nunit.framework.dll - + 3.5 @@ -75,4 +80,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/Makefile b/Tests/Makefile new file mode 100644 index 0000000..5bbb879 --- /dev/null +++ b/Tests/Makefile @@ -0,0 +1,161 @@ + +EXTRA_DIST = Makefile + +# Warning: This is an automatically generated file, do not edit! + +srcdir=. +top_srcdir=.. + +include $(top_srcdir)/config.make + +ifeq ($(CONFIG),DEBUG) +ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" +ASSEMBLY = bin/Debug/Divan.Test.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../src/bin/Debug/Divan.dll +BUILD_DIR = bin/Debug/ + +NEWTONSOFT_JSON_DLL_SOURCE=../lib/Newtonsoft.Json.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../lib/nunit.framework.dll +DIVAN_DLL_SOURCE=../src/bin/Debug/Divan.dll +DIVAN_DLL_MDB_SOURCE=../src/bin/Debug/Divan.dll.mdb +DIVAN_DLL_MDB=$(BUILD_DIR)/Divan.dll.mdb +DIVAN_TEST_DLL_MDB_SOURCE=bin/Debug/Divan.Test.dll.mdb +DIVAN_TEST_DLL_MDB=$(BUILD_DIR)/Divan.Test.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = bin/Release/Divan.Test.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../src/bin/Release/Divan.dll +BUILD_DIR = bin/Release/ + +NEWTONSOFT_JSON_DLL_SOURCE=../lib/Newtonsoft.Json.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../lib/nunit.framework.dll +DIVAN_DLL_SOURCE=../src/bin/Release/Divan.dll +DIVAN_DLL_MDB= +DIVAN_TEST_DLL_MDB= + +endif + +AL=al2 +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NEWTONSOFT_JSON_DLL) \ + $(NUNIT_FRAMEWORK_DLL) \ + $(DIVAN_DLL) \ + $(DIVAN_DLL_MDB) \ + $(DIVAN_TEST_DLL_MDB) + +LINUX_PKGCONFIG = \ + $(DIVAN_TEST_PC) + + +RESGEN=resgen2 + +NEWTONSOFT_JSON_DLL = $(BUILD_DIR)/Newtonsoft.Json.dll +NUNIT_FRAMEWORK_DLL = $(BUILD_DIR)/nunit.framework.dll +DIVAN_DLL = $(BUILD_DIR)/Divan.dll +DIVAN_TEST_PC = $(BUILD_DIR)/divan.test.pc + +FILES = \ + CouchTest.cs \ + Lucene/CouchLuceneTest.cs \ + Properties/AssemblyInfo.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + App.config \ + divan.test.pc.in + +REFERENCES = \ + ../lib/Newtonsoft.Json.dll \ + ../lib/nunit.framework.dll \ + ../src/bin/Debug/Divan.dll \ + System \ + System.Configuration \ + System.Core \ + System.Data \ + System.Data.DataSetExtensions \ + System.Xml \ + System.Xml.Linq + +DLL_REFERENCES = \ + ../lib/Newtonsoft.Json.dll \ + ../lib/nunit.framework.dll + +CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,NEWTONSOFT_JSON_DLL)) +$(eval $(call emit-deploy-target,NUNIT_FRAMEWORK_DLL)) +$(eval $(call emit-deploy-target,DIVAN_DLL)) +$(eval $(call emit-deploy-target,DIVAN_DLL_MDB)) +$(eval $(call emit-deploy-wrapper,DIVAN_TEST_PC,divan.test.pc)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list) + make pre-all-local-hook prefix=$(prefix) + mkdir -p $(shell dirname $(ASSEMBLY)) + make $(CONFIG)_BeforeBuild + $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref) + make $(CONFIG)_AfterBuild + make post-all-local-hook prefix=$(prefix) + +install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) + make pre-install-local-hook prefix=$(prefix) + make install-satellite-assemblies prefix=$(prefix) + mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)' + $(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(DIVAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(DIVAN_TEST_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(libdir)/pkgconfig' + $(call cp,$(DIVAN_TEST_PC),$(DESTDIR)$(libdir)/pkgconfig) + make post-install-local-hook prefix=$(prefix) + +uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) + make pre-uninstall-local-hook prefix=$(prefix) + make uninstall-satellite-assemblies prefix=$(prefix) + $(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(DIVAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(DIVAN_TEST_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(DIVAN_TEST_PC),$(DESTDIR)$(libdir)/pkgconfig) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Tests/divan.test.pc b/Tests/divan.test.pc new file mode 100644 index 0000000..06f1e79 --- /dev/null +++ b/Tests/divan.test.pc @@ -0,0 +1,6 @@ +Name: Divan.Test +Description: Divan.Test +Version: 0.1 + +Requires: +Libs: -r:/usr/local/lib/divan/Divan.Test.dll diff --git a/Tests/divan.test.pc.in b/Tests/divan.test.pc.in new file mode 100644 index 0000000..a54ffb7 --- /dev/null +++ b/Tests/divan.test.pc.in @@ -0,0 +1,6 @@ +Name: Divan.Test +Description: Divan.Test +Version: 0.1 + +Requires: +Libs: -r:@expanded_libdir@/@PACKAGE@/Divan.Test.dll diff --git a/configure b/configure index 9d90ec6..9cd4231 100755 --- a/configure +++ b/configure @@ -3,8 +3,8 @@ VERSION=0.1 PACKAGE=divan prefix=/usr/local config=DEBUG -configurations=" RELEASE DEBUG" -common_packages=" nunit;2.4" +configurations=" DEBUG RELEASE" +common_packages="" usage () diff --git a/samples/Trivial/Makefile b/samples/Trivial/Makefile index 0b2f3fe..59416f7 100644 --- a/samples/Trivial/Makefile +++ b/samples/Trivial/Makefile @@ -10,7 +10,7 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" "-main:Trivial.Program" +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" ASSEMBLY = bin/Debug/Trivial.exe ASSEMBLY_MDB = $(ASSEMBLY).mdb COMPILE_TARGET = exe @@ -18,11 +18,11 @@ PROJECT_REFERENCES = \ ../../src/bin/Debug/Divan.dll BUILD_DIR = bin/Debug/ -NEWTONSOFT_JSON_DLL_SOURCE=../../../../../Divan/bin/Debug/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB_SOURCE=../../../../../Divan/bin/Debug/Newtonsoft.Json.dll.mdb +NEWTONSOFT_JSON_DLL_SOURCE=../../lib/Newtonsoft.Json.dll +DIVAN_DLL_SOURCE=../../src/bin/Debug/Divan.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../../lib/nunit.framework.dll DIVAN_DLL_MDB_SOURCE=../../src/bin/Debug/Divan.dll.mdb DIVAN_DLL_MDB=$(BUILD_DIR)/Divan.dll.mdb -DIVAN_DLL_SOURCE=../../src/bin/Debug/Divan.dll TRIVIAL_EXE_MDB_SOURCE=bin/Debug/Trivial.exe.mdb TRIVIAL_EXE_MDB=$(BUILD_DIR)/Trivial.exe.mdb @@ -30,7 +30,7 @@ endif ifeq ($(CONFIG),RELEASE) ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" "-main:Trivial.Program" +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" ASSEMBLY = bin/Release/Trivial.exe ASSEMBLY_MDB = COMPILE_TARGET = exe @@ -38,10 +38,10 @@ PROJECT_REFERENCES = \ ../../src/bin/Release/Divan.dll BUILD_DIR = bin/Release/ -NEWTONSOFT_JSON_DLL_SOURCE=../../../../../Divan/bin/Debug/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB_SOURCE=../../../../../Divan/bin/Debug/Newtonsoft.Json.dll.mdb -DIVAN_DLL_MDB= +NEWTONSOFT_JSON_DLL_SOURCE=../../lib/Newtonsoft.Json.dll DIVAN_DLL_SOURCE=../../src/bin/Release/Divan.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../../lib/nunit.framework.dll +DIVAN_DLL_MDB= TRIVIAL_EXE_MDB= endif @@ -51,9 +51,9 @@ SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll PROGRAMFILES = \ $(NEWTONSOFT_JSON_DLL) \ - $(NEWTONSOFT_JSON_DLL_MDB) \ - $(DIVAN_DLL_MDB) \ $(DIVAN_DLL) \ + $(NUNIT_FRAMEWORK_DLL) \ + $(DIVAN_DLL_MDB) \ $(TRIVIAL_EXE_MDB) BINARIES = \ @@ -62,12 +62,12 @@ BINARIES = \ RESGEN=resgen2 -TRIVIAL = $(BUILD_DIR)/trivial NEWTONSOFT_JSON_DLL = $(BUILD_DIR)/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB = $(BUILD_DIR)/Newtonsoft.Json.dll.mdb DIVAN_DLL = $(BUILD_DIR)/Divan.dll +NUNIT_FRAMEWORK_DLL = $(BUILD_DIR)/nunit.framework.dll +TRIVIAL = $(BUILD_DIR)/trivial -FILES = \ +FILES = \ Program.cs \ Properties/AssemblyInfo.cs @@ -79,15 +79,17 @@ EXTRAS = \ trivial.in REFERENCES = \ + ../../lib/Newtonsoft.Json.dll \ + ../../src/bin/Debug/Divan.dll \ System \ System.Core \ - System.Xml.Linq \ - System.Data.DataSetExtensions \ System.Data \ - System.Xml + System.Data.DataSetExtensions \ + System.Xml \ + System.Xml.Linq DLL_REFERENCES = \ - ../../../../../Divan/bin/Debug/Newtonsoft.Json.dll + ../../lib/Newtonsoft.Json.dll CLEANFILES = $(PROGRAMFILES) $(BINARIES) @@ -99,11 +101,11 @@ include $(top_srcdir)/Makefile.include -$(eval $(call emit-deploy-wrapper,TRIVIAL,trivial,x)) $(eval $(call emit-deploy-target,NEWTONSOFT_JSON_DLL)) -$(eval $(call emit-deploy-target,NEWTONSOFT_JSON_DLL_MDB)) -$(eval $(call emit-deploy-target,DIVAN_DLL_MDB)) $(eval $(call emit-deploy-target,DIVAN_DLL)) +$(eval $(call emit-deploy-target,NUNIT_FRAMEWORK_DLL)) +$(eval $(call emit-deploy-target,DIVAN_DLL_MDB)) +$(eval $(call emit-deploy-wrapper,TRIVIAL,trivial,x)) $(eval $(call emit_resgen_targets)) @@ -125,13 +127,13 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)' $(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) - mkdir -p '$(DESTDIR)$(bindir)' - $(call cp,$(TRIVIAL),$(DESTDIR)$(bindir)) $(call cp,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call cp,$(NEWTONSOFT_JSON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call cp,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(DIVAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(TRIVIAL_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(bindir)' + $(call cp,$(TRIVIAL),$(DESTDIR)$(bindir)) make post-install-local-hook prefix=$(prefix) uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) @@ -139,12 +141,12 @@ uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) make uninstall-satellite-assemblies prefix=$(prefix) $(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call rm,$(TRIVIAL),$(DESTDIR)$(bindir)) $(call rm,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call rm,$(NEWTONSOFT_JSON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call rm,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(DIVAN_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(TRIVIAL_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(TRIVIAL),$(DESTDIR)$(bindir)) make post-uninstall-local-hook prefix=$(prefix) install: install-local diff --git a/samples/Trivial/Trivial.csproj b/samples/Trivial/Trivial.csproj index f8ed2b5..b5a1de3 100644 --- a/samples/Trivial/Trivial.csproj +++ b/samples/Trivial/Trivial.csproj @@ -66,4 +66,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Divan.csproj b/src/Divan.csproj index e8a76c1..7b2425b 100644 --- a/src/Divan.csproj +++ b/src/Divan.csproj @@ -1,4 +1,4 @@ - + Debug @@ -40,6 +40,10 @@ 3.5 + + False + ..\lib\nunit.framework.dll + diff --git a/src/Makefile b/src/Makefile index 1e55248..28fb368 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,15 +10,15 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:3 -optimize- -debug "-define:DEBUG;TRACE" ASSEMBLY = bin/Debug/Divan.dll ASSEMBLY_MDB = $(ASSEMBLY).mdb COMPILE_TARGET = library PROJECT_REFERENCES = BUILD_DIR = bin/Debug/ -NEWTONSOFT_JSON_DLL_SOURCE=../../../../Divan/bin/Debug/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB_SOURCE=../../../../Divan/bin/Debug/Newtonsoft.Json.dll.mdb +NEWTONSOFT_JSON_DLL_SOURCE=../lib/Newtonsoft.Json.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../lib/nunit.framework.dll DIVAN_DLL_MDB_SOURCE=bin/Debug/Divan.dll.mdb DIVAN_DLL_MDB=$(BUILD_DIR)/Divan.dll.mdb @@ -26,15 +26,15 @@ endif ifeq ($(CONFIG),RELEASE) ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:3 -optimize+ "-define:TRACE" ASSEMBLY = bin/Release/Divan.dll ASSEMBLY_MDB = COMPILE_TARGET = library PROJECT_REFERENCES = BUILD_DIR = bin/Release/ -NEWTONSOFT_JSON_DLL_SOURCE=../../../../Divan/bin/Debug/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB_SOURCE=../../../../Divan/bin/Debug/Newtonsoft.Json.dll.mdb +NEWTONSOFT_JSON_DLL_SOURCE=../lib/Newtonsoft.Json.dll +NUNIT_FRAMEWORK_DLL_SOURCE=../lib/nunit.framework.dll DIVAN_DLL_MDB= endif @@ -44,7 +44,7 @@ SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll PROGRAMFILES = \ $(NEWTONSOFT_JSON_DLL) \ - $(NEWTONSOFT_JSON_DLL_MDB) \ + $(NUNIT_FRAMEWORK_DLL) \ $(DIVAN_DLL_MDB) LINUX_PKGCONFIG = \ @@ -54,7 +54,7 @@ LINUX_PKGCONFIG = \ RESGEN=resgen2 NEWTONSOFT_JSON_DLL = $(BUILD_DIR)/Newtonsoft.Json.dll -NEWTONSOFT_JSON_DLL_MDB = $(BUILD_DIR)/Newtonsoft.Json.dll.mdb +NUNIT_FRAMEWORK_DLL = $(BUILD_DIR)/nunit.framework.dll DIVAN_PC = $(BUILD_DIR)/divan.pc FILES = \ @@ -74,7 +74,6 @@ FILES = \ CouchQueryDocument.cs \ CouchRequest.cs \ CouchServer.cs \ - CouchTest.cs \ CouchViewDefinition.cs \ CouchViewDefinitionBase.cs \ CouchViewResult.cs \ @@ -86,7 +85,6 @@ FILES = \ Linq/TypeSystem.cs \ Lucene/CouchLuceneHit.cs \ Lucene/CouchLuceneQuery.cs \ - Lucene/CouchLuceneTest.cs \ Lucene/CouchLuceneViewDefinition.cs \ Lucene/CouchLuceneViewResult.cs \ Properties/AssemblyInfo.cs @@ -106,7 +104,8 @@ REFERENCES = \ System.Web DLL_REFERENCES = \ - ../../../../Divan/bin/Debug/Newtonsoft.Json.dll + ../lib/Newtonsoft.Json.dll \ + ../lib/nunit.framework.dll CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG) @@ -119,7 +118,7 @@ include $(top_srcdir)/Makefile.include $(eval $(call emit-deploy-target,NEWTONSOFT_JSON_DLL)) -$(eval $(call emit-deploy-target,NEWTONSOFT_JSON_DLL_MDB)) +$(eval $(call emit-deploy-target,NUNIT_FRAMEWORK_DLL)) $(eval $(call emit-deploy-wrapper,DIVAN_PC,divan.pc)) @@ -143,7 +142,7 @@ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call cp,$(NEWTONSOFT_JSON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call cp,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) mkdir -p '$(DESTDIR)$(libdir)/pkgconfig' $(call cp,$(DIVAN_PC),$(DESTDIR)$(libdir)/pkgconfig) @@ -155,7 +154,7 @@ uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(NEWTONSOFT_JSON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) - $(call rm,$(NEWTONSOFT_JSON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NUNIT_FRAMEWORK_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(DIVAN_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) $(call rm,$(DIVAN_PC),$(DESTDIR)$(libdir)/pkgconfig) make post-uninstall-local-hook prefix=$(prefix)