From 28f15f3026687b22f9524e7f0804c29f16f47a66 Mon Sep 17 00:00:00 2001 From: jared Date: Mon, 25 Jan 2021 14:27:03 +0800 Subject: [PATCH] use submodules --- .github/workflows/android-qt5_15_2.yml | 1 + .github/workflows/android.yml | 1 + .github/workflows/ios.yml | 1 + .github/workflows/macos-11_0.yml | 1 + .github/workflows/macos.yml | 1 + .github/workflows/ubuntu.yml | 1 + .github/workflows/windows.yml | 1 + .gitmodules | 3 +++ 3rdparty/3rdparty.pri | 3 ++- 3rdparty/TaoCommon | 1 + README-zh.md | 9 +++++++++ README.md | 7 +++++++ examples/TaoQuickShow/CMakeLists.txt | 12 +++++++++--- examples/TaoQuickShow/TaoQuickShow.pro | 6 ++++-- 14 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 160000 3rdparty/TaoCommon diff --git a/.github/workflows/android-qt5_15_2.yml b/.github/workflows/android-qt5_15_2.yml index f53a6569..95581591 100644 --- a/.github/workflows/android-qt5_15_2.yml +++ b/.github/workflows/android-qt5_15_2.yml @@ -43,6 +43,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build android run: | export ANDROID_SDK_ROOT=$ANDROID_HOME diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 76813067..98073956 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -43,6 +43,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build android run: | export ANDROID_SDK_ROOT=$ANDROID_HOME diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ceae999d..fdc3ca12 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -42,6 +42,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build ios run: | qmake -r -spec macx-ios-clang CONFIG+=release CONFIG+=iphoneos diff --git a/.github/workflows/macos-11_0.yml b/.github/workflows/macos-11_0.yml index 79c6f027..3a37164e 100644 --- a/.github/workflows/macos-11_0.yml +++ b/.github/workflows/macos-11_0.yml @@ -44,6 +44,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build macos run: | qmake diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 251bc22d..a631cbfd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,6 +40,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build macos run: | qmake diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ba70a115..ad72c64c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -41,6 +41,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' - name: build ubuntu run: | qmake diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fb85f560..7b35f037 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,6 +80,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: 'true' # msvc编译 - name: msvc-build id: build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..e85409ca --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rdparty/TaoCommon"] + path = 3rdparty/TaoCommon + url = https://github.com/jaredtao/TaoCommon.git diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index d0b6d461..041e7f4a 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -1 +1,2 @@ -include($$PWD/TaoCommon/TaoCommon.pri) +include($$PWD/TaoCommon/src/TaoCommon.pri) + diff --git a/3rdparty/TaoCommon b/3rdparty/TaoCommon new file mode 160000 index 00000000..c3f33c57 --- /dev/null +++ b/3rdparty/TaoCommon @@ -0,0 +1 @@ +Subproject commit c3f33c57c20aa22d3125f3d548dacc430a538935 diff --git a/README-zh.md b/README-zh.md index 0af4e258..7b982fa6 100644 --- a/README-zh.md +++ b/README-zh.md @@ -247,6 +247,15 @@ CusConfig是核心库的全局配置,主要包括字体、颜色等,所有组件 # 使用核心库TaoQuick +## 获取代码 + +```shell +git clone https://githun.com/jaredtao/TaoQuick.git +cd TaoQuick +git submodule update +``` + + 详细的使用方法，可以阅读 [入门指南](入门指南.md) ## qmake用法 diff --git a/README.md b/README.md index 8591a1cc..662ac0a1 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,13 @@ Other Contents reference to above table： # Use TaoQuick +## get code +```shell +git clone https://githun.com/jaredtao/TaoQuick.git +cd TaoQuick +git submodule update +``` + ## qmake You just need import '.pri' file to project and add import Path to QmlEngine, TaoQuick will be use as local file or qrc resource. diff --git a/examples/TaoQuickShow/CMakeLists.txt b/examples/TaoQuickShow/CMakeLists.txt index cbb3381c..eb406d52 100644 --- a/examples/TaoQuickShow/CMakeLists.txt +++ b/examples/TaoQuickShow/CMakeLists.txt @@ -13,9 +13,15 @@ aux_source_directory(Src/DeviceAddTable SRC2) include(taoVersion) add_compile_definitions(TaoCommon_NO_LIB) -add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/TaoCommon ${CMAKE_SOURCE_DIR}/build/3rdparty/TaoCommon) -#message("TaoCommonPath ${TaoCommonPath}") -#message("TaoCommonFiles ${TaoCommonFiles}") +if (EXISTS ${CMAKE_SOURCE_DIR}/3rdparty/TaoCommon/src/TaoCommon) + add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/TaoCommon/src/TaoCommon ${CMAKE_SOURCE_DIR}/build/3rdparty/TaoCommon) + #message("TaoCommonPath ${TaoCommonPath}") + #message("TaoCommonFiles ${TaoCommonFiles}") +else() + message(FATAL_ERROR "3rdparty library TaoCommon missing, please update by command: git submodule update") +endif() + + include(taoQuick) message("TaoQuickRes ${TaoQuickRes}") diff --git a/examples/TaoQuickShow/TaoQuickShow.pro b/examples/TaoQuickShow/TaoQuickShow.pro index d64d269d..6352f7ff 100644 --- a/examples/TaoQuickShow/TaoQuickShow.pro +++ b/examples/TaoQuickShow/TaoQuickShow.pro @@ -20,8 +20,10 @@ CONFIG(debug,debug|release) { } else { DESTDIR = $${TaoQuick_RUN_TREE}/release } - -include($${TaoQuick_3RDPARTY_TREE}/TaoCommon/TaoCommon.pri) +!exists($${TaoQuick_3RDPARTY_TREE}/TaoCommon/src/TaoCommon/TaoCommon.pri) { + error("3rdparty library TaoCommon missing, please update by command: git submodule update") +} +include($${TaoQuick_3RDPARTY_TREE}/TaoCommon/src/TaoCommon/TaoCommon.pri) include($${TaoQuick_SOURCE_TREE}/src/TaoQuick/imports/imports.pri) include(TaoQuickShow.pri) DEFINES += QMAKE_GEN_TAOMACRO