SHS/pip
4
3
Fork 0
Code Issues 16 Pull Requests 2 Actions Releases Wiki Activity

version 5.6.1

Browse Source 
patch deploy_tool: procDpkg now prioritize "non-cross" and "non-dev" packages, then only "non-cross"
add PIP_MANUAL_TEST CMake option
This commit is contained in:
Пелипенко Иван
2026-03-20 13:00:24 +03:00
parent a1be5be5a1
commit fe3b30bd49
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@@ -6,7 +6,7 @@ endif()
project(PIP) project(PIP)
set(PIP_MAJOR 5) set(PIP_MAJOR 5)
set(PIP_MINOR 6) set(PIP_MINOR 6)
set(PIP_REVISION 0) set(PIP_REVISION 1)
set(PIP_SUFFIX ) set(PIP_SUFFIX )
set(PIP_COMPANY SHS) set(PIP_COMPANY SHS)
set(PIP_DOMAIN org.SHS) set(PIP_DOMAIN org.SHS)
@@ -73,6 +73,7 @@ option(COVERAGE "Build project with coverage info" OFF)
option(PIP_FFTW_F "Support fftw module for float" ON) option(PIP_FFTW_F "Support fftw module for float" ON)
option(PIP_FFTW_L "Support fftw module for long double" ON) option(PIP_FFTW_L "Support fftw module for long double" ON)
option(PIP_FFTW_Q "Support fftw module for quad double" OFF) option(PIP_FFTW_Q "Support fftw module for quad double" OFF)
option(PIP_MANUAL_TEST "Build dev test (main.cpp)" OFF)
set(PIP_UTILS 1) set(PIP_UTILS 1)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
@@ -593,12 +594,14 @@ if (NOT CROSSTOOLS)
#target_link_libraries(pip_plugin pip) #target_link_libraries(pip_plugin pip)
if (NOT DEFINED ANDROID_PLATFORM) if (NOT DEFINED ANDROID_PLATFORM)
if(microhttpd_FOUND AND curl_FOUND) if (PIP_MANUAL_TEST)
add_executable(pip_test "main.cpp") if(microhttpd_FOUND AND curl_FOUND)
target_link_libraries(pip_test pip pip_io_utils pip_client_server pip_http_server pip_http_client) add_executable(pip_test "main.cpp")
if(sodium_FOUND) target_link_libraries(pip_test pip pip_io_utils pip_client_server pip_http_server pip_http_client)
add_executable(pip_cloud_test "main_picloud_test.cpp") if(sodium_FOUND)
target_link_libraries(pip_cloud_test pip_cloud) add_executable(pip_cloud_test "main_picloud_test.cpp")
target_link_libraries(pip_cloud_test pip_cloud)
endif()
endif() endif()
endif() endif()
endif() endif()

19
utils/deploy_tool/main.cpp
View File

@@ -467,11 +467,20 @@ bool procDpkg(const PIString & l) {
if (!vs.isEmpty()) { if (!vs.isEmpty()) {
PIStringList lines = vs.split('\n').reverse(); PIStringList lines = vs.split('\n').reverse();
for (auto l: lines) { for (auto l: lines) {
auto sl = l; l = l.left(l.find(":"));
l = l.left(l.find(":")); if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross") && !l.endsWith("-dev")) {
if (!l.isEmpty() && !l.endsWith("-cross") && !l.contains(' ')) all_deps << l; // PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\""; all_deps << l;
return true; return true;
}
}
for (auto l: lines) {
l = l.left(l.find(":"));
if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross")) {
// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
all_deps << l;
return true;
}
} }
} }
// piCout << "No dep on" << l; // piCout << "No dep on" << l;