Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-android-tonlib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-arm64-appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04-arm

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-arm64-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-x86-64-appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-x86-64-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-linux-x86-64-werror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-24.04

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-macos-13-x86-64-portable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: macos-13

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-macos-14-arm64-portable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: macos-14

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-macos-15-arm64-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: macos-15

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-macos-arm64-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: macos-14

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-macos-x86-64-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: macos-13

steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-ton-wasm-emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04

steps:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/docker-ubuntu-branch-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ env:

jobs:
build-arm64:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04-arm
steps:
- name: Check out repository
Expand Down Expand Up @@ -51,8 +49,6 @@ jobs:


build-amd64:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04
steps:
- name: Check out repository
Expand Down Expand Up @@ -90,8 +86,6 @@ jobs:


merge:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04
needs:
- build-amd64
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/docker-ubuntu-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ env:

jobs:
build-arm64:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04-arm
steps:
- name: Check out repository
Expand Down Expand Up @@ -55,8 +53,6 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }}-arm64

build-amd64:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04
steps:
- name: Check out repository
Expand Down Expand Up @@ -99,8 +95,6 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }}-amd64

merge:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04
needs:
- build-amd64
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ton-ccpcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: ubuntu-22.04

steps:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ton-x86-64-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ defaults:

jobs:
build:
if: github.repository == 'ton-blockchain/ton'

