rainlance
/
ntpa
mirror of https://bitbucket.org/anguist/ntpa
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of https://bitbucket.org/anguist/ntpa

This commit is contained in:
Carsten Larsen 2016-08-20 09:15:55 +00:00
parent 27cdff73e2 624db96651
commit 7daa991012
5 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -6,7 +6,7 @@
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/bin/Ntp.Analyzer.Cli.exe",
"args": ["--config", "/home/carsten/ntpa/examples/ntpa.conf"],
"args": ["--config", "${workspaceRoot}/test/ntpa.conf"],
"cwd": "${workspaceRoot}",
"preLaunchTask": "",
"runtimeExecutable": null,

3
.vscode/tasks.json vendored
View File

@ -4,8 +4,7 @@
"version": "0.1.0",
"command": "xbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true"
"/p:GenerateFullPaths=true /p:mysql=ON /p:pgsql=ON /p:graph=NPlot"
],
"taskSelector": "/t:",
"showOutput": "silent",

14
Makefile
View File

@ -1,21 +1,19 @@
# NTP Analyzer Makefile v0.2
MYSQL= on
PQSQL= on
GRAPH= nplot
# NTP Analyzer Makefile v0.3
FRAMEWORK= v4.0
MYSQL= ON
PGSQL= ON
GRAPH= NPlot
all: release
debug:
xbuild /p:Configuration=Debug /p:TargetFrameworkVersion=${FRAMEWORK} \
Ntp.Analyzer.sln
/p:MySql=${MYSQL} /p:PgSql=${PGSQL} /p:Graph=${GRAPH} Ntp.Analyzer.sln
release:
xbuild /p:Configuration=Release /p:TargetFrameworkVersion=${FRAMEWORK} \
/p:mysql=${MYSQL} /p:pgsql=${PQSQL} /p:/p:graph=${GRAPH} \
Ntp.Analyzer.sln
/p:MySql=${MYSQL} /p:PgSql=${PGSQL} /p:Graph=${GRAPH} Ntp.Analyzer.sln
install: release
install -d ${DESTDIR}$(PREFIX)/sbin

15
Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
View File

@ -3,6 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Graph Condition=" '$(Graph)' == '' ">NPlot</Graph>
<ProjectGuid>{266A828E-05CA-4FEB-8B78-0BC066760C26}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Ntp.Analyzer.Process</RootNamespace>
@ -29,14 +30,12 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<!-- Override when doing automated build -->
<Choose>
<When Condition=" '$(graph)' == 'nplot' ">
<PropertyGroup>
<DefineConstants>GRAPH;TRACE</DefineConstants>
</PropertyGroup>
</When>
</Choose>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(Graph)' == 'Debug|AnyCPU|NPlot' ">
<DefineConstants>GRAPH;TRACE;DEBUG;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(Graph)' == 'Release|AnyCPU|NPlot' ">
<DefineConstants>GRAPH;TRACE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />

62
Ntp.Data.Provider/Ntp.Data.Provider.csproj
View File

@ -3,6 +3,8 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<MySql Condition=" '$(MySql)' == '' ">ON</MySql>
<PgSql Condition=" '$(PgSql)' == '' ">ON</PgSql>
<ProjectGuid>{B982916F-F2F1-4975-89A6-C8BACDC65542}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Ntp.Data.Provider</RootNamespace>
@ -15,7 +17,6 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin</OutputPath>
<DefineConstants>TRACE;DEBUG;MYSQL;PGSQL;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
@ -24,40 +25,33 @@
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin</OutputPath>
<DefineConstants>TRACE;MYSQL;PGSQL;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<!-- Override when doing automated build -->
<!-- SQL Provider definitions (debug) -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(MySql)' == 'Debug|AnyCPU|ON' ">
<DefineConstants>MYSQL;TRACE;DEBUG;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(PgSql)' == 'Debug|AnyCPU|ON' ">
<DefineConstants>PGSQL;TRACE;DEBUG;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(MySql)|$(PgSql)' == 'Debug|AnyCPU|ON|ON' ">
<DefineConstants>MYSQL;PGSQL;TRACE;DEBUG;</DefineConstants>
</PropertyGroup>
<!-- SQL Provider definitions (release) -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(MySql)' == 'Release|AnyCPU|ON' ">
<DefineConstants>MYSQL;TRACE;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(PgSql)' == 'Release|AnyCPU|ON' ">
<DefineConstants>PGSQL;TRACE;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)|$(MySql)|$(PgSql)' == 'Release|AnyCPU|ON|ON' ">
<DefineConstants>MYSQL;PGSQL;TRACE;</DefineConstants>
</PropertyGroup>
<!-- PostgreSQL Provider include -->
<Choose>
<When Condition=" '$(mysql)|$(pgsql)' == 'on|on' ">
<PropertyGroup>
<DefineConstants>MYSQL;PGSQL;TRACE</DefineConstants>
</PropertyGroup>
</When>
<When Condition=" '$(mysql)' == 'on' ">
<PropertyGroup>
<DefineConstants>MYSQL;TRACE</DefineConstants>
</PropertyGroup>
</When>
<When Condition=" '$(pgsql)' == 'on' ">
<PropertyGroup>
<DefineConstants>PGSQL;TRACE</DefineConstants>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
</ItemGroup>
<Choose>
<When Condition=" '$(pgsql)' == 'on' ">
<When Condition=" '$(PgSql)' == 'ON' ">
<ItemGroup>
<Reference Include="Npgsql">
<HintPath>..\libbin\Npgsql.dll</HintPath>
@ -65,8 +59,9 @@
</ItemGroup>
</When>
</Choose>
<!-- MySQL Provider include -->
<Choose>
<When Condition=" '$(mysql)' == 'on' ">
<When Condition=" '$(MySql)' == 'ON' ">
<ItemGroup>
<Reference Include="MySql.Data">
<HintPath>..\libbin\MySql.Data.dll</HintPath>
@ -74,7 +69,10 @@
</ItemGroup>
</When>
</Choose>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
</ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="MySqlFactory.cs" />