version 5.6.1

patch deploy_tool: procDpkg now prioritize "non-cross" and "non-dev" packages, then only "non-cross"
add PIP_MANUAL_TEST CMake option

CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 project(PIP)
 set(PIP_MAJOR    5)
 set(PIP_MINOR    6)
-set(PIP_REVISION 0)
+set(PIP_REVISION 1)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  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_L "Support fftw module for long double" ON)
 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(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 11)
@@ -593,6 +594,7 @@ if (NOT CROSSTOOLS)
 			#target_link_libraries(pip_plugin pip)
 
 			if (NOT DEFINED ANDROID_PLATFORM)
+				if (PIP_MANUAL_TEST)
 					if(microhttpd_FOUND AND curl_FOUND)
 						add_executable(pip_test "main.cpp")
 						target_link_libraries(pip_test pip pip_io_utils pip_client_server pip_http_server pip_http_client)
@@ -603,6 +605,7 @@ if (NOT CROSSTOOLS)
 					endif()
 				endif()
 			endif()
+		endif()
 
 	else()
 

utils/deploy_tool/main.cpp

@@ -467,13 +467,22 @@ bool procDpkg(const PIString & l) {
 	if (!vs.isEmpty()) {
 		PIStringList lines = vs.split('\n').reverse();
 		for (auto l: lines) {
-			auto sl = l;
 			l = l.left(l.find(":"));
-			if (!l.isEmpty() && !l.endsWith("-cross") && !l.contains(' ')) all_deps << l;
+			if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross") && !l.endsWith("-dev")) {
 				// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
+				all_deps << l;
 				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;
 	return false;
 }