From 03a0bfb1342dd5150e544ea00363802d3eef2cdd Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:35:13 -0400
Subject: [PATCH 01/25] revert

---
 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 2034b9a38f..850f3f68ca 160000
--- a/tools/external/antler-proj
+++ b/tools/external/antler-proj
@@ -1 +1 @@
-Subproject commit 2034b9a38f61aa1a55f17eed657d466bbcfcc6e6
+Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608

From ffe38960f083290f77a4156a3690a502cf8703bf Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:35:25 -0400
Subject: [PATCH 02/25] Revert "revert back cturtle changes"

This reverts commit 772926c08b2c21c572e1f34ce2de82621f7da5bd.
---
 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..622fb725ce 160000
--- a/tools/external/antler-proj
+++ b/tools/external/antler-proj
@@ -1 +1 @@
-Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608
+Subproject commit 622fb725ceb9b152c9b3fe83b3b6d5ec6cedbbf9

From 3b832e3446e4e5cabc07e182868d34189ca77f81 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:35:57 -0400
Subject: [PATCH 03/25] revert

---
 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 af509ad5a816fff8d8b5ca082bf9e4e6252426e8 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:38:18 -0400
Subject: [PATCH 04/25] reverting antler-proj

---
 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 8f700ae16f700e7ffadd0c2545b63b774b5969d0 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:38:26 -0400
Subject: [PATCH 05/25] Revert "ubuntu 18 build fix"

This reverts commit 1a8b4d7c04f394a9ce60cd793c68f7fed30ab845.
---
 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..850f3f68ca 160000
--- a/tools/external/antler-proj
+++ b/tools/external/antler-proj
@@ -1 +1 @@
-Subproject commit e582e8300b14395d1ea197a2e4834b71d715c28c
+Subproject commit 850f3f68ca40675d246fbfcfd4c0a1bcfef98608

From 1206eeff1be78696943eec2fc2f49bb9c4dadf10 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:39:15 -0400
Subject: [PATCH 06/25] Revert "fixing ubuntu 22 build"

This reverts commit b1fd200aa863435b7dc8d826fe58492f3cc2e777.
---
 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 5e7a14c81ab1f4f80532d757e80051732a6b7049 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:40:24 -0400
Subject: [PATCH 07/25] reverting antler-proj

---
 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..6dc9b1ca01 160000
--- a/tools/external/antler-proj
+++ b/tools/external/antler-proj
@@ -1 +1 @@
-Subproject commit e582e8300b14395d1ea197a2e4834b71d715c28c
+Subproject commit 6dc9b1ca01e96aec8402cdae05d68f8cbde1b28d

From 523a88f298f3ba42ec27f2128b13b7092b34725b Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:40:45 -0400
Subject: [PATCH 08/25] Revert "remove libcurl4-openssl"

This reverts commit 92116ada5e8c9d62513c2070fb8bb7038c638ad1.
---
 .cicd/platforms/ubuntu20.Dockerfile | 1 +
 .cicd/platforms/ubuntu22.Dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index c6fc3d7970..a4a87a6f62 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -7,5 +7,6 @@ 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 67b04586a1..2cb4348572 100644
--- a/.cicd/platforms/ubuntu22.Dockerfile
+++ b/.cicd/platforms/ubuntu22.Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       ninja-build \
                                                       python3 \
                                                       pkg-config \
+                                                      libcurl4-openssl-dev \
                                                       libboost-all-dev \
                                                       libcurl4-gnutls-dev \
                                                       clang-tidy

From 72936e8ee544d1f24ec89890b42741028216d686 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:41:34 -0400
Subject: [PATCH 09/25] Revert "update cicd"

This reverts commit 88d1569a93dfa962c5a60a5f8736733c40fff465.
---
 .cicd/platforms/ubuntu20.Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index a4a87a6f62..b8b78d33b4 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -8,5 +8,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       python3 \
                                                       pkg-config \
                                                       libcurl4-openssl-dev \
-                                                      libboost-all-dev \
-                                                      libcurl4-gnutls-dev
+                                                      libboost-all-dev

From 8efbcedfbd87249dbe98e22fa797da5091868c8e Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:42:03 -0400
Subject: [PATCH 10/25] Revert "updates to allow for building and proper
 generation of packages"

This reverts commit be71fb0557a1c2b9d76801618be08bbcd05963a9.
---
 scripts/generate_deb.sh     | 1 -
 scripts/generate_tarball.sh | 4 ----
 tools/CMakeLists.txt        | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh
index 4c64e8d239..92d7b09c68 100644
--- a/scripts/generate_deb.sh
+++ b/scripts/generate_deb.sh
@@ -19,7 +19,6 @@ 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 4a1ccbc5f3..271e511894 100644
--- a/scripts/generate_tarball.sh
+++ b/scripts/generate_tarball.sh
@@ -64,8 +64,6 @@ 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
@@ -74,8 +72,6 @@ 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 df4ebf1698..a3085a2744 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -88,4 +88,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

From fb399831e89235710f7a05021f1dc02e5ebf6721 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:43:28 -0400
Subject: [PATCH 11/25] reverting antler-proj

---
 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..86ad4fde81 160000
--- a/tools/external/antler-proj
+++ b/tools/external/antler-proj
@@ -1 +1 @@
-Subproject commit 6dc9b1ca01e96aec8402cdae05d68f8cbde1b28d
+Subproject commit 86ad4fde8180af81d9b5c5064c0714a95a156414

From a080e7dbf3082b68193095e549fc6b9d232dc23a Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:44:31 -0400
Subject: [PATCH 12/25] Revert "fix build & test step: adding boost"

This reverts commit cb02ee55fdc5c9454cbe1bbd5e948adf74422e32.
---
 .cicd/platforms/ubuntu20.Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index b8b78d33b4..6a097ac44e 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -7,5 +7,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       ninja-build \
                                                       python3 \
                                                       pkg-config \
-                                                      libcurl4-openssl-dev \
-                                                      libboost-all-dev
+                                                      libcurl4-openssl-dev

From e9abfab88823787e308d8b264fc292a1c8ca39c2 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:45:02 -0400
Subject: [PATCH 13/25] Revert "fixing build & test step"

This reverts commit 5f505262c04895e3e450fd736b8e4024c67095b4.
---
 .cicd/platforms/ubuntu20.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index 6a097ac44e..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 \
-                                                      libcurl4-openssl-dev
+                                                      libcurl4

From 6c4b3d2785246710d3cfd48014d880576472277b Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:45:23 -0400
Subject: [PATCH 14/25] Revert "fix build & test step"

This reverts commit a78788f1e6f3386f8d7c3874b950e9c0f30e73b8.
---
 .cicd/platforms/ubuntu20.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index f87b4beb82..f45f526e5f 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
+                                                      libcurl

From 58c38a800b9ca86782849ab0e0d8dcad76f856c2 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:45:43 -0400
Subject: [PATCH 15/25] Revert "install step fix"

This reverts commit 32614bf8a9c79fc379e83c23d73d7d2260d2e372.
---
 .cicd/platforms/ubuntu20.Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index f45f526e5f..dd1de23028 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -6,5 +6,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       git \
                                                       ninja-build \
                                                       python3 \
-                                                      pkg-config \
-                                                      libcurl
+                                                      pkg-config

From 149f82ce0cb618585dfed6a883a53f2249c20abb Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:46:06 -0400
Subject: [PATCH 16/25] Revert "fix build after adding antler-proj"

This reverts commit 87184a2103a69e910af0cfe681a0ed8fbac08b0a.
---
 .cicd/platforms/ubuntu20.Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index dd1de23028..d1e1f50107 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -5,5 +5,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       cmake \
                                                       git \
                                                       ninja-build \
-                                                      python3 \
-                                                      pkg-config
+                                                      python3

From a11caaa04874e403fb813862032f7ee599db2cf3 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 19:47:14 -0400
Subject: [PATCH 17/25] Revert "add antler-proj to cdt"

This reverts commit 9736614860929bda1d79a357f156eac4d7c95a40.
---
 .gitmodules                   |  5 +----
 CMakeLists.txt                | 11 -----------
 modules/InstallCDT.cmake      |  1 -
 tools/CMakeLists.txt          | 13 +------------
 tools/external/CMakeLists.txt |  3 +--
 tools/external/antler-proj    |  1 -
 6 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 160000 tools/external/antler-proj

diff --git a/.gitmodules b/.gitmodules
index 6ef39354df..8c975eb8bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,4 @@
 	url = https://github.com/AntelopeIO/cdt-libcxx
 [submodule "libraries/native/softfloat"]
 	path = libraries/native/softfloat
-	url = https://github.com/AntelopeIO/berkeley-softfloat-3
-[submodule "tools/external/antler-proj"]
-	path = tools/external/antler-proj
-	url = https://github.com/AntelopeIO/antler-proj
\ No newline at end of file
+	url = https://github.com/AntelopeIO/berkeley-softfloat-3
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee22a1bcbb..68873d6ebb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,17 +93,6 @@ 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 5a18b6d8b3..f5b977321f 100644
--- a/modules/InstallCDT.cmake
+++ b/modules/InstallCDT.cmake
@@ -74,7 +74,6 @@ 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 a3085a2744..141ae16197 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -22,8 +22,6 @@ 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(EOSIO_STACK_SIZE 8192)
 
@@ -69,6 +67,7 @@ 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 $<TARGET_FILE:${name}> ${CMAKE_BINARY_DIR}/bin/ )
 endmacro()
 
