Skip to content

Merge to release for 0.4.25 #4957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Sep 13, 2018
Merged

Merge to release for 0.4.25 #4957

merged 35 commits into from
Sep 13, 2018

Conversation

chriseth
Copy link
Contributor

No description provided.

chriseth and others added 30 commits September 6, 2018 16:55
 Disallow structs in events without ABIEncoderV2
[BACKPORT] Use wildcards for MSVC version in scripts/release.bat.
 - any unicode line break (line feed, vertical tab, form feed, carriage
   return, NEL, LS and PS) is considered to terminate a single-line
   comment. The line break itself is considered to be the next token
   after the comment, leading to a parser error if it is not an
   ascii character (i.e. for NEL, LS and PS).
 - unterminated multiline comments are considered illegal tokens
 - '/** /' is considered an unterminated multiline comment
   (previously, whitespace was allowed before the last '/'
Disallow indexed reference types in events when using ABIEncoderV2 (backported)
[backport] Buglist check script supports json paths
…v0425

[backport] Buglist entry for returning nested arrays.
When building on Debian/Ubuntu with install prefix /usr (e.g. in PPA builds) the CMAKE_INSTALL_LIBDIR is resolved to lib/x86_64-linux-gnu. For jsoncpp external project this is never the case because the install prefix is not /usr. Remove multiarch part from libdir if there.
According to cmake documents, we cannot assume CMAKE_INSTALL_LIBDIR is a
relative path. This commit fixes the "no rule to make libjsoncpp.a"
error by passing -DCMAKE_INSTALL_LIBDIR=lib to jsoncpp external project.
@chriseth
Copy link
Contributor Author

Failure for appveyor was due to bytecode upload. Wil not retrigger.

@chriseth chriseth merged commit 59dbf8f into release Sep 13, 2018
@@ -1,3 +1,14 @@
### 0.4.25 (2018-09-12)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it's fine to keep this...

@axic axic deleted the develop_v0425 branch September 18, 2018 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants