Merge branch 'master' into picloud

CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
 set(_PIP_MAJOR    1)
-set(_PIP_MINOR    21)
+set(_PIP_MINOR    22)
 set(_PIP_REVISION 0)
-set(_PIP_SUFFIX   beta)
+set(_PIP_SUFFIX   )
 set(_PIP_COMPANY  SHS)
 set(_PIP_DOMAIN   org.SHS)
 
@@ -57,16 +57,27 @@ macro(gather_src DIR CPP H H_P)
 	list(APPEND ${H_P} ${PHS})
 endmacro()
 
-set(PIP_SRC_MAIN       "src_main")
+set(PIP_SRC_MAIN       "lib/main")
-set(PIP_SRC_CRYPT      "src_crypt")
+set(PIP_SRC_CONSOLE    "lib/console")
-set(PIP_SRC_COMPRESS   "src_compress")
+set(PIP_SRC_CRYPT      "lib/crypt")
-set(PIP_SRC_USB        "src_usb")
+set(PIP_SRC_COMPRESS   "lib/compress")
-set(PIP_SRC_FFTW       "src_fftw")
+set(PIP_SRC_USB        "lib/usb")
-set(PIP_SRC_OPENCL     "src_opencl")
+set(PIP_SRC_FFTW       "lib/fftw")
-set(PIP_SRC_IO_UTILS   "src_io_utils")
+set(PIP_SRC_OPENCL     "lib/opencl")
-set(PIP_SRC_CONCURRENT "src_concurrent")
+set(PIP_SRC_IO_UTILS   "lib/io_utils")
-set(PIP_SRC_CLOUD      "src_cloud")
+set(PIP_SRC_CONCURRENT "lib/concurrent")
-set(PIP_SRC_DIRS "src_main" "src_crypt" "src_compress" "src_usb" "src_fftw" "src_opencl" "src_io_utils" "src_concurrent" "src_cloud")
+set(PIP_SRC_CLOUD      "lib/cloud")
+set(PIP_SRC_DIRS ${PIP_SRC_MAIN}
+	${PIP_SRC_CONSOLE}
+	${PIP_SRC_CRYPT}
+	${PIP_SRC_COMPRESS}
+	${PIP_SRC_USB}
+	${PIP_SRC_FFTW}
+	${PIP_SRC_OPENCL}
+	${PIP_SRC_IO_UTILS}
+	${PIP_SRC_CONCURRENT}
+	${PIP_SRC_CLOUD}  
+)
 set(PIP_LIBS_TARGETS pip)
 set(LIBS_MAIN)
 set(LIBS_STATUS)
@@ -178,6 +189,9 @@ endforeach(F)
 # Crypt lib
 gather_src("${PIP_SRC_CRYPT}" CPP_LIB_CRYPT HDRS PHDRS)
 
+# Console lib
+gather_src("${PIP_SRC_CONSOLE}" CPP_LIB_CONSOLE HDRS PHDRS)
+
 # Compress lib
 gather_src("${PIP_SRC_COMPRESS}" CPP_LIB_COMPRESS HDRS PHDRS)
 
@@ -400,6 +414,19 @@ if (NOT CROSSTOOLS)
 		endif()
 
 
+		# Add console library
+		import_version(pip_console pip)
+		set_deploy_property(pip_console ${PIP_LIB_TYPE}
+			LABEL "PIP console support"
+			FULLNAME "${_PIP_DOMAIN}.pip_console"
+			COMPANY "${_PIP_COMPANY}"
+			INFO "Platform-Independent Primitives")
+		make_rc(pip_console _RC)
+		add_library(pip_console ${PIP_LIB_TYPE} ${CPP_LIB_CONSOLE} ${_RC})
+		target_link_libraries(pip_console pip)
+		list(APPEND PIP_LIBS_TARGETS pip_console)
+
+
 		# Check if PIP support cryptographic encryption/decryption using sodium library
 		find_library(sodium_FOUND sodium)
 		if(sodium_FOUND)
@@ -517,7 +544,7 @@ if (NOT CROSSTOOLS)
 				include_directories(${OpenCL_INCLUDE_DIRS})
 			endif()
 			add_definitions(-DPIP_OPENCL)
-			pip_resources(CL_RES "src_opencl/resources.conf")
+			pip_resources(CL_RES "${PIP_SRC_OPENCL}/resources.conf")
 			add_library(pip_opencl ${PIP_LIB_TYPE} ${CPP_LIB_OPENCL} ${CL_RES} ${_RC})
 			add_dependencies(pip_opencl pip_rc)
 			if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
