Skip to content

Commit 7151ff2

Browse files
EmelyanenkoKEmelyanenkoK
authored
Merge pull request #1345 from ton-blockchain/tolk-v0.6.0
Tolk Language: next-generation FunC
2 parents eed3153 + d110022 commit 7151ff2

File tree

204 files changed

+23041
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+23041
-47
lines changed

‎.github/script/amd64-20.04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ENV CC clang
1717
ENV CXX clang++
1818
ENV CCACHE_DISABLE 1
1919
RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" ..
20-
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client
20+
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func tolk validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client

‎.github/script/amd64-22.04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ENV CC clang
1717
ENV CXX clang++
1818
ENV CCACHE_DISABLE 1
1919
RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" ..
20-
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client
20+
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func tolk validator-engine validator-engine-console create-state generate-random-id create-hardfork dht-server lite-client

‎.github/script/arm64-20.04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ENV CC clang
1717
ENV CXX clang++
1818
ENV CCACHE_DISABLE 1
1919
RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= ..
20-
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id dht-server lite-client
20+
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func tolk validator-engine validator-engine-console create-state generate-random-id dht-server lite-client

‎.github/script/arm64-22.04.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ENV CC clang
1717
ENV CXX clang++
1818
ENV CCACHE_DISABLE 1
1919
RUN cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= ..
20-
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func validator-engine validator-engine-console create-state generate-random-id dht-server lite-client
20+
RUN ninja storage-daemon storage-daemon-cli tonlibjson blockchain-explorer fift func tolk validator-engine validator-engine-console create-state generate-random-id dht-server lite-client

‎.github/workflows/create-release.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ jobs:
167167
asset_name: func.exe
168168
tag: ${{ steps.tag.outputs.TAG }}
169169

170+
- name: Upload Windows 2019 single artifact - tolk
171+
uses: svenstaro/upload-release-action@v2
172+
with:
173+
repo_token: ${{ secrets.GITHUB_TOKEN }}
174+
file: artifacts/ton-win-binaries/tolk.exe
175+
asset_name: tolk.exe
176+
tag: ${{ steps.tag.outputs.TAG }}
177+
170178
- name: Upload Windows 2019 single artifact - lite-client
171179
uses: svenstaro/upload-release-action@v2
172180
with:
@@ -257,6 +265,14 @@ jobs:
257265
asset_name: func-mac-x86-64
258266
tag: ${{ steps.tag.outputs.TAG }}
259267

268+
- name: Upload Mac x86-64 single artifact - tolk
269+
uses: svenstaro/upload-release-action@v2
270+
with:
271+
repo_token: ${{ secrets.GITHUB_TOKEN }}
272+
file: artifacts/ton-x86_64-macos-binaries/tolk
273+
asset_name: tolk-mac-x86-64
274+
tag: ${{ steps.tag.outputs.TAG }}
275+
260276
- name: Upload Mac x86-64 single artifact - lite-client
261277
uses: svenstaro/upload-release-action@v2
262278
with:
@@ -348,6 +364,14 @@ jobs:
348364
asset_name: func-mac-arm64
349365
tag: ${{ steps.tag.outputs.TAG }}
350366

367+
- name: Upload Mac arm64 single artifact - tolk
368+
uses: svenstaro/upload-release-action@v2
369+
with:
370+
repo_token: ${{ secrets.GITHUB_TOKEN }}
371+
file: artifacts/ton-arm64-macos-binaries/tolk
372+
asset_name: tolk-mac-arm64
373+
tag: ${{ steps.tag.outputs.TAG }}
374+
351375
- name: Upload Mac arm64 single artifact - lite-client
352376
uses: svenstaro/upload-release-action@v2
353377
with:
@@ -438,6 +462,14 @@ jobs:
438462
asset_name: func-linux-x86_64
439463
tag: ${{ steps.tag.outputs.TAG }}
440464

465+
- name: Upload Linux x86-64 single artifact - tolk
466+
uses: svenstaro/upload-release-action@v2
467+
with:
468+
repo_token: ${{ secrets.GITHUB_TOKEN }}
469+
file: artifacts/ton-x86_64-linux-binaries/tolk
470+
asset_name: tolk-linux-x86_64
471+
tag: ${{ steps.tag.outputs.TAG }}
472+
441473
- name: Upload Linux x86-64 single artifact - lite-client
442474
uses: svenstaro/upload-release-action@v2
443475
with:

‎.github/workflows/ton-arm64-macos.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
artifacts/lite-client -V
3030
artifacts/fift -V
3131
artifacts/func -V
32+
artifacts/tolk -v
3233
3334
- name: Upload artifacts
3435
uses: actions/upload-artifact@master

‎.github/workflows/ton-x86-64-linux.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
artifacts/lite-client -V
3434
artifacts/fift -V
3535
artifacts/func -V
36+
artifacts/tolk -v
3637
3738
- name: Upload artifacts
3839
uses: actions/upload-artifact@master

‎.github/workflows/ton-x86-64-macos.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
artifacts/lite-client -V
3030
artifacts/fift -V
3131
artifacts/func -V
32+
artifacts/tolk -v
3233
3334
- name: Upload artifacts
3435
uses: actions/upload-artifact@master

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ test/regression-tests.cache/
1313
**/*build*/
1414
.idea
1515
.vscode
16+
.DS_Store
17+
dev/
1618
zlib/
1719
libsodium/
1820
libmicrohttpd-0.9.77-w32-bin/

‎CMakeLists.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ add_subdirectory(adnl)
413413
add_subdirectory(crypto)
414414
add_subdirectory(lite-client)
415415
add_subdirectory(emulator)
416+
add_subdirectory(tolk)
416417

417418
#BEGIN tonlib
418419
add_subdirectory(tonlib)
@@ -626,6 +627,30 @@ if (NOT NIX)
626627
endif()
627628
endif()
628629

630+
# Tolk tests
631+
if (NOT NIX)
632+
if (MSVC)
633+
set(PYTHON_VER "python")
634+
else()
635+
set(PYTHON_VER "python3")
636+
endif()
637+
add_test(
638+
NAME test-tolk
639+
COMMAND ${PYTHON_VER} tolk-tester.py tests/
640+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tolk-tester)
641+
if (WIN32)
642+
set_property(TEST test-tolk PROPERTY ENVIRONMENT
643+
"TOLK_EXECUTABLE=${CMAKE_CURRENT_BINARY_DIR}/tolk/tolk.exe"
644+
"FIFT_EXECUTABLE=${CMAKE_CURRENT_BINARY_DIR}/crypto/fift.exe"
645+
"FIFTPATH=${CMAKE_CURRENT_SOURCE_DIR}/crypto/fift/lib/")
646+
else()
647+
set_property(TEST test-tolk PROPERTY ENVIRONMENT
648+
"TOLK_EXECUTABLE=${CMAKE_CURRENT_BINARY_DIR}/tolk/tolk"
649+
"FIFT_EXECUTABLE=${CMAKE_CURRENT_BINARY_DIR}/crypto/fift"
650+
"FIFTPATH=${CMAKE_CURRENT_SOURCE_DIR}/crypto/fift/lib/")
651+
endif()
652+
endif()
653+
629654
#BEGIN internal
630655
if (NOT TON_ONLY_TONLIB)
631656
add_test(test-adnl test-adnl)

0 commit comments

Comments
 (0)