From d83e233c1428af58dad8267dbe49d92e2c844d2f Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Wed, 15 Jun 2022 13:26:03 -0400 Subject: [PATCH] New upstream version 5.5.32 --- .github/workflows/call-build-distribution.yml | 17 +++++++++++++++++ src/src.pro | 11 ++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/call-build-distribution.yml diff --git a/.github/workflows/call-build-distribution.yml b/.github/workflows/call-build-distribution.yml new file mode 100644 index 0000000..c4c277e --- /dev/null +++ b/.github/workflows/call-build-distribution.yml @@ -0,0 +1,17 @@ +name: Call build-distribution +on: + push: + paths-ignore: + - ".github/workflows/**" + pull_request_target: + paths-ignore: + - ".github/workflows/**" + +jobs: + check_job: + uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master + secrets: + BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }} + BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }} + WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }} + WEBDAV_USER: ${{ secrets.WEBDAV_USER }} diff --git a/src/src.pro b/src/src.pro index 6c83fb2..9b147a8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -56,11 +56,6 @@ include($$PWD/log/log.pri) include($$PWD/filesystem/filesystem.pri) include($$PWD/settings/settings.pri) -DTK_MODULE_NAME = $$TARGET -load(dtk_build) - -# ---------------------------------------------- -# install config includes.files += \ $$PWD/*.h \ $$PWD/dtkcore_config.h \ @@ -71,6 +66,12 @@ includes.files += \ $$PWD/DConfigFile \ $$PWD/DConfig +# ---------------------------------------------- +# install config + +DTK_MODULE_NAME = $$TARGET +load(dtk_build) + INSTALLS += includes target isEmpty(DTK_STATIC_LIB){ -- 2.30.2