chore: 移动binding文件夹，改由cmake进行安装

MaaXYZ · Oct 23, 2023 · 023412d · 023412d
1 parent 8019001
commit 023412d
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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
@@ -15,4 +15,6 @@ add_subdirectory(MaaToolKit)
 
 if(WITH_GRPC)
     add_subdirectory(MaaRpc)
-endif(WITH_GRPC)
+endif(WITH_GRPC)
+
+add_subdirectory(binding)
diff --git a/source/binding/CMakeLists.txt 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 → source/binding/Python/maa/__init__.py b/binding/Python/maa/__init__.py → source/binding/Python/maa/__init__.py
diff --git a/binding/Python/maa/callback_agent.py → source/binding/Python/maa/callback_agent.py b/binding/Python/maa/callback_agent.py → source/binding/Python/maa/callback_agent.py
diff --git a/binding/Python/maa/common.py → source/binding/Python/maa/common.py b/binding/Python/maa/common.py → source/binding/Python/maa/common.py
diff --git a/binding/Python/maa/controller.py → source/binding/Python/maa/controller.py b/binding/Python/maa/controller.py → source/binding/Python/maa/controller.py
diff --git a/binding/Python/maa/define.py → source/binding/Python/maa/define.py b/binding/Python/maa/define.py → source/binding/Python/maa/define.py
diff --git a/binding/Python/maa/library.py → source/binding/Python/maa/library.py b/binding/Python/maa/library.py → source/binding/Python/maa/library.py
diff --git a/binding/Python/maa/maa.py → source/binding/Python/maa/maa.py b/binding/Python/maa/maa.py → source/binding/Python/maa/maa.py
diff --git a/binding/Python/maa/resource.py → source/binding/Python/maa/resource.py b/binding/Python/maa/resource.py → source/binding/Python/maa/resource.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Python" DESTINATION binding)