From 192e4625c868b8deb01743150e857782a2cf7d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= Date: Thu, 13 May 2021 14:47:42 +0800 Subject: [PATCH] split debug & release for macos --- ...conanfile-macos.py => conanfile-macos-debug.py} | 2 +- .../doric/scripts/conanfile-macos-release.py | 14 ++++++++++++++ doric-Qt/example/doric/scripts/package-macos.py | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) rename doric-Qt/example/doric/scripts/{conanfile-macos.py => conanfile-macos-debug.py} (77%) create mode 100644 doric-Qt/example/doric/scripts/conanfile-macos-release.py diff --git a/doric-Qt/example/doric/scripts/conanfile-macos.py b/doric-Qt/example/doric/scripts/conanfile-macos-debug.py similarity index 77% rename from doric-Qt/example/doric/scripts/conanfile-macos.py rename to doric-Qt/example/doric/scripts/conanfile-macos-debug.py index 8a29c853..3c230206 100644 --- a/doric-Qt/example/doric/scripts/conanfile-macos.py +++ b/doric-Qt/example/doric/scripts/conanfile-macos-debug.py @@ -7,7 +7,7 @@ class DoricCore(ConanFile): def package(self): self.copy("*.h", dst="include", src="../../doric") - self.copy("*.a", dst="lib",src="../../../binary/doric") + self.copy("*.a", dst="lib",src="../../../binary/debug/doric") self.copy("*", dst="qml",src="../resources") self.copy("*.js", dst="js",src="../../../../doric-js/bundle") def package_info(self): diff --git a/doric-Qt/example/doric/scripts/conanfile-macos-release.py b/doric-Qt/example/doric/scripts/conanfile-macos-release.py new file mode 100644 index 00000000..275a8d45 --- /dev/null +++ b/doric-Qt/example/doric/scripts/conanfile-macos-release.py @@ -0,0 +1,14 @@ +from conans import ConanFile + +class DoricCore(ConanFile): + license = "MIT" + name = "DoricCore" + settings = "os", "compiler", "build_type", "arch" + + def package(self): + self.copy("*.h", dst="include", src="../../doric") + self.copy("*.a", dst="lib",src="../../../binary/release/doric") + self.copy("*", dst="qml",src="../resources") + self.copy("*.js", dst="js",src="../../../../doric-js/bundle") + def package_info(self): + self.cpp_info.libs = ["DoricCore"] \ No newline at end of file diff --git a/doric-Qt/example/doric/scripts/package-macos.py b/doric-Qt/example/doric/scripts/package-macos.py index a5fe0eee..4d3826a6 100755 --- a/doric-Qt/example/doric/scripts/package-macos.py +++ b/doric-Qt/example/doric/scripts/package-macos.py @@ -30,8 +30,8 @@ def main(): else: print("params error."); return; - system('conan export-pkg ./conanfile-macos.py DoricCore/%s@bixin/stable -s build_type=Debug -s os=Macos' % version) - system('conan export-pkg ./conanfile-macos.py DoricCore/%s@bixin/stable -s build_type=Release -s os=Macos' % version) + system('conan export-pkg ./conanfile-macos-debug.py DoricCore/%s@bixin/stable -s build_type=Debug -s os=Macos' % version) + system('conan export-pkg ./conanfile-macos-release.py DoricCore/%s@bixin/stable -s build_type=Release -s os=Macos' % version) if isOnline == "1": system('conan upload DoricCore/%s@bixin/stable --all -r=pc' % version) system('git tag %s' % version)