@@ -730,7 +757,7 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 		endforeach(F)
 		string(REPLACE ";" " " DOXY_INPUT "${DOXY_INPUT}")
 		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${PIP_MAIN_FOLDERS}")
-		add_documentation(doc Doxyfile.in)
+		add_documentation(doc doc/Doxyfile.in)
 		install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip COMPONENT doc EXCLUDE_FROM_ALL OPTIONAL)
 	endif()
 endif()

clean

@@ -1,24 +0,0 @@
-#! /bin/sh
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd utils/system_test
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/system_daemon
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/remote_console
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/code_model_generator
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../

clean.bat

@@ -1,34 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd utils\system_test
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\remote_console
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\code_model_generator
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\system_daemon
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\udp_file_transfer
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..

cmake/FindPIP.cmake

@@ -3,6 +3,7 @@
 Also create imported targets:
   * PIP - main library
   * PIP::USB
+  * PIP::Console
   * PIP::Crypt
   * PIP::FFTW
   * PIP::Compress
@@ -58,6 +59,7 @@ set(_pip_suffix "")
 
 find_library(PIP_LIBRARY pip${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_USB_LIBRARY pip_usb${_pip_suffix} HINTS ${_PIP_LIBDIR})
+find_library(PIP_CONSOLE_LIBRARY pip_console${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_CRYPT_LIBRARY pip_crypt${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_FFTW_LIBRARY pip_fftw${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_COMPRESS_LIBRARY pip_compress${_pip_suffix} HINTS ${_PIP_LIBDIR})
@@ -115,8 +117,9 @@ if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
 	message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
 endif()
 
-set(__modules "USB;Crypt;FFTW;Compress;IOUtils;Concurrent;Cloud")
+set(__modules "USB;Crypt;Console;FFTW;Compress;IOUtils;Concurrent;Cloud")
 set(__module_USB        "${PIP_USB_LIBRARY}"       )
+set(__module_Console    "${PIP_CONSOLE_LIBRARY}"   )
 set(__module_Crypt      "${PIP_CRYPT_LIBRARY}"     )
 set(__module_FFTW       "${PIP_FFTW_LIBRARY}"      )
 set(__module_Compress   "${PIP_COMPRESS_LIBRARY}"  )
@@ -138,8 +141,12 @@ foreach (_m ${__modules})
 			INTERFACE_LINK_LIBRARIES "PIP")
 	endif()
 endforeach()
+if(__module_IOUtils AND __module_Crypt)
 	set_target_properties(PIP::IOUtils PROPERTIES INTERFACE_LINK_LIBRARIES "PIP::Crypt")
+endif()
+if(__module_Cloud AND __module_IOUtils)
 	set_target_properties(PIP::Cloud PROPERTIES INTERFACE_LINK_LIBRARIES "PIP::IOUtils")
+endif()
 
 include(PIPMacros)
 

esp32_component/esp-idf/components/pip/CMakeLists.txt

@@ -1,20 +1,20 @@
 set(COMPONENT_SRCS "main.cpp")
-set(COMPONENT_ADD_INCLUDEDIRS "pip/src_main")
+set(COMPONENT_ADD_INCLUDEDIRS "pip/lib/main")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/auxiliary")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/auxiliary")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/code")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/code")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/console")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/console")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/containers")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/containers")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/core")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/core")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/crypt")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/crypt")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/geo")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/geo")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/io_devices")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_devices")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/io_utils")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_utils")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/math")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/math")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/opencl")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/opencl")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/resources")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/resources")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/system")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/system")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/thread")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/thread")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/introspection")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/introspection")
 set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spiffs)
 register_component()
 set(PIP_FREERTOS ON)

lib/main/auxiliary/piterminal/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_executable(piterminal "main.cpp")
-target_link_libraries(piterminal pip)
+target_link_libraries(piterminal pip pip_console)
 if (DEFINED LIB)
 	install(TARGETS piterminal DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 endif ()

lib/main/auxiliary/piterminal/main.cpp

@@ -25,7 +25,7 @@ int main (int argc, char * argv[]) {
 #else
 #  include "piscreentypes.h"
 #  include "pisharedmemory.h"
-#  include "piterminal.cpp"
+#  include "../../lib/console/piterminal.cpp"
 #  include "pifile.h"
 #  include <wincon.h>