@@ -79,13 +78,3 @@ add_subdirectory(init)
 add_subdirectory(external)
 
 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 $<TARGET_FILE:antler-proj> ${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 4f5e28cc78..57f354da15 100644
--- a/tools/external/CMakeLists.txt
+++ b/tools/external/CMakeLists.txt
@@ -1,2 +1 @@
-add_subdirectory(wabt)
-add_subdirectory(antler-proj)
\ No newline at end of file
+add_subdirectory(wabt)
\ No newline at end of file
diff --git a/tools/external/antler-proj b/tools/external/antler-proj
deleted file mode 160000
index 86ad4fde81..0000000000
--- a/tools/external/antler-proj
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 86ad4fde8180af81d9b5c5064c0714a95a156414

From e2d8f970e70ae6720855ef0abaf74dc0b951074c Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 20:54:02 -0400
Subject: [PATCH 18/25] resolve incorrect revert

---
 .cicd/platforms/ubuntu20.Dockerfile | 3 +--
 .cicd/platforms/ubuntu22.Dockerfile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index d1e1f50107..574b6bb713 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -4,5 +4,4 @@ RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \
                                                       cmake \
                                                       git \
-                                                      ninja-build \
-                                                      python3
+                                                      ninja-build
\ No newline at end of file
diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile
index 2cb4348572..ca38aad5cd 100644
--- a/.cicd/platforms/ubuntu22.Dockerfile
+++ b/.cicd/platforms/ubuntu22.Dockerfile
@@ -7,7 +7,6 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       ninja-build \
                                                       python3 \
                                                       pkg-config \
-                                                      libcurl4-openssl-dev \
                                                       libboost-all-dev \
                                                       libcurl4-gnutls-dev \
-                                                      clang-tidy
+                                                      clang-tidy
\ No newline at end of file

From 3dcf7ed99f0417012d26370ee67f95c0c2468691 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 20:56:20 -0400
Subject: [PATCH 19/25] correct revert

---
 .cicd/platforms/ubuntu20.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index 574b6bb713..f84b8e0bd2 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -4,4 +4,4 @@ RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \
                                                       cmake \
                                                       git \
-                                                      ninja-build
\ No newline at end of file
+                                                      ninja-build

From b9b450d1dcacfb0f023631f5c7f62cbfd470a06e Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 21:07:01 -0400
Subject: [PATCH 20/25] fix revert

---
 .cicd/platforms/ubuntu20.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index f84b8e0bd2..574b6bb713 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -4,4 +4,4 @@ RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \
                                                       cmake \
                                                       git \
-                                                      ninja-build
+                                                      ninja-build
\ No newline at end of file

From 1f125fb952f8b06186a13321ffa3a15d181c30cc Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 21:14:10 -0400
Subject: [PATCH 21/25] fix revert errors

---
 .cicd/platforms/ubuntu20.Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index 574b6bb713..69ff3802a8 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -4,4 +4,8 @@ RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential \
                                                       cmake \
                                                       git \
-                                                      ninja-build
\ No newline at end of file
+                                                      ninja-build \
+                                                      python3 \
+                                                      pkg-config \
+                                                      libboost-all-dev \
+                                                      libcurl4-gnutls-dev
\ No newline at end of file

From cedbfd251a6807854c5608ff50434f842b72c973 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 21:27:25 -0400
Subject: [PATCH 22/25] restore ubuntu20 docker file from main

---
 .cicd/platforms/ubuntu20.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
index 69ff3802a8..c6fc3d7970 100644
--- a/.cicd/platforms/ubuntu20.Dockerfile
+++ b/.cicd/platforms/ubuntu20.Dockerfile
@@ -8,4 +8,4 @@ RUN apt-get update && apt-get upgrade -y && \
                                                       python3 \
                                                       pkg-config \
                                                       libboost-all-dev \
-                                                      libcurl4-gnutls-dev
\ No newline at end of file
+                                                      libcurl4-gnutls-dev

From 4b8bf0e70cdf295e93ef548f35b7774a97ac063c Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 21:42:30 -0400
Subject: [PATCH 23/25] restore wrongly reverted files

---
 scripts/generate_deb.sh | 1 +
 1 file changed, 1 insertion(+)

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}

From 71ae8429c0f3a473baa4fec7b91558aa1c73a569 Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Fri, 29 Sep 2023 21:45:29 -0400
Subject: [PATCH 24/25] resolving wrong revert

---
 tools/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 141ae16197..d0eb54044f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -22,6 +22,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(EOSIO_STACK_SIZE 8192)
 
@@ -67,7 +69,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 $<TARGET_FILE:${name}> ${CMAKE_BINARY_DIR}/bin/ )
 endmacro()
 

From 2a91ea6db14a34265d6ba99eb71c878964c137cd Mon Sep 17 00:00:00 2001
From: Dmytro Sydorchenko <dmitriysidorchenko@gmail.com>
Date: Thu, 5 Oct 2023 12:12:22 -0400
Subject: [PATCH 25/25] get back additional sym links in tarball

---
 scripts/generate_tarball.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/generate_tarball.sh b/scripts/generate_tarball.sh
index 271e511894..93a21d1b17 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