From 023412deda8150df4138283f1d86f09cb819f91d Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 23 Oct 2023 18:54:46 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E5=8A=A8binding=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=EF=BC=8C=E6=94=B9=E7=94=B1cmake=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 6 ------ sample/cpp/CMakeLists.txt | 4 ---- source/CMakeLists.txt | 4 +++- source/binding/CMakeLists.txt | 1 + {binding => source/binding}/Python/maa/__init__.py | 0 {binding => source/binding}/Python/maa/callback_agent.py | 0 {binding => source/binding}/Python/maa/common.py | 0 {binding => source/binding}/Python/maa/controller.py | 0 {binding => source/binding}/Python/maa/define.py | 0 {binding => source/binding}/Python/maa/library.py | 0 {binding => source/binding}/Python/maa/maa.py | 0 {binding => source/binding}/Python/maa/resource.py | 0 12 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 source/binding/CMakeLists.txt rename {binding => source/binding}/Python/maa/__init__.py (100%) rename {binding => source/binding}/Python/maa/callback_agent.py (100%) rename {binding => source/binding}/Python/maa/common.py (100%) rename {binding => source/binding}/Python/maa/controller.py (100%) rename {binding => source/binding}/Python/maa/define.py (100%) rename {binding => source/binding}/Python/maa/library.py (100%) rename {binding => source/binding}/Python/maa/maa.py (100%) rename {binding => source/binding}/Python/maa/resource.py (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f58b1fbc..86cea5181 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,8 +121,6 @@ jobs: cp -r docs install - cp -r binding install - cp -r sample install rm -r install/sample/cpp/*.vcxproj install/sample/cpp/CMakeLists.txt @@ -202,8 +200,6 @@ jobs: cp -r docs install - cp -r binding install - cp -r sample install rm -r install/sample/cpp/*.vcxproj install/sample/cpp/CMakeLists.txt @@ -274,8 +270,6 @@ jobs: cp -r docs install - cp -r binding install - cp -r sample install rm -r install/sample/cpp/*.vcxproj install/sample/cpp/CMakeLists.txt diff --git a/sample/cpp/CMakeLists.txt b/sample/cpp/CMakeLists.txt index 2449e9ef2..87ff672dc 100644 --- a/sample/cpp/CMakeLists.txt +++ b/sample/cpp/CMakeLists.txt @@ -1,7 +1,3 @@ add_executable(sample main.cpp) target_link_libraries(sample MaaFramework MaaToolKit) - -add_dependencies(sample AssetsAgentBinary AssetsResource) - -install(TARGETS sample RUNTIME DESTINATION share) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index df2de4e18..bcf7b0a42 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -15,4 +15,6 @@ add_subdirectory(MaaToolKit) if(WITH_GRPC) add_subdirectory(MaaRpc) -endif(WITH_GRPC) \ No newline at end of file +endif(WITH_GRPC) + +add_subdirectory(binding) diff --git a/source/binding/CMakeLists.txt b/source/binding/CMakeLists.txt new file mode 100644 index 000000000..c192d46a1 --- /dev/null +++ b/source/binding/CMakeLists.txt @@ -0,0 +1 @@ +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Python" DESTINATION binding) diff --git a/binding/Python/maa/__init__.py b/source/binding/Python/maa/__init__.py similarity index 100% rename from binding/Python/maa/__init__.py rename to source/binding/Python/maa/__init__.py diff --git a/binding/Python/maa/callback_agent.py b/source/binding/Python/maa/callback_agent.py similarity index 100% rename from binding/Python/maa/callback_agent.py rename to source/binding/Python/maa/callback_agent.py diff --git a/binding/Python/maa/common.py b/source/binding/Python/maa/common.py similarity index 100% rename from binding/Python/maa/common.py rename to source/binding/Python/maa/common.py diff --git a/binding/Python/maa/controller.py b/source/binding/Python/maa/controller.py similarity index 100% rename from binding/Python/maa/controller.py rename to source/binding/Python/maa/controller.py diff --git a/binding/Python/maa/define.py b/source/binding/Python/maa/define.py similarity index 100% rename from binding/Python/maa/define.py rename to source/binding/Python/maa/define.py diff --git a/binding/Python/maa/library.py b/source/binding/Python/maa/library.py similarity index 100% rename from binding/Python/maa/library.py rename to source/binding/Python/maa/library.py diff --git a/binding/Python/maa/maa.py b/source/binding/Python/maa/maa.py similarity index 100% rename from binding/Python/maa/maa.py rename to source/binding/Python/maa/maa.py diff --git a/binding/Python/maa/resource.py b/source/binding/Python/maa/resource.py similarity index 100% rename from binding/Python/maa/resource.py rename to source/binding/Python/maa/resource.py