diff --git a/.vscode/launch.json b/.vscode/launch.json index e302e568b..81e1931d1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,16 @@ { "version": "0.2.0", "configurations": [ + { + "name": "Client Launch", + "type": "clr", + "request": "launch", + "program": "${workspaceRoot}/build/Debug/bin/net462/spark.exe", + "args": [], + "cwd": "${workspaceRoot}", + "stopAtEntry": false, + "externalConsole": true + }, { "name": "Python", "type": "python", @@ -53,7 +63,7 @@ "type": "cppdbg", "request": "launch", "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", - "args": ["run"], + "args": ["test","all"], "stopAtEntry": false, "cwd": "/bts/build/gcc_debug/src/server/sparkd", "environment": [], @@ -74,7 +84,7 @@ "debuggerPath": "/usr/bin/gdb" }, "sourceFileMap": { - "/bts/": "d:\\blue\\spark" + "/bts/": "${workspaceRoot}" } }, { diff --git a/docker/linux b/docker/linux index 8ff762140..257cafd59 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit 8ff7621408e9be2dcfe53704625859c20db811f3 +Subproject commit 257cafd595061d0bfb5e775f4a8280eea92a2b0c diff --git a/externals b/externals index 1884a761e..56d97f6b2 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 1884a761e4a0296b59c6801ec7e62acca4d22997 +Subproject commit 56d97f6b28ada78be20089008191f4cb386e8c3f diff --git a/tools/clientbuild.cmd b/tools/clientbuild.cmd index dd979b4ca..8594724f7 100644 --- a/tools/clientbuild.cmd +++ b/tools/clientbuild.cmd @@ -8,5 +8,5 @@ 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 %~dp0\.. msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore spark_client.sln -msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary spark_client.sln +msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary spark_client.sln