diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml index 6263f0c2..80f02067 100644 --- a/.github/workflows/autotest.yml +++ b/.github/workflows/autotest.yml @@ -44,7 +44,6 @@ jobs: with: path: | third_party - vendor_tools test/baseline/.cache key: third-party-autotest-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-autotest- @@ -103,7 +102,6 @@ jobs: with: path: | third_party - vendor_tools test/baseline/.cache key: third-party-autotest-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1da0a22..edf90655 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-ios-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-ios- @@ -76,7 +75,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-ios-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed @@ -105,7 +103,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-android-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-android- @@ -135,7 +132,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-android-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed @@ -204,7 +200,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-web-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-web- @@ -263,7 +258,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-web-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed @@ -292,7 +286,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-windows-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-windows- @@ -312,7 +305,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-windows-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed @@ -341,7 +333,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-linux- @@ -363,7 +354,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed @@ -392,7 +382,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} restore-keys: third-party-qt- @@ -424,7 +413,6 @@ jobs: with: path: | third_party - vendor_tools key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed diff --git a/.gitignore b/.gitignore index bfc87c83..5425ddf2 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,4 @@ win/Win32Demo/Release/ QTCMAKE.cfg test/baseline/.cache /result - - -vendor_tools/ .vscode \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c07a78b8..4272b02b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(TGFX) #set(CMAKE_VERBOSE_MAKEFILE ON) -include(./vendor_tools/vendor.cmake) +include(./third_party/vendor_tools/vendor.cmake) # Options for building tgfx option(TGFX_USE_OPENGL "Allow use of OpenGL as GPU backend" ON) diff --git a/DEPS b/DEPS index e6f894b8..6b20fe8b 100644 --- a/DEPS +++ b/DEPS @@ -8,7 +8,7 @@ { "url": "${PAG_GROUP}/vendor_tools.git", "commit": "1250341da861a215aa4ba1d4abb6e8e287d4aa87", - "dir": "vendor_tools" + "dir": "third_party/vendor_tools" }, { "url": "${PAG_GROUP}/pathkit.git", diff --git a/build_tgfx b/build_tgfx index 0383e9f7..77bfc715 100755 --- a/build_tgfx +++ b/build_tgfx @@ -1,2 +1,2 @@ #!/usr/bin/env node -require("./vendor_tools/lib-build"); +require("./third_party/vendor_tools/lib-build"); diff --git a/build_vendor b/build_vendor index 60c1d8a5..4abaa0d2 100755 --- a/build_vendor +++ b/build_vendor @@ -1,3 +1,3 @@ #!/usr/bin/env node // run 'node build_vendor -h" to print help message -require("./vendor_tools/vendor-build"); \ No newline at end of file +require("./third_party/vendor_tools/vendor-build"); \ No newline at end of file