From 51ddea62d197092ad7309d4faabefbc877dffd00 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 24 Jan 2018 17:37:37 -0500 Subject: [PATCH] target .net 471 and change build scripts to generate portable PDBs to facilitate debugging in vscode --- .vscode/launch.json | 425 ++++++++++++++-------------- src/client/spark/Spark.csproj | 4 +- src/client/sparkcmd/sparkcmd.csproj | 2 +- tools/buildspark.cmd | 2 +- tools/clientbuild.cmd | 4 +- tools/cpp.build.props | 4 +- tools/devcmd.cmd | 1 + tools/runspark.cmd | 2 +- 8 files changed, 223 insertions(+), 221 deletions(-) create mode 100644 tools/devcmd.cmd diff --git a/.vscode/launch.json b/.vscode/launch.json index 814cebbf9..21498745b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,213 +1,214 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "(gdb) Launch", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceRoot}/build/ninja_debug/src/server/sparkd/sparkd", - "args": ["run"], - "stopAtEntry": false, - "cwd": "${workspaceRoot}/build/ninja_debug/src/server/sparkd", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, - { - "name": "Client Launch", - "type": "clr", - "request": "launch", - "program": "${workspaceRoot}/build/Debug/bin/net462/spark.exe", - "args": [], - "cwd": "${workspaceRoot}", - "stopAtEntry": false, - "externalConsole": true - }, - { - "name": "Client Attach", - "type": "clr", - "request": "attach", - "processId":"${command:pickProcess}" - }, - { - "name": "SparkVM Launch", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", - "args": ["test", "[position]"], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["bts@sparkvm"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Spreader Tests", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", - "args": ["test", "[spreader]"], - "stopAtEntry": false, - "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "logging": { - "engineLogging": false - }, - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["bts@sparkvm"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "SparkVM attach", - "type": "cppdbg", - "request": "attach", - "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", - "processId": "${command:pickRemoteProcess}", - "MIMode": "gdb", - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["bts@sparkvm"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/home/bts/spark/": "${workspaceRoot}" - } - }, - { - "name": "Python", - "type": "python", - "request": "launch", - "stopOnEntry": false, - "pythonPath": "${config:python.pythonPath}", - "program": "${file}", - "cwd": "${workspaceRoot}", - "env": {}, - "envFile": "${workspaceRoot}/.env", - "args": [ "DEBUG" ], - "debugOptions": [ - "WaitOnAbnormalExit", - "WaitOnNormalExit", - "RedirectOutput" - ] - }, - { - "name": "edge-asp051", - "type": "cppdbg", - "request": "launch", - "program": "/home/bts/spark/sparkd", - "args": ["run"], - "stopAtEntry": false, - "cwd": "/home/bts/spark/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["bts@edge-asp051"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/bts/": "${workspaceRoot}" - } - }, - { - "name": "Docker Launch", - "type": "cppdbg", - "request": "launch", - "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", - "args": ["test"], - "stopAtEntry": false, - "cwd": "/bts/build/gcc_debug/src/server/sparkd", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["-p 2000","root@localhost"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/bts/": "${workspaceRoot}" - } - }, - { - "name": "Docker attach", - "type": "cppdbg", - "request": "attach", - "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", - "processId": "${command:pickRemoteProcess}", - "MIMode": "gdb", - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["-p 2000","root@localhost"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/bts/": "${workspaceRoot}" - } - } - ] +{ + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceRoot}/build/ninja_debug/src/server/sparkd/sparkd", + "args": ["run"], + "stopAtEntry": false, + "cwd": "${workspaceRoot}/build/ninja_debug/src/server/sparkd", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, + { + "name": "Client Launch", + "type": "clr", + "request": "launch", + "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe", + "args": [], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true, + "requireExactSource": false + }, + { + "name": "Client Attach", + "type": "clr", + "request": "attach", + "processId":"${command:pickProcess}" + }, + { + "name": "SparkVM Launch", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", + "args": ["test", "[position]"], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@sparkvm"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Spreader Tests", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", + "args": ["test", "[spreader]"], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "logging": { + "engineLogging": false + }, + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@sparkvm"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "SparkVM attach", + "type": "cppdbg", + "request": "attach", + "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", + "processId": "${command:pickRemoteProcess}", + "MIMode": "gdb", + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@sparkvm"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + } + }, + { + "name": "Python", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ "DEBUG" ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": "edge-asp051", + "type": "cppdbg", + "request": "launch", + "program": "/home/bts/spark/sparkd", + "args": ["run"], + "stopAtEntry": false, + "cwd": "/home/bts/spark/", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@edge-asp051"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/bts/": "${workspaceRoot}" + } + }, + { + "name": "Docker Launch", + "type": "cppdbg", + "request": "launch", + "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", + "args": ["test"], + "stopAtEntry": false, + "cwd": "/bts/build/gcc_debug/src/server/sparkd", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "preLaunchTask": "", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "enable pretty-printer", + "ignoreFailures": true + } + ], + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["-p 2000","root@localhost"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/bts/": "${workspaceRoot}" + } + }, + { + "name": "Docker attach", + "type": "cppdbg", + "request": "attach", + "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", + "processId": "${command:pickRemoteProcess}", + "MIMode": "gdb", + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["-p 2000","root@localhost"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/bts/": "${workspaceRoot}" + } + } + ] } \ No newline at end of file diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 6f37af1a2..7276d9151 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -1,6 +1,6 @@  - net462 + net471 Blue Trading Systems Blue Trading Systems Spark @@ -18,7 +18,7 @@ 7.1 true - + diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 538bf4aa3..56d713a66 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -2,7 +2,7 @@ Exe - net462 + net471 win7-x64;ubuntu.16.04-x64 Blue Trading Systems Blue Trading Systems diff --git a/tools/buildspark.cmd b/tools/buildspark.cmd index 5cf769827..222296c39 100644 --- a/tools/buildspark.cmd +++ b/tools/buildspark.cmd @@ -2,4 +2,4 @@ setlocal @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul cd /d %~dp0/../ -msbuild /m /nologo /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln +msbuild /m /nologo /p:debugtype=portable /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln diff --git a/tools/clientbuild.cmd b/tools/clientbuild.cmd index 628bf20c3..bb0e9f59d 100644 --- a/tools/clientbuild.cmd +++ b/tools/clientbuild.cmd @@ -7,5 +7,5 @@ if not exist build\src\lib\spark_lib.vcxproj ( copy /y tools\cpp.build.props build\Directory.Build.Props > nul @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul cd /d %~dp0\.. -msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore %* spark_client.sln -msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln +msbuild /m /p:debugtype=portable /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore %* spark_client.sln +msbuild /m /p:debugtype=portable /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln diff --git a/tools/cpp.build.props b/tools/cpp.build.props index 0b67eacdd..3212d453b 100644 --- a/tools/cpp.build.props +++ b/tools/cpp.build.props @@ -2,11 +2,11 @@ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory))) - $(BuildRoot)\$(Configuration)\bin\net462\ + $(BuildRoot)\$(Configuration)\bin\net471\ None - +