ci: disable ThriftController by default (#152)

Author: MistEO

.github/workflows/build.yml

@@ -92,13 +92,6 @@ jobs:
         with:
           sdk-version: 22621
 
-      # Download host arch tools for Thrift of ThriftControlUnit
-      - name: Download host tools from MaaDeps
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python3 tools/maadeps-download.py x64-windows
-
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -167,13 +160,6 @@ jobs:
         with:
           remove_stale_cache: false
 
-      # Download host arch tools for Thrift of ThriftControlUnit
-      - name: Download host tools from MaaDeps
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python3 tools/maadeps-download.py x64-linux
-
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -237,13 +223,6 @@ jobs:
           brew install llvm
         # 17
 
-      # Download host arch tools for Thrift of ThriftControlUnit
-      - name: Download host tools from MaaDeps
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python3 tools/maadeps-download.py x64-osx
-
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -6,15 +6,15 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_MAP_IMPORTED_CONFIG_DebWithRelDeps "DebWithRelDeps;Release;")
 
-set(Boost_NO_WARN_NEW_VERSIONS 1)
-set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+set(Boost_NO_WARN_NEW_VERSIONS ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(USE_MAADEPS "use third-party libraries built by MaaDeps" ON)
 
 option(WITH_ADB_CONTROLLER "build with adb controller" ON)
-option(WITH_THRIFT_CONTROLLER "build with thrift controller" ON)
-option(WITH_DBG_CONTROLLER "build with debugging controller" ON)
 option(WITH_WIN32_CONTROLLER "build with win32 controller" ON)
+option(WITH_DBG_CONTROLLER "build with debugging controller" ON)
+option(WITH_THRIFT_CONTROLLER "build with thrift controller" OFF)
 
 option(WITH_GRPC "build with protobuf and grpc" OFF)
 
@@ -42,22 +42,21 @@ if(NOT WITH_GRPC)
     set(BUILD_GRPC_CLI OFF)
     set(BUILD_GRPC_TESTING OFF)
 endif()
+
 if(NOT WITH_DBG_CONTROLLER)
     message(STATUS "Dbg controller is disabled, disable BUILD_PIPELINE_TESTING")
     set(BUILD_PIPELINE_TESTING OFF)
 endif()
+
 if(WITH_WIN32_CONTROLLER AND NOT WIN32)
     message(STATUS "Not on Windows, disable WITH_WIN32_CONTROLLER")
     set(WITH_WIN32_CONTROLLER OFF)
 endif()
-if(WITH_THRIFT_CONTROLLER AND MAA_CROSSCOMPILE)
-    message(STATUS "Cross-compiling, disable WITH_THRIFT_CONTROLLER")
-    set(WITH_THRIFT_CONTROLLER OFF)
-endif()
 
 if(WITH_THRIFT_CONTROLLER)
     include(${PROJECT_SOURCE_DIR}/cmake/thrift-gen.cmake)
 endif()
+
 if(WITH_GRPC)
     include(${PROJECT_SOURCE_DIR}/cmake/grpc-gen.cmake)
 endif()
@@ -67,9 +66,11 @@ find_package(Boost REQUIRED COMPONENTS system)
 find_package(ZLIB REQUIRED)
 find_package(fastdeploy_ppocr REQUIRED)
 find_package(ONNXRuntime)
+
 if(WITH_THRIFT_CONTROLLER)
     find_package(Thrift CONFIG REQUIRED)
 endif()
+
 if(WITH_GRPC)
     find_package(protobuf CONFIG REQUIRED)
     find_package(gRPC CONFIG REQUIRED)
@@ -82,13 +83,16 @@ add_subdirectory(tools)
 if(BUILD_SAMPLE)
     add_subdirectory(sample/cpp)
 endif()
+
 if(BUILD_PIPELINE_TESTING)
     add_subdirectory(test/pipeline)
     add_subdirectory(test/TestingDataSet)
 endif()
+
 if(BUILD_GRPC_TESTING)
     add_subdirectory(test/grpc)
 endif()
+
 if(BUILD_DLOPEN_TESTING)
     add_subdirectory(test/dlopen)
 endif()

cmake/grpc-gen.cmake

@@ -1,5 +1,5 @@
-set(PROTO_COMPILER ${MAADEPS_HOST_TOOLS}/protobuf/protoc${CMAKE_EXECUTABLE_SUFFIX})
-set(PROTO_GRPC_PLUGIN ${MAADEPS_HOST_TOOLS}/grpc/grpc_cpp_plugin${CMAKE_EXECUTABLE_SUFFIX})
+set(PROTO_COMPILER ${MAADEPS_TOOLS}/protobuf/protoc${CMAKE_EXECUTABLE_SUFFIX})
+set(PROTO_GRPC_PLUGIN ${MAADEPS_TOOLS}/grpc/grpc_cpp_plugin${CMAKE_EXECUTABLE_SUFFIX})
 
 macro(GENERATE_GRPC_LIB LIB_NAME IN_DIR OUT_DIR GEN_SRCS)
     file(MAKE_DIRECTORY ${OUT_DIR})

cmake/thrift-gen.cmake

@@ -1,4 +1,4 @@
-set(THRIFT_COMPILER ${MAADEPS_TARGET_TOOLS}/thrift/thrift${CMAKE_EXECUTABLE_SUFFIX})
+set(THRIFT_COMPILER ${MAADEPS_TOOLS}/thrift/thrift${CMAKE_EXECUTABLE_SUFFIX})
 
 macro(GENERATE_THRIFT_LIB LIB_NAME FILENAME OUTPUTDIR SOURCES)
     file(MAKE_DIRECTORY ${OUTPUTDIR})

cmake/utils.cmake

@@ -38,21 +38,7 @@ if(APPLE)
     get_osx_architecture()
 endif(APPLE)
 
-if(WIN32)
-    set(MAADEPS_HOST_TRIPLET "x64-windows")
-elseif(APPLE)
-    set(MAADEPS_HOST_TRIPLET "x64-osx")
-else()
-    set(MAADEPS_HOST_TRIPLET "x64-linux")
-endif()
-set(MAADEPS_HOST_TOOLS ${MAA_DEPS_DIR}/vcpkg/installed/${MAADEPS_HOST_TRIPLET}/tools)
 if(NOT DEFINED MAADEPS_TRIPLET)
     detect_maadeps_triplet(MAADEPS_TRIPLET)
 endif()
-set(MAADEPS_TARGET_TOOLS ${MAA_DEPS_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}/tools)
-
-if(maa-${MAADEPS_HOST_TRIPLET} STREQUAL ${MAADEPS_TRIPLET})
-    set(MAA_CROSSCOMPILE OFF)
-else()
-    set(MAA_CROSSCOMPILE ON)
-endif()
+set(MAADEPS_TOOLS ${MAA_DEPS_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}/tools)