From 00047dc1327c8800a1e958789f6dd1ca3cb844ef 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:16:07 +0800 Subject: [PATCH] split debug & release for windows --- doric-Qt/example/app/app.pro | 4 +++- .../doric/scripts/conanfile-windows-debug.py | 15 +++++++++++++++ ...windows.py => conanfile-windows-release.py} | 4 +++- .../example/doric/scripts/package-windows.py | 6 ++---- doric-Qt/example/example.pro.user | 18 ++++++++++-------- 5 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 doric-Qt/example/doric/scripts/conanfile-windows-debug.py rename doric-Qt/example/doric/scripts/{conanfile-windows.py => conanfile-windows-release.py} (52%) diff --git a/doric-Qt/example/app/app.pro b/doric-Qt/example/app/app.pro index 715e5fa8..e86e3bbc 100644 --- a/doric-Qt/example/app/app.pro +++ b/doric-Qt/example/app/app.pro @@ -55,4 +55,6 @@ else:unix: { INCLUDEPATH += $$PWD/../doric -LIBS += -L$$OUT_PWD/../../binary/doric -lDoricCore +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../binary/doric/release/ -lDoricCore +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../binary/doric/debug/ -lDoricCore +else:macx: LIBS += -L$$OUT_PWD/../../binary/doric -lDoricCore diff --git a/doric-Qt/example/doric/scripts/conanfile-windows-debug.py b/doric-Qt/example/doric/scripts/conanfile-windows-debug.py new file mode 100644 index 00000000..5a338a07 --- /dev/null +++ b/doric-Qt/example/doric/scripts/conanfile-windows-debug.py @@ -0,0 +1,15 @@ +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("*.lib", dst="lib",src="../../../binary/doric/debug") + self.copy("*.pdb", dst="bin",src="../../../binary/doric/debug") + 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/conanfile-windows.py b/doric-Qt/example/doric/scripts/conanfile-windows-release.py similarity index 52% rename from doric-Qt/example/doric/scripts/conanfile-windows.py rename to doric-Qt/example/doric/scripts/conanfile-windows-release.py index 00e6ddf7..93fe46ae 100644 --- a/doric-Qt/example/doric/scripts/conanfile-windows.py +++ b/doric-Qt/example/doric/scripts/conanfile-windows-release.py @@ -7,6 +7,8 @@ class DoricCore(ConanFile): def package(self): self.copy("*.h", dst="include", src="../../doric") - self.copy("*.lib", dst="lib",src="../../../binary/doric") + self.copy("*.lib", dst="lib",src="../../../binary/doric/release") + 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-windows.py b/doric-Qt/example/doric/scripts/package-windows.py index 7b37f514..5c342fb6 100644 --- a/doric-Qt/example/doric/scripts/package-windows.py +++ b/doric-Qt/example/doric/scripts/package-windows.py @@ -30,11 +30,9 @@ def main(): else: print("params error."); return; - system('conan export-pkg ./conanfile-windows.py DoricCore/%s@bixin/stable -s build_type=Debug -s os=Windows' % version) - system('conan export-pkg ./conanfile-windows.py DoricCore/%s@bixin/stable -s build_type=Release -s os=Windows' % version) + system('conan export-pkg ./conanfile-windows-debug.py DoricCore/%s@bixin/stable -s build_type=Debug -s os=Windows' % version) + system('conan export-pkg ./conanfile-windows-release.py DoricCore/%s@bixin/stable -s build_type=Release -s os=Windows' % version) if isOnline == "1": system('conan upload DoricCore/%s@bixin/stable --all -r=pc' % version) - system('git tag %s' % version) - system('git push --tags') if __name__ == "__main__": main() diff --git a/doric-Qt/example/example.pro.user b/doric-Qt/example/example.pro.user index 40297cb1..091ec26e 100644 --- a/doric-Qt/example/example.pro.user +++ b/doric-Qt/example/example.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -91,13 +91,13 @@ Desktop Qt 5.15.2 MSVC2019 64bit Desktop Qt 5.15.2 MSVC2019 64bit qt.qt5.5152.win64_msvc2019_64_kit - 0 + 1 0 0 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-example-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug - C:/Users/maverick/Workspace/Doric/doric-Qt/build-example-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + C:\Users\maverick\Workspace\Doric\doric-Qt\binary + C:/Users/maverick/Workspace/Doric/doric-Qt/binary true @@ -136,8 +136,8 @@ 0 - C:\Users\maverick\Workspace\Doric\doric-Qt\build-example-Desktop_Qt_5_15_2_MSVC2019_64bit-Release - C:/Users/maverick/Workspace/Doric/doric-Qt/build-example-Desktop_Qt_5_15_2_MSVC2019_64bit-Release + C:\Users\maverick\Workspace\Doric\doric-Qt\binary + C:/Users/maverick/Workspace/Doric/doric-Qt/binary true @@ -294,12 +294,14 @@ 2 - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/maverick/Workspace/Doric/doric-Qt/example/app/app.pro + C:/Users/maverick/Workspace/Doric/doric-Qt/example/app/app.pro false true + true false true + C:/Users/maverick/Workspace/Doric/doric-Qt/binary/app 1