runs-on: windows-2022

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parsetab.py
parsetab.pyc
tdutils/generate/auto/
tl/generate/auto/
tl/generate/scheme/*.tlo
compile_commands.json
crypto/block/block-auto.cpp
crypto/block/block-auto.h
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@
path = third-party/secp256k1
url = https://github.com/bitcoin-core/secp256k1
branch = v0.3.2
[submodule "third-party/tl-parser"]
path = third-party/tl-parser
url = https://github.com/ton-blockchain/tl-parser.git
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ if (USE_LIBRAPTORQ)
add_subdirectory(third-party/libraptorq EXCLUDE_FROM_ALL)
endif()

message("Add tl-parser")
add_subdirectory(third-party/tl-parser EXCLUDE_FROM_ALL)

message("Add ton")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})

Expand Down Expand Up @@ -366,6 +369,10 @@ if (NOT LATEX_FOUND)
endif()
#END internal

if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

function(target_link_libraries_system target)
set(libs ${ARGN})
foreach(lib ${libs})
Expand Down
4 changes: 0 additions & 4 deletions catchain/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(CATCHAIN_SOURCE
catchain-received-block.cpp
#catchain-receiver-fork.cpp
Expand Down
5 changes: 0 additions & 5 deletions create-hardfork/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()


set(CREATE_HARDFORK_SOURCE
create-hardfork.cpp
)
Expand Down
4 changes: 0 additions & 4 deletions crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(TON_CRYPTO_CORE_SOURCE
Ed25519.cpp
common/bigint.cpp
Expand Down
5 changes: 0 additions & 5 deletions dht-server/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()


set (DHT_SERVER_SOURCE
dht-server.cpp
dht-server.hpp
Expand Down
4 changes: 0 additions & 4 deletions dht/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(DHT_SOURCE
dht.cpp
dht-remote-node.cpp
Expand Down
4 changes: 0 additions & 4 deletions fec/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(FEC_SOURCE
fec.h
fec.cpp
Expand Down
4 changes: 0 additions & 4 deletions overlay/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(OVERLAY_SOURCE
overlay-manager.cpp
overlay.cpp
Expand Down
4 changes: 0 additions & 4 deletions rldp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(RLDP_SOURCE
rldp.cpp
rldp-peer.cpp
Expand Down
4 changes: 0 additions & 4 deletions rldp2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

if (NOT GSL_FOUND)
find_package(GSL)
endif()
Expand Down
5 changes: 0 additions & 5 deletions storage/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()


set(STORAGE_SOURCE
LoadSpeed.cpp
MerkleTree.cpp
Expand Down
2 changes: 1 addition & 1 deletion storage/storage-daemon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_custom_command(
COMMAND embed-provider-code smartcont/storage-provider-code.boc smartcont/provider-code.h
COMMENT "Generate provider-code.h"
DEPENDS embed-provider-code smartcont/storage-provider-code.boc
OUTPUT smartcont/provider-code.h
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/smartcont/provider-code.h"
)

set(STORAGE_DAEMON_SOURCE
Expand Down
1 change: 0 additions & 1 deletion tddb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ if (TDDB_USE_ROCKSDB)
target_sources(tddb PRIVATE ${TDDB_ROCKSDB_SOURCE})
target_compile_definitions(tddb PUBLIC -DTDDB_USE_ROCKSDB)
target_link_libraries(tddb PUBLIC rocksdb)
target_include_directories(tddb PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../third-party/rocksdb/include>)
endif()

add_executable(io-bench test/io-bench.cpp)
Expand Down
10 changes: 2 additions & 8 deletions tdutils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
option(TDUTILS_MIME_TYPE "Generate mime types conversion (gperf is required)" ON)

set(TD_HAVE_OPENSSL 1)

if (WIN32)
if (WINGETOPT_FOUND)
set(TD_HAVE_GETOPT 1)
Expand All @@ -19,14 +21,6 @@ endif()
if (ZLIB_FOUND)
set(TD_HAVE_ZLIB 1)
message(STATUS "Found ZLIB: ${ZLIB_INCLUDE_DIR} ${ZLIB_LIBRARIES}")

# OpenSSL internally depends on zlib
if (NOT OPENSSL_FOUND)
find_package(OpenSSL)
endif()
if (OPENSSL_FOUND)
set(TD_HAVE_OPENSSL 1)
endif()
endif()

if (CRC32C_FOUND)
Expand Down
4 changes: 0 additions & 4 deletions terminal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(TERMINAL_SOURCE
terminal.cpp

Expand Down
1 change: 1 addition & 0 deletions third-party/tl-parser
Submodule tl-parser added at aba892
9 changes: 8 additions & 1 deletion tl/generate/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,14 @@ add_executable(tonlib_generate_java_api ${TL_GENERATE_JAVA_SOURCE})
target_link_libraries(tonlib_generate_java_api PRIVATE tdtl)

if (NOT CMAKE_CROSSCOMPILING)
find_program(PHP_EXECUTABLE php)
foreach(tl_scheme lite_api ton_api tonlib_api)
add_custom_command(
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scheme
COMMAND $<TARGET_FILE:tl-parser> -e "${tl_scheme}.tlo" "${tl_scheme}.tl"
DEPENDS tl-parser "scheme/${tl_scheme}.tl"
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/scheme/${tl_scheme}.tlo"
)
endforeach()

set(GENERATE_COMMON_CMD generate_common)
add_executable(generate_common ${TL_GENERATE_COMMON_SOURCE})
Expand Down
Binary file removed tl/generate/scheme/lite_api.tlo
Binary file not shown.
Binary file removed tl/generate/scheme/ton_api.tlo
Binary file not shown.
Binary file removed tl/generate/scheme/tonlib_api.tlo
Binary file not shown.
5 changes: 0 additions & 5 deletions tl/generate/scheme/update-tlo.sh

This file was deleted.

4 changes: 0 additions & 4 deletions tonlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
option(TONLIBJSON_STATIC "Build tonlibjson as static library" OFF)

if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

set(TONLIB_SOURCE
tonlib/Client.cpp
tonlib/Config.cpp
Expand Down
4 changes: 0 additions & 4 deletions utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()

add_executable(generate-random-id generate-random-id.cpp )
target_link_libraries(generate-random-id tl_api ton_crypto keys adnl git)

Expand Down
5 changes: 0 additions & 5 deletions validator-engine/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
if (NOT OPENSSL_FOUND)
find_package(OpenSSL REQUIRED)
endif()


set(VALIDATOR_ENGINE_SOURCE
validator-engine.hpp
validator-engine.cpp
Expand Down
Loading
Loading