From 18c967ac6ca8feabbf26816d36c44fceba878abf Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sun, 15 Nov 2020 15:08:03 +0100
Subject: [PATCH] Update build.yaml and CMakeLists.txt

---
 .github/workflows/build.yaml |  4 ++--
 td/generate/CMakeLists.txt   | 17 +++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2a2e63999..41bbce82b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,13 +36,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ env.SAFE_ARCH }}-ccache-
       - name: Install build tools
-        run: sudo apt-get install -y make git zlib1g-dev libssl-dev gperf php-cli cmake clang-6.0 libc++-dev libc++abi-dev ccache tree
+        run: sudo apt-get install -y make git zlib1g-dev libssl-dev gperf php-cli cmake clang-6.0 libc++-dev libc++abi-dev ccache
       - name: Build
         run: |
           mkdir build
           cd build
           CXXFLAGS="-stdlib=libc++" CC=/usr/bin/clang-10 CXX=/usr/bin/clang++-10 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=../tdlib ..
-          cmake --build . --target install
+          cmake --build . --target install -- -j4
       - uses: actions/upload-artifact@v2
         with:
           name: tdlight-${{ env.SAFE_ARCH }}
diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
index e7a659207..c54251ce2 100644
--- a/td/generate/CMakeLists.txt
+++ b/td/generate/CMakeLists.txt
@@ -152,12 +152,6 @@ if (NOT CMAKE_CROSSCOMPILING)
           DEPENDS scheme/td_api.tl
           )
   add_dependencies(generate_td_api_tlo build_tl_parser)
-
-  add_custom_target(tree_test
-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-          COMMAND tree scheme
-          COMMENT "Debug output"
-          )
    # End of .tlo update
 
   find_program(PHP_EXECUTABLE php)
@@ -173,15 +167,14 @@ if (NOT CMAKE_CROSSCOMPILING)
   endif()
 
   add_executable(generate_common ${TL_GENERATE_COMMON_SOURCE})
-  add_dependencies(generate_common generate_mtproto_api_tlo generate_secret_api_tlo generate_telegram_api_tlo generate_td_api_tlo tree_test)
+  add_dependencies(generate_common generate_mtproto_api_tlo generate_secret_api_tlo generate_telegram_api_tlo generate_td_api_tlo)
   target_link_libraries(generate_common PRIVATE tdtl)
   add_custom_target(tl_generate_common
           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
           COMMAND ${GENERATE_COMMON_CMD}
           COMMENT "Generate common tl source files"
-          DEPENDS generate_common scheme/telegram_api.tlo scheme/secret_api.tlo ${TL_TD_API_TLO} DoxygenTlDocumentationGenerator.php
+          DEPENDS generate_common DoxygenTlDocumentationGenerator.php
           )
-  add_dependencies(tl_generate_common generate_mtproto_api_tlo generate_secret_api_tlo generate_telegram_api_tlo generate_td_api_tlo tree_test)
   if (TD_ENABLE_JNI)
     target_compile_definitions(generate_common PRIVATE TD_ENABLE_JNI=1)
   endif()
@@ -195,7 +188,7 @@ if (NOT CMAKE_CROSSCOMPILING)
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMAND generate_c
     COMMENT "Generate C tl source files"
-    DEPENDS generate_c ${TL_TD_API_TLO}
+    DEPENDS generate_c generate_td_api_tlo
   )
   add_dependencies(tl_generate_c generate_td_api_tlo)
 
@@ -208,7 +201,7 @@ if (NOT CMAKE_CROSSCOMPILING)
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMAND generate_json
     COMMENT "Generate JSON tl source files"
-    DEPENDS generate_json ${TL_TD_API_TLO}
+    DEPENDS generate_json generate_td_api_tlo
   )
   add_dependencies(tl_generate_json generate_td_api_tlo)
 
@@ -231,7 +224,7 @@ if (NOT CMAKE_CROSSCOMPILING)
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       COMMAND ${GENERATE_DOTNET_API_CMD} ${TL_TD_API_TLO}
       COMMENT "Generate .NET API files"
-      DEPENDS td_generate_dotnet_api ${TL_TD_API_TLO} DotnetTlDocumentationGenerator.php
+      DEPENDS td_generate_dotnet_api generate_td_api_tlo DotnetTlDocumentationGenerator.php
     )
   endif()