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
+1 −1		CMakeLists.txt
+3 −3		alethzero/CMakeLists.txt
+0 −32		alethzero/QNatspec.cpp
+0 −43		alethzero/QNatspec.h
+9 −45		alethzero/TransactDialog.cpp
+0 −1		alethzero/TransactDialog.h
+0 −2		alethzero/main.cpp
+5 −4		alethzero/plugins/EVMJIT.cpp
+3 −3		alethzero/plugins/accounts/AllAccounts.cpp
+3 −3		alethzero/plugins/blockchain/BlockList.cpp
+1 −2		alethzero/plugins/blockchain/ExportState.cpp
+0 −1		alethzero/plugins/blockchain/ExportState.h
+0 −202		alethzero/plugins/browser/Browser.cpp
+0 −69		alethzero/plugins/browser/Browser.h
+0 −90		alethzero/plugins/browser/Browser.ui
+0 −95		alethzero/plugins/browser/Cors.cpp
+0 −63		alethzero/plugins/browser/Cors.h
+0 −100		alethzero/plugins/browser/Cors.ui
+0 −61		alethzero/plugins/browser/JsConsole.cpp
+0 −44		alethzero/plugins/browser/JsConsole.h
+0 −131		alethzero/plugins/browser/JsConsoleWidget.cpp
+0 −64		alethzero/plugins/browser/JsConsoleWidget.h
+0 −282		alethzero/plugins/browser/JsConsoleWidget.ui
+0 −30		alethzero/plugins/browser/WebPage.cpp
+0 −51		alethzero/plugins/browser/WebPage.h
+3 −3		alethzero/plugins/namers/NameRegNamer.cpp
+0 −3		libaleth/AccountHolder.cpp
+0 −29		libaleth/Common.cpp
+0 −4		libaleth/Common.h
+6 −1		CMakeLists.txt
+5 −0		ConfigInfo.h.in
+1 −1		ethkey/KeyAux.h
+40 −29		ethminer/MinerAux.h
+2 −2		ethvm/main.cpp
+0 −5		evmjit/CMakeLists.txt
+10 −11		libethashseal/Ethash.cpp
+1 −0		libethashseal/Ethash.h
+3 −3		libethashseal/EthashAux.cpp
+7 −6		libethashseal/EthashCPUMiner.cpp
+4 −3		libethashseal/EthashGPUMiner.cpp
+3 −2		libethashseal/EthashGPUMiner.h
+2 −2		libethcore/ABI.h
+5 −1		libethcore/BasicAuthority.cpp
+1 −0		libethcore/BasicAuthority.h
+7 −1		libethcore/ChainOperationParams.cpp
+2 −2		libethcore/Common.cpp
+2 −2		libethcore/CommonJS.cpp
+1 −1		libethcore/ICAP.cpp
+1 −1		libethcore/Precompiled.cpp
+4 −1		libethcore/SealEngine.cpp
+1 −0		libethcore/SealEngine.h
+17 −16		libethereum/BlockChain.cpp
+4 −4		libethereum/BlockChainSync.cpp
+2 −2		libethereum/BlockQueue.cpp
+1 −1		libethereum/ClientBase.cpp
+5 −5		libethereum/EthereumPeer.cpp
+4 −0		libethereum/LogFilter.h
+1 −1		libethereum/State.cpp
+0 −1		libethereum/State.h
+2 −2		libevm/ExtVMFace.h
+28 −28		libevm/VM.cpp
+0 −1		libevm/VMFactory.cpp
+7 −0		test/TestHelper.cpp
+1 −1		test/libethereum/Block.cpp
+2 −0		test/libethereum/BlockChain.cpp
+3 −0		test/libethereum/BlockChainInsert.cpp
+9 −0		test/libethereum/BlockChainTests.cpp
+443 −0		test/libethereum/BlockchainTestsFiller/Homestead/bcUncleHeaderValiditiyFiller.json
+0 −1		test/libethereum/State.cpp
+6 −2		CMakeLists.txt
+17 −0		docs/frequently-asked-questions.rst
+2 −0		docs/installing-solidity.rst
+1 −1		docs/introduction-to-smart-contracts.rst
+1 −1		docs/solidity-by-example.rst
+0 −9		libevmasm/Assembly.cpp
+6 −6		libevmasm/Assembly.h
+1 −1		libevmasm/AssemblyItem.cpp
+3 −2		libevmasm/AssemblyItem.h
+1 −1		libevmasm/BlockDeduplicator.cpp
+1 −1		libevmasm/CMakeLists.txt
+9 −10		libevmasm/ConstantOptimiser.cpp
+0 −8		libevmasm/ConstantOptimiser.h
+35 −24		libevmasm/GasMeter.cpp
+41 −7		libevmasm/GasMeter.h
+353 −0		libevmasm/Instruction.cpp
+268 −0		libevmasm/Instruction.h
+3 −3		libevmasm/PathGasMeter.cpp
+3 −3		libevmasm/SemanticInformation.h
+0 −38		libevmasm/Version.cpp
+0 −36		libevmasm/Version.h
+1 −2		liblll/CodeFragment.cpp
+1 −1		liblll/CodeFragment.h
+1 −1		libsolidity/CMakeLists.txt
+1 −1		libsolidity/analysis/TypeChecker.cpp
+1 −1		libsolidity/ast/AST.h
+1 −0		libsolidity/ast/Types.h
+217 −217		libsolidity/codegen/ArrayUtils.cpp
+46 −47		libsolidity/codegen/Compiler.cpp
+2 −2		libsolidity/codegen/CompilerContext.cpp
+2 −2		libsolidity/codegen/CompilerContext.h
+75 −75		libsolidity/codegen/CompilerUtils.cpp
+127 −128		libsolidity/codegen/ExpressionCompiler.cpp
+78 −78		libsolidity/codegen/LValue.cpp
+6 −5		libsolidity/inlineasm/AsmCodeGen.cpp
+2 −2		libsolidity/inlineasm/AsmData.h
+15 −12		libsolidity/inlineasm/AsmParser.cpp
+3 −3		libsolidity/interface/GasEstimator.cpp
+20 −29		libsolidity/interface/SourceReferenceFormatter.cpp
+14 −3		libsolidity/interface/SourceReferenceFormatter.h
+1 −3		libsolidity/interface/Version.cpp
+0 −1		libsolidity/parsing/Parser.cpp
+59 −19		libsolidity/parsing/ParserBase.cpp
+7 −1		libsolidity/parsing/Scanner.h
+5 −4		libsolidity/parsing/Token.cpp
+9 −7		libsolidity/parsing/Token.h
+1 −1		lllc/CMakeLists.txt
+3 −4		lllc/main.cpp
+7 −7		solc/CommandLineInterface.cpp
+4 −4		solc/jsonCompiler.cpp
+1 −1		test/CMakeLists.txt
+0 −1		test/libsolidity/Assembly.cpp
+3 −2		test/libsolidity/GasMeter.cpp
+5 −1		test/libsolidity/InlineAssembly.cpp
+58 −0		test/libsolidity/SolidityEndToEndTest.cpp
+111 −112		test/libsolidity/SolidityExpressionCompiler.cpp
+12 −1		test/libsolidity/SolidityNameAndTypeResolution.cpp
+19 −19		test/libsolidity/SolidityOptimizer.cpp
+0 −1		test/libsolidity/SolidityParser.cpp
+4 −1		test/libsolidity/solidityExecutionFramework.h
+1 −1		CMakeLists.txt
+2 −1		eth/CMakeLists.txt
+22 −24		eth/main.cpp
+3 −0		libwebthree/WebThree.cpp
+204 −195		test/libwhisper/bloomFilter.cpp
+52 −48		test/libwhisper/shhrpc.cpp
+176 −172		test/libwhisper/whisperDB.cpp
+33 −29		test/libwhisper/whisperMessage.cpp
+396 −392		test/libwhisper/whisperTopic.cpp
+0 −27		cmake/EthBuildInfo.cmake
+11 −5		cmake/EthExecutableHelper.cmake
+33 −16		cmake/EthOptions.cmake
+2 −2		cmake/UseSolidity.cmake
+14 −0		cmake/scripts/macdeployfix.sh
+1 −1		homebrew/cpp-ethereum.rb.in
+173 −0		scripts/build_emscripten.sh
+20 −1		scripts/ethbinaries.sh
+5 −0		scripts/ethtests.sh
+5 −0		scripts/ethupdate.sh
+1 −1		scripts/locdep.rb
+101 −0		scripts/ppabuild.sh
+1 −1		utils/CMakeLists.txt