Merge pull request #461 from ethereum/develop

Merge develop into release.
ethereum · Apr 18, 2016 · 28b30ec · 28b30ec
2 parents c6fc5e5 + 812c6f9
commit 28b30ec
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git 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
diff --git a/libethereum b/libethereum
diff --git a/libweb3core b/libweb3core
diff --git a/mix b/mix
diff --git 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
diff --git 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
diff --git a/webthree-helpers b/webthree-helpers