From 9736614860929bda1d79a357f156eac4d7c95a40 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 20:23:31 -0400 Subject: [PATCH 01/19] add antler-proj to cdt --- .gitmodules | 3 +++ CMakeLists.txt | 11 +++++++++++ modules/InstallCDT.cmake | 1 + tools/CMakeLists.txt | 13 ++++++++++++- tools/external/CMakeLists.txt | 3 ++- tools/external/antler-proj | 1 + 6 files changed, 30 insertions(+), 2 deletions(-) create mode 160000 tools/external/antler-proj diff --git a/.gitmodules b/.gitmodules index 42f9caaedb..f2c1eb62c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "tools/external/eos-vm"] path = tools/external/eos-vm url = https://github.com/AntelopeIO/eos-vm +[submodule "tools/external/antler-proj"] + path = tools/external/antler-proj + url = https://github.com/AntelopeIO/antler-proj diff --git a/CMakeLists.txt b/CMakeLists.txt index 41479e0e21..2c276e6648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,17 @@ configure_file(${CMAKE_SOURCE_DIR}/cdt-llvm/LICENSE.TXT ${CMAKE_BINARY_DIR}/lice configure_file(${CMAKE_SOURCE_DIR}/libraries/boost/boost.license ${CMAKE_BINARY_DIR}/licenses/boost.license COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/libraries/meta_refl/LICENSE ${CMAKE_BINARY_DIR}/licenses/meta_refl.license COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/tools/external/wabt/LICENSE ${CMAKE_BINARY_DIR}/licenses/wabt.license COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/tools/external/antler-proj/LICENSE ${CMAKE_BINARY_DIR}/licenses/antler-proj.license COPYONLY) +file(GLOB license_files ${CMAKE_SOURCE_DIR}/tools/external/antler-proj/licenses/*) +# add licenses for antler-proj submodules +foreach(full_path IN ITEMS ${license_files}) + # change format to match other license filenames + get_filename_component(file_name ${full_path} NAME) + string(REPLACE "LICENSE." "" file_name ${file_name}) + string(TOLOWER ${file_name} file_name) + set(file_name "${file_name}.license") + configure_file("${full_path}" "${CMAKE_BINARY_DIR}/licenses/${file_name}" COPYONLY) +endforeach() configure_file(${CMAKE_SOURCE_DIR}/tools/jsoncons/LICENSE ${CMAKE_BINARY_DIR}/licenses/jsoncons.license COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/licenses/cdt.license COPYONLY) diff --git a/modules/InstallCDT.cmake b/modules/InstallCDT.cmake index f5b977321f..5a18b6d8b3 100644 --- a/modules/InstallCDT.cmake +++ b/modules/InstallCDT.cmake @@ -74,6 +74,7 @@ cdt_tool_install_and_symlink(cdt-cpp cdt-cpp) cdt_tool_install_and_symlink(cdt-ld cdt-ld) cdt_tool_install_and_symlink(cdt-abidiff cdt-abidiff) cdt_tool_install_and_symlink(cdt-init cdt-init) +cdt_tool_install_and_symlink(antler-proj antler-proj) cdt_clang_install(../lib/LLVMEosioApply${CMAKE_SHARED_LIBRARY_SUFFIX}) cdt_clang_install(../lib/LLVMEosioSoftfloat${CMAKE_SHARED_LIBRARY_SUFFIX}) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index f788de2263..4c27658ce0 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -23,6 +23,8 @@ include_directories(${LLVM_SRCDIR}/include) include_directories(${LLVM_BINDIR}/include) link_directories(${LLVM_LIBRARY_DIRS}) add_definitions(${LLVM_DEFINITIONS}) +file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set(CMAKE_CXX_STANDARD 17) set(EOSIO_STACK_SIZE 8192) @@ -70,7 +72,6 @@ macro (add_tool name) LLVMDemangle ) - add_custom_command( TARGET ${name} POST_BUILD COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin ) add_custom_command( TARGET ${name} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/bin/ ) endmacro() @@ -84,3 +85,13 @@ add_subdirectory(external) add_subdirectory(antler-run) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/compiler_options.hpp.in ${CMAKE_BINARY_DIR}/compiler_options.hpp) + +add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/antler-proj + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/bin/ + DEPENDS antler-proj + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/external/antler-proj/tools + ) + +add_custom_target(copy_files ALL + DEPENDS ${CMAKE_BINARY_DIR}/bin/antler-proj +) \ No newline at end of file diff --git a/tools/external/CMakeLists.txt b/tools/external/CMakeLists.txt index 19ca931b9e..e486f2dcb0 100644 --- a/tools/external/CMakeLists.txt +++ b/tools/external/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(wabt) -add_subdirectory(eos-vm) \ No newline at end of file +add_subdirectory(eos-vm) +add_subdirectory(antler-proj) \ No newline at end of file diff --git a/tools/external/antler-proj b/tools/external/antler-proj new file mode 160000 index 0000000000..86ad4fde81 --- /dev/null +++ b/tools/external/antler-proj @@ -0,0 +1 @@ +Subproject commit 86ad4fde8180af81d9b5c5064c0714a95a156414 From 87184a2103a69e910af0cfe681a0ed8fbac08b0a Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 20:32:28 -0400 Subject: [PATCH 02/19] fix build after adding antler-proj --- .cicd/platforms/ubuntu18.Dockerfile | 3 ++- .cicd/platforms/ubuntu20.Dockerfile | 3 ++- .cicd/platforms/ubuntu22.Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cicd/platforms/ubuntu18.Dockerfile b/.cicd/platforms/ubuntu18.Dockerfile index 04df4f9c72..ffb791dad0 100644 --- a/.cicd/platforms/ubuntu18.Dockerfile +++ b/.cicd/platforms/ubuntu18.Dockerfile @@ -7,7 +7,8 @@ RUN apt-get update && apt-get upgrade -y && \ curl \ ninja-build \ software-properties-common \ - zlib1g-dev + zlib1g-dev \ + pkg-config RUN add-apt-repository ppa:git-core/ppa && apt update && apt install -y git diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index d1e1f50107..dd1de23028 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -5,4 +5,5 @@ RUN apt-get update && apt-get upgrade -y && \ cmake \ git \ ninja-build \ - python3 + python3 \ + pkg-config diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index a6b8f54c7d..079e005564 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -5,4 +5,5 @@ RUN apt-get update && apt-get upgrade -y && \ cmake \ git \ ninja-build \ - python3 + python3 \ + pkg-config From 32614bf8a9c79fc379e83c23d73d7d2260d2e372 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 20:50:34 -0400 Subject: [PATCH 03/19] install step fix --- .cicd/platforms/ubuntu20.Dockerfile | 3 ++- .cicd/platforms/ubuntu22.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index dd1de23028..f45f526e5f 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -6,4 +6,5 @@ RUN apt-get update && apt-get upgrade -y && \ git \ ninja-build \ python3 \ - pkg-config + pkg-config \ + libcurl diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 079e005564..73747f66b1 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -6,4 +6,5 @@ RUN apt-get update && apt-get upgrade -y && \ git \ ninja-build \ python3 \ - pkg-config + pkg-config \ + libcurl From a78788f1e6f3386f8d7c3874b950e9c0f30e73b8 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 20:58:08 -0400 Subject: [PATCH 04/19] fix build & test step --- .cicd/platforms/ubuntu20.Dockerfile | 2 +- .cicd/platforms/ubuntu22.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index f45f526e5f..f87b4beb82 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -7,4 +7,4 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl + libcurl4 diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 73747f66b1..8228ba6609 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -7,4 +7,4 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl + libcurl4 From 5f505262c04895e3e450fd736b8e4024c67095b4 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 21:13:41 -0400 Subject: [PATCH 05/19] fixing build & test step --- .cicd/platforms/ubuntu20.Dockerfile | 2 +- .cicd/platforms/ubuntu22.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index f87b4beb82..6a097ac44e 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -7,4 +7,4 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4 + libcurl4-openssl-dev diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 8228ba6609..37aaad0c56 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -7,4 +7,4 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4 + libcurl4-openssl-dev From cb02ee55fdc5c9454cbe1bbd5e948adf74422e32 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 14 Mar 2023 21:27:09 -0400 Subject: [PATCH 06/19] fix build & test step: adding boost --- .cicd/platforms/ubuntu18.Dockerfile | 3 ++- .cicd/platforms/ubuntu20.Dockerfile | 3 ++- .cicd/platforms/ubuntu22.Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cicd/platforms/ubuntu18.Dockerfile b/.cicd/platforms/ubuntu18.Dockerfile index ffb791dad0..13b91ece14 100644 --- a/.cicd/platforms/ubuntu18.Dockerfile +++ b/.cicd/platforms/ubuntu18.Dockerfile @@ -8,7 +8,8 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ software-properties-common \ zlib1g-dev \ - pkg-config + pkg-config \ + libboost-all-dev RUN add-apt-repository ppa:git-core/ppa && apt update && apt install -y git diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index 6a097ac44e..b8b78d33b4 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -7,4 +7,5 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4-openssl-dev + libcurl4-openssl-dev \ + libboost-all-dev diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 37aaad0c56..093308524b 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -7,4 +7,5 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4-openssl-dev + libcurl4-openssl-dev \ + libboost-all-dev From e7e19bb9285d60b34e6e9affd47ec8ded059111d Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 16 Mar 2023 21:49:17 -0400 Subject: [PATCH 07/19] update ref --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 86ad4fde81..f9f555eaf1 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 86ad4fde8180af81d9b5c5064c0714a95a156414 +Subproject commit f9f555eaf1f985b8a39708f40f41c7d1bd904f01 From be71fb0557a1c2b9d76801618be08bbcd05963a9 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Mon, 27 Mar 2023 05:06:43 -0400 Subject: [PATCH 08/19] updates to allow for building and proper generation of packages --- scripts/generate_deb.sh | 1 + scripts/generate_tarball.sh | 4 ++++ tools/CMakeLists.txt | 4 ++-- tools/external/antler-proj | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh index 92d7b09c68..4c64e8d239 100644 --- a/scripts/generate_deb.sh +++ b/scripts/generate_deb.sh @@ -19,6 +19,7 @@ NAME="${PROJECT}_${VERSION_NO_SUFFIX}-${RELEASE}_${ARCH}" mkdir -p ${PROJECT}/DEBIAN echo "Package: ${PROJECT} Version: ${VERSION_NO_SUFFIX}-${RELEASE} +Depends: libcurl4-gnutls-dev Section: devel Priority: optional Architecture: ${ARCH} diff --git a/scripts/generate_tarball.sh b/scripts/generate_tarball.sh index 271e511894..4a1ccbc5f3 100644 --- a/scripts/generate_tarball.sh +++ b/scripts/generate_tarball.sh @@ -64,6 +64,8 @@ create_symlink eosio-pp eosio-pp create_symlink cdt-init cdt-init create_symlink eosio-wasm2wast eosio-wasm2wast create_symlink eosio-wast2wasm eosio-wast2wasm +create_symlink eosio-wasm2wast cdt-wasm2wast +create_symlink eosio-wast2wasm cdt-wast2wasm create_symlink cdt-ar cdt-ar create_symlink cdt-abidiff cdt-abidiff create_symlink cdt-nm cdt-nm @@ -72,6 +74,8 @@ create_symlink cdt-objdump cdt-objdump create_symlink cdt-ranlib cdt-ranlib create_symlink cdt-readelf cdt-readelf create_symlink cdt-strip cdt-strip +create_symlink antler-proj antler-proj +create_symlink antler-proj cdt-proj echo "Generating Tarball $NAME.tar.gz..." tar -cvzf $NAME.tar.gz ./${PREFIX}/* || exit 1 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4c27658ce0..0ef0102326 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -82,7 +82,7 @@ add_subdirectory(cc) add_subdirectory(ld) add_subdirectory(init) add_subdirectory(external) -add_subdirectory(antler-run) +#add_subdirectory(antler-run) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/compiler_options.hpp.in ${CMAKE_BINARY_DIR}/compiler_options.hpp) @@ -94,4 +94,4 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/antler-proj add_custom_target(copy_files ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/antler-proj -) \ No newline at end of file +) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index f9f555eaf1..6dc9b1ca01 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit f9f555eaf1f985b8a39708f40f41c7d1bd904f01 +Subproject commit 6dc9b1ca01e96aec8402cdae05d68f8cbde1b28d From 88d1569a93dfa962c5a60a5f8736733c40fff465 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Mon, 27 Mar 2023 05:45:53 -0400 Subject: [PATCH 09/19] update cicd --- .cicd/platforms/ubuntu18.Dockerfile | 5 +++-- .cicd/platforms/ubuntu20.Dockerfile | 3 ++- .cicd/platforms/ubuntu22.Dockerfile | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cicd/platforms/ubuntu18.Dockerfile b/.cicd/platforms/ubuntu18.Dockerfile index 13b91ece14..ddae5b432d 100644 --- a/.cicd/platforms/ubuntu18.Dockerfile +++ b/.cicd/platforms/ubuntu18.Dockerfile @@ -9,7 +9,8 @@ RUN apt-get update && apt-get upgrade -y && \ software-properties-common \ zlib1g-dev \ pkg-config \ - libboost-all-dev + libboost-all-dev \ + libcurl4-gnutls-dev RUN add-apt-repository ppa:git-core/ppa && apt update && apt install -y git @@ -21,4 +22,4 @@ RUN curl -L https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tgz | tar zx rm -rf Python* ENV CC=gcc-8 -ENV CXX=g++-8 \ No newline at end of file +ENV CXX=g++-8 diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index b8b78d33b4..a4a87a6f62 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -8,4 +8,5 @@ RUN apt-get update && apt-get upgrade -y && \ python3 \ pkg-config \ libcurl4-openssl-dev \ - libboost-all-dev + libboost-all-dev \ + libcurl4-gnutls-dev diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 093308524b..7f0d37c61d 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -8,4 +8,5 @@ RUN apt-get update && apt-get upgrade -y && \ python3 \ pkg-config \ libcurl4-openssl-dev \ - libboost-all-dev + libboost-all-dev \ + libcurl4-gnutls-dev From 92116ada5e8c9d62513c2070fb8bb7038c638ad1 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Mon, 27 Mar 2023 07:35:49 -0400 Subject: [PATCH 10/19] remove libcurl4-openssl --- .cicd/platforms/ubuntu20.Dockerfile | 1 - .cicd/platforms/ubuntu22.Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile index a4a87a6f62..c6fc3d7970 100644 --- a/.cicd/platforms/ubuntu20.Dockerfile +++ b/.cicd/platforms/ubuntu20.Dockerfile @@ -7,6 +7,5 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4-openssl-dev \ libboost-all-dev \ libcurl4-gnutls-dev diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index 7f0d37c61d..d4df4190e2 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -7,6 +7,5 @@ RUN apt-get update && apt-get upgrade -y && \ ninja-build \ python3 \ pkg-config \ - libcurl4-openssl-dev \ libboost-all-dev \ libcurl4-gnutls-dev From b6220fbceab071981114f954d92a8f7ebbba11f3 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 4 Apr 2023 22:26:19 -0400 Subject: [PATCH 11/19] antler-proj updated --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 6dc9b1ca01..850f3f68ca 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 6dc9b1ca01e96aec8402cdae05d68f8cbde1b28d +Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608 From b1fd200aa863435b7dc8d826fe58492f3cc2e777 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Tue, 4 Apr 2023 22:40:54 -0400 Subject: [PATCH 12/19] fixing ubuntu 22 build --- .cicd/platforms/ubuntu22.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile index d4df4190e2..67b04586a1 100644 --- a/.cicd/platforms/ubuntu22.Dockerfile +++ b/.cicd/platforms/ubuntu22.Dockerfile @@ -8,4 +8,5 @@ RUN apt-get update && apt-get upgrade -y && \ python3 \ pkg-config \ libboost-all-dev \ - libcurl4-gnutls-dev + libcurl4-gnutls-dev \ + clang-tidy From 1a8b4d7c04f394a9ce60cd793c68f7fed30ab845 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Wed, 5 Apr 2023 15:01:07 -0400 Subject: [PATCH 13/19] ubuntu 18 build fix --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 850f3f68ca..e582e8300b 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608 +Subproject commit e582e8300b14395d1ea197a2e4834b71d715c28c From 043dfa49ab6d27ad6a79caf1b7c093224ecc2fbd Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Wed, 5 Apr 2023 17:39:01 -0400 Subject: [PATCH 14/19] ubuntu 18 build fix --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index e582e8300b..622fb725ce 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit e582e8300b14395d1ea197a2e4834b71d715c28c +Subproject commit 622fb725ceb9b152c9b3fe83b3b6d5ec6cedbbf9 From 6510dd271993e92351c450bd79c25b55186732cf Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Thu, 6 Apr 2023 16:01:31 -0400 Subject: [PATCH 15/19] adding custom cmake to ubuntu 18 build --- .cicd/platforms/ubuntu18.Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.cicd/platforms/ubuntu18.Dockerfile b/.cicd/platforms/ubuntu18.Dockerfile index ddae5b432d..8f9c618be1 100644 --- a/.cicd/platforms/ubuntu18.Dockerfile +++ b/.cicd/platforms/ubuntu18.Dockerfile @@ -2,7 +2,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \ - cmake \ g++-8 \ curl \ ninja-build \ @@ -12,6 +11,13 @@ RUN apt-get update && apt-get upgrade -y && \ libboost-all-dev \ libcurl4-gnutls-dev +RUN curl -L https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz | tar zx && \ + cd cmake-3.13.5 && \ + ./configure && \ + make -j$(nproc) install && \ + cd .. && \ + rm -rf cmake-3.13.5 + RUN add-apt-repository ppa:git-core/ppa && apt update && apt install -y git RUN curl -L https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tgz | tar zx && \ From 772926c08b2c21c572e1f34ce2de82621f7da5bd Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Thu, 6 Apr 2023 16:15:37 -0400 Subject: [PATCH 16/19] revert back cturtle changes --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 622fb725ce..850f3f68ca 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 622fb725ceb9b152c9b3fe83b3b6d5ec6cedbbf9 +Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608 From e06b9f3335d1ed1df36b9a66b630a43ecd9ffc09 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Thu, 6 Apr 2023 16:24:05 -0400 Subject: [PATCH 17/19] ubuntu 18 build fix --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 850f3f68ca..31bf44e42e 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608 +Subproject commit 31bf44e42efaa3b45893051271ab5bd7811594af From 5e43caad78294de6749a6a6e44511f33ab4df282 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Thu, 6 Apr 2023 16:54:22 -0400 Subject: [PATCH 18/19] cturtle update --- tools/external/antler-proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/external/antler-proj b/tools/external/antler-proj index 31bf44e42e..25b54b0ce5 160000 --- a/tools/external/antler-proj +++ b/tools/external/antler-proj @@ -1 +1 @@ -Subproject commit 31bf44e42efaa3b45893051271ab5bd7811594af +Subproject commit 25b54b0ce57224481ae78d8fcd4f16d73342a2d8 From 745cbdd53c947a87ce0f3bb4b201cb664bf351e5 Mon Sep 17 00:00:00 2001 From: Dmytro Sydorchenko Date: Fri, 7 Apr 2023 12:42:00 -0400 Subject: [PATCH 19/19] add comment for commented out antler-run --- tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 0ef0102326..06d53ee67c 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -82,7 +82,7 @@ add_subdirectory(cc) add_subdirectory(ld) add_subdirectory(init) add_subdirectory(external) -#add_subdirectory(antler-run) +#add_subdirectory(antler-run) # TODO: add back when it will be ready configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/compiler_options.hpp.in ${CMAKE_BINARY_DIR}/compiler_options.hpp)