mirror of https://bitbucket.org/anguist/ntpa
Merge branch 'master' of https://bitbucket.com/anguist/ntpa
This commit is contained in:
commit
4f5bd215ab
|
@ -143,7 +143,7 @@ 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)/Ntp.Analyzer.Cli.exe
|
||||
|
||||
FILES = \
|
||||
FILES = \
|
||||
../Shared/AssemblyInfo.cs \
|
||||
Program.cs
|
||||
|
||||
|
@ -151,10 +151,12 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpa.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
../bin/Ntp.Analyzer.dll \
|
||||
../bin/Ntp.Analyzer.Process.dll \
|
||||
../bin/Ntp.Common.dll \
|
||||
System
|
||||
|
||||
DLL_REFERENCES =
|
||||
|
@ -171,7 +173,7 @@ include $(top_srcdir)/Makefile.include
|
|||
|
||||
$(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-deploy-wrapper,NTPA))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
@ -183,9 +185,7 @@ $(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)
|
||||
|
|
|
@ -134,8 +134,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpa.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
System
|
||||
|
@ -162,7 +161,7 @@ NTPA = $(BUILD_DIR)/Ntp.Analyzer.Cli.exe
|
|||
|
||||
$(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
|
||||
$(eval $(call emit-deploy-target,NPGSQL_DLL))
|
||||
$(eval $(call emit-deploy-target,NTPA,x))
|
||||
$(eval $(call emit-deploy-wrapper,NTPA))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
|
|
@ -57,7 +57,16 @@
|
|||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
<Properties>
|
||||
<Deployment.LinuxDeployData scriptName="ntpa" />
|
||||
<Deployment.LinuxDeployData generateScript="False" />
|
||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
|
||||
<BuildFilesVar Sync="True" Name="FILES" />
|
||||
<DeployFilesVar />
|
||||
<ResourcesVar Name="RESOURCES" />
|
||||
<OthersVar />
|
||||
<GacRefVar Sync="True" Name="REFERENCES" />
|
||||
<AsmRefVar Sync="True" Name="REFERENCES" />
|
||||
<ProjectRefVar Sync="True" Name="REFERENCES" />
|
||||
</MonoDevelop.Autotools.MakefileInfo>
|
||||
</Properties>
|
||||
</MonoDevelop>
|
||||
</ProjectExtensions>
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Cli.exe" "$@"
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Cli.exe" "$@"
|
|
@ -157,9 +157,7 @@ $(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)
|
||||
|
|
|
@ -155,9 +155,7 @@ $(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)
|
||||
|
|
|
@ -77,8 +77,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpac.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
../bin/Ntp.Analyzer.Monitor.Client.dll \
|
||||
|
@ -97,7 +96,7 @@ include $(top_srcdir)/Makefile.include
|
|||
|
||||
|
||||
|
||||
$(eval $(call emit-deploy-wrapper,NTPAC,ntpac,x))
|
||||
$(eval $(call emit-deploy-wrapper,NTPAC))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
@ -109,9 +108,7 @@ $(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)
|
||||
|
|
|
@ -70,8 +70,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpac.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
System
|
||||
|
@ -86,8 +85,7 @@ NTP_ANALYZER_MONITOR_CLIENT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Client.dll
|
|||
NTP_COMMON_DLL = $(BUILD_DIR)/Ntp.Common.dll
|
||||
NTPAC = $(BUILD_DIR)/Ntp.Analyzer.Monitor.Cli.exe
|
||||
|
||||
$(eval $(call emit-deploy-wrapper,NTPAC,ntpac,x))
|
||||
|
||||
$(eval $(call emit-deploy-wrapper,NTPAC))
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
$(build_xamlg_list): %.xaml.g.cs: %.xaml
|
||||
|
|
|
@ -55,11 +55,11 @@
|
|||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
<Properties>
|
||||
<Deployment.LinuxDeployData scriptName="ntpac" />
|
||||
<Deployment.LinuxDeployData generateScript="False" />
|
||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
|
||||
<BuildFilesVar Sync="True" Name="FILES" />
|
||||
<DeployFilesVar />
|
||||
<ResourcesVar Sync="True" Name="RESOURCES" />
|
||||
<ResourcesVar />
|
||||
<OthersVar />
|
||||
<GacRefVar Sync="True" Name="REFERENCES" />
|
||||
<AsmRefVar Sync="True" Name="REFERENCES" />
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Monitor.Cli.exe" "$@"
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Monitor.Cli.exe" "$@"
|
|
@ -94,9 +94,7 @@ $(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)
|
||||
|
|
|
@ -185,9 +185,7 @@ $(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)
|
||||
|
|
|
@ -96,9 +96,7 @@ $(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)
|
||||
|
|
|
@ -209,9 +209,7 @@ $(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)
|
||||
|
|
|
@ -125,8 +125,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpav.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
../bin/Ntp.Analyzer.dll \
|
||||
|
@ -147,7 +146,7 @@ include $(top_srcdir)/Makefile.include
|
|||
|
||||
$(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-deploy-wrapper,NTPAV))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
@ -159,9 +158,7 @@ $(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)
|
||||
|
|
|
@ -111,8 +111,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpav.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
System
|
||||
|
@ -136,7 +135,7 @@ NTPAV = $(BUILD_DIR)/Ntp.Analyzer.Validate.Cli.exe
|
|||
|
||||
$(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-deploy-wrapper,NTPAV))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
<Properties>
|
||||
<Deployment.LinuxDeployData scriptName="ntpav" />
|
||||
<Deployment.LinuxDeployData generateScript="False" />
|
||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
|
||||
<BuildFilesVar Sync="True" Name="FILES" />
|
||||
<DeployFilesVar />
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Validate.Cli.exe" "$@"
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Cli.exe" "$@"
|
|
@ -125,8 +125,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpag.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
../bin/Ntp.Analyzer.dll \
|
||||
|
@ -149,7 +148,7 @@ include $(top_srcdir)/Makefile.include
|
|||
|
||||
$(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-deploy-wrapper,NTPAG))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
@ -161,9 +160,7 @@ $(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)
|
||||
|
|
|
@ -111,8 +111,7 @@ DATA_FILES =
|
|||
|
||||
RESOURCES =
|
||||
|
||||
EXTRAS = \
|
||||
ntpag.in
|
||||
EXTRAS =
|
||||
|
||||
REFERENCES = \
|
||||
System \
|
||||
|
@ -139,7 +138,7 @@ NTPAG = $(BUILD_DIR)/Ntp.Analyzer.Validate.Gui.exe
|
|||
|
||||
$(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-deploy-wrapper,NTPAG))
|
||||
|
||||
|
||||
$(eval $(call emit_resgen_targets))
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
<Properties>
|
||||
<Deployment.LinuxDeployData scriptName="ntpag" />
|
||||
<Deployment.LinuxDeployData generateScript="False" />
|
||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile" SyncReferences="True">
|
||||
<BuildFilesVar Sync="True" Name="FILES" />
|
||||
<DeployFilesVar />
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "/usr/local/lib/ntp.analyzer/Ntp.Analyzer.Validate.Gui.exe" "$@"
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec mono "@expanded_libdir@/@PACKAGE@/Ntp.Analyzer.Validate.Gui.exe" "$@"
|
|
@ -396,10 +396,10 @@ protected Uri CheckLink(string link, string keyword)
|
|||
return null;
|
||||
|
||||
Uri uri;
|
||||
if (Uri.TryCreate(link, UriKind.Absolute, out uri))
|
||||
if (Uri.TryCreate("/" + link.TrimStart('/'), UriKind.Relative, out uri))
|
||||
return uri;
|
||||
|
||||
if (Uri.TryCreate("/" + link.TrimStart('/'), UriKind.Relative, out uri))
|
||||
if (Uri.TryCreate(link, UriKind.Absolute, out uri))
|
||||
return uri;
|
||||
|
||||
var name = Keyword.Find(Symbol).Name;
|
||||
|
|
|
@ -327,9 +327,7 @@ $(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)
|
||||
|
|
|
@ -117,9 +117,7 @@ $(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)
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Ntp.Common.Web
|
||||
{
|
||||
|
@ -29,41 +30,98 @@ public static class UriExtensions
|
|||
{
|
||||
public static Uri Append(this Uri uri, params string[] paths)
|
||||
{
|
||||
string basePath = uri.ToString();
|
||||
var uriKind = Uri.IsWellFormedUriString(basePath, UriKind.Absolute)
|
||||
? UriKind.Absolute
|
||||
: UriKind.Relative;
|
||||
string basePath;
|
||||
UriKind uriKind;
|
||||
|
||||
GetBase(uri, out basePath, out uriKind);
|
||||
string resPath = paths.Aggregate(
|
||||
basePath,
|
||||
(current, path) => $"{current.TrimEnd('/')}/{path.TrimStart('/')}"
|
||||
);
|
||||
(current, path) => $"{current.TrimEnd('/')}/{path.TrimStart('/')}");
|
||||
Uri newUri = new Uri(resPath, uriKind);
|
||||
|
||||
return new Uri(resPath, uriKind);
|
||||
return newUri;
|
||||
}
|
||||
|
||||
public static Uri Append(this Uri uri, Uri relativeUri, params string[] paths)
|
||||
{
|
||||
var list = new List<string> {relativeUri.ToString()};
|
||||
string relativeUriText = relativeUri.IsAbsoluteUri
|
||||
? relativeUri.AbsolutePath
|
||||
: relativeUri.ToString();
|
||||
var list = new List<string> { relativeUriText };
|
||||
list.AddRange(paths);
|
||||
return uri.Append(list.ToArray());
|
||||
}
|
||||
|
||||
public static Uri Append(this Uri uri, Uri relativeUri, string path)
|
||||
{
|
||||
var list = new List<string> {relativeUri.ToString(), path};
|
||||
string relativeUriText = relativeUri.IsAbsoluteUri
|
||||
? relativeUri.AbsolutePath
|
||||
: relativeUri.ToString();
|
||||
var list = new List<string> { relativeUriText, path};
|
||||
return uri.Append(list.ToArray());
|
||||
}
|
||||
|
||||
public static Uri AppendExtension(this Uri uri, string extension)
|
||||
{
|
||||
string basePath = uri.ToString().TrimEnd('/') + extension;
|
||||
return new Uri(basePath, uri.IsAbsoluteUri ? UriKind.Absolute : UriKind.Relative);
|
||||
string basePath;
|
||||
UriKind uriKind;
|
||||
|
||||
GetBase(uri, out basePath, out uriKind);
|
||||
basePath = basePath.TrimEnd('/') + extension;
|
||||
Uri newUri = new Uri(basePath, uriKind);
|
||||
|
||||
return newUri;
|
||||
}
|
||||
|
||||
public static string ToHtmlString(this Uri uri)
|
||||
{
|
||||
return Uri.EscapeUriString(uri.ToString());
|
||||
}
|
||||
|
||||
private static void GetBase(Uri uri, out string basePath, out UriKind uriKind)
|
||||
{
|
||||
string orig = uri.OriginalString.TrimStart();
|
||||
if (orig.StartsWith("/") && !orig.StartsWith("//")) {
|
||||
basePath = uri.IsAbsoluteUri
|
||||
? uri.AbsolutePath
|
||||
: uri.ToString();
|
||||
uriKind = UriKind.Relative;
|
||||
} else {
|
||||
basePath = uri.ToString();
|
||||
uriKind = UriKind.Absolute;
|
||||
}
|
||||
}
|
||||
|
||||
public static string DebugInfo(this Uri uri)
|
||||
{
|
||||
StringBuilder b = new StringBuilder();
|
||||
b.AppendLine($"ToString(): {uri.ToString()}");
|
||||
b.AppendLine($"IsAbsoluteUri: {uri.IsAbsoluteUri}");
|
||||
b.AppendLine($"OriginalString: {uri.OriginalString}");
|
||||
|
||||
if (uri.IsAbsoluteUri) {
|
||||
b.AppendLine($"AbsolutePath: {uri.AbsolutePath}");
|
||||
b.AppendLine($"AbsoluteUri: {uri.AbsoluteUri}");
|
||||
b.AppendLine($"Authority: {uri.Authority}");
|
||||
b.AppendLine($"DnsSafeHost: {uri.DnsSafeHost}");
|
||||
b.AppendLine($"Fragment: {uri.Fragment}");
|
||||
b.AppendLine($"Host: {uri.Host}");
|
||||
b.AppendLine($"HostNameType: {uri.HostNameType}");
|
||||
b.AppendLine($"IsDefaultPort {uri.IsDefaultPort}");
|
||||
b.AppendLine($"IsFile: {uri.IsFile}");
|
||||
b.AppendLine($"IsLoopback: {uri.IsLoopback}");
|
||||
b.AppendLine($"IsUnc: {uri.IsUnc}");
|
||||
b.AppendLine($"LocalPath: {uri.LocalPath}");
|
||||
b.AppendLine($"PathAndQuery: {uri.PathAndQuery}");
|
||||
b.AppendLine($"Port: {uri.Port}");
|
||||
b.AppendLine($"Query: {uri.Query}");
|
||||
b.AppendLine($"Scheme: {uri.Scheme}");
|
||||
b.AppendLine($"Segments: {uri.Segments}");
|
||||
b.AppendLine($"UserEscaped: {uri.UserEscaped}");
|
||||
b.AppendLine($"UserInfo: {uri.UserInfo}");
|
||||
}
|
||||
|
||||
return b.ToString();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -115,9 +115,7 @@ $(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)
|
||||
|
|
|
@ -81,8 +81,8 @@ REFERENCES = \
|
|||
System.Data
|
||||
|
||||
DLL_REFERENCES = \
|
||||
$(MYSQL_DATA_DLL_SOURCE) \
|
||||
$(NPGSQL_DLL_SOURCE)
|
||||
$(MYSQL_DATA_DLL_SOURCE) \
|
||||
$(NPGSQL_DLL_SOURCE)
|
||||
|
||||
CLEANFILES = $(PROGRAMFILES)
|
||||
|
||||
|
|
|
@ -104,9 +104,7 @@ $(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)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
|
||||
PROJECT=Ntp.Analyzer
|
||||
PROJECT=ntpa
|
||||
FILE=
|
||||
CONFIGURE=configure.ac
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ SHAMROCK_EXPAND_DATADIR
|
|||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AC_PATH_PROG(mcs, mcs, no)
|
||||
if test "x$mcs" = "xno"; then
|
||||
AC_PATH_PROG(MCS, mcs, no)
|
||||
if test "x$MCS" = "xno"; then
|
||||
AC_MSG_ERROR([mcs Not found])
|
||||
fi
|
||||
|
||||
|
@ -57,18 +57,14 @@ Ntp.Common/Makefile
|
|||
Ntp.Analyzer.Monitor.Client/Makefile
|
||||
Ntp.Data/Makefile
|
||||
Ntp.Data.Provider/Makefile
|
||||
Ntp.Analyzer.Monitor.Cli/ntpac
|
||||
Ntp.Analyzer.Monitor.Cli/Makefile
|
||||
Ntp.Analyzer.Data/Makefile
|
||||
Ntp.Analyzer.Import/Makefile
|
||||
Ntp.Analyzer/Makefile
|
||||
Ntp.Analyzer.Validate.Cli/ntpav
|
||||
Ntp.Analyzer.Validate.Cli/Makefile
|
||||
Ntp.Analyzer.Validate.Gui/ntpag
|
||||
Ntp.Analyzer.Validate.Gui/Makefile
|
||||
Ntp.Analyzer.Monitor.Server/Makefile
|
||||
Ntp.Analyzer.Process/Makefile
|
||||
Ntp.Analyzer.Cli/ntpa
|
||||
Ntp.Analyzer.Cli/Makefile
|
||||
Makefile
|
||||
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
Time server org IDs:
|
||||
http://ntp.exactlywww.com/ntp/
|
||||
|
|
@ -0,0 +1 @@
|
|||
This package is only needed when building with Microsoft.NET.
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue