Merge remote-tracking branch 'origin/develop' into release

Author: chriseth

.travis.yml

@@ -135,10 +135,8 @@ git:
 cache:
     ccache: true
     directories:
-        - cryptopp
         - boost_1_57_0
         - build
-        - jsoncpp
 
 install:
     - test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh
@@ -164,7 +162,7 @@ script:
     # in Solidity's RPC setup and some will be in 'eth'.  It seems unlikely that Solidity
     # itself is broken from the failure messages which we are seeing.
     #
-    # More details on known issues at https://github.com/ethereum/solidity/issues/769    
+    # More details on known issues at https://github.com/ethereum/solidity/issues/769
     - test $TRAVIS_TESTS != On || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
 env:
     global:

CMakeLists.txt

@@ -8,11 +8,12 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.4.4")
+set(PROJECT_VERSION "0.4.5")
 project(solidity VERSION ${PROJECT_VERSION})
 
 # Let's find our dependencies
 include(EthDependencies)
+include(deps/jsoncpp.cmake)
 
 # Figure out what compiler and system are we using
 include(EthCompilerSettings)

Changelog.md

@@ -1,3 +1,20 @@
+### 0.4.5 (2016-11-21)
+
+Features:
+ * Function types
+ * Do-while loops: support for a ``do <block> while (<expr>);`` control structure
+ * Inline assembly: support ``invalidJumpLabel`` as a jump label.
+ * Type checker: now more eagerly searches for a common type of an inline array with mixed types
+ * Code generator: generates a runtime error when an out-of-range value is converted into an enum type.
+
+Bugfixes:
+
+ * Inline assembly: calculate stack height warning correctly even when local variables are used.
+ * Code generator: check for value transfer in non-payable constructors.
+ * Parser: disallow empty enum definitions.
+ * Type checker: disallow conversion between different enum types.
+ * Interface JSON: do not include trailing new line.
+
 ### 0.4.4 (2016-10-31)
 
 Bugfixes:

appveyor.yml

@@ -29,7 +29,7 @@
 
 branches:
   only:
-    - master
+    - release
     - develop
 os: Visual Studio 2015
 configuration:
@@ -83,14 +83,13 @@ artifacts:
 # below.
 
 deploy:
-    description: 'Development build of solidity at commit $(APPVEYOR_REPO_COMMIT).\n\n$(APPVEYOR_REPO_COMMIT_MESSAGE)\n\nCommitted by $(APPVEYOR_REPO_COMMIT_AUTHOR), $(APPVEYOR_REPO_COMMIT_TIMESTAMP).'
-    prerelease: true
     provider: GitHub
     auth_token:
         secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans
     artifact: solidity-windows-zip
     on:
         branch: release
+        appveyor_repo_tag: true
 
 notifications:
     - provider: GitHubPullRequest

cmake/EthCompilerSettings.cmake

@@ -71,7 +71,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 	add_compile_options(-fPIC)
 
 	# Configuration-specific compiler settings.
-	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
+	set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g -DETH_DEBUG")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

cmake/FindJsoncpp.cmake

@@ -15,8 +15,7 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
 	target_include_directories(${TARGET} PUBLIC ${Solidity_INCLUDE_DIRS})
 
 	if (${SUBMODULE} STREQUAL "solevmasm")
-		eth_use(${TARGET} ${REQUIRED} Jsoncpp)
-		target_link_libraries(${TARGET} ${Solidity_SOLEVMASM_LIBRARIES})
+		target_link_libraries(${TARGET} ${Solidity_SOLEVMASM_LIBRARIES} jsoncpp)
 	endif()
 
 	if (${SUBMODULE} STREQUAL "lll")

cmake/UseJsoncpp.cmake

@@ -56,9 +56,9 @@ def setup(sphinx):
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.4'
+version = '0.4.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.4-develop'
+release = '0.4.5-develop'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.