Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Lucene integration, refactorings and more.
- Loading branch information
Showing
20 changed files
with
1,826 additions
and
976 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,30 @@ | ||
|
|
||
| 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 | ||
| 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 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| 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 | ||
| 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 | ||
| EndGlobalSection | ||
| GlobalSection(MonoDevelopProperties) = preSolution | ||
| version = 0.1 | ||
| StartupItem = src\Divan.csproj | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
|
|
||
| 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" "-main:Trivial.Program" | ||
| ASSEMBLY = bin/Debug/Trivial.exe | ||
| ASSEMBLY_MDB = $(ASSEMBLY).mdb | ||
| COMPILE_TARGET = exe | ||
| 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 | ||
| 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 | ||
|
|
||
| endif | ||
|
|
||
| ifeq ($(CONFIG),RELEASE) | ||
| ASSEMBLY_COMPILER_COMMAND = gmcs | ||
| ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" "-main:Trivial.Program" | ||
| ASSEMBLY = bin/Release/Trivial.exe | ||
| ASSEMBLY_MDB = | ||
| COMPILE_TARGET = exe | ||
| 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= | ||
| DIVAN_DLL_SOURCE=../../src/bin/Release/Divan.dll | ||
| TRIVIAL_EXE_MDB= | ||
|
|
||
| endif | ||
|
|
||
| AL=al2 | ||
| SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll | ||
|
|
||
| PROGRAMFILES = \ | ||
| $(NEWTONSOFT_JSON_DLL) \ | ||
| $(NEWTONSOFT_JSON_DLL_MDB) \ | ||
| $(DIVAN_DLL_MDB) \ | ||
| $(DIVAN_DLL) \ | ||
| $(TRIVIAL_EXE_MDB) | ||
|
|
||
| BINARIES = \ | ||
| $(TRIVIAL) | ||
|
|
||
|
|
||
| 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 | ||
|
|
||
| FILES = \ | ||
| Program.cs \ | ||
| Properties/AssemblyInfo.cs | ||
|
|
||
| DATA_FILES = | ||
|
|
||
| RESOURCES = | ||
|
|
||
| EXTRAS = \ | ||
| trivial.in | ||
|
|
||
| REFERENCES = \ | ||
| System \ | ||
| System.Core \ | ||
| System.Xml.Linq \ | ||
| System.Data.DataSetExtensions \ | ||
| System.Data \ | ||
| System.Xml | ||
|
|
||
| DLL_REFERENCES = \ | ||
| ../../../../../Divan/bin/Debug/Newtonsoft.Json.dll | ||
|
|
||
| CLEANFILES = $(PROGRAMFILES) $(BINARIES) | ||
|
|
||
| #Targets | ||
| all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) $(top_srcdir)/config.make | ||
|
|
||
| include $(top_srcdir)/Makefile.include | ||
| #include $(srcdir)/custom-hooks.make | ||
|
|
||
|
|
||
|
|
||
| $(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_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)) | ||
| 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,$(TRIVIAL_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) | ||
| 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,$(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,$(TRIVIAL_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) | ||
| make post-uninstall-local-hook prefix=$(prefix) | ||
|
|
||
| install: install-local | ||
| uninstall: uninstall-local | ||
| clean: clean-local | ||
|
|
||
| include $(top_srcdir)/rules.make |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/bin/sh | ||
|
|
||
| exec mono "/usr/local/lib/divan/Trivial.exe" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/bin/sh | ||
|
|
||
| exec mono "@expanded_libdir@/@PACKAGE@/Trivial.exe" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,4 +34,4 @@ public override void ReadJson(JObject obj) | |
| throw new NotImplementedException(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.