From 1f6818cc1eb30a90be8662897dcb174c7fcbe433 Mon Sep 17 00:00:00 2001 From: Carsten Larsen Date: Tue, 6 Dec 2016 21:41:35 +0100 Subject: [PATCH] Makefile support --- Makefile | 98 +++-- Makefile.include | 119 ++++++ Ntp.Analyzer.Cli/Makefile | 259 ++++++++++++ Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj | 2 +- Ntp.Analyzer.Cli/ntpa.in | 3 + Ntp.Analyzer.Data/Makefile | 202 ++++++++++ Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj | 18 +- Ntp.Analyzer.Import/Makefile | 204 ++++++++++ .../Ntp.Analyzer.Import.csproj | 19 +- Ntp.Analyzer.Monitor.Cli/Makefile | 147 +++++++ .../Ntp.Analyzer.Monitor.Cli.csproj | 15 +- Ntp.Analyzer.Monitor.Cli/ntpac.in | 3 + Ntp.Analyzer.Monitor.Client/Makefile | 126 ++++++ .../Ntp.Analyzer.Monitor.Client.csproj | 20 +- Ntp.Analyzer.Monitor.Server/Makefile | 242 +++++++++++ .../Ntp.Analyzer.Monitor.Server.csproj | 19 +- Ntp.Analyzer.Objects/Makefile | 126 ++++++ .../Ntp.Analyzer.Objects.csproj | 18 +- Ntp.Analyzer.Process/Makefile | 269 +++++++++++++ .../Ntp.Analyzer.Process.csproj | 22 +- Ntp.Analyzer.Validate.Cli/Makefile | 221 ++++++++++ .../Ntp.Analyzer.Validate.Cli.csproj | 11 +- Ntp.Analyzer.Validate.Cli/ntpav.in | 3 + Ntp.Analyzer.Validate.Gui/Makefile | 224 +++++++++++ .../Ntp.Analyzer.Validate.Gui.csproj | 17 + Ntp.Analyzer.Validate.Gui/ntpag.in | 3 + Ntp.Analyzer.sln | 98 ++--- Ntp.Analyzer/Makefile | 379 ++++++++++++++++++ Ntp.Analyzer/Ntp.Analyzer.csproj | 24 +- Ntp.Common/Makefile | 146 +++++++ Ntp.Common/Ntp.Common.csproj | 24 +- Ntp.Data.Provider/Makefile | 156 +++++++ Ntp.Data.Provider/Ntp.Data.Provider.csproj | 24 +- Ntp.Data.Provider/packages.config | 2 +- Ntp.Data/Makefile | 137 +++++++ Ntp.Data/Ntp.Data.csproj | 10 +- Shared/AssemblyInfo.cs | 4 +- config.make | 9 + configure | 159 ++++++++ examples/Makefile | 50 +++ rules.make | 42 ++ 41 files changed, 3557 insertions(+), 117 deletions(-) create mode 100644 Makefile.include create mode 100644 Ntp.Analyzer.Cli/Makefile create mode 100644 Ntp.Analyzer.Cli/ntpa.in create mode 100644 Ntp.Analyzer.Data/Makefile create mode 100644 Ntp.Analyzer.Import/Makefile create mode 100644 Ntp.Analyzer.Monitor.Cli/Makefile create mode 100644 Ntp.Analyzer.Monitor.Cli/ntpac.in create mode 100644 Ntp.Analyzer.Monitor.Client/Makefile create mode 100644 Ntp.Analyzer.Monitor.Server/Makefile create mode 100644 Ntp.Analyzer.Objects/Makefile create mode 100644 Ntp.Analyzer.Process/Makefile create mode 100644 Ntp.Analyzer.Validate.Cli/Makefile create mode 100644 Ntp.Analyzer.Validate.Cli/ntpav.in create mode 100644 Ntp.Analyzer.Validate.Gui/Makefile create mode 100644 Ntp.Analyzer.Validate.Gui/ntpag.in create mode 100644 Ntp.Analyzer/Makefile create mode 100644 Ntp.Common/Makefile create mode 100644 Ntp.Data.Provider/Makefile create mode 100644 Ntp.Data/Makefile create mode 100644 config.make create mode 100755 configure create mode 100644 examples/Makefile create mode 100644 rules.make diff --git a/Makefile b/Makefile index f90f45d9..17233987 100644 --- a/Makefile +++ b/Makefile @@ -1,45 +1,71 @@ -all: release +EXTRA_DIST = rules.make configure Makefile.include ../MySql.Data ../Npgsql -debug: - xbuild /p:Configuration=Debug /p:TargetFrameworkVersion=v4.0 Ntp.Analyzer.sln +all: all-recursive -release: - xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.0 Ntp.Analyzer.sln +top_srcdir=. +include $(top_srcdir)/config.make +include $(top_srcdir)/Makefile.include +include $(top_srcdir)/rules.make -install: release - install -d ${DESTDIR}$(PREFIX)/sbin - install -d ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Data.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Import.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Monitor.Client.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Monitor.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Monitor.Server.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Objects.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Process.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Validate.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Analyzer.Validate.Gui.exe ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Common.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Data.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install bin/Ntp.Data.Provider.dll ${DESTDIR}$(PREFIX)/libexec/ntpa - install -d ${DESTDIR}$(PREFIX)/etc/ntpa/ - install examples/ntpa.conf ${DESTDIR}$(PREFIX)/etc/ntpa/ntpa.conf.sample +#include $(top_srcdir)/custom-hooks.make -install-linux: install - useradd -r ntpa - mkdir /var/run/ntpa - chown ntpa:ntpa /var/run/ntpa - touch /var/log/ntpa.log - chown ntpa:ntpa /var/log/ntpa.log +#Warning: This is an automatically generated file, do not edit! +ifeq ($(CONFIG),DEBUG) + SUBDIRS = Ntp.Analyzer.Objects examples Ntp.Common Ntp.Analyzer.Monitor.Client Ntp.Data Ntp.Data.Provider Ntp.Analyzer.Monitor.Cli Ntp.Analyzer.Data Ntp.Analyzer.Import Ntp.Analyzer Ntp.Analyzer.Validate.Cli Ntp.Analyzer.Validate.Gui Ntp.Analyzer.Monitor.Server Ntp.Analyzer.Process Ntp.Analyzer.Cli +endif +ifeq ($(CONFIG),RELEASE) + SUBDIRS = Ntp.Analyzer.Objects examples Ntp.Common Ntp.Analyzer.Monitor.Client Ntp.Data Ntp.Data.Provider Ntp.Analyzer.Monitor.Cli Ntp.Analyzer.Data Ntp.Analyzer.Import Ntp.Analyzer Ntp.Analyzer.Validate.Cli Ntp.Analyzer.Validate.Gui Ntp.Analyzer.Monitor.Server Ntp.Analyzer.Process Ntp.Analyzer.Cli +endif -clean-debug: - xbuild Ntp.Analyzer.sln /p:Configuration=Debug /t:clean -clean-release: - xbuild Ntp.Analyzer.sln /p:Configuration=Release /t:clean +CONFIG_MAKE=$(top_srcdir)/config.make -clean-all: clean-debug clean-release +%-recursive: $(CONFIG_MAKE) + @set . $$MAKEFLAGS; final_exit=:; \ + case $$2 in --unix) shift ;; esac; \ + case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \ + make pre-$*-hook prefix=$(prefix) ; \ + for dir in $(call quote_each,$(SUBDIRS)); do \ + case "$$dir" in \ + .) make $*-local || { final_exit="exit 1"; $$dk; };;\ + *) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\ + esac \ + done; \ + make post-$*-hook prefix=$(prefix) ; \ + $$final_exit -clean: clean-release +$(CONFIG_MAKE): + echo "You must run configure first" + exit 1 + +clean: clean-recursive +install: install-recursive +uninstall: uninstall-recursive + +dist: $(CONFIG_MAKE) + rm -rf $(PACKAGE)-$(VERSION) + mkdir $(PACKAGE)-$(VERSION) + make pre-dist-hook distdir=$$distdir + for dir in $(call quote_each,$(SUBDIRS)); do \ + pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \ + mkdir "$$pkgdir/$$dir" || true; \ + case $$dir in \ + .) make dist-local "distdir=$$pkgdir" || exit 1;; \ + *) (cd "$$dir"; make dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \ + esac \ + done + (make dist-local distdir=$(PACKAGE)-$(VERSION)) + make post-dist-hook "distsir=$$distdir" + tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION) + rm -rf $(PACKAGE)-$(VERSION) + @echo "==========================================" + @echo "$(PACKAGE)-$(VERSION) has been packaged > $(PACKAGE)-$(VERSION).tar.gz" + @echo "==========================================" + +distcheck: dist + (mkdir test; cd test; \ + tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \ + ./configure --prefix=$$(cd `pwd`/..; pwd); \ + make && make install && make dist); + rm -rf test diff --git a/Makefile.include b/Makefile.include new file mode 100644 index 00000000..e818cdbf --- /dev/null +++ b/Makefile.include @@ -0,0 +1,119 @@ +VALID_CULTURES = ar bg ca zh-CHS zh-Hans cs da de el en es fi fr he hu is it ja ko nl no pl pt rm ro ru hr sk sq sv th tr ur id uk be sl et lv lt tg fa vi hy az eu mk tn xh zu af ka fo hi mt se ga ms kk ky sw uz bn pa gu or ta te kn ml as mr mn bo cy km lo gl kok si am tzm ne ps fil ha yo nso kl ig ii br gsw sah rw gd 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 rm-CH ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR ur-PK id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT tg-Cyrl-TJ fa-IR vi-VN hy-AM az-Latn-AZ eu-ES mk-MK tn-ZA xh-ZA zu-ZA af-ZA ka-GE fo-FO hi-IN mt-MT se-NO sw-KE uz-Latn-UZ bn-IN gu-IN or-IN ta-IN te-IN kn-IN ml-IN as-IN mr-IN bo-CN cy-GB km-KH lo-LA gl-ES kok-IN si-LK am-ET ne-NP ps-AF fil-PH ha-Latn-NG yo-NG nso-ZA kl-GL ig-NG ii-CN br-FR sah-RU rw-RW gd-GB ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI az-Cyrl-AZ ga-IE uz-Cyrl-UZ bn-BD ar-EG zh-HK de-AT en-AU es-ES fr-CA se-FI ar-LY zh-SG de-LU en-CA es-GT fr-CH hr-BA ar-DZ zh-MO de-LI en-NZ es-CR fr-LU bs-Latn-BA ar-MA en-IE es-PA fr-MC sr-Latn-BA ar-TN en-ZA es-DO sr-Cyrl-BA ar-OM en-JM es-VE bs-Cyrl-BA ar-YE es-CO sr-Latn-RS ar-SY en-BZ es-PE sr-Cyrl-RS ar-JO en-TT es-AR sr-Latn-ME ar-LB en-ZW es-EC sr-Cyrl-ME ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA en-IN es-BO es-SV en-SG es-HN es-NI es-PR es-US bs-Cyrl bs-Latn sr-Cyrl sr-Latn az-Cyrl zh nn bs az-Latn uz-Cyrl mn-Cyrl zh-Hant zh-CHT nb sr tg-Cyrl uz-Latn tzm-Latn ha-Latn + +s2q=$(subst \ ,?,$1) +q2s=$(subst ?,\ ,$1) +# use this when result will be quoted +unesc2=$(subst ?, ,$1) + +build_sources = $(FILES) $(GENERATED_FILES) +build_sources_esc= $(call s2q,$(build_sources)) +# use unesc2, as build_sources_embed is quoted +build_sources_embed= $(call unesc2,$(build_sources_esc:%='$(srcdir)/%')) + +comma__=, +get_resource_name = $(firstword $(subst $(comma__), ,$1)) +get_culture = $(lastword $(subst ., ,$(basename $1))) +is_cultured_resource = $(and $(word 3,$(subst ., ,$1)), $(filter $(VALID_CULTURES),$(lastword $(subst ., ,$(basename $1))))) + +RESOURCES_ESC=$(call s2q,$(RESOURCES)) + +build_resx_list = $(foreach res, $(RESOURCES_ESC), $(if $(filter %.resx, $(call get_resource_name,$(res))),$(res),)) +build_non_culture_resx_list = $(foreach res, $(build_resx_list),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res))) +build_non_culture_others_list = $(foreach res, $(filter-out $(build_resx_list),$(RESOURCES_ESC)),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res))) +build_others_list = $(build_non_culture_others_list) +build_xamlg_list = $(filter %.xaml.g.cs, $(FILES)) + +# resgen all .resx resources +build_resx_files = $(foreach res, $(build_resx_list), $(call get_resource_name,$(res))) +build_resx_resources_esc = $(build_resx_files:.resx=.resources) +build_resx_resources = $(call q2s,$(build_resx_resources_esc)) + +# embed resources for the main assembly +build_resx_resources_hack = $(subst .resx,.resources, $(build_non_culture_resx_list)) +# use unesc2, as build_resx_resources_embed is quoted +build_resx_resources_embed = $(call unesc2,$(build_resx_resources_hack:%='-resource:%')) +build_others_files = $(call q2s,$(foreach res, $(build_others_list),$(call get_resource_name,$(res)))) +build_others_resources = $(build_others_files) +# use unesc2, as build_others_resources_embed is quoted +build_others_resources_embed = $(call unesc2,$(build_others_list:%='-resource:$(srcdir)/%')) + +build_resources = $(build_resx_resources) $(build_others_resources) +build_resources_embed = $(build_resx_resources_embed) $(build_others_resources_embed) + +# -usesourcepath is available only for resgen2 +emit_resgen_target_1=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); cd '$$(shell dirname '$$<')' && MONO_IOMAP=drive $$(RESGEN) '$$(shell basename '$$<')' '$$(shell basename '$$@')' +emit_resgen_target_2=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); MONO_IOMAP=drive $$(RESGEN) -usesourcepath '$$<' '$$@' + +emit_resgen_target=$(if $(filter resgen2,$(RESGEN)),$(emit_resgen_target_2),$(emit_resgen_target_1)) +emit_resgen_targets=$(foreach res,$(build_resx_resources_esc),$(eval $(call emit_resgen_target,$(res)))) + +build_references_ref = $(call q2s,$(foreach ref, $(call s2q,$(REFERENCES)), $(if $(filter -pkg:%, $(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref))))) +build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(DLL_REFERENCES)), -r:$(ref))) +build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(PROJECT_REFERENCES)), -r:$(ref))) + +s2q2s=$(call unesc2,$(call s2q,$1)) +cp_actual=test -z $1 || cp $1 $2 +cp=$(call cp_actual,'$(call s2q2s,$1)','$(call s2q2s,$2)') + +rm_actual=test -z '$1' || rm -f '$2' +rm=$(call rm_actual,$(call s2q2s,$1),$(call s2q2s,$2)/$(shell basename '$(call s2q2s,$1)')) + +EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) $(build_culture_res_files) +CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list) +DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/* + +programfilesdir = $(pkglibdir) +programfiles_DATA = $(ASSEMBLY) +bin_SCRIPTS = $(BINARIES) + +programfilesdir = @libdir@/@PACKAGE@ +programfiles_DATA = $(PROGRAMFILES) + + +# macros + +# $(call emit-deploy-target,deploy-variable-name) +define emit-deploy-target +$($1): $($1_SOURCE) + mkdir -p '$$(shell dirname '$$@')' + cp '$$<' '$$@' +endef + +# $(call emit-deploy-wrapper,wrapper-variable-name,wrapper-sourcefile,x) +# assumes that for a wrapper foo.pc its source template is foo.pc.in +# if $3 is non-empty then wrapper is marked exec +define emit-deploy-wrapper +$($1): $2 $(top_srcdir)/config.make + mkdir -p '$$(shell dirname '$$@')' + cp '$$<' '$$@' + $(if $3,chmod +x '$$@') + +$2: $2.in $(top_srcdir)/config.make + sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," -e "s,@expanded_libdir@,$(libdir)," -e "s,@expanded_bindir@,$(bindir)," -e "s,@expanded_datadir@,$(datadir)," < $2.in > $2 +endef + +# generating satellite assemblies + +culture_resources = $(foreach res, $(RESOURCES_ESC), $(if $(call is_cultured_resource,$(call get_resource_name, $(res))),$(res))) +cultures = $(sort $(foreach res, $(culture_resources), $(call get_culture,$(call get_resource_name,$(res))))) +culture_resource_dependencies = $(call q2s,$(BUILD_DIR)/$1/$(SATELLITE_ASSEMBLY_NAME): $(subst .resx,.resources,$2)) +culture_resource_commandlines = $(call unesc2,cmd_line_satellite_$1 += '/embed:$(subst .resx,.resources,$2)') +build_satellite_assembly_list = $(call q2s,$(cultures:%=$(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME))) +build_culture_res_files = $(call q2s,$(foreach res, $(culture_resources),$(call get_resource_name,$(res)))) +install_satellite_assembly_list = $(subst $(BUILD_DIR),$(DESTDIR)$(libdir)/$(PACKAGE),$(build_satellite_assembly_list)) + +$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_dependencies,$(call get_culture,$(call get_resource_name,$(res))),$(call get_resource_name,$(res)))))) +$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_commandlines,$(call get_culture,$(call get_resource_name,$(res))),$(res))))) + +$(build_satellite_assembly_list): $(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME): + mkdir -p '$(@D)' + $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*) + +$(install_satellite_assembly_list): + mkdir -p '$(@D)' + cp $(subst $(DESTDIR)$(libdir)/$(PACKAGE), $(BUILD_DIR), $@) $@ + +install-satellite-assemblies: $(install_satellite_assembly_list) + +uninstall-satellite-assemblies: + rm -rf $(install_satellite_assembly_list) \ No newline at end of file diff --git a/Ntp.Analyzer.Cli/Makefile b/Ntp.Analyzer.Cli/Makefile new file mode 100644 index 00000000..0b15eaaf --- /dev/null +++ b/Ntp.Analyzer.Cli/Makefile @@ -0,0 +1,259 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" "-main:Ntp.Analyzer.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Cli.exe +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Analyzer.Process.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_CLI_EXE_MDB_SOURCE=../bin/Ntp.Analyzer.Cli.exe.mdb +NTP_ANALYZER_CLI_EXE_MDB=$(BUILD_DIR)/Ntp.Analyzer.Cli.exe.mdb +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_PROCESS_DLL_SOURCE=../bin/Ntp.Analyzer.Process.dll +NTP_ANALYZER_PROCESS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Process.dll.mdb +NTP_ANALYZER_PROCESS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Process.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_ANALYZER_MONITOR_SERVER_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll.mdb +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" "-main:Ntp.Analyzer.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Cli.exe +ASSEMBLY_MDB = +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Analyzer.Process.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_CLI_EXE_MDB= +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= +NTP_ANALYZER_PROCESS_DLL_SOURCE=../bin/Ntp.Analyzer.Process.dll +NTP_ANALYZER_PROCESS_DLL_MDB= +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB= +NTP_ANALYZER_MONITOR_SERVER_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_CLI_EXE_MDB) \ + $(NTP_ANALYZER_DLL) \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) \ + $(NTP_ANALYZER_PROCESS_DLL) \ + $(NTP_ANALYZER_PROCESS_DLL_MDB) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB) \ + $(NTP_ANALYZER_MONITOR_SERVER_DLL) \ + $(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB) + +BINARIES = \ + $(NTPA) + + +RESGEN=resgen2 + +NTP_ANALYZER_DLL = $(BUILD_DIR)/Ntp.Analyzer.dll +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll +NTP_ANALYZER_PROCESS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Process.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_SERVER_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll +NTPA = $(BUILD_DIR)/ntpa + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Program.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + ntpa.in + +REFERENCES = \ + System + +DLL_REFERENCES = + +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-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) +$(eval $(call emit-deploy-wrapper,NTPA,ntpa,x)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_PROCESS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_PROCESS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_SERVER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(bindir)' + $(call cp,$(NTPA),$(DESTDIR)$(bindir)) + 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,$(NTP_ANALYZER_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_PROCESS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_PROCESS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_SERVER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTPA),$(DESTDIR)$(bindir)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj index 365d13d2..0a91b930 100644 --- a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj +++ b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj @@ -7,7 +7,7 @@ Exe Ntp.Analyzer.Cli Ntp.Analyzer.Cli.Program - 0.7.0 + 0.7.5 Ntp.Analyzer.Cli v4.5.2 diff --git a/Ntp.Analyzer.Cli/ntpa.in b/Ntp.Analyzer.Cli/ntpa.in new file mode 100644 index 00000000..2da3100c --- /dev/null +++ b/Ntp.Analyzer.Cli/ntpa.in @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Cli.exe" "$@" diff --git a/Ntp.Analyzer.Data/Makefile b/Ntp.Analyzer.Data/Makefile new file mode 100644 index 00000000..e83d3e16 --- /dev/null +++ b/Ntp.Analyzer.Data/Makefile @@ -0,0 +1,202 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Data.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Data.Provider.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Data.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Data.Provider.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_DATA_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) + + +RESGEN=resgen2 + +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Changes/Change03.cs \ + DataFace.cs \ + Import/TimeServerImporter.cs \ + Import/TimeServerLoader.cs \ + Log/LogExtensions.cs \ + Sql/DriftReadingDatabaseMapper.cs \ + Sql/HostDatabaseMapper.cs \ + Sql/HostReadingDatabaseMapper.cs \ + Sql/PeerDatabaseMapper.cs \ + Sql/PeerReadingDatabaseMapper.cs \ + Sql/TimeServerDatabaseMapper.cs \ + Sql/PeerActivityDatabaseMapper.cs \ + Sql/SqlDatabaseMapper.cs \ + Sql/FilteredSqlDatabaseMapper.cs \ + DatabaseInitializer.cs \ + Changes/Change01.cs \ + Sql/ReadingBulkMapper.cs \ + Sql/AssociationEntryMapper.cs \ + Sql/HostIoReadingDatabaseMapper.cs \ + Changes/Change02.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System \ + System.Data \ + System.Core \ + System.Xml + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(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,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj index a21478e6..345dcc15 100644 --- a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj +++ b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj @@ -7,7 +7,7 @@ Library Ntp.Analyzer.Data Ntp.Analyzer.Data - 0.7.0 + 0.7.5 v4.5.2 @@ -78,4 +78,20 @@ Ntp.Data.Provider + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Import/Makefile b/Ntp.Analyzer.Import/Makefile new file mode 100644 index 00000000..bc4a3166 --- /dev/null +++ b/Ntp.Analyzer.Import/Makefile @@ -0,0 +1,204 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Import.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Import.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_IMPORT_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) + + +RESGEN=resgen2 + +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + DriftFileImporter.cs \ + LogExtensions.cs \ + NtpctlHostImporter.cs \ + NtpqHostImporter.cs \ + NtpdcImporter.cs \ + ShellImporter.cs \ + ServerType.cs \ + NtpqPeerImporter.cs \ + NtpctlPeerImporter.cs \ + IoStatsImporter.cs \ + NtpctlImporter.cs \ + ImportFactory.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System \ + System.Core + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(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,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj index 5ac7c4eb..6d1fe48e 100644 --- a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj +++ b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj @@ -7,7 +7,7 @@ Library Ntp.Analyzer.Import Ntp.Analyzer.Import - 0.7.0 + 0.7.5 v4.5.2 @@ -31,6 +31,7 @@ + @@ -66,4 +67,20 @@ Ntp.Data + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Monitor.Cli/Makefile b/Ntp.Analyzer.Monitor.Cli/Makefile new file mode 100644 index 00000000..2635ed96 --- /dev/null +++ b/Ntp.Analyzer.Monitor.Cli/Makefile @@ -0,0 +1,147 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" "-main:Ntp.Analyzer.Monitor.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Cli.exe +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Monitor.Client.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_CLI_EXE_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Cli.exe.mdb +NTP_ANALYZER_MONITOR_CLI_EXE_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Cli.exe.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" "-main:Ntp.Analyzer.Monitor.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Cli.exe +ASSEMBLY_MDB = +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Monitor.Client.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_CLI_EXE_MDB= +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_MONITOR_CLI_EXE_MDB) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) + +BINARIES = \ + $(NTPAC) + + +RESGEN=resgen2 + +NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTPAC = $(BUILD_DIR)/ntpac + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Program.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + ntpac.in + +REFERENCES = \ + System + +DLL_REFERENCES = + +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,NTPAC,ntpac,x)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_MONITOR_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(bindir)' + $(call cp,$(NTPAC),$(DESTDIR)$(bindir)) + 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,$(NTP_ANALYZER_MONITOR_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTPAC),$(DESTDIR)$(bindir)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj b/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj index 4b489241..d299f84c 100644 --- a/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj +++ b/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj @@ -6,7 +6,7 @@ {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A} Exe Ntp.Analyzer.Monitor.Cli - 0.7.0 + 0.7.5 Ntp.Analyzer.Monitor.Cli v4.5.2 @@ -44,11 +44,11 @@ - {44d739da-4cd4-4214-88ee-a9a293bb32b5} + {44D739DA-4CD4-4214-88EE-A9A293BB32B5} Ntp.Analyzer.Monitor.Client - {86848f80-2692-47ab-a68a-bfb2990b632e} + {86848F80-2692-47AB-A68A-BFB2990B632E} Ntp.Common @@ -56,6 +56,15 @@ + + + + + + + + + diff --git a/Ntp.Analyzer.Monitor.Cli/ntpac.in b/Ntp.Analyzer.Monitor.Cli/ntpac.in new file mode 100644 index 00000000..f2d95681 --- /dev/null +++ b/Ntp.Analyzer.Monitor.Cli/ntpac.in @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Monitor.Cli.exe" "$@" diff --git a/Ntp.Analyzer.Monitor.Client/Makefile b/Ntp.Analyzer.Monitor.Client/Makefile new file mode 100644 index 00000000..fb60b9d2 --- /dev/null +++ b/Ntp.Analyzer.Monitor.Client/Makefile @@ -0,0 +1,126 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Client.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Client.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) + + +RESGEN=resgen2 + +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + TextRequest.cs \ + BinaryRequest.cs \ + Request.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_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,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_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 diff --git a/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj b/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj index 9a4df450..b870f6e6 100644 --- a/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj +++ b/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj @@ -7,7 +7,7 @@ Library Ntp.Analyzer.Monitor.Client Ntp.Analyzer.Monitor.Client - 0.7.0 + 0.7.5 v4.5.2 @@ -40,9 +40,25 @@ - {86848f80-2692-47ab-a68a-bfb2990b632e} + {86848F80-2692-47AB-A68A-BFB2990B632E} Ntp.Common + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Monitor.Server/Makefile b/Ntp.Analyzer.Monitor.Server/Makefile new file mode 100644 index 00000000..a5654359 --- /dev/null +++ b/Ntp.Analyzer.Monitor.Server/Makefile @@ -0,0 +1,242 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Server.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Analyzer.Data.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll.mdb +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll.mdb +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Monitor.Server.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Analyzer.Data.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB= +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB) \ + $(NTP_ANALYZER_DLL) \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) + + +RESGEN=resgen2 + +NTP_ANALYZER_DLL = $(BUILD_DIR)/Ntp.Analyzer.dll +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Billboard.cs \ + Listener.cs \ + Request.cs \ + ApplicationState.cs \ + CommandType.cs \ + CommandFactory.cs \ + CommandDescription.cs \ + ICommandDescription.cs \ + TextCommand/PidCommand.cs \ + TextCommand/PingCommand.cs \ + TextCommand/VersionCommand.cs \ + TextCommand/ConfigFileCommand.cs \ + TextCommand/HelpCommand.cs \ + TextCommand/JobsCommand.cs \ + TextCommand/ScheduleCommand.cs \ + TextCommand/TimeCommand.cs \ + TextCommand/NextJobCommand.cs \ + TextCommand/ServerCommand.cs \ + TextCommand/ProgCommand.cs \ + TextCommand/MonitorTextCommand.cs \ + TextCommand/UptimeCommand.cs \ + Command.cs \ + PacketCommand/PacketCommand.cs \ + TextCommand/RunningCommand.cs \ + TextCommand/ProcCommand.cs \ + TextCommand/ActivityCommand.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System \ + System.Core + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_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,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_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 diff --git a/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj b/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj index a80d2475..49160161 100644 --- a/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj +++ b/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj @@ -7,7 +7,7 @@ Library Ntp.Analyzer.Monitor.Server Ntp.Analyzer.Monitor.Server - 0.7.0 + 0.7.5 v4.5.2 @@ -18,7 +18,6 @@ TRACE;DEBUG; prompt 4 - false @@ -83,4 +82,20 @@ Ntp.Analyzer.Data + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Objects/Makefile b/Ntp.Analyzer.Objects/Makefile new file mode 100644 index 00000000..8de08ef4 --- /dev/null +++ b/Ntp.Analyzer.Objects/Makefile @@ -0,0 +1,126 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Objects.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = +BUILD_DIR = ../bin + +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Objects.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = +BUILD_DIR = ../bin + +NTP_ANALYZER_OBJECTS_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) + + +RESGEN=resgen2 + + +FILES = \ + ../Shared/AssemblyInfo.cs \ + DriftReading.cs \ + Host.cs \ + HostReading.cs \ + Peer.cs \ + PeerReading.cs \ + StatusLine.cs \ + TallyCode.cs \ + TimeServer.cs \ + Reading.cs \ + PersistentObject.cs \ + ReadingBulk.cs \ + NamedObject.cs \ + DispersionReading.cs \ + PeerActivity.cs \ + AssociationEntry.cs \ + IoStatsEntry.cs \ + HostIoReading.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_OBJECTS_DLL_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,$(NTP_ANALYZER_OBJECTS_DLL_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 diff --git a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj index f07383c9..19ec4b27 100644 --- a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj +++ b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj @@ -7,7 +7,7 @@ Library Ntp.Analyzer.Objects Ntp.Analyzer.Objects - 0.7.0 + 0.7.5 v4.5.2 @@ -53,4 +53,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Process/Makefile b/Ntp.Analyzer.Process/Makefile new file mode 100644 index 00000000..f4bf9b3f --- /dev/null +++ b/Ntp.Analyzer.Process/Makefile @@ -0,0 +1,269 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Process.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Monitor.Client.dll \ + ../bin/Ntp.Analyzer.Monitor.Server.dll \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Analyzer.Import.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.Provider.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_PROCESS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Process.dll.mdb +NTP_ANALYZER_PROCESS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Process.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_MONITOR_SERVER_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll.mdb +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll.mdb +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Process.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Monitor.Client.dll \ + ../bin/Ntp.Analyzer.Monitor.Server.dll \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Analyzer.Import.dll \ + ../bin/Ntp.Common.dll \ + ../bin/Ntp.Data.Provider.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_PROCESS_DLL_MDB= +NTP_ANALYZER_MONITOR_CLIENT_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Client.dll +NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_MONITOR_SERVER_DLL_SOURCE=../bin/Ntp.Analyzer.Monitor.Server.dll +NTP_ANALYZER_MONITOR_SERVER_DLL_MDB= +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_PROCESS_DLL_MDB) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL) \ + $(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_MONITOR_SERVER_DLL) \ + $(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB) \ + $(NTP_ANALYZER_DLL) \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) + + +RESGEN=resgen2 + +NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_MONITOR_SERVER_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Server.dll +NTP_ANALYZER_DLL = $(BUILD_DIR)/Ntp.Analyzer.dll +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Description/DriftStatJob.cs \ + Description/HostStatJob.cs \ + Description/PeerStatJob.cs \ + Description/HostGraphJob.cs \ + Description/PeerGraphJob.cs \ + Description/HostPageJob.cs \ + Description/PeerPageJob.cs \ + Description/StreamJob.cs \ + Description/BulkStatJob.cs \ + Description/NotifyJob.cs \ + Description/AboutPageJob.cs \ + Description/PeerGraphPageJob.cs \ + Description/HostGraphPageJob.cs \ + Description/TrafficGraphJob.cs \ + Initializer.cs \ + Log/LogExtensions.cs \ + Main.cs \ + Description/PeerSummaryPage.cs \ + Description/HostIoStatJob.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System \ + System.Core + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_PROCESS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_SERVER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_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,$(NTP_ANALYZER_PROCESS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_CLIENT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_SERVER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_MONITOR_SERVER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_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 diff --git a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj index 586c3bb1..c418d3d4 100644 --- a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj +++ b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj @@ -8,7 +8,7 @@ Library Ntp.Analyzer.Process Ntp.Analyzer.Process - 0.7.0 + 0.7.5 v4.5.2 @@ -65,11 +65,11 @@ - {44d739da-4cd4-4214-88ee-a9a293bb32b5} + {44D739DA-4CD4-4214-88EE-A9A293BB32B5} Ntp.Analyzer.Monitor.Client - {13fa10ab-d656-4d72-bc69-2525d484c9de} + {13FA10AB-D656-4D72-BC69-2525D484C9DE} Ntp.Analyzer.Monitor.Server @@ -101,4 +101,20 @@ Ntp.Data.Provider + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Analyzer.Validate.Cli/Makefile b/Ntp.Analyzer.Validate.Cli/Makefile new file mode 100644 index 00000000..088ee5c8 --- /dev/null +++ b/Ntp.Analyzer.Validate.Cli/Makefile @@ -0,0 +1,221 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" "-main:Ntp.Analyzer.Validate.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Validate.Cli.exe +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_VALIDATE_CLI_EXE_MDB_SOURCE=../bin/Ntp.Analyzer.Validate.Cli.exe.mdb +NTP_ANALYZER_VALIDATE_CLI_EXE_MDB=$(BUILD_DIR)/Ntp.Analyzer.Validate.Cli.exe.mdb +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" "-main:Ntp.Analyzer.Validate.Cli.Program" +ASSEMBLY = ../bin/Ntp.Analyzer.Validate.Cli.exe +ASSEMBLY_MDB = +COMPILE_TARGET = exe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_VALIDATE_CLI_EXE_MDB= +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_VALIDATE_CLI_EXE_MDB) \ + $(NTP_ANALYZER_DLL) \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) + +BINARIES = \ + $(NTPAV) + + +RESGEN=resgen2 + +NTP_ANALYZER_DLL = $(BUILD_DIR)/Ntp.Analyzer.dll +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll +NTPAV = $(BUILD_DIR)/ntpav + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Program.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + ntpav.in + +REFERENCES = \ + System + +DLL_REFERENCES = + +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-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) +$(eval $(call emit-deploy-wrapper,NTPAV,ntpav,x)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_VALIDATE_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(bindir)' + $(call cp,$(NTPAV),$(DESTDIR)$(bindir)) + 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,$(NTP_ANALYZER_VALIDATE_CLI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTPAV),$(DESTDIR)$(bindir)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj index 26fe36be..b49e125e 100644 --- a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj +++ b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj @@ -6,7 +6,7 @@ {9790FACF-170E-43C7-889A-D4445FC7E7A1} Exe Ntp.Analyzer.Validate.Cli - 0.7.0 + 0.7.5 Ntp.Analyzer.Validate.Cli.Program Ntp.Analyzer.Validate.Cli v4.5.2 @@ -54,6 +54,15 @@ + + + + + + + + + diff --git a/Ntp.Analyzer.Validate.Cli/ntpav.in b/Ntp.Analyzer.Validate.Cli/ntpav.in new file mode 100644 index 00000000..be76e801 --- /dev/null +++ b/Ntp.Analyzer.Validate.Cli/ntpav.in @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Cli.exe" "$@" diff --git a/Ntp.Analyzer.Validate.Gui/Makefile b/Ntp.Analyzer.Validate.Gui/Makefile new file mode 100644 index 00000000..038d8d62 --- /dev/null +++ b/Ntp.Analyzer.Validate.Gui/Makefile @@ -0,0 +1,224 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.Validate.Gui.exe +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = winexe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_VALIDATE_GUI_EXE_MDB_SOURCE=../bin/Ntp.Analyzer.Validate.Gui.exe.mdb +NTP_ANALYZER_VALIDATE_GUI_EXE_MDB=$(BUILD_DIR)/Ntp.Analyzer.Validate.Gui.exe.mdb +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.Validate.Gui.exe +ASSEMBLY_MDB = +COMPILE_TARGET = winexe +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_VALIDATE_GUI_EXE_MDB= +NTP_ANALYZER_DLL_SOURCE=../bin/Ntp.Analyzer.dll +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_VALIDATE_GUI_EXE_MDB) \ + $(NTP_ANALYZER_DLL) \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) + +BINARIES = \ + $(NTPAG) + + +RESGEN=resgen2 + +NTP_ANALYZER_DLL = $(BUILD_DIR)/Ntp.Analyzer.dll +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll +NTPAG = $(BUILD_DIR)/ntpag + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Validator.cs \ + Validator.Designer.cs \ + Program.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + ntpag.in + +REFERENCES = \ + System \ + System.Core \ + System.Drawing \ + System.Windows.Forms + +DLL_REFERENCES = + +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-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) +$(eval $(call emit-deploy-wrapper,NTPAG,ntpag,x)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_VALIDATE_GUI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + mkdir -p '$(DESTDIR)$(bindir)' + $(call cp,$(NTPAG),$(DESTDIR)$(bindir)) + 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,$(NTP_ANALYZER_VALIDATE_GUI_EXE_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTPAG),$(DESTDIR)$(bindir)) + make post-uninstall-local-hook prefix=$(prefix) + +install: install-local +uninstall: uninstall-local +clean: clean-local + +include $(top_srcdir)/rules.make diff --git a/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj b/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj index 2bcaf4f0..26bda95c 100644 --- a/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj +++ b/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj @@ -10,6 +10,7 @@ Ntp.Analyzer.Validate.Gui v4.5.2 true + 0.7.5 true @@ -53,4 +54,20 @@ + + + + + + + + + + + + + + + + diff --git a/Ntp.Analyzer.Validate.Gui/ntpag.in b/Ntp.Analyzer.Validate.Gui/ntpag.in new file mode 100644 index 00000000..2248770c --- /dev/null +++ b/Ntp.Analyzer.Validate.Gui/ntpag.in @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Gui.exe" "$@" diff --git a/Ntp.Analyzer.sln b/Ntp.Analyzer.sln index f94576ce..0c74bb46 100644 --- a/Ntp.Analyzer.sln +++ b/Ntp.Analyzer.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 2012 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ntp.Analyzer", "Ntp.Analyzer\Ntp.Analyzer.csproj", "{28444C86-1B41-4558-BA27-DCF32B2B1E0F}" @@ -47,65 +47,64 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Release|Any CPU.Build.0 = Release|Any CPU - {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Release|Any CPU.Build.0 = Release|Any CPU {02912378-E62D-4445-BA30-F56D3ABE9DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {02912378-E62D-4445-BA30-F56D3ABE9DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {02912378-E62D-4445-BA30-F56D3ABE9DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {02912378-E62D-4445-BA30-F56D3ABE9DA2}.Release|Any CPU.Build.0 = Release|Any CPU - {266A828E-05CA-4FEB-8B78-0BC066760C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {266A828E-05CA-4FEB-8B78-0BC066760C26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {266A828E-05CA-4FEB-8B78-0BC066760C26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {266A828E-05CA-4FEB-8B78-0BC066760C26}.Release|Any CPU.Build.0 = Release|Any CPU - {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Release|Any CPU.Build.0 = Release|Any CPU - {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Release|Any CPU.Build.0 = Release|Any CPU - {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Release|Any CPU.Build.0 = Release|Any CPU - {B982916F-F2F1-4975-89A6-C8BACDC65542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B982916F-F2F1-4975-89A6-C8BACDC65542}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B982916F-F2F1-4975-89A6-C8BACDC65542}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B982916F-F2F1-4975-89A6-C8BACDC65542}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Release|Any CPU.Build.0 = Release|Any CPU - {86848F80-2692-47AB-A68A-BFB2990B632E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86848F80-2692-47AB-A68A-BFB2990B632E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86848F80-2692-47AB-A68A-BFB2990B632E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86848F80-2692-47AB-A68A-BFB2990B632E}.Release|Any CPU.Build.0 = Release|Any CPU - {FA940278-6627-4451-AAC4-984765789AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA940278-6627-4451-AAC4-984765789AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA940278-6627-4451-AAC4-984765789AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA940278-6627-4451-AAC4-984765789AC2}.Release|Any CPU.Build.0 = Release|Any CPU {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}.Release|Any CPU.Build.0 = Release|Any CPU - {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Release|Any CPU.Build.0 = Release|Any CPU + {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03F3B0D9-AC35-43E3-9303-87A71FB73CD1}.Release|Any CPU.Build.0 = Release|Any CPU {13FA10AB-D656-4D72-BC69-2525D484C9DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13FA10AB-D656-4D72-BC69-2525D484C9DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {13FA10AB-D656-4D72-BC69-2525D484C9DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {13FA10AB-D656-4D72-BC69-2525D484C9DE}.Release|Any CPU.Build.0 = Release|Any CPU + {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Release|Any CPU.Build.0 = Release|Any CPU + {266A828E-05CA-4FEB-8B78-0BC066760C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {266A828E-05CA-4FEB-8B78-0BC066760C26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {266A828E-05CA-4FEB-8B78-0BC066760C26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {266A828E-05CA-4FEB-8B78-0BC066760C26}.Release|Any CPU.Build.0 = Release|Any CPU + {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28444C86-1B41-4558-BA27-DCF32B2B1E0F}.Release|Any CPU.Build.0 = Release|Any CPU + {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44D739DA-4CD4-4214-88EE-A9A293BB32B5}.Release|Any CPU.Build.0 = Release|Any CPU + {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A635537-E5E9-493E-8B89-E0E5EBB64E72}.Release|Any CPU.Build.0 = Release|Any CPU + {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8263BEAB-1610-4F82-9FC0-84421E5AB6B0}.Release|Any CPU.Build.0 = Release|Any CPU + {86848F80-2692-47AB-A68A-BFB2990B632E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86848F80-2692-47AB-A68A-BFB2990B632E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86848F80-2692-47AB-A68A-BFB2990B632E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86848F80-2692-47AB-A68A-BFB2990B632E}.Release|Any CPU.Build.0 = Release|Any CPU + {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9790FACF-170E-43C7-889A-D4445FC7E7A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B982916F-F2F1-4975-89A6-C8BACDC65542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B982916F-F2F1-4975-89A6-C8BACDC65542}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B982916F-F2F1-4975-89A6-C8BACDC65542}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B982916F-F2F1-4975-89A6-C8BACDC65542}.Release|Any CPU.Build.0 = Release|Any CPU + {FA940278-6627-4451-AAC4-984765789AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA940278-6627-4451-AAC4-984765789AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA940278-6627-4451-AAC4-984765789AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA940278-6627-4451-AAC4-984765789AC2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(NestedProjects) = preSolution EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 @@ -124,7 +123,10 @@ Global $5.IncludeInstanceMembers = True $5.IncludeStaticEntities = True description = NTP Analyzer is a tool dedicated to analyze the operation of time servers. - version = 0.7.0 + version = 0.7.5 StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/Ntp.Analyzer/Makefile b/Ntp.Analyzer/Makefile new file mode 100644 index 00000000..c8d8f282 --- /dev/null +++ b/Ntp.Analyzer/Makefile @@ -0,0 +1,379 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Analyzer.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Analyzer.Import.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb +NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Data.dll.mdb +NTP_ANALYZER_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Data.dll.mdb +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb +NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Analyzer.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Analyzer.Objects.dll \ + ../bin/Ntp.Data.dll \ + ../bin/Ntp.Analyzer.Data.dll \ + ../bin/Ntp.Analyzer.Import.dll \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_ANALYZER_DLL_MDB= +NTP_ANALYZER_OBJECTS_DLL_SOURCE=../bin/Ntp.Analyzer.Objects.dll +NTP_ANALYZER_OBJECTS_DLL_MDB= +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= +NTP_ANALYZER_DATA_DLL_SOURCE=../bin/Ntp.Analyzer.Data.dll +NTP_ANALYZER_DATA_DLL_MDB= +NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.Data.Provider.dll +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll +NTP_ANALYZER_IMPORT_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_ANALYZER_DLL_MDB) \ + $(NTP_ANALYZER_OBJECTS_DLL) \ + $(NTP_ANALYZER_OBJECTS_DLL_MDB) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) \ + $(NTP_ANALYZER_DATA_DLL) \ + $(NTP_ANALYZER_DATA_DLL_MDB) \ + $(NTP_DATA_PROVIDER_DLL) \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL) \ + $(NTP_ANALYZER_IMPORT_DLL_MDB) + + +RESGEN=resgen2 + +NTP_ANALYZER_OBJECTS_DLL = $(BUILD_DIR)/Ntp.Analyzer.Objects.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll +NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp.Analyzer.Data.dll +NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + Config/Attribute/NtpaIndex.cs \ + Config/Node/ClusterConfiguration.cs \ + Config/Node/DriftStatConfiguration.cs \ + Config/Node/NodeConfiguration.cs \ + Graph/HostGraph.cs \ + Graph/GraphBase.cs \ + Graph/PeerGraph.cs \ + Graph/DispersionGraph.cs \ + Log/LogExtensions.cs \ + Render/Renderer.cs \ + Render/HtmlRenderer.cs \ + Render/IHtmlObject.cs \ + Export/StreamDestination.cs \ + Export/FileStreamDestination.cs \ + Export/DirectoryStreamDestination.cs \ + Export/IStreamGenerator.cs \ + Page/DefaultHostPageBuilder.cs \ + Page/BootstrapHostPageBuilder.cs \ + Render/Host/DefaultHostPageRender.cs \ + Render/Host/BootstrapHostPageRender.cs \ + Render/Host/BootstrapHostTableRender.cs \ + Render/Host/BootstrapHostGraphRender.cs \ + Render/Peer/BootstrapPeerPageRender.cs \ + Render/Peer/BootstrapPeerInfoRender.cs \ + Render/Peer/BootstrapPeerGraphRender.cs \ + Page/BootstrapPeerPageBuilder.cs \ + Page/BootstrapAboutPageBuilder.cs \ + Render/BootstrapAboutPageRender.cs \ + Render/Graph/BootstrapGrapPageRender.cs \ + Render/BootstrapPageRender.cs \ + Render/HtmlObjectRender.cs \ + Render/Host/DefaultHostTableRender.cs \ + Render/Host/DefaultHostGraphRender.cs \ + Render/Peer/DefaultPeerGraphRender.cs \ + Render/Peer/DefaultPeerInfoRender.cs \ + Render/Peer/DefaultPeerPageRender.cs \ + Render/BootstrapMenuRender.cs \ + Render/Host/HostLineRender.cs \ + Page/DefaultPeerPageBuilder.cs \ + Page/PageBuilderBase.cs \ + Page/GraphPageBuilder.cs \ + Export/WebLink.cs \ + Render/IHtmlExtension.cs \ + Graph/TrafficGraph.cs \ + Interface/IGraphBaseConfiguration.cs \ + Interface/IHostGraphConfiguration.cs \ + Interface/IPeerGraphConfiguration.cs \ + Interface/ITrafficGraphConfiguration.cs \ + Export/FtpStreamDestination.cs \ + Render/Summary/BootstrapSummaryGraphRender.cs \ + Render/Summary/BootstrapSummaryPageRender.cs \ + Render/Summary/DefaultPeerSummaryGraphRender.cs \ + Render/Summary/DefaultPeerSummaryPageRender.cs \ + Page/DefaultPeerSummaryPageBuilder.cs \ + Page/BootstrapPeerSummaryPageBuilder.cs \ + Export/FileSystemDestination.cs \ + Statistics/DbStatusBuilder.cs \ + Statistics/DirectStatusBuilder.cs \ + Statistics/StatusBuilder.cs \ + Config/ConfigBuilder.cs \ + Interface/IDispersionGraphConfiguration.cs \ + Config/Node/Destination/DestinationCollection.cs \ + Config/Node/Destination/DirectoryCollection.cs \ + Config/Node/Destination/FileCollection.cs \ + Config/Node/Destination/GraphSetConfiguration.cs \ + Config/Node/Destination/WebLinkCollection.cs \ + Config/Node/Graph/GraphBaseConfiguration.cs \ + Config/Node/Graph/HostGraphConfiguration.cs \ + Config/Node/Graph/PeerGraphConfiguration.cs \ + Config/Node/Graph/TrafficGraphConfiguration.cs \ + Config/Node/Navigation/DropdownItemConfiguration.cs \ + Config/Node/Navigation/HeaderMenuItemConfiguration.cs \ + Config/Node/Navigation/HeadMenuItemConfiguration.cs \ + Config/Node/Navigation/ILinkable.cs \ + Config/Node/Navigation/LinkMenuItemConfiguration.cs \ + Config/Node/Navigation/MenuConfiguration.cs \ + Config/Node/Navigation/MenuItemConfiguration.cs \ + Config/Node/Navigation/MenuItemType.cs \ + Config/Node/Navigation/PageMenuItemConfiguration.cs \ + Config/Node/Navigation/SpacerMenuItemConfiguration.cs \ + Config/Node/Page/AboutPageConfiguration.cs \ + Config/Node/Page/Collection/SummaryCollection.cs \ + Config/Node/Page/HostGraphPageConfiguration.cs \ + Config/Node/Page/HostPageConfiguration.cs \ + Config/Node/Page/PageConfigurationBase.cs \ + Config/Node/Page/PageTheme.cs \ + Config/Node/Page/PeerGraphPageConfiguration.cs \ + Config/Node/Page/PeerPageConfiguration.cs \ + Config/Node/Page/PeerSummaryPageConfiguration.cs \ + Config/Node/DatabaseConfiguration.cs \ + Config/Node/HeartbeatConfiguration.cs \ + Config/Node/ListenerConfiguration.cs \ + Config/Node/LogConfiguration.cs \ + Config/Node/NotifyConfiguration.cs \ + Config/Node/PermissionConfiguration.cs \ + Config/Node/ReadingBulkConfiguration.cs \ + Config/Node/Configuration.cs \ + Config/Node/HostConfiguration.cs \ + Config/Node/HostSubConfiguration.cs \ + Config/Syntax/AboutPageSyntaxNode.cs \ + Config/Syntax/DatabaseSyntaxNode.cs \ + Config/Syntax/DirDestinationSyntaxNode.cs \ + Config/Syntax/FileDestinationSyntaxNode.cs \ + Config/Syntax/GraphSetSyntaxNode.cs \ + Config/Syntax/HeartbeatSyntaxNode.cs \ + Config/Syntax/HostGraphSyntaxNode.cs \ + Config/Syntax/HostPageSyntaxNode.cs \ + Config/Syntax/HostSyntaxNode.cs \ + Config/Syntax/ISyntaxNode.cs \ + Config/Syntax/ListenerSyntaxNode.cs \ + Config/Syntax/LogSyntaxNode.cs \ + Config/Syntax/MenuItemSyntaxNode.cs \ + Config/Syntax/MenuSyntaxNode.cs \ + Config/Syntax/NotifySyntaxNode.cs \ + Config/Syntax/Option/DatabaseProviderNode.cs \ + Config/Syntax/Option/HostTypeNode.cs \ + Config/Syntax/Option/LogTypeNode.cs \ + Config/Syntax/Option/MenuItemTypeNode.cs \ + Config/Syntax/Option/PageThemeNode.cs \ + Config/Syntax/Option/SeverityNode.cs \ + Config/Syntax/Option/TimeStampNode.cs \ + Config/Syntax/PeerGraphSyntaxNode.cs \ + Config/Syntax/PeerPageSyntaxNode.cs \ + Config/Syntax/PermissionSyntaxNode.cs \ + Config/Syntax/ReadingSyntaxNode.cs \ + Config/Syntax/RootSyntaxNode.cs \ + Config/Syntax/Setting/BooleanSettingNode.cs \ + Config/Syntax/Setting/IntegerSettingNode.cs \ + Config/Syntax/Setting/NumericSettingNode.cs \ + Config/Syntax/Setting/SettingNode.cs \ + Config/Syntax/Setting/StringSettingNode.cs \ + Config/Syntax/Setting/SymbolSettingNode.cs \ + Config/Syntax/StatSyntaxNode.cs \ + Config/Syntax/SummariesSyntaxNode.cs \ + Config/Syntax/SyntaxNode.cs \ + Config/Syntax/TrafficGraphSyntaxNode.cs \ + Config/Syntax/WebLinkSyntaxNode.cs \ + Config/Attribute/NtpaReference.cs \ + Config/Attribute/NtpaReferenceCollection.cs \ + Config/Attribute/NtpaSetting.cs \ + Config/Attribute/NtpaSettingsCollection.cs \ + Config/Table/SymbolTable.cs \ + Config/Table/Symbol.cs \ + Config/Table/Keyword.cs \ + Config/Table/IntegerToken.cs \ + Config/Table/KeywordToken.cs \ + Config/Table/LitteralToken.cs \ + Config/Table/NumericToken.cs \ + Config/Table/QuotedIdentToken.cs \ + Config/Table/SymbolToken.cs \ + Config/Table/Token.cs \ + Config/Table/TokenType.cs \ + Config/Node/ConfigurationNode.cs \ + Config/Syntax/HostGraphPageSyntaxNode.cs \ + Config/Syntax/PeerGraphPageSyntaxNode.cs \ + Config/Syntax/PeerSummaryPageSyntaxNode.cs \ + Interface/IConfigurationNode.cs \ + Config/Attribute/Layout.cs \ + Config/Node/StatsConfiguration.cs \ + Config/Compiler/ConfigCompiler.cs \ + Config/Compiler/ConfigFileReader.cs \ + Config/Compiler/Tokenizer.cs \ + Config/Compiler/ConfigParser.cs \ + Config/Compiler/Decompiler.cs \ + Config/Compiler/SchematicValidator.cs \ + Config/Compiler/SymbolResolver.cs \ + Config/Compiler/ICompilerStage.cs \ + Config/Node/Page/GraphPageConfiguration.cs \ + Interface/IPathProvider.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + packages.config + +REFERENCES = \ + System \ + System.Core \ + System.Drawing \ + System.Runtime.Serialization \ + -pkg:NPlot + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_ANALYZER_IMPORT_DLL_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,$(NTP_ANALYZER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_OBJECTS_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_ANALYZER_IMPORT_DLL_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 diff --git a/Ntp.Analyzer/Ntp.Analyzer.csproj b/Ntp.Analyzer/Ntp.Analyzer.csproj index 522ab518..b0637f55 100644 --- a/Ntp.Analyzer/Ntp.Analyzer.csproj +++ b/Ntp.Analyzer/Ntp.Analyzer.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -7,7 +7,7 @@ Library Ntp.Analyzer Ntp.Analyzer - 0.7.0 + 0.7.5 v4.5.2 @@ -30,13 +30,11 @@ false - - ..\packages\NPlot.0.9.10.0\lib\net20\NPlot.dll - + @@ -237,4 +235,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Common/Makefile b/Ntp.Common/Makefile new file mode 100644 index 00000000..06880128 --- /dev/null +++ b/Ntp.Common/Makefile @@ -0,0 +1,146 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Common.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = +BUILD_DIR = ../bin + +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Common.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = +BUILD_DIR = ../bin + +NTP_COMMON_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_COMMON_DLL_MDB) + + +RESGEN=resgen2 + + +FILES = \ + ../Shared/AssemblyInfo.cs \ + IO/DirectoryCommand.cs \ + Log/ActivityLog.cs \ + Log/ConsoleLog.cs \ + Log/EventLog.cs \ + Log/FileLog.cs \ + Log/ILogConfiguration.cs \ + Log/LogBase.cs \ + Log/LogExtensions.cs \ + Log/LogFactory.cs \ + Log/LogGroup.cs \ + Log/LogType.cs \ + Log/Severity.cs \ + Log/SysLog.cs \ + Log/TextLog.cs \ + Process/Cluster.cs \ + Process/IJobConfiguration.cs \ + Process/IRequest.cs \ + Process/IScheduler.cs \ + Process/Job.cs \ + Process/JobDescription.cs \ + Process/JobScheduleDescription.cs \ + Process/ScheduledJob.cs \ + Process/Scheduler.cs \ + Process/ThreadType.cs \ + System/InterProcess.cs \ + IO/Options.cs \ + IO/Permission.cs \ + System/ProcessInfo.cs \ + IO/ShellCommand.cs \ + System/SignalHandler.cs \ + App/IApplicationController.cs \ + App/Heartbeat.cs \ + Web/PageText.cs \ + Web/UriExtensions.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + packages.config + +REFERENCES = \ + System \ + Mono.Posix \ + System.Core + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_COMMON_DLL_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,$(NTP_COMMON_DLL_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 diff --git a/Ntp.Common/Ntp.Common.csproj b/Ntp.Common/Ntp.Common.csproj index 17e8836c..ab936d01 100644 --- a/Ntp.Common/Ntp.Common.csproj +++ b/Ntp.Common/Ntp.Common.csproj @@ -7,7 +7,7 @@ Library Ntp.Common Ntp.Common - 0.7.0 + 0.7.5 v4.5.2 @@ -30,11 +30,9 @@ false - - ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll - True - + + @@ -77,4 +75,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Data.Provider/Makefile b/Ntp.Data.Provider/Makefile new file mode 100644 index 00000000..c7eb19b0 --- /dev/null +++ b/Ntp.Data.Provider/Makefile @@ -0,0 +1,156 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug -define:DEBUG +ASSEMBLY = ../bin/Ntp.Data.Provider.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Data.dll +BUILD_DIR = ../bin + +NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/Ntp.Data.Provider.dll.mdb +NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ +ASSEMBLY = ../bin/Ntp.Data.Provider.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Data.dll +BUILD_DIR = ../bin + +NTP_DATA_PROVIDER_DLL_MDB= +MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll +NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll +NTP_DATA_DLL_SOURCE=../bin/Ntp.Data.dll +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_DATA_PROVIDER_DLL_MDB) \ + $(MYSQL_DATA_DLL) \ + $(NPGSQL_DLL) \ + $(NTP_DATA_DLL) \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) + + +RESGEN=resgen2 + +MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll +NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll +NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + MySqlFactory.cs \ + SqlDatabaseFactory.cs \ + PostgreSqlFactory.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = \ + packages.config + +REFERENCES = \ + System \ + System.Data + +DLL_REFERENCES = \ + ../../MySql.Data \ + ../../Npgsql + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + +$(eval $(call emit-deploy-target,MYSQL_DATA_DLL)) +$(eval $(call emit-deploy-target,NPGSQL_DLL)) + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_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,$(NTP_DATA_PROVIDER_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(MYSQL_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NPGSQL_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_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 diff --git a/Ntp.Data.Provider/Ntp.Data.Provider.csproj b/Ntp.Data.Provider/Ntp.Data.Provider.csproj index b152eb09..6e69dd7b 100644 --- a/Ntp.Data.Provider/Ntp.Data.Provider.csproj +++ b/Ntp.Data.Provider/Ntp.Data.Provider.csproj @@ -9,7 +9,7 @@ Library Ntp.Data.Provider Ntp.Data.Provider - 0.7.0 + 0.7.5 v4.5.2 @@ -61,11 +61,11 @@ ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - - ..\packages\Npgsql.3.1.7\lib\net451\Npgsql.dll - + + ..\packages\Npgsql.3.1.9\lib\net451\Npgsql.dll + @@ -83,4 +83,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ntp.Data.Provider/packages.config b/Ntp.Data.Provider/packages.config index 6345d68c..4d67d15e 100644 --- a/Ntp.Data.Provider/packages.config +++ b/Ntp.Data.Provider/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Ntp.Data/Makefile b/Ntp.Data/Makefile new file mode 100644 index 00000000..32468d75 --- /dev/null +++ b/Ntp.Data/Makefile @@ -0,0 +1,137 @@ + +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 = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:TRACE;DEBUG" +ASSEMBLY = ../bin/Ntp.Data.dll +ASSEMBLY_MDB = $(ASSEMBLY).mdb +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_DATA_DLL_MDB_SOURCE=../bin/Ntp.Data.dll.mdb +NTP_DATA_DLL_MDB=$(BUILD_DIR)/Ntp.Data.dll.mdb +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB_SOURCE=../bin/Ntp.Common.dll.mdb +NTP_COMMON_DLL_MDB=$(BUILD_DIR)/Ntp.Common.dll.mdb + +endif + +ifeq ($(CONFIG),RELEASE) +ASSEMBLY_COMPILER_COMMAND = dmcs +ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-define:TRACE" +ASSEMBLY = ../bin/Ntp.Data.dll +ASSEMBLY_MDB = +COMPILE_TARGET = library +PROJECT_REFERENCES = \ + ../bin/Ntp.Common.dll +BUILD_DIR = ../bin + +NTP_DATA_DLL_MDB= +NTP_COMMON_DLL_SOURCE=../bin/Ntp.Common.dll +NTP_COMMON_DLL_MDB= + +endif + +AL=al +SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll + +PROGRAMFILES = \ + $(NTP_DATA_DLL_MDB) \ + $(NTP_COMMON_DLL) \ + $(NTP_COMMON_DLL_MDB) + + +RESGEN=resgen2 + +NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll + +FILES = \ + ../Shared/AssemblyInfo.cs \ + DataMapper.cs \ + FileDataMapper.cs \ + ITableInitializer.cs \ + Log/LogExtensions.cs \ + SqlDatabaseProvider.cs \ + Schema/DatabaseUpdater.cs \ + Schema/SqlChangeSet.cs \ + Schema/IVersionChanges.cs \ + ISqlFactory.cs \ + Schema/VersionController.cs \ + SqlDatabaseChecker.cs \ + IDatabaseConfiguration.cs + +DATA_FILES = + +RESOURCES = + +EXTRAS = + +REFERENCES = \ + System \ + System.Data \ + System.Core + +DLL_REFERENCES = + +CLEANFILES = $(PROGRAMFILES) + +#Targets +all: $(ASSEMBLY) $(PROGRAMFILES) $(top_srcdir)/config.make + +include $(top_srcdir)/Makefile.include +#include $(srcdir)/custom-hooks.make + + + + + +$(eval $(call emit_resgen_targets)) +$(build_xamlg_list): %.xaml.g.cs: %.xaml + xamlg '$<' + + +$(ASSEMBLY_MDB): $(ASSEMBLY) +$(ASSEMBLY): $(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,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call cp,$(NTP_COMMON_DLL_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,$(NTP_DATA_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL),$(DESTDIR)$(libdir)/$(PACKAGE)) + $(call rm,$(NTP_COMMON_DLL_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 diff --git a/Ntp.Data/Ntp.Data.csproj b/Ntp.Data/Ntp.Data.csproj index 9e52d7c4..62f708a0 100644 --- a/Ntp.Data/Ntp.Data.csproj +++ b/Ntp.Data/Ntp.Data.csproj @@ -7,7 +7,7 @@ Library Ntp.Data Ntp.Data - 0.7.0 + 0.7.5 v4.5.2 @@ -32,6 +32,7 @@ + @@ -56,4 +57,11 @@ + + + + + + + \ No newline at end of file diff --git a/Shared/AssemblyInfo.cs b/Shared/AssemblyInfo.cs index 277e4eb6..c4b78ccf 100644 --- a/Shared/AssemblyInfo.cs +++ b/Shared/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyVersion("0.7.4.0")] +[assembly: AssemblyVersion("0.7.5.0")] [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen ")] [assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] \ No newline at end of file +[assembly: ComVisible(false)] diff --git a/config.make b/config.make new file mode 100644 index 00000000..63e0d45b --- /dev/null +++ b/config.make @@ -0,0 +1,9 @@ +prefix=/usr/local +libdir=/usr/local/lib +bindir=/usr/local/bin +datadir=/usr/local/share +RUNTIME=mono +ASSEMBLY_VERSION=0.7.5.0.0 +VERSION=0.7.5 +PACKAGE=ntp.analyzer +CONFIG=RELEASE diff --git a/configure b/configure new file mode 100755 index 00000000..be99906b --- /dev/null +++ b/configure @@ -0,0 +1,159 @@ +#!/usr/bin/env bash +VERSION=0.7.5 +PACKAGE=ntp.analyzer +prefix=/usr/local +config=RELEASE +configurations=" DEBUG RELEASE" +common_packages=" NPlot;0.9.11" + + +usage () +{ + echo "Usage : configure [OPTION]... [--config=CONFIG]" + echo + echo "Options:" + echo " --prefix=PREFIX install architecture-independent files in PREFIX" + echo " [/usr/local]" + echo " --bindir=DIR user executables [PREFIX/bin]" + echo " --datadir=DIR read-only architecture-independent data [PREFIX/share]" + echo " --libdir=DIR object code libraries [PREFIX/lib]" + echo + echo "Configurations available :" + for c in $configurations; do + if [ "$c" = "$config" ]; then + echo " $c (Default)" + else + echo " $c" + fi + done +} + +validate_config () +{ + test -z "$1" && return 0 + for c in $configurations; do + if [ "$c" = "$1" ]; then + return 1 + fi + done + return 0 +} + +check_package () +{ + name=`echo $1 | cut -d\; -f1` + version=`echo $1 | cut -d\; -f2` + + echo -n "Checking for package '$name'.." | tee -a config.log + pkg-config --atleast-version=$version $name + if [ $? -ne 0 ]; then + echo " ERROR: Package named '$name' >= $version not found." | tee -a config.log + echo "Try adjusting your PKG_CONFIG_PATH environment variable." | tee -a config.log + return 1 + fi + echo " found." | tee -a config.log +} + +check_required_packages () +{ + echo "Looking for required packages" | tee config.log + var=required_packages_$config + for pkg in $common_packages ${!var}; do + check_package $pkg + retval=$? + [ $retval -ne 0 ] && return $retval + done + return 0 +} + +while test x$1 != x; do + case $1 in + --prefix=*) + prefix=`echo $1 | sed 's/--prefix=//'` + ;; + --prefix) + shift + prefix=$1 + ;; + --libdir=*) + libdir=`echo $1 | sed 's/--libdir=//'` + ;; + --libdir) + shift + libdir=$1 + ;; + --bindir=*) + bindir=`echo $1 | sed 's/--bindir=//'` + ;; + --bindir) + shift + bindir=$1 + ;; + --datadir=*) + datadir=`echo $1 | sed 's/--datadir=//'` + ;; + --datadir) + shift + datadir=$1 + ;; + --config=*) + conf=`echo $1 | sed 's/--config=//'` + validate_config "$conf" + if [ $? -eq 1 ]; then + config=$conf + else + echo "Invalid config name - $conf" + usage + exit 1 + fi + ;; + --help) + usage + exit + ;; + *) + echo Unknown argument $1 >&2 + usage + exit 1 + ;; + esac + shift +done + +check_required_packages +[ $? -eq 1 ] && exit 1 + +if [ -z "$libdir" ]; then + libdir=$prefix/lib +fi +if [ -z "$bindir" ]; then + bindir=$prefix/bin +fi +if [ -z "$datadir" ]; then + datadir=$prefix/share +fi + +echo "prefix=$prefix" > config.make +echo "libdir=$libdir" >> config.make +echo "bindir=$bindir" >> config.make +echo "datadir=$datadir" >> config.make +echo "RUNTIME=mono" >> config.make +echo "ASSEMBLY_VERSION=$VERSION.0.0" >> config.make +echo "VERSION=$VERSION" >> config.make +echo "PACKAGE=$PACKAGE" >> config.make +echo "CONFIG=$config" >> config.make + +echo +echo "$PACKAGE has been configured with " +echo " prefix = $prefix" +if [ "$libdir" != "$prefix/lib" ]; then + echo " libdir = $libdir" +fi +if [ "$bindir" != "$prefix/bin" ]; then + echo " bindir = $bindir" +fi +if [ "$datadir" != "$prefix/share" ]; then + echo " datadir = $datadir" +fi +echo " config = $config" +echo diff --git a/examples/Makefile b/examples/Makefile new file mode 100644 index 00000000..5ab75a02 --- /dev/null +++ b/examples/Makefile @@ -0,0 +1,50 @@ + +EXTRA_DIST = Makefile + +all: all-recursive + +top_srcdir=.. +include $(top_srcdir)/config.make +include $(top_srcdir)/Makefile.include +include $(top_srcdir)/rules.make + +#include $(top_srcdir)/custom-hooks.make + +#Warning: This is an automatically generated file, do not edit! +ifeq ($(CONFIG),DEBUG) + SUBDIRS = +endif +ifeq ($(CONFIG),RELEASE) + SUBDIRS = +endif + + +CONFIG_MAKE=$(top_srcdir)/config.make + +%-recursive: $(CONFIG_MAKE) + @set . $$MAKEFLAGS; final_exit=:; \ + case $$2 in --unix) shift ;; esac; \ + case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \ + make pre-$*-hook prefix=$(prefix) ; \ + for dir in $(call quote_each,$(SUBDIRS)); do \ + case "$$dir" in \ + .) make $*-local || { final_exit="exit 1"; $$dk; };;\ + *) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\ + esac \ + done; \ + make post-$*-hook prefix=$(prefix) ; \ + $$final_exit + +$(CONFIG_MAKE): + echo "You must run configure first" + exit 1 + +clean: clean-recursive +install: install-recursive +uninstall: uninstall-recursive + +install: install-local +uninstall: uninstall-local +clean: clean-local + +dist-local: dist-local-recursive diff --git a/rules.make b/rules.make new file mode 100644 index 00000000..a4f37a1f --- /dev/null +++ b/rules.make @@ -0,0 +1,42 @@ +clean-local: + make pre-clean-local-hook + make $(CONFIG)_BeforeClean + -rm -f $(call quote_each,$(CLEANFILES)) + make $(CONFIG)_AfterClean + make post-clean-local-hook + +install-local: +uninstall-local: + +q2quote = '$(subst ?, ,$1)' +quote_each = $(foreach f,$(call s2q,$1),$(call q2quote,$f)) + +dist-local: + make pre-dist-local-hook "distdir=$$distdir" + for f in Makefile $(call quote_each,$(EXTRA_DIST)); do \ + d=`dirname "$$f"`; \ + test -d "$(distdir)/$$d" || \ + mkdir -p "$(distdir)/$$d"; \ + cp -p "$$f" "$(distdir)/$$d" || exit 1; \ + done + make post-dist-local-hook "distdir=$$distdir" + +dist-local-recursive: + for dir in $(call quote_each,$(SUBDIRS)); do \ + mkdir -p "$(distdir)/$$dir" || true; \ + case "$$dir" in \ + .) make dist-local "distdir=$(distdir)" || exit 1;; \ + *) (cd "$$dir"; make dist-local "distdir=$(distdir)/$$dir") || exit 1; \ + esac \ + done + +#hooks: Available hooks - all, clean, install, uninstall and dist +# and their *-local variants +pre-%-hook: ; @: +post-%-hook: ; @: + +#targets for custom commands +%_BeforeBuild: ; @: +%_AfterBuild: ; @: +%_BeforeClean: ; @: +%_AfterClean: ; @: