Regressions on non-Ubuntu build.
This commit is contained in:
Vendored
+26
-1
@@ -7,7 +7,7 @@
|
|||||||
{
|
{
|
||||||
// Use IntelliSense to learn about possible attributes.
|
// Use IntelliSense to learn about possible attributes.
|
||||||
// Hover to view descriptions of existing 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",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"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",
|
"name": "(gdb) pipedal_nm_p2pd",
|
||||||
"type": "cppdbg",
|
"type": "cppdbg",
|
||||||
|
|||||||
+1
-1
@@ -73,7 +73,7 @@ if ("${DEBIAN_ARCHITECTURE}" MATCHES "arm64")
|
|||||||
|
|
||||||
# select LV2 source directory for the current build architecture
|
# 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}
|
install (DIRECTORY ${LV2_SOURCE_DIRECTORY}
|
||||||
DESTINATION /usr/lib/lv2
|
DESTINATION /usr/lib/lv2
|
||||||
|
|||||||
@@ -43,10 +43,10 @@ std::string psystem(const std::string &command)
|
|||||||
{
|
{
|
||||||
throw std::runtime_error("popen() failed!");
|
throw std::runtime_error("popen() failed!");
|
||||||
}
|
}
|
||||||
Finally ([pipe]() {
|
Finally ff{[pipe]() {
|
||||||
pclose(pipe);
|
pclose(pipe);
|
||||||
});
|
}};
|
||||||
while (fgets(buffer.data(), buffer.size(), pipe) != nullptr)
|
while (fgets(buffer.data(), buffer.size()-1, pipe) != nullptr)
|
||||||
{
|
{
|
||||||
result += buffer.data();
|
result += buffer.data();
|
||||||
}
|
}
|
||||||
@@ -113,7 +113,9 @@ void SignPackage()
|
|||||||
cout << "trusted certificate authority in the Updater keychain." << endl;
|
cout << "trusted certificate authority in the Updater keychain." << endl;
|
||||||
std::string verifyCommand = SS("/usr/bin/gpg --verify --no-default-keyring "
|
std::string verifyCommand = SS("/usr/bin/gpg --verify --no-default-keyring "
|
||||||
<< "--homedir " << keyringPath.c_str()
|
<< "--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());
|
auto output = psystem(verifyCommand.c_str());
|
||||||
cout << output << endl;
|
cout << output << endl;
|
||||||
auto npos = output.find("Good signature from \"" UPDATE_GPG_ADDRESS2 "\"");
|
auto npos = output.find("Good signature from \"" UPDATE_GPG_ADDRESS2 "\"");
|
||||||
|
|||||||
Reference in New Issue
Block a user