diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f1f9b9f8..8385ea229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ include(EthPolicy) eth_policy() # project name and version should be set after cmake_policy CMP0048 -project(cpp-ethereum VERSION "1.2.3") +project(cpp-ethereum VERSION "1.2.4") include(EthCompilerSettings) diff --git a/alethzero b/alethzero index 320d50b76..0e65260c8 160000 --- a/alethzero +++ b/alethzero @@ -1 +1 @@ -Subproject commit 320d50b768df80b870d733c0de282fd4ceb76418 +Subproject commit 0e65260c86c66a04dd97f80940850f63bce9e35e diff --git a/libethereum b/libethereum index f88f5dc21..4b55bf902 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit f88f5dc2128f86614001c6e505c0d0313539c0c9 +Subproject commit 4b55bf902e2b5bc3e826e261099c2a4f52c3ef4d diff --git a/libweb3core b/libweb3core index 9ef32cd89..300ade534 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit 9ef32cd892048ebfde0b1fd8def484228ba20bec +Subproject commit 300ade534ff90acffb3e01db8b5de2789ed0227d diff --git a/mix b/mix index 03f1a3139..91fbfc104 160000 --- a/mix +++ b/mix @@ -1 +1 @@ -Subproject commit 03f1a3139586305f3f1c55b32022821cabc85f80 +Subproject commit 91fbfc1046c80669bddcaaedcaa0109fe13e6c94 diff --git a/res/mac/appdmg.json.in b/res/mac/appdmg.json.in index 90644816f..40c813bf6 100644 --- a/res/mac/appdmg.json.in +++ b/res/mac/appdmg.json.in @@ -6,7 +6,6 @@ "contents": [ { "x": 484, "y": 480, "type": "link", "path": "/Applications" }, { "x": 290, "y": 250, "type": "file", "path": "${ETH_ALETHZERO_APP}" }, - { "x": 160, "y": 250, "type": "file", "path": "${ETH_ALETHONE_APP}" }, { "x": 678, "y": 250, "type": "file", "path": "${ETH_MIX_APP}" } ] } diff --git a/solidity b/solidity index 33b954599..81ae2a783 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 33b954599589695181d995583413fa7184616cbd +Subproject commit 81ae2a78321fddcd2d32efc51568ebeca28866a8 diff --git a/sync.sh b/sync.sh index af6212f68..d2dae1c10 100755 --- a/sync.sh +++ b/sync.sh @@ -4,10 +4,14 @@ set -e git submodule sync git submodule update --init --remote . +mkdir -p build cd build +cmake .. make -j 4 cd .. -./webthree-helpers/scripts/ethtests.sh libethereum --umbrella +# Only update if tests do not fail (disabled for now) +#./webthree-helpers/scripts/ethtests.sh all --umbrella +git checkout -B develop git commit -am 'updated submodules' git push diff --git a/webthree b/webthree index 343535f48..240a3aa7a 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 343535f48bd665c4a3280869c512557639119792 +Subproject commit 240a3aa7af4d55f6551099583b74ac6fc557f65e diff --git a/webthree-helpers b/webthree-helpers index 50c2ac4e6..f37cc061d 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 50c2ac4e6a42d345ae5c9031691161f05ea756e2 +Subproject commit f37cc061d7004c7e69d2fc39f76651900edc3d78