Merge pull request #515 from ewasm/wabt-default

Make wabt the default engine

Author: axic

CMakeLists.txt

@@ -48,12 +48,12 @@ if(HERA_FUZZING)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${fuzzer_flags}")
 endif()
 
-option(HERA_BINARYEN "Build with binaryen" ON)
+option(HERA_BINARYEN "Build with binaryen" OFF)
 if (HERA_BINARYEN)
     include(ProjectBinaryen)
 endif()
 
-option(HERA_WABT "Build with wabt" OFF)
+option(HERA_WABT "Build with wabt" ON)
 if (HERA_WABT)
     include(ProjectWabt)
 endif()

README.md

@@ -35,21 +35,21 @@ Please also check the build options listed in the following section.
 - `-DHERA_DEBUGGING=ON` will turn on debugging features and messages
 - `-DBUILD_SHARED_LIBS=ON` is a standard CMake option to build libraries as shared. This will build Hera shared library that can be then dynamically loaded by EVMC compatible Clients (e.g. `aleth` from [aleth]). **This is the preferred way of compilation.**
 
-### Binaryen support
+### wabt support
 
 *Complete support.*
 
-[Binaryen] is built by default and needs no build options. It can be disabled with:
+[wabt] is built by default and needs no build options. It can be disabled with:
 
-- `-DHERA_BINARYEN=OFF`
+- `-DHERA_WABT=OFF`
 
-### wabt support
+### Binaryen support
 
 *Complete support.*
 
-[wabt] support needs to be enabled via the following build option and requested at runtime with `engine=wabt`:
+[Binaryen] support needs to be enabled via the following build option and requested at runtime with `engine=binaryen`:
 
-- `-DHERA_WABT=ON` will request the compilation of wabt support
+- `-DHERA_BINARYEN=ON` will request the compilation of Binaryen support
 
 ### WAVM support
 

circle.yml

@@ -191,7 +191,7 @@ jobs:
       CC:  clang
       GENERATOR: Ninja
       BUILD_PARALLEL_JOBS: 4
-      CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON
+      CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON
     docker:
       - image: ethereum/cpp-build-env:9
     steps:
@@ -219,7 +219,7 @@ jobs:
       CC:  clang
       GENERATOR: Ninja
       BUILD_PARALLEL_JOBS: 4
-      CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON -DSANITIZE=address
+      CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON -DSANITIZE=address
       # The ASan must the first loaded shared library. Force preloading it with this flag.
       PRELOAD_ASAN: true
     docker:
@@ -248,7 +248,7 @@ jobs:
       - CC:  gcc
       - GENERATOR: Ninja
       - BUILD_PARALLEL_JOBS: 4
-      - CMAKE_OPTIONS: -DCOVERAGE=ON -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=ON
+      - CMAKE_OPTIONS: -DCOVERAGE=ON -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON
     docker:
       - image: ethereum/cpp-build-env:9
     steps:
@@ -272,7 +272,7 @@ jobs:
       - CC:  gcc
       - GENERATOR: Unix Makefiles
       - BUILD_PARALLEL_JOBS: 4
-      - CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=OFF -DHERA_DEBUGGING=ON -DHERA_WAVM=ON -DHERA_WABT=ON
+      - CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=OFF -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON
     docker:
       - image: ethereum/cpp-build-env:9
     steps:
@@ -291,7 +291,7 @@ jobs:
       - CXX: c++
       - GENERATOR: Unix Makefiles
       - BUILD_PARALLEL_JOBS: 4
-      - CMAKE_OPTIONS: -DHERA_DEBUGGING=ON -DHERA_WABT=ON
+      - CMAKE_OPTIONS: -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON -DHERA_WABT=ON
     macos:
       xcode: "10.1.0"
     steps: