diff --git a/.vscode/launch.json b/.vscode/launch.json index 3a3272a..3c12bd4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ { // Use IntelliSense to learn about possible attributes. // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + // For more information, visicat t: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ @@ -40,6 +40,31 @@ } ] }, + { + "name": "(gdb) external console", + "type": "cppdbg", + "request": "launch", + // Resolved by CMake Tools: + "program": "${command:cmake.launchTargetPath}", + "args": [ ], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [ + { + "name": "PATH", + "value": "$PATH:${command:cmake.launchTargetDirectory}" + } + ], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, { "name": "(gdb) pipedal_nm_p2pd", "type": "cppdbg", diff --git a/CMakeLists.txt b/CMakeLists.txt index 117ff98..49f7bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if ("${DEBIAN_ARCHITECTURE}" MATCHES "arm64") # select LV2 source directory for the current build architecture - set(LV2_SOURCE_DIRECTORY ${PROJECT_SOURCE_DIR}/build/lv2/${CMAKE_SYSTEM_PROCESSOR}/ToobAmp.lv2) + set(LV2_SOURCE_DIRECTORY ${PROJECT_SOURCE_DIR}/lv2/${CMAKE_SYSTEM_PROCESSOR}/ToobAmp.lv2) install (DIRECTORY ${LV2_SOURCE_DIRECTORY} DESTINATION /usr/lib/lv2 diff --git a/src/makeReleaseMain.cpp b/src/makeReleaseMain.cpp index 6032e60..3350a29 100644 --- a/src/makeReleaseMain.cpp +++ b/src/makeReleaseMain.cpp @@ -43,10 +43,10 @@ std::string psystem(const std::string &command) { throw std::runtime_error("popen() failed!"); } - Finally ([pipe]() { + Finally ff{[pipe]() { pclose(pipe); - }); - while (fgets(buffer.data(), buffer.size(), pipe) != nullptr) + }}; + while (fgets(buffer.data(), buffer.size()-1, pipe) != nullptr) { result += buffer.data(); } @@ -113,7 +113,9 @@ void SignPackage() cout << "trusted certificate authority in the Updater keychain." << endl; std::string verifyCommand = SS("/usr/bin/gpg --verify --no-default-keyring " << "--homedir " << keyringPath.c_str() - << " --armor " << packagePath << ".asc " << packagePath.c_str()); + << " --armor " << packagePath.c_str() << ".asc " << packagePath.c_str()); + + cout << verifyCommand << endl; auto output = psystem(verifyCommand.c_str()); cout << output << endl; auto npos = output.find("Good signature from \"" UPDATE_GPG_ADDRESS2 "\"");