diff --git a/.gitmodules b/.gitmodules index 6ef39354df..ac62b95d85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [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 diff --git a/CMakeLists.txt b/CMakeLists.txt index ee22a1bcbb..1c53deefe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ project(cdt) set(VERSION_MAJOR 4) set(VERSION_MINOR 0) -set(VERSION_PATCH 0) +set(VERSION_PATCH 1) set(VERSION_SUFFIX "") if (VERSION_SUFFIX) @@ -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/scripts/generate_tarball.sh b/scripts/generate_tarball.sh index 4a1ccbc5f3..93a21d1b17 100644 --- a/scripts/generate_tarball.sh +++ b/scripts/generate_tarball.sh @@ -74,8 +74,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/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 5dbcdbaaa1..cd2b3fec8b 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required( VERSION 3.5 ) set(EOSIO_VERSION_MIN "3.1") -set(EOSIO_VERSION_SOFT_MAX "4.0") +set(EOSIO_VERSION_SOFT_MAX "5.0") #set(EOSIO_VERSION_HARD_MAX "") find_package(leap) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index df4ebf1698..d0eb54044f 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -79,13 +79,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 $ ${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 -) diff --git a/tools/external/CMakeLists.txt b/tools/external/CMakeLists.txt index 4f5e28cc78..eae7583dca 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 diff --git a/tools/external/antler-proj b/tools/external/antler-proj deleted file mode 160000 index 2034b9a38f..0000000000 --- a/tools/external/antler-proj +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2034b9a38f61aa1a55f17eed657d466bbcfcc6e6