From cf58df596d07da9ca91d085e30c9f6a9eec8ed45 Mon Sep 17 00:00:00 2001 From: llsth Date: Sun, 26 Jun 2016 22:18:59 +0200 Subject: [PATCH] Prepare release 0.6.2 --- Makefile.mysql | 6 - Makefile.ntpa | 117 ------------ Makefile.pgsql | 102 ----------- MySql/Source/MySql.Data/MySql.Data.csproj | 2 +- NPlot/NPlot.csproj | 2 +- Npgsql/Npgsql.csproj | 2 +- Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj | 2 +- Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj | 2 +- .../Ntp.Analyzer.Import.csproj | 2 +- .../Ntp.Analyzer.Localize.csproj | 2 +- Ntp.Analyzer.Localize/VersionInfo.cs | 2 +- .../Ntp.Analyzer.Objects.csproj | 2 +- .../Ntp.Analyzer.Process.csproj | 10 +- .../Ntp.Analyzer.Validate.Cli.csproj | 2 +- Ntp.Analyzer.sln | 2 +- Ntp.Analyzer/Ntp.Analyzer.csproj | 2 +- Ntp.Common/Ntp.Common.csproj | 2 +- Ntp.Config/Ntp.Config.csproj | 2 +- Ntp.Data.Provider/Ntp.Data.Provider.csproj | 55 +++++- Ntp.Data/Ntp.Data.csproj | 2 +- Ntp.Interop/Ntp.Interop.csproj | 2 +- Ntp.Log/Ntp.Log.csproj | 2 +- Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj | 2 +- Ntp.Monitor.Client/Ntp.Monitor.Client.csproj | 2 +- Ntp.Monitor.Server/Ntp.Monitor.Server.csproj | 2 +- Ntp.Process/Ntp.Process.csproj | 2 +- .../OxyPlot.Gdi.Example.csproj | 2 +- OxyPlot.Gdi/OxyPlot.Gdi.csproj | 2 +- OxyPlot/OxyPlot.csproj | 2 +- configure | 171 ++++++------------ 30 files changed, 130 insertions(+), 379 deletions(-) delete mode 100644 Makefile.mysql delete mode 100644 Makefile.ntpa delete mode 100644 Makefile.pgsql diff --git a/Makefile.mysql b/Makefile.mysql deleted file mode 100644 index 5f010ce1..00000000 --- a/Makefile.mysql +++ /dev/null @@ -1,6 +0,0 @@ - -.PHONY: MySql.Data -MySql.Data: build - $(CP) $(MSQ)/Properties/ReservedWords.txt $(OBJS)MySql.Data.MySqlClient.Properties.ReservedWords.txt - $(GEN) -usesourcepath -compile "$(MSQ)/Properties/Resources.resx,$(OBJS)MySql.Data.MySqlClient.Properties.Resources.resources" - $(MCS) $(OPTS) -out:$(OUT)MySql.Data.dll $(DEFSLIB) $(MSQ)/Authentication/AuthenticationManager.cs $(MSQ)/Authentication/MySQLAuthenticationPlugin.cs $(MSQ)/Authentication/NativePasswordPlugins.cs $(MSQ)/Authentication/Sha256AuthenticationPlugin.cs $(MSQ)/Authentication/WindowsAuthenticationPlugin.cs $(MSQ)/BulkLoader.cs $(MSQ)/CharSetMap.cs $(MSQ)/command.cs $(MSQ)/CommandBuilder.cs $(MSQ)/common/Cache.cs $(MSQ)/common/ContextString.cs $(MSQ)/common/LowResolutionStopwatch.cs $(MSQ)/common/MyNetworkStream.cs $(MSQ)/common/MySqlTokenizer.cs $(MSQ)/common/NamedPipeStream.cs $(MSQ)/common/NativeMethods.cs $(MSQ)/common/Platform.cs $(MSQ)/common/QueryNormalizer.cs $(MSQ)/common/SharedMemoryStream.cs $(MSQ)/common/StreamCreator.cs $(MSQ)/common/StringUtility.cs $(MSQ)/common/Version.cs $(MSQ)/CompressedStream.cs $(MSQ)/Connection.cs $(MSQ)/Crypt.cs $(MSQ)/dataadapter.cs $(MSQ)/datareader.cs $(MSQ)/Driver.cs $(MSQ)/Exception.cs $(MSQ)/extensions/NonRT/MySqlCommand.cs $(MSQ)/extensions/NonRT/MySqlConnection.cs $(MSQ)/extensions/NonRT/MySqlConnectionStringBuilder.cs $(MSQ)/extensions/NonRT/MySqlDataReader.cs $(MSQ)/extensions/NonRT/MySqlDateTime.cs $(MSQ)/extensions/NonRT/MySqlParameter.cs $(MSQ)/extensions/NonRT/MySqlParameterCollection.cs $(MSQ)/extensions/NonRT/MySqlTrace.cs $(MSQ)/extensions/NonRT/MySqlTransaction.cs $(MSQ)/Field.cs $(MSQ)/Installer.cs $(MSQ)/Interceptors/CommandInterceptor.cs $(MSQ)/Interceptors/Interceptor.cs $(MSQ)/Interceptors/ExceptionInterceptor.cs $(MSQ)/ISSchemaProvider.cs $(MSQ)/Memcached/BinaryClient.cs $(MSQ)/Memcached/MemcachedException.cs $(MSQ)/Memcached/TextClient.cs $(MSQ)/Memcached/Client.cs $(MSQ)/MySqlClientFactory.cs $(MSQ)/MySqlClientPermission.cs $(MSQ)/MySqlConfiguration.cs $(MSQ)/MySqlConnectionStringBuilder.cs $(MSQ)/MysqlDefs.cs $(MSQ)/MySqlError.cs $(MSQ)/MySqlHelper.cs $(MSQ)/MySqlPacket.cs $(MSQ)/MySqlClientPermissionAttribute.cs $(MSQ)/MySqlPool.cs $(MSQ)/MySqlPoolManager.cs $(MSQ)/MySqlPromotableTransaction.cs $(MSQ)/MySqlScript.cs $(MSQ)/MySqlSecurityPermission.cs $(MSQ)/MySqlStream.cs $(MSQ)/NativeDriver.cs $(MSQ)/parameter.cs $(MSQ)/parameter_collection.cs $(MSQ)/PerformanceMonitor.cs $(MSQ)/PreparableStatement.cs $(MSQ)/ProcedureCache.cs $(MSQ)/Properties/AssemblyInfo.cs $(MSQ)/Properties/VersionInfo.cs $(MSQ)/Replication/ReplicationConfiguration.cs $(MSQ)/Replication/ReplicationManager.cs $(MSQ)/Replication/ReplicationRoundRobinServerGroup.cs $(MSQ)/Replication/ReplicationServer.cs $(MSQ)/Replication/ReplicationServerGroup.cs $(MSQ)/ResultSet.cs $(MSQ)/Schema.cs $(MSQ)/SchemaProvider.cs $(MSQ)/Statement.cs $(MSQ)/StoredProcedure.cs $(MSQ)/SystemPerformanceMonitor.cs $(MSQ)/TableCache.cs $(MSQ)/TimedStream.cs $(MSQ)/TracingDriver.cs $(MSQ)/transaction.cs $(MSQ)/Types/MetaData.cs $(MSQ)/Types/MySqlBinary.cs $(MSQ)/Types/MySqlBit.cs $(MSQ)/Types/MySqlByte.cs $(MSQ)/Types/MySqlConversionException.cs $(MSQ)/Types/MySqlDateTime.cs $(MSQ)/Types/MySqlDecimal.cs $(MSQ)/Types/MySqlDouble.cs $(MSQ)/Types/MySqlGeometry.cs $(MSQ)/Types/MySqlGuid.cs $(MSQ)/Types/MySqlInt16.cs $(MSQ)/Types/MySqlInt32.cs $(MSQ)/Types/MySqlInt64.cs $(MSQ)/Types/MySqlSingle.cs $(MSQ)/Types/MySqlString.cs $(MSQ)/Types/MySqlTime.cs $(MSQ)/Types/MySqlUByte.cs $(MSQ)/Types/MySqlUInt16.cs $(MSQ)/Types/MySqlUInt32.cs $(MSQ)/Types/MySqlUInt64.cs $(MSQ)/Types/MySqlValue.cs $(MSQ)/zlib/Adler32.cs $(MSQ)/zlib/Deflate.cs $(MSQ)/zlib/InfBlocks.cs $(MSQ)/zlib/InfCodes.cs $(MSQ)/zlib/Inflate.cs $(MSQ)/zlib/InfTree.cs $(MSQ)/zlib/StaticTree.cs $(MSQ)/zlib/SupportClass.cs $(MSQ)/zlib/Tree.cs $(MSQ)/zlib/ZInputStream.cs $(MSQ)/zlib/Zlib.cs $(MSQ)/zlib/ZOutputStream.cs $(MSQ)/zlib/ZStream.cs $(MSQ)/zlib/ZStreamException.cs $(MSQ)/Properties/Resources.Designer.cs -resource:$(OBJS)MySql.Data.MySqlClient.Properties.Resources.resources -resource:$(OBJS)MySql.Data.MySqlClient.Properties.ReservedWords.txt -r:System.Configuration.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Design.dll -r:System.Drawing.dll -r:System.Management.dll -r:System.Security.dll -r:System.Transactions.dll -r:System.Xml.dll $(STDREF) -warn:0 diff --git a/Makefile.ntpa b/Makefile.ntpa deleted file mode 100644 index 9ecb52e0..00000000 --- a/Makefile.ntpa +++ /dev/null @@ -1,117 +0,0 @@ - -# Projects -LOC= Ntp.Analyzer.Localize -OB= Ntp.Analyzer.Objects -INT= Ntp.Interop -NP= NPlot -COM= Ntp.Common -DB= Ntp.Data -DBP= Ntp.Data.Provider -PRO= Ntp.Process -NC= Ntp.Config -NL= Ntp.Log -IMP= Ntp.Analyzer.Import -ADA= Ntp.Analyzer.Data -MC= Ntp.Monitor.Client -MS= Ntp.Monitor.Server -NA= Ntp.Analyzer -APR= Ntp.Analyzer.Process - -.PHONY: all -all: ntpa ntpav ntpac - -.PHONY: build -build: - $(MKDIR) $(OUT) - $(MKDIR) $(OBJS) - -.PHONY: ntpa -ntpa: build Ntp.Analyzer.Cli - $(ECHO) >$(OUT)ntpa "#!/bin/sh\n\nexec mono \"${DESTDIR}$(PREFIX)$(INSTDIR)/Ntp.Analyzer.Cli.exe\" \"\$$@\"" - $(CHMOD) 775 $(OUT)ntpa - -.PHONY: ntpav -ntpav: build Ntp.Analyzer.Validate.Cli - $(ECHO) >$(OUT)ntpav "#!/bin/sh\n\nexec mono \"${DESTDIR}$(PREFIX)$(INSTDIR)/Ntp.Analyzer.Validate.Cli.exe\" \"\$$@\"" - $(CHMOD) 775 $(OUT)ntpav - -.PHONY: ntpac -ntpac: build Ntp.Monitor.Cli - $(ECHO) >$(OUT)ntpac "#!/bin/sh\n\nexec mono \"${DESTDIR}$(PREFIX)$(INSTDIR)/Ntp.Monitor.Cli.exe\" \"\$$@\"" - $(CHMOD) 775 $(OUT)ntpac - -.PHONY: Ntp.Analyzer.Cli -Ntp.Analyzer.Cli: build Ntp.Analyzer Ntp.Process Ntp.Process Ntp.Config Ntp.Interop Ntp.Analyzer.Localize Ntp.Analyzer.Process Ntp.Analyzer Ntp.Log - $(MCS) $(OPTS) Ntp.Analyzer.Cli/Program.cs $(DEFSEXE) -main:Ntp.Analyzer.Cli.Program -out:$(OUT)Ntp.Analyzer.Cli.exe -r:Ntp.Analyzer.dll -r:Ntp.Process.dll -r:Ntp.Process.dll -r:Ntp.Config.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Analyzer.Process.dll -r:Ntp.Analyzer.dll -r:Ntp.Log.dll $(STDREF) - -.PHONY: Ntp.Analyzer.Validate.Cli -Ntp.Analyzer.Validate.Cli: build Ntp.Analyzer Ntp.Config Ntp.Interop Ntp.Analyzer.Localize - $(MCS) $(OPTS) Ntp.Analyzer.Validate.Cli/Program.cs $(DEFSEXE) -out:$(OUT)Ntp.Analyzer.Validate.Cli.exe -r:Ntp.Analyzer.dll -r:Ntp.Config.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Localize.dll $(STDREF) - -.PHONY: Ntp.Monitor.Cli -Ntp.Monitor.Cli: build Ntp.Monitor.Client Ntp.Process - $(MCS) $(OPTS) Ntp.Monitor.Cli/Program.cs $(DEFSEXE) -out:$(OUT)Ntp.Monitor.Cli.exe -r:Ntp.Monitor.Client.dll -r:Ntp.Process.dll $(STDREF) - -.PHONY: Ntp.Analyzer.Objects -Ntp.Analyzer.Objects: build - $(MCS) $(OPTS) /out:$(OUT)$(OB).dll $(DEFSLIB) $(OB)/Host.cs $(OB)/HostReading.cs $(OB)/Peer.cs $(OB)/PeerReading.cs $(OB)/StatusLine.cs $(OB)/TallyCode.cs $(OB)/TimeServer.cs $(OB)/TimeServerRole.cs $(OB)/Reading.cs $(OB)/ServerName.cs $(OB)/SourceEntry.cs $(OB)/PersistentObject.cs $(OB)/ReadingBulk.cs $(OB)/NamedObject.cs $(OB)/DispersionReading.cs $(OB)/PeerActivity.cs $(OB)/AssociationEntry.cs $(OB)/IoStatsEntry.cs $(OB)/HostIoReading.cs $(STDREF) - -.PHONY: NPlot -NPlot: build - $(MCS) $(OPTS) -out:$(OUT)$(NP).dll $(DEFSLIB) $(NP)/AdapterUtils.cs $(NP)/ArrowItem.cs $(NP)/AssemblyInfo.cs $(NP)/AxesConstraint.cs $(NP)/Axis.cs $(NP)/BarPlot.cs $(NP)/BasePlot.cs $(NP)/BaseSequencePlot.cs $(NP)/Bitmap.PlotSurface2D.cs $(NP)/CandlePlot.cs $(NP)/DateTimeAxis.cs $(NP)/FilledRegion.cs $(NP)/FontScaler.cs $(NP)/Grid.cs $(NP)/HistogramPlot.cs $(NP)/HorizontalLine.cs $(NP)/IDrawable.cs $(NP)/IGradient.cs $(NP)/IPlot.cs $(NP)/IPlotSurface2D.cs $(NP)/ISequencePlot.cs $(NP)/ISurface.cs $(NP)/ITransform2D.cs $(NP)/ImagePlot.cs $(NP)/LabelAxis.cs $(NP)/LabelPointPlot.cs $(NP)/Legend.cs $(NP)/LegendBase.cs $(NP)/LinePlot.cs $(NP)/LinearAxis.cs $(NP)/LinearGradient.cs $(NP)/LogAxis.cs $(NP)/Marker.cs $(NP)/MarkerItem.cs $(NP)/NPlotException.cs $(NP)/PageAlignedPhysicalAxis.cs $(NP)/PhysicalAxis.cs $(NP)/PiAxis.cs $(NP)/PiePlot.cs $(NP)/PlotSurface2D.cs $(NP)/PointD.cs $(NP)/PointPlot.cs $(NP)/RectangleBrushes.cs $(NP)/RectangleD.cs $(NP)/SequenceAdapter.cs $(NP)/StartStep.cs $(NP)/StepGradient.cs $(NP)/StepPlot.cs $(NP)/TextItem.cs $(NP)/TradingDateTimeAxis.cs $(NP)/Transform2D.cs $(NP)/Utils.cs $(NP)/VerticalLine.cs $(NP)/Windows.PlotSurface2D.cs -r:System.Data.dll -r:System.Drawing.dll -r:System.Windows.Forms.dll -r:System.Web.dll -r:System.Xml.dll $(STDREF) - -.PHONY: Ntp.Analyzer.Localize -Ntp.Analyzer.Localize: build - $(MCS) $(OPTS) -out:$(OUT)$(LOC).dll $(DEFSLIB) $(LOC)/ConfigurationKeyword.cs $(LOC)/ConfigurationMessage.cs $(LOC)/VersionInfo.cs $(LOC)/LogMessage.cs $(LOC)/PageText.cs $(LOC)/InitializationMessage.cs $(STDREF) - -.PHONY: Ntp.Interop -Ntp.Interop: build Ntp.Log - $(MCS) $(OPTS) -out:$(OUT)$(INT).dll $(DEFSLIB) $(INT)/ShellCommand.cs $(INT)/ProcessInfo.cs $(INT)/Options.cs $(INT)/InterProcess.cs $(INT)/DirectoryCommand.cs $(INT)/Permission.cs -r:Ntp.Log.dll -r:Mono.Posix.dll $(STDREF) - -.PHONY: Ntp.Common -Ntp.Common: build Ntp.Log Ntp.Interop Ntp.Config - $(MCS) $(OPTS) -out:$(OUT)$(COM).dll $(DEFSLIB) $(COM)/SignalHandler.cs $(COM)/IApplicationController.cs $(COM)/LogMessage.cs $(COM)/Heartbeat.cs $(COM)/HeartbeatConfiguration.cs -r:Ntp.Log.dll -r:Ntp.Interop.dll -r:Ntp.Config.dll $(STDREF) - -.PHONY: Ntp.Data -Ntp.Data: build Ntp.Config Ntp.Analyzer.Localize Ntp.Log Ntp.Common - $(MCS) $(OPTS) -out:$(OUT)Ntp.Data.dll $(DEFSLIB) $(DB)/DataMapper.cs $(DB)/FileDataMapper.cs $(DB)/ITableInitializer.cs $(DB)/DatabaseConfiguration.cs $(DB)/SqlDatabaseProvider.cs $(DB)/Schema/DatabaseUpdater.cs $(DB)/Schema/SqlChangeSet.cs $(DB)/Schema/IVersionChanges.cs $(DB)/ISqlFactory.cs $(DB)/Schema/VersionController.cs $(DB)/SqlDatabaseChecker.cs -r:Ntp.Config.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Log.dll -r:Ntp.Common.dll -r:System.Data.dll $(STDREF) - -.PHONY: Ntp.Process -Ntp.Process: build Ntp.Config Ntp.Interop Ntp.Analyzer.Localize Ntp.Log Ntp.Common - $(MCS) $(OPTS) /out:$(OUT)Ntp.Process.dll $(DEFSLIB) $(PRO)/ScheduledJob.cs $(PRO)/IScheduler.cs $(PRO)/Billboard.cs $(PRO)/JobDescription.cs $(PRO)/Job.cs $(PRO)/JobScheduleDescription.cs $(PRO)/JobConfiguration.cs $(PRO)/Scheduler.cs $(PRO)/IRequest.cs $(PRO)/Cluster.cs $(PRO)/ThreadType.cs -r:Ntp.Config.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Log.dll -r:Ntp.Common.dll $(STDREF) - -.PHONY: Ntp.Config -Ntp.Config: build Ntp.Analyzer.Localize - $(MCS) $(OPTS) -out:$(OUT)Ntp.Config.dll $(DEFSLIB) $(NC)/ConfigurationBase.cs $(NC)/ConfigurationBlock.cs $(NC)/ConfigurationException.cs $(NC)/OptionSet.cs -r:Ntp.Analyzer.Localize.dll $(STDREF) - -.PHONY: Ntp.Log -Ntp.Log: build Ntp.Config Ntp.Analyzer.Localize - $(MCS) $(OPTS) -out:$(OUT)Ntp.Log.dll $(DEFSLIB) $(NL)/TextLog.cs $(NL)/Severity.cs $(NL)/LogBase.cs $(NL)/LogFactory.cs $(NL)/LogConfiguration.cs $(NL)/LogGroup.cs $(NL)/ActivityLog.cs $(NL)/SysLog.cs $(NL)/ConsoleLog.cs $(NL)/FileLog.cs $(NL)/LogType.cs $(NL)/LogConfigurationKeyword.cs -r:Ntp.Config.dll -r:Mono.Posix.dll $(STDREF) - -.PHONY: Ntp.Data.Provider -Ntp.Data.Provider: build Ntp.Data Ntp.Config $(DBPROJ) - $(MCS) $(OPTS) -out:$(OUT)$(DBP).dll $(DEFSLIB) $(DBP)/MySqlFactory.cs $(DBP)/SqlDatabaseFactory.cs $(DBP)/PostgreSqlFactory.cs -r:Ntp.Data.dll -r:Ntp.Config.dll -r:System.Data.dll $(STDREF) $(DBREF) - -.PHONY: Ntp.Analyzer.Import -Ntp.Analyzer.Import: build Ntp.Analyzer.Objects Ntp.Analyzer.Localize Ntp.Interop Ntp.Analyzer.Data Ntp.Data Ntp.Log - $(MCS) $(OPTS) -out:$(OUT)$(IMP).dll $(DEFSLIB) $(IMP)/NtpctlHostImporter.cs $(IMP)/NtpqHostImporter.cs $(IMP)/NtpdcImporter.cs $(IMP)/Importer.cs $(IMP)/ServerType.cs $(IMP)/NtpqPeerImporter.cs $(IMP)/NtpctlPeerImporter.cs $(IMP)/IoStatsImporter.cs $(IMP)/NtpctlImporter.cs $(IMP)/ImportFactory.cs -r:Ntp.Analyzer.Objects.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Data.dll -r:Ntp.Data.dll -r:Ntp.Log.dll $(STDREF) - -.PHONY: Ntp.Analyzer.Data -Ntp.Analyzer.Data: build Ntp.Analyzer.Objects Ntp.Data Ntp.Analyzer.Localize Ntp.Log Ntp.Data.Provider - $(MCS) $(OPTS) -out:$(OUT)Ntp.Analyzer.Data.dll $(DEFSLIB) $(ADA)/DataFace.cs $(ADA)/Import/TimeServerImporter.cs $(ADA)/Import/TimeServerLoader.cs $(ADA)/Sql/HostDatabaseMapper.cs $(ADA)/Sql/HostReadingDatabaseMapper.cs $(ADA)/Sql/PeerDatabaseMapper.cs $(ADA)/Sql/PeerReadingDatabaseMapper.cs $(ADA)/Sql/TimeServerDatabaseMapper.cs $(ADA)/Sql/PeerActivityDatabaseMapper.cs $(ADA)/Sql/SqlDatabaseMapper.cs $(ADA)/Sql/FilteredSqlDatabaseMapper.cs $(ADA)/DatabaseInitializer.cs $(ADA)/Changes/Change01.cs $(ADA)/Sql/ReadingBulkMapper.cs $(ADA)/Sql/AssociationEntryMapper.cs $(ADA)/Sql/HostIoReadingDatabaseMapper.cs -r:Ntp.Analyzer.Objects.dll -r:Ntp.Data.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Log.dll -r:Ntp.Data.Provider.dll -r:System.Data.dll -r:System.Xml.dll $(STDREF) - -.PHONY: Ntp.Monitor.Client -Ntp.Monitor.Client: build Ntp.Process - $(MCS) $(OPTS) -out:$(OUT)$(MC).dll $(DEFSLIB) $(MC)/TextRequest.cs $(MC)/BinaryRequest.cs $(MC)/Request.cs -r:Ntp.Process.dll $(STDREF) - -.PHONY: Ntp.Monitor.Server -Ntp.Monitor.Server: build Ntp.Analyzer Ntp.Analyzer.Objects Ntp.Config Ntp.Process Ntp.Analyzer.Data Ntp.Log - $(MCS) $(OPTS) -out:$(OUT)$(MS).dll $(DEFSLIB) $(MS)/Listener.cs $(MS)/Request.cs $(MS)/ApplicationState.cs $(MS)/CommandType.cs $(MS)/CommandFactory.cs $(MS)/CommandDescription.cs $(MS)/ICommandDescription.cs $(MS)/TextCommand/PidCommand.cs $(MS)/TextCommand/PingCommand.cs $(MS)/TextCommand/VersionCommand.cs $(MS)/TextCommand/ConfigFileCommand.cs $(MS)/TextCommand/HelpCommand.cs $(MS)/TextCommand/JobsCommand.cs $(MS)/TextCommand/ScheduleCommand.cs $(MS)/TextCommand/TimeCommand.cs $(MS)/TextCommand/NextJobCommand.cs $(MS)/TextCommand/ServerCommand.cs $(MS)/TextCommand/ProgCommand.cs $(MS)/TextCommand/MonitorTextCommand.cs $(MS)/TextCommand/UptimeCommand.cs $(MS)/Command.cs $(MS)/PacketCommand/PacketCommand.cs $(MS)/PacketCommand/JobPacketCommand.cs $(MS)/TextCommand/RunningCommand.cs $(MS)/TextCommand/ProcCommand.cs $(MS)/TextCommand/ActivityCommand.cs -r:Ntp.Analyzer.dll -r:Ntp.Analyzer.Objects.dll -r:Ntp.Config.dll -r:Ntp.Process.dll -r:Ntp.Analyzer.Data.dll -r:Ntp.Log.dll $(STDREF) - -.PHONY: Ntp.Analyzer -Ntp.Analyzer: build Ntp.Config Ntp.Analyzer.Objects Ntp.Data Ntp.Process Ntp.Analyzer.Localize Ntp.Interop Ntp.Analyzer.Data Ntp.Analyzer.Import Ntp.Log Ntp.Common $(PLOTTER) - $(MCS) $(OPTS) -out:$(OUT)$(NA).dll $(DEFSLIB) $(NA)/Graph/HostGraph.cs $(NA)/Graph/GraphBase.cs $(NA)/Graph/PeerGraph.cs $(NA)/Graph/DispersionGraph.cs $(NA)/Render/Renderer.cs $(NA)/Render/HtmlRenderer.cs $(NA)/Render/IHtmlObject.cs $(NA)/Export/StreamDestination.cs $(NA)/Export/FileStreamDestination.cs $(NA)/Export/DirectoryStreamDestination.cs $(NA)/Export/IStreamGenerator.cs $(NA)/Config/Graph/DispersionGraphConfiguration.cs $(NA)/Config/Graph/GraphBaseConfiguration.cs $(NA)/Config/Graph/HostGraphConfiguration.cs $(NA)/Config/Graph/PeerGraphConfiguration.cs $(NA)/Config/Page/HostPageConfiguration.cs $(NA)/Config/Page/PageGraphConfiguration.cs $(NA)/Config/Page/PeerPageConfiguration.cs $(NA)/Config/Stats/HostStatConfiguration.cs $(NA)/Config/Stats/PeerStatConfiguration.cs $(NA)/Config/Stats/StatsConfiguration.cs $(NA)/Config/Configuration.cs $(NA)/Page/DefaultHostPageBuilder.cs $(NA)/Page/BootstrapHostPageBuilder.cs $(NA)/Render/Host/DefaultHostPageRender.cs $(NA)/Render/Host/BootstrapHostPageRender.cs $(NA)/Render/Host/BootstrapHostTableRender.cs $(NA)/Render/Host/BootstrapHostGraphRender.cs $(NA)/Config/Page/PageConfigurationBase.cs $(NA)/Config/Navigation/MenuConfiguration.cs $(NA)/Config/Navigation/MenuItemConfiguration.cs $(NA)/Config/Navigation/DropdownItemConfiguration.cs $(NA)/Config/Navigation/ILinkable.cs $(NA)/Config/Navigation/PageMenuItemConfiguration.cs $(NA)/Config/Navigation/LinkMenuItemConfiguration.cs $(NA)/Config/Navigation/HeadMenuItemConfiguration.cs $(NA)/Config/Navigation/SpacerMenuItemConfiguration.cs $(NA)/Config/Navigation/HeaderMenuItemConfiguration.cs $(NA)/Render/Peer/BootstrapPeerPageRender.cs $(NA)/Render/Peer/BootstrapPeerInfoRender.cs $(NA)/Render/Peer/BootstrapPeerGraphRender.cs $(NA)/Page/BootstrapPeerPageBuilder.cs $(NA)/Page/BootstrapAboutPageBuilder.cs $(NA)/Render/BootstrapAboutPageRender.cs $(NA)/Config/Page/AboutPageConfiguration.cs $(NA)/Render/Graph/BootstrapGrapPageRender.cs $(NA)/Render/BootstrapPageRender.cs $(NA)/Render/HtmlObjectRender.cs $(NA)/Render/Host/DefaultHostTableRender.cs $(NA)/Render/Host/DefaultHostGraphRender.cs $(NA)/Render/Peer/DefaultPeerGraphRender.cs $(NA)/Render/Peer/DefaultPeerInfoRender.cs $(NA)/Render/Peer/DefaultPeerPageRender.cs $(NA)/Render/BootstrapMenuRender.cs $(NA)/Render/Host/HostLineRender.cs $(NA)/Page/DefaultPeerPageBuilder.cs $(NA)/Page/PageBuilderBase.cs $(NA)/Config/Page/PeerGraphPageConfiguration.cs $(NA)/Config/Page/HostGraphPageConfiguration.cs $(NA)/Page/GraphPageBuilder.cs $(NA)/Config/Page/GraphPageConfiguration.cs $(NA)/Config/Destination/FileCollection.cs $(NA)/Config/Destination/DirectoryCollection.cs $(NA)/Config/Destination/DestinationCollection.cs $(NA)/Config/Destination/WebLinkCollection.cs $(NA)/Export/WebLink.cs $(NA)/Config/Destination/GraphSetConfiguration.cs $(NA)/Render/IHtmlExtension.cs $(NA)/Config/Graph/TrafficGraphConfiguration.cs $(NA)/Graph/TrafficGraph.cs $(NA)/Interface/IDispersionGraphConfiguration.cs $(NA)/Interface/IGraphBaseConfiguration.cs $(NA)/Interface/IHostGraphConfiguration.cs $(NA)/Interface/IPeerGraphConfiguration.cs $(NA)/Interface/ITrafficGraphConfiguration.cs $(NA)/Config/Root/NotifyConfiguration.cs $(NA)/Config/Root/ReadingBulkConfiguration.cs $(NA)/Config/Root/ListenerConfiguration.cs $(NA)/Config/Net/EndPointConfiguration.cs $(NA)/Config/Root/ClusterConfiguration.cs $(NA)/Config/Root/NodeConfiguration.cs $(NA)/Export/FtpStreamDestination.cs $(NA)/Render/Summary/BootstrapSummaryGraphRender.cs $(NA)/Render/Summary/BootstrapSummaryPageRender.cs $(NA)/Render/Summary/DefaultPeerSummaryGraphRender.cs $(NA)/Render/Summary/DefaultPeerSummaryPageRender.cs $(NA)/Page/DefaultPeerSummaryPageBuilder.cs $(NA)/Page/BootstrapPeerSummaryPageBuilder.cs $(NA)/Config/Page/PeerSummaryPageConfiguration.cs $(NA)/Config/Page/HostSummaryPageConfiguration.cs $(NA)/Config/Page/Collection/SummaryCollection.cs $(NA)/Config/Navigation/MenuItemType.cs $(NA)/Config/Root/PermissionConfiguration.cs $(NA)/Export/FileSystemDestination.cs $(NA)/Config/HostConfiguration.cs $(NA)/Config/HostSubConfiguration.cs $(NA)/Config/ConfigurationReader.cs $(NA)/Config/Stats/HostIoStatConfiguration.cs $(NA)/Statistics/DbStatusBuilder.cs $(NA)/Statistics/DirectStatusBuilder.cs $(NA)/Statistics/StatusBuilder.cs /target:library -r:Ntp.Config.dll -r:Ntp.Analyzer.Objects.dll -r:Ntp.Data.dll -r:Ntp.Process.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Data.dll -r:Ntp.Analyzer.Import.dll -r:Ntp.Log.dll -r:Ntp.Common.dll -r:System.Xml.dll -r:System.Data.dll -r:System.Drawing.dll -r:System.ServiceProcess.dll $(PLOTREF) $(STDREF) - -.PHONY: Ntp.Analyzer.Process -Ntp.Analyzer.Process: build Ntp.Analyzer Ntp.Config Ntp.Analyzer.Objects Ntp.Monitor.Server Ntp.Data Ntp.Process Ntp.Monitor.Client Ntp.Interop Ntp.Analyzer.Localize Ntp.Analyzer.Data Ntp.Analyzer.Import Ntp.Log Ntp.Common Ntp.Data.Provider - $(MCS) $(OPTS) -out:$(OUT)$(APR).dll $(DEFSLIB) $(APR)/Description/HostStatJob.cs $(APR)/Description/PeerStatJob.cs $(APR)/Description/HostGraphJob.cs $(APR)/Description/PeerGraphJob.cs $(APR)/Description/HostPageJob.cs $(APR)/Description/PeerPageJob.cs $(APR)/Description/StreamJob.cs $(APR)/Description/BulkStatJob.cs $(APR)/Description/NotifyJob.cs $(APR)/Description/AboutPageJob.cs $(APR)/Description/PeerGraphPageJob.cs $(APR)/Description/HostGraphPageJob.cs $(APR)/Description/TrafficGraphJob.cs $(APR)/Initializer.cs $(APR)/Main.cs $(APR)/Description/PeerSummaryPage.cs $(APR)/Description/HostIoStatJob.cs -r:Ntp.Analyzer.dll -r:Ntp.Config.dll -r:Ntp.Analyzer.Objects.dll -r:Ntp.Monitor.Server.dll -r:Ntp.Data.dll -r:Ntp.Process.dll -r:Ntp.Monitor.Client.dll -r:Ntp.Interop.dll -r:Ntp.Analyzer.Localize.dll -r:Ntp.Analyzer.Data.dll -r:Ntp.Analyzer.Import.dll -r:Ntp.Log.dll -r:Ntp.Common.dll -r:Ntp.Data.Provider.dll $(STDREF) diff --git a/Makefile.pgsql b/Makefile.pgsql deleted file mode 100644 index c518bb4a..00000000 --- a/Makefile.pgsql +++ /dev/null @@ -1,102 +0,0 @@ - -.PHONY: Npgsql -Npgsql: build - $(CP) $(PSQ)/Npgsql/NpgsqlMetaData.xml $(OBJS)Npgsql.Npgsql.NpgsqlMetaData.xml - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlClosedState.resx,$(OBJS)Npgsql.NpgsqlNetworkStream.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.resx,$(OBJS)Npgsql.NpgsqlCommand.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommandBuilder.resx,$(OBJS)Npgsql.NpgsqlCommandBuilder.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectedState.resx,$(OBJS)Npgsql.NpgsqlConnectedState.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.resx,$(OBJS)Npgsql.NpgsqlConnection.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.resx,$(OBJS)Npgsql.NpgsqlEventLog.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlException.resx,$(OBJS)Npgsql.NpgsqlException.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.resx,$(OBJS)Npgsql.NpgsqlParameter.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlReadyState.resx,$(OBJS)Npgsql.NpgsqlReadyState.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlRow.resx,$(OBJS)Npgsql.NpgsqlRow.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlState.resx,$(OBJS)Npgsql.NpgsqlState.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.resx,$(OBJS)Npgsql.NpgsqlTransaction.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/PGUtil.resx,$(OBJS)Npgsql.PGUtil.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.resx,$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.de.resx,$(OBJS)Npgsql.NpgsqlCommand.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.fr.resx,$(OBJS)Npgsql.NpgsqlCommand.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.es.resx,$(OBJS)Npgsql.NpgsqlCommand.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.fi.resx,$(OBJS)Npgsql.NpgsqlCommand.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.ja.resx,$(OBJS)Npgsql.NpgsqlCommand.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommand.zh-CN.resx,$(OBJS)Npgsql.NpgsqlCommand.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.de.resx,$(OBJS)Npgsql.NpgsqlConnection.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.es.resx,$(OBJS)Npgsql.NpgsqlConnection.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.fi.resx,$(OBJS)Npgsql.NpgsqlConnection.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.fr.resx,$(OBJS)Npgsql.NpgsqlConnection.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.ja.resx,$(OBJS)Npgsql.NpgsqlConnection.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnection.zh-CN.resx,$(OBJS)Npgsql.NpgsqlConnection.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.de.resx,$(OBJS)Npgsql.NpgsqlEventLog.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.es.resx,$(OBJS)Npgsql.NpgsqlEventLog.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.fi.resx,$(OBJS)Npgsql.NpgsqlEventLog.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.fr.resx,$(OBJS)Npgsql.NpgsqlEventLog.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.ja.resx,$(OBJS)Npgsql.NpgsqlEventLog.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlEventLog.zh-CN.resx,$(OBJS)Npgsql.NpgsqlEventLog.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlException.de.resx,$(OBJS)Npgsql.NpgsqlException.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlException.fr.resx,$(OBJS)Npgsql.NpgsqlException.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.de.resx,$(OBJS)Npgsql.NpgsqlParameter.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.es.resx,$(OBJS)Npgsql.NpgsqlParameter.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.fi.resx,$(OBJS)Npgsql.NpgsqlParameter.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.fr.resx,$(OBJS)Npgsql.NpgsqlParameter.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.ja.resx,$(OBJS)Npgsql.NpgsqlParameter.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameter.zh-CN.resx,$(OBJS)Npgsql.NpgsqlParameter.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.de.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.es.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.fi.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.fr.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.ja.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlParameterCollection.zh-CN.resx,$(OBJS)Npgsql.NpgsqlParameterCollection.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlReadyState.de.resx,$(OBJS)Npgsql.NpgsqlReadyState.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlReadyState.fr.resx,$(OBJS)Npgsql.NpgsqlReadyState.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlRow.de.resx,$(OBJS)Npgsql.NpgsqlRow.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlRow.fr.resx,$(OBJS)Npgsql.NpgsqlRow.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlState.de.resx,$(OBJS)Npgsql.NpgsqlState.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlState.fr.resx,$(OBJS)Npgsql.NpgsqlState.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.de.resx,$(OBJS)Npgsql.NpgsqlTransaction.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.es.resx,$(OBJS)Npgsql.NpgsqlTransaction.es.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.fi.resx,$(OBJS)Npgsql.NpgsqlTransaction.fi.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.fr.resx,$(OBJS)Npgsql.NpgsqlTransaction.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.ja.resx,$(OBJS)Npgsql.NpgsqlTransaction.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlTransaction.zh-CN.resx,$(OBJS)Npgsql.NpgsqlTransaction.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/PGUtil.de.resx,$(OBJS)Npgsql.PGUtil.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/PGUtil.fr.resx,$(OBJS)Npgsql.PGUtil.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlClosedState.ja.resx,$(OBJS)Npgsql.NpgsqlNetworkStream.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlClosedState.de.resx,$(OBJS)Npgsql.NpgsqlNetworkStream.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlClosedState.fr.resx,$(OBJS)Npgsql.NpgsqlNetworkStream.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlClosedState.zh-CN.resx,$(OBJS)Npgsql.NpgsqlNetworkStream.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommandBuilder.ja.resx,$(OBJS)Npgsql.NpgsqlCommandBuilder.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommandBuilder.fr.resx,$(OBJS)Npgsql.NpgsqlCommandBuilder.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommandBuilder.de.resx,$(OBJS)Npgsql.NpgsqlCommandBuilder.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlCommandBuilder.zh-CN.resx,$(OBJS)Npgsql.NpgsqlCommandBuilder.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectedState.de.resx,$(OBJS)Npgsql.NpgsqlConnectedState.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectedState.fr.resx,$(OBJS)Npgsql.NpgsqlConnectedState.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectedState.ja.resx,$(OBJS)Npgsql.NpgsqlConnectedState.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectedState.zh-CN.resx,$(OBJS)Npgsql.NpgsqlConnectedState.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.de.resx,$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.de.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.fr.resx,$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.fr.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.ja.resx,$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.zh-CN.resx,$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlException.ja.resx,$(OBJS)Npgsql.NpgsqlException.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlException.zh-CN.resx,$(OBJS)Npgsql.NpgsqlException.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlReadyState.ja.resx,$(OBJS)Npgsql.NpgsqlReadyState.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlReadyState.zh-CN.resx,$(OBJS)Npgsql.NpgsqlReadyState.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlState.ja.resx,$(OBJS)Npgsql.NpgsqlState.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/NpgsqlState.zh-CN.resx,$(OBJS)Npgsql.NpgsqlState.zh-CN.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/PGUtil.ja.resx,$(OBJS)Npgsql.PGUtil.ja.resources" - $(GEN) -usesourcepath -compile "$(PSQ)/Npgsql/PGUtil.zh-CN.resx,$(OBJS)Npgsql.PGUtil.zh-CN.resources" - $(MKDIR) $(OUT)de - $(AL) /culture:de /embed:$(OBJS)Npgsql.NpgsqlCommand.de.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.de.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.de.resources /embed:$(OBJS)Npgsql.NpgsqlException.de.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.de.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.de.resources /embed:$(OBJS)Npgsql.NpgsqlReadyState.de.resources /embed:$(OBJS)Npgsql.NpgsqlRow.de.resources /embed:$(OBJS)Npgsql.NpgsqlState.de.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.de.resources /embed:$(OBJS)Npgsql.PGUtil.de.resources /embed:$(OBJS)Npgsql.NpgsqlNetworkStream.de.resources /embed:$(OBJS)Npgsql.NpgsqlCommandBuilder.de.resources /embed:$(OBJS)Npgsql.NpgsqlConnectedState.de.resources /embed:$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.de.resources /out:$(OUT)de/Npgsql.resources.dll - $(MKDIR) $(OUT)fr - $(AL) /culture:fr /embed:$(OBJS)Npgsql.NpgsqlCommand.fr.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.fr.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.fr.resources /embed:$(OBJS)Npgsql.NpgsqlException.fr.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.fr.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.fr.resources /embed:$(OBJS)Npgsql.NpgsqlReadyState.fr.resources /embed:$(OBJS)Npgsql.NpgsqlRow.fr.resources /embed:$(OBJS)Npgsql.NpgsqlState.fr.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.fr.resources /embed:$(OBJS)Npgsql.PGUtil.fr.resources /embed:$(OBJS)Npgsql.NpgsqlNetworkStream.fr.resources /embed:$(OBJS)Npgsql.NpgsqlCommandBuilder.fr.resources /embed:$(OBJS)Npgsql.NpgsqlConnectedState.fr.resources /embed:$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.fr.resources /out:$(OUT)fr/Npgsql.resources.dll - $(MKDIR) $(OUT)es - $(AL) /culture:es /embed:$(OBJS)Npgsql.NpgsqlCommand.es.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.es.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.es.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.es.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.es.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.es.resources /out:$(OUT)es/Npgsql.resources.dll - $(MKDIR) $(OUT)fi - $(AL) /culture:fi /embed:$(OBJS)Npgsql.NpgsqlCommand.fi.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.fi.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.fi.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.fi.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.fi.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.fi.resources /out:$(OUT)fi/Npgsql.resources.dll - $(MKDIR) $(OUT)ja - $(AL) /culture:ja /embed:$(OBJS)Npgsql.NpgsqlCommand.ja.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.ja.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.ja.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.ja.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.ja.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.ja.resources /embed:$(OBJS)Npgsql.NpgsqlNetworkStream.ja.resources /embed:$(OBJS)Npgsql.NpgsqlCommandBuilder.ja.resources /embed:$(OBJS)Npgsql.NpgsqlConnectedState.ja.resources /embed:$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.ja.resources /embed:$(OBJS)Npgsql.NpgsqlException.ja.resources /embed:$(OBJS)Npgsql.NpgsqlReadyState.ja.resources /embed:$(OBJS)Npgsql.NpgsqlState.ja.resources /embed:$(OBJS)Npgsql.PGUtil.ja.resources /out:$(OUT)ja/Npgsql.resources.dll - $(MKDIR) $(OUT)zh-CN - $(AL) /culture:zh-CN /embed:$(OBJS)Npgsql.NpgsqlCommand.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlConnection.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlEventLog.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlParameter.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlParameterCollection.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlTransaction.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlNetworkStream.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlCommandBuilder.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlConnectedState.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlException.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlReadyState.zh-CN.resources /embed:$(OBJS)Npgsql.NpgsqlState.zh-CN.resources /embed:$(OBJS)Npgsql.PGUtil.zh-CN.resources /out:$(OUT)zh-CN/Npgsql.resources.dll - $(MCS) $(OPTS) -out:$(OUT)Npgsql.dll $(DEFSLIB) $(PSQ)/NpgsqlTypes/ArrayHandling.cs $(PSQ)/NpgsqlTypes/BitString.cs $(PSQ)/NpgsqlTypes/DateDatatypes.cs $(PSQ)/NpgsqlTypes/ExpectedTypeConverter.cs $(PSQ)/NpgsqlTypes/FastConverter.cs $(PSQ)/NpgsqlTypes/FastPath.cs $(PSQ)/NpgsqlTypes/FastPathArg.cs $(PSQ)/NpgsqlTypes/LargeObject.cs $(PSQ)/NpgsqlTypes/LargeObjectManager.cs $(PSQ)/NpgsqlTypes/NpgsqlDbType.cs $(PSQ)/NpgsqlTypes/NpgsqlNativeToBackendOptions.cs $(PSQ)/NpgsqlTypes/NpgsqlTypeConvBackendToNative.cs $(PSQ)/NpgsqlTypes/NpgsqlTypeConvNativeToBackend.cs $(PSQ)/NpgsqlTypes/NpgsqlTypeInfoBackend.cs $(PSQ)/NpgsqlTypes/NpgsqlTypeInfoNative.cs $(PSQ)/NpgsqlTypes/NpgsqlTypeMappings.cs $(PSQ)/NpgsqlTypes/NpgsqlTypes.cs $(PSQ)/NpgsqlTypes/NpgsqlTypesHelper.cs $(PSQ)/Npgsql/NpgsqlQuery.cs $(PSQ)/Properties/AssemblyInfo.cs $(PSQ)/Properties/CommonAssemblyInfo.cs $(PSQ)/Npgsql/Cache.cs $(PSQ)/Npgsql/BackendEncoding.cs $(PSQ)/Npgsql/ASCIIBytes.cs $(PSQ)/Npgsql/NpgsqlState.BackendResponse.cs $(PSQ)/Npgsql/HashAlgorithm.cs $(PSQ)/Npgsql/MD5.cs $(PSQ)/Npgsql/MD5CryptoServiceProvider.cs $(PSQ)/Npgsql/NpgsqlAsciiRow.cs $(PSQ)/Npgsql/NpgsqlBackEndKeyData.cs $(PSQ)/Npgsql/NpgsqlBind.cs $(PSQ)/Npgsql/NpgsqlCancelRequest.cs $(PSQ)/Npgsql/NpgsqlClosedState.cs $(PSQ)/Npgsql/NpgsqlCommand.cs $(PSQ)/Npgsql/NpgsqlCommand.PrepareExecute.cs $(PSQ)/Npgsql/NpgsqlCommand.Rewrite.cs $(PSQ)/Npgsql/NpgsqlCommandBuilder.cs $(PSQ)/Npgsql/NpgsqlConnectedState.cs $(PSQ)/Npgsql/NpgsqlConnection.cs $(PSQ)/Npgsql/NpgsqlConnectionStringBuilder.cs $(PSQ)/Npgsql/NpgsqlConnector.cs $(PSQ)/Npgsql/NpgsqlConnectorPool.cs $(PSQ)/Npgsql/NpgsqlCopyFormat.cs $(PSQ)/Npgsql/NpgsqlCopyIn.cs $(PSQ)/Npgsql/NpgsqlCopyInState.cs $(PSQ)/Npgsql/NpgsqlCopyInStream.cs $(PSQ)/Npgsql/NpgsqlCopyOut.cs $(PSQ)/Npgsql/NpgsqlCopyOutState.cs $(PSQ)/Npgsql/NpgsqlCopyOutStream.cs $(PSQ)/Npgsql/NpgsqlCopySerializer.cs $(PSQ)/Npgsql/NpgsqlDataAdapter.cs $(PSQ)/Npgsql/NpgsqlDataReader.cs $(PSQ)/Npgsql/NpgsqlDescribe.cs $(PSQ)/Npgsql/NpgsqlError.cs $(PSQ)/Npgsql/NpgsqlEventLog.cs $(PSQ)/Npgsql/NpgsqlException.cs $(PSQ)/Npgsql/NpgsqlExecute.cs $(PSQ)/Npgsql/NpgsqlFactory.cs $(PSQ)/Npgsql/NpgsqlFlush.cs $(PSQ)/Npgsql/NpgsqlMediator.cs $(PSQ)/Npgsql/NpgsqlMessageTypes.cs $(PSQ)/Npgsql/NpgsqlNotificationEventArgs.cs $(PSQ)/Npgsql/NpgsqlParameter.cs $(PSQ)/Npgsql/NpgsqlParameterCollection.cs $(PSQ)/Npgsql/NpgsqlParameterStatus.cs $(PSQ)/Npgsql/NpgsqlParse.cs $(PSQ)/Npgsql/NpgsqlPasswordPacket.cs $(PSQ)/Npgsql/NpgsqlPromotableSinglePhaseNotification.cs $(PSQ)/Npgsql/NpgsqlReadyState.cs $(PSQ)/Npgsql/NpgsqlResourceManager.cs $(PSQ)/Npgsql/NpgsqlRow.cs $(PSQ)/Npgsql/NpgsqlRowDescription.cs $(PSQ)/Npgsql/NpgsqlSchema.cs $(PSQ)/Npgsql/NpgsqlStartupPacket.cs $(PSQ)/Npgsql/NpgsqlStartupState.cs $(PSQ)/Npgsql/NpgsqlState.cs $(PSQ)/Npgsql/NpgsqlSync.cs $(PSQ)/Npgsql/NpgsqlTransaction.cs $(PSQ)/Npgsql/NpgsqlTransactionCallbacks.cs $(PSQ)/Npgsql/PGUtil.cs $(PSQ)/Npgsql/SSPIHandler.cs -resource:$(OBJS)Npgsql.NpgsqlNetworkStream.resources -resource:$(OBJS)Npgsql.NpgsqlCommand.resources -resource:$(OBJS)Npgsql.NpgsqlCommandBuilder.resources -resource:$(OBJS)Npgsql.NpgsqlConnectedState.resources -resource:$(OBJS)Npgsql.NpgsqlConnection.resources -resource:$(OBJS)Npgsql.NpgsqlEventLog.resources -resource:$(OBJS)Npgsql.NpgsqlException.resources -resource:$(OBJS)Npgsql.NpgsqlParameter.resources -resource:$(OBJS)Npgsql.NpgsqlParameterCollection.resources -resource:$(OBJS)Npgsql.NpgsqlReadyState.resources -resource:$(OBJS)Npgsql.NpgsqlRow.resources -resource:$(OBJS)Npgsql.NpgsqlState.resources -resource:$(OBJS)Npgsql.NpgsqlTransaction.resources -resource:$(OBJS)Npgsql.PGUtil.resources -resource:$(OBJS)Npgsql.NpgsqlConnectionStringBuilder.resources -resource:$(OBJS)Npgsql.Npgsql.NpgsqlMetaData.xml -r:System.Data.dll -r:System.DirectoryServices.dll -r:System.Transactions.dll -r:System.Configuration.dll -r:System.Xml.dll -r:Mono.Security.dll $(STDREF) -warn:0 diff --git a/MySql/Source/MySql.Data/MySql.Data.csproj b/MySql/Source/MySql.Data/MySql.Data.csproj index 7e3731c5..edfcceea 100644 --- a/MySql/Source/MySql.Data/MySql.Data.csproj +++ b/MySql/Source/MySql.Data/MySql.Data.csproj @@ -7,7 +7,7 @@ 2.0 4.0 NET_40_OR_GREATER - 0.6.1 + 0.6.2 {E9DF5ED1-4CBD-4226-B931-9A51610AC14D} diff --git a/NPlot/NPlot.csproj b/NPlot/NPlot.csproj index bc6381d4..99283d51 100644 --- a/NPlot/NPlot.csproj +++ b/NPlot/NPlot.csproj @@ -9,7 +9,7 @@ Library NPlot NPlot - 0.6.1 + 0.6.2 true diff --git a/Npgsql/Npgsql.csproj b/Npgsql/Npgsql.csproj index fd6aea25..30ba2652 100644 --- a/Npgsql/Npgsql.csproj +++ b/Npgsql/Npgsql.csproj @@ -9,7 +9,7 @@ Library Npgsql Npgsql - 0.6.1 + 0.6.2 true diff --git a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj index eb83c997..e706b361 100644 --- a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj +++ b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj @@ -9,7 +9,7 @@ Exe Ntp.Analyzer.Cli Ntp.Analyzer.Cli.Program - 0.6.1 + 0.6.2 Ntp.Analyzer.Cli diff --git a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj index a4cfb014..93f8c00f 100644 --- a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj +++ b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer.Data Ntp.Analyzer.Data - 0.6.1 + 0.6.2 true diff --git a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj index 34a5a029..c55cc983 100644 --- a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj +++ b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer.Import Ntp.Analyzer.Import - 0.6.1 + 0.6.2 true diff --git a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj index 5556b39a..c6098c1e 100644 --- a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj +++ b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer.Localize Ntp.Analyzer.Localize - 0.6.1 + 0.6.2 true diff --git a/Ntp.Analyzer.Localize/VersionInfo.cs b/Ntp.Analyzer.Localize/VersionInfo.cs index b6aad27b..76dc9108 100644 --- a/Ntp.Analyzer.Localize/VersionInfo.cs +++ b/Ntp.Analyzer.Localize/VersionInfo.cs @@ -28,7 +28,7 @@ namespace Ntp.Analyzer.Localize { public static class VersionInfo { - public static readonly string Number = "0.6.1"; + public static readonly string Number = "0.6.2"; public static readonly string Text = "v" + Number; } diff --git a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj index e64aeb53..282b743a 100644 --- a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj +++ b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer.Objects Ntp.Analyzer.Objects - 0.6.1 + 0.6.2 true diff --git a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj index 503bdb8c..714584a0 100644 --- a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj +++ b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer.Process Ntp.Analyzer.Process - 0.6.1 + 0.6.2 true @@ -33,7 +33,6 @@ true ..\bin - GRAPH; 4 @@ -42,6 +41,13 @@ GRAPH; 4 + + + + GRAPH;TRACE + + + diff --git a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj index 5b9d1e33..b578abc8 100644 --- a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj +++ b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj @@ -8,7 +8,7 @@ {9790FACF-170E-43C7-889A-D4445FC7E7A1} Exe Ntp.Analyzer.Validate.Cli - 0.6.1 + 0.6.2 Ntp.Analyzer.Validate.Cli.Program Ntp.Analyzer.Validate.Cli diff --git a/Ntp.Analyzer.sln b/Ntp.Analyzer.sln index 0d489a38..80553a9b 100644 --- a/Ntp.Analyzer.sln +++ b/Ntp.Analyzer.sln @@ -464,7 +464,7 @@ Global $36.inheritsScope = application/xml $36.scope = application/xml description = NTP Analyzer is a tool dedicated to analyze the operation of time servers. - version = 0.6.1 + version = 0.6.2 StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/Ntp.Analyzer/Ntp.Analyzer.csproj b/Ntp.Analyzer/Ntp.Analyzer.csproj index eb99d3a6..97bd2689 100644 --- a/Ntp.Analyzer/Ntp.Analyzer.csproj +++ b/Ntp.Analyzer/Ntp.Analyzer.csproj @@ -9,7 +9,7 @@ Library Ntp.Analyzer Ntp.Analyzer - 0.6.1 + 0.6.2 true diff --git a/Ntp.Common/Ntp.Common.csproj b/Ntp.Common/Ntp.Common.csproj index 68d6914b..1f86062d 100644 --- a/Ntp.Common/Ntp.Common.csproj +++ b/Ntp.Common/Ntp.Common.csproj @@ -9,7 +9,7 @@ Library Ntp.Common Ntp.Common - 0.6.1 + 0.6.2 true diff --git a/Ntp.Config/Ntp.Config.csproj b/Ntp.Config/Ntp.Config.csproj index c7d9598d..992feb25 100644 --- a/Ntp.Config/Ntp.Config.csproj +++ b/Ntp.Config/Ntp.Config.csproj @@ -9,7 +9,7 @@ Library Ntp.Config Ntp.Config - 0.6.1 + 0.6.2 true diff --git a/Ntp.Data.Provider/Ntp.Data.Provider.csproj b/Ntp.Data.Provider/Ntp.Data.Provider.csproj index e87d28cd..b92d1372 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.6.1 + 0.6.2 true @@ -37,8 +37,31 @@ false ..\bin 4 - MYSQL;PGSQL; + MYSQL;PGSQL;TRACE + + + + + MYSQL;PGSQL;TRACE + + + + + MYSQL;TRACE + + + + + PGSQL;TRACE + + + + + TRACE + + + @@ -58,13 +81,25 @@ {43A1A769-6ED9-4AE1-821A-43F97814968C} Ntp.Config - - {9D13B739-62B1-4190-B386-7A9547304EB3} - Npgsql - - - {E9DF5ED1-4CBD-4226-B931-9A51610AC14D} - MySql.Data - + + + + + {9D13B739-62B1-4190-B386-7A9547304EB3} + Npgsql + + + + + + + + + {E9DF5ED1-4CBD-4226-B931-9A51610AC14D} + MySql.Data + + + + diff --git a/Ntp.Data/Ntp.Data.csproj b/Ntp.Data/Ntp.Data.csproj index 50727000..eb0b1d02 100644 --- a/Ntp.Data/Ntp.Data.csproj +++ b/Ntp.Data/Ntp.Data.csproj @@ -9,7 +9,7 @@ Library Ntp.Data Ntp.Data - 0.6.1 + 0.6.2 true diff --git a/Ntp.Interop/Ntp.Interop.csproj b/Ntp.Interop/Ntp.Interop.csproj index dbb0c37e..43cba473 100644 --- a/Ntp.Interop/Ntp.Interop.csproj +++ b/Ntp.Interop/Ntp.Interop.csproj @@ -9,7 +9,7 @@ Library Ntp.Interop Ntp.Interop - 0.6.1 + 0.6.2 true diff --git a/Ntp.Log/Ntp.Log.csproj b/Ntp.Log/Ntp.Log.csproj index 1c4db131..7311ebdf 100644 --- a/Ntp.Log/Ntp.Log.csproj +++ b/Ntp.Log/Ntp.Log.csproj @@ -9,7 +9,7 @@ Library Ntp.Log Ntp.Analyzer.Log - 0.6.1 + 0.6.2 true diff --git a/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj b/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj index 33b62bf8..ff475052 100644 --- a/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj +++ b/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj @@ -8,7 +8,7 @@ {0349CF56-C07C-46B5-B9CD-2BCB2709EE0A} Exe Ntp.Monitor.Cli - 0.6.1 + 0.6.2 Ntp.Monitor.Cli diff --git a/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj b/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj index 5cbe689b..ec4c0882 100644 --- a/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj +++ b/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj @@ -9,7 +9,7 @@ Library Ntp.Monitor.Client Ntp.Monitor.Client - 0.6.1 + 0.6.2 true diff --git a/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj b/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj index b442cd2e..2f416689 100644 --- a/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj +++ b/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj @@ -9,7 +9,7 @@ Library Ntp.Monitor.Server Ntp.Monitor.Server - 0.6.1 + 0.6.2 true diff --git a/Ntp.Process/Ntp.Process.csproj b/Ntp.Process/Ntp.Process.csproj index 303ddb54..981ca335 100644 --- a/Ntp.Process/Ntp.Process.csproj +++ b/Ntp.Process/Ntp.Process.csproj @@ -9,7 +9,7 @@ Library Ntp.Process Ntp.Process - 0.6.1 + 0.6.2 true diff --git a/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj b/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj index bbe4adba..a57c3c01 100644 --- a/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj +++ b/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj @@ -11,7 +11,7 @@ 512 8.0.30703 2.0 - 0.6.1 + 0.6.2 true diff --git a/OxyPlot.Gdi/OxyPlot.Gdi.csproj b/OxyPlot.Gdi/OxyPlot.Gdi.csproj index 877cb237..50fd2131 100644 --- a/OxyPlot.Gdi/OxyPlot.Gdi.csproj +++ b/OxyPlot.Gdi/OxyPlot.Gdi.csproj @@ -12,7 +12,7 @@ 512 8.0.30703 2.0 - 0.6.1 + 0.6.2 true diff --git a/OxyPlot/OxyPlot.csproj b/OxyPlot/OxyPlot.csproj index 8f6f3839..f47cda06 100644 --- a/OxyPlot/OxyPlot.csproj +++ b/OxyPlot/OxyPlot.csproj @@ -12,7 +12,7 @@ 512 8.0.30703 2.0 - 0.6.1 + 0.6.2 true diff --git a/configure b/configure index 2f10c2a7..811f662b 100755 --- a/configure +++ b/configure @@ -1,13 +1,6 @@ #! /bin/sh -# -# Make a test build with: -# xbuild /property:Configuration=Server Ntp.Analyzer.sln -# -# Clean with: -# xbuild /property:Configuration=Server Ntp.Analyzer.sln /t:clean -# - +OPTS=' ' PGSQL='OFF' MYSQL='OFF' GRAPH='OFF' @@ -16,14 +9,17 @@ getarg () { if [ "$1" = "MYSQL" ]; then MYSQL='ON' + OPTS="$OPTS/p:mysql=on " fi if [ "$1" = "PGSQL" ]; then PGSQL='ON' + OPTS="$OPTS/p:pgsql=on " fi if [ "$1" = "GRAPH" ]; then - GRAPH='ON' + GRAPH='NPLOT' + OPTS="$OPTS/p:graph=nplot " fi } @@ -39,130 +35,69 @@ if [ -n "$3" ]; then getarg "$3" fi -rm -f Makefile -rm -f Makefile.1 -rm -f Makefile.2 - ( -echo '#NTP Analyzer make file' +echo 'all: server' echo -echo 'PREFIX=/usr/local' -echo 'INSTDIR=/libexec/ntpa' +echo 'debug:' +echo ' xbuild Ntp.Analyzer.sln /p:Configuration=Debug' echo -echo 'MCS= /usr/lib/mono/4.5/mcs.exe' -echo 'GEN= /usr/lib/mono/4.5/resgen.exe' -echo 'AL= /usr/lib/mono/4.5/al.exe' -echo 'MLIB= /usr/lib/mono/4.5' +echo 'release:' +echo ' xbuild Ntp.Analyzer.sln /p:Configuration=Release' echo -echo 'CP= /bin/cp' -echo 'RM= /bin/rm -f' -echo 'MKDIR= /bin/mkdir -p' -echo 'ECHO= /bin/echo' -echo 'CHMOD= /bin/chmod' +echo 'server:' +echo " xbuild /p:Configuration=Server$OPTS Ntp.Analyzer.sln" echo -echo 'OUT= bin/' -echo 'OBJS= obj/' -echo -if [ $PGSQL = "ON" ] ; then -echo 'PGSQLP=Npgsql' -echo 'PGSQLR=-r:Npgsql.dll' -echo 'PGSQLD=PGSQL;' -echo 'PSQ=Npgsql' -fi -if [ $MYSQL = "ON" ] ; then -echo 'MYSQLP=MySql.Data' -echo 'MYSQLR=-r:MySql.Data.dll' -echo 'MYSQLD=MYSQL;' -echo 'MSQ=MySql/Source/MySql.Data' -fi -if [ $GRAPH = "ON" ] ; then -echo 'GRAPHD=GRAPH;' -fi -echo -echo 'OPTIMIZE=-optimize+' -echo 'STDOPT=-noconfig -nostdlib' -echo 'OPTS=$(STDOPT) $(OPTIMIZE)' -echo -echo 'DEBUG=' -echo 'TRACE=TRACE;' -echo 'NET40=NET40;' -echo 'NET40P=NET_40_OR_GREATER;' -echo 'DEFS=-d:"$(TRACE)$(DEBUG)$(NET40)$(NET40P)$(GRAPHD)$(PGSQLD)$(MYSQLD)NTPA"' -echo -echo 'DEFSEXE=-t:exe $(DEFS) -lib:"$(MLIB),bin"' -echo 'DEFSLIB=-t:library $(DEFS) -lib:"/usr/lib/mono/4.5,bin"' -echo 'STDREF= -r:System.dll -r:System.Core.dll -r:mscorlib.dll' -echo -echo 'DBPROJ=$(PGSQLP) $(MYSQLP)' -echo 'DBREF=$(PGSQLR) $(MYSQLR)' -echo -echo 'PLOTTER=NPlot' -echo 'PLOTREF=-r:NPlot.dll' -) > Makefile.1 - -( -echo -echo '.PHONY:' echo 'install:' echo ' install -d ${DESTDIR}$(PREFIX)/sbin' echo ' install script/ntpa ${DESTDIR}$(PREFIX)/sbin' echo ' install script/ntpac ${DESTDIR}$(PREFIX)/sbin' echo ' install script/ntpav ${DESTDIR}$(PREFIX)/sbin' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/NPlot.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Cli.exe ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Data.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Import.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Localize.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Log.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Objects.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Process.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Analyzer.Validate.Cli.exe ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Common.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Config.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Data.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Data.Provider.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Interop.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Monitor.Client.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Monitor.Cli.exe ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Monitor.Server.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install bin/Ntp.Process.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/NPlot.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Data.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Import.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Localize.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Log.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Objects.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Process.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Analyzer.Validate.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Common.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Config.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Data.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Data.Provider.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Interop.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Monitor.Client.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Monitor.Cli.exe ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Monitor.Server.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install bin/Ntp.Process.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' + if [ $MYSQL = "ON" ]; then -echo ' install bin/MySql.Data.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' +echo ' install bin/MySql.Data.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' fi + if [ $PGSQL = "ON" ]; then -echo ' install bin/Npgsql.dll ${DESTDIR}$(PREFIX)$(INSTDIR)' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/de' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/es' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/fi' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/fr' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/ja' -echo ' install -d ${DESTDIR}$(PREFIX)$(INSTDIR)/zh-CN' -echo ' install bin/de/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/de' -echo ' install bin/es/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/es' -echo ' install bin/fi/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/fi' -echo ' install bin/fr/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/fr' -echo ' install bin/ja/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/ja' -echo ' install bin/ja/Npgsql.resources.dll ${DESTDIR}$(PREFIX)$(INSTDIR)/zh-CN' +echo ' install bin/Npgsql.dll ${DESTDIR}$(PREFIX)/libexec/ntpa' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/de' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/es' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/fi' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/fr' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/ja' +echo ' install -d ${DESTDIR}$(PREFIX)/libexec/ntpa/zh-CN' +echo ' install bin/de/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/de' +echo ' install bin/es/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/es' +echo ' install bin/fi/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/fi' +echo ' install bin/fr/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/fr' +echo ' install bin/ja/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/ja' +echo ' install bin/ja/Npgsql.resources.dll ${DESTDIR}$(PREFIX)/libexec/ntpa/zh-CN' fi + echo ' install -d ${DESTDIR}$(PREFIX)/etc/ntpa/' echo ' install examples/ntpa.conf ${DESTDIR}$(PREFIX)/etc/ntpa/ntpa.conf.sample' echo -echo '.PHONY:' echo 'clean:' -echo ' $(RM) $(OUT)$(LOC).dll $(OUT)$(OB).dll $(OUT)$(INT).dll $(OUT)$(NP).dll $(OUT)$(COM).dll $(OUT)$(DB).dll $(OUT)$(DBP).dll $(OUT)$(PRO).dll $(OUT)$(NC).dll $(OUT)$(NL).dll $(OUT)$(ADA).dll $(OUT)$(IMP).dll $(OUT)$(MC).dll $(OUT)$(MS).dll $(OUT)$(NA).dll $(OUT)$(APR).dll $(OUT)MySql.Data.dll $(OUT)Ntp.Analyzer.Cli.exe $(OUT)Ntp.Analyzer.Validate.Cli.exe $(OUT)Ntp.Monitor.Cli.exe $(OUT)ntpa $(OUT)ntpav $(OUT)ntpac' - -) > Makefile.2 - -if [ $MYSQL = "ON" ] ; then - MakeMySql=" Makefile.mysql" -fi - -if [ $PGSQL = "ON" ] ; then - MakePgSql=" Makefile.pgsql" -fi - -cat >Makefile Makefile.1 Makefile.ntpa$MakeMySql$MakePgSql Makefile.2 -rm Makefile.1 -rm Makefile.2 +echo ' xbuild Ntp.Analyzer.sln /p:Configuration=Debug /t:clean' +echo ' xbuild Ntp.Analyzer.sln /p:Configuration=Release /t:clean' +echo ' xbuild Ntp.Analyzer.sln /p:Configuration=Server /t:clean' +) > Makefile