Skip to content

Java bytecode build fixes #1970

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.

Sign up for GitHub

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 3 commits into from
Mar 24, 2018
Merged

Java bytecode build fixes #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55656ff
Include missing invariant header
tautschnig Feb 17, 2018
1782e8f
Include missing map header
tautschnig Mar 23, 2018
df1c7e3
Builds require javac as of f66288b4
tautschnig Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions COMPILING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.
The GNU Make needs to be version 3.81 or higher.
On Debian-like distributions, do
```
apt-get install g++ gcc flex bison make git libwww-perl patch
apt-get install g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk
Copy link
Member

Choose a reason for hiding this comment

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

(Just a note for me to revert these changes as part of #1869).

```
On Red Hat/Fedora or derivates, do
```
yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6
yum install gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel
```
Note that you need g++ version 4.9 or newer.
2. As a user, get the CBMC source via
Expand Down Expand Up @@ -91,7 +91,7 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution.

1. As root, get the necessary tools:
```
pkg install bash gmake git www/p5-libwww patch flex bison
pkg install bash gmake git www/p5-libwww patch flex bison openjdk
```
2. As a user, get the CBMC source via
```
Expand Down Expand Up @@ -186,11 +186,11 @@ require manual modification of build files.
--version`. To install all build dependencies:
- On Debian-like distributions, do
```
apt-get install cmake g++ gcc flex bison make git libwww-perl patch
apt-get install cmake g++ gcc flex bison make git libwww-perl patch openjdk-7-jdk
```
- On Red Hat/Fedora or derivates, do
```
yum install cmake gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6
yum install cmake gcc gcc-c++ flex bison perl-libwww-perl patch devtoolset-6 java-1.7.0-openjdk-devel
```
- On macOS, do
```
Expand Down
4 changes: 2 additions & 2 deletions scripts/perf-test/codebuild-glucose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Resources:
- apt-get install -y software-properties-common
- add-apt-repository ppa:ubuntu-toolchain-r/test
- apt-get update -y
- apt-get install -y libwww-perl g++-5 flex bison git
- apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
build:
Expand Down Expand Up @@ -109,7 +109,7 @@ Resources:
- apt-get install -y software-properties-common
- add-apt-repository ppa:ubuntu-toolchain-r/test
- apt-get update -y
- apt-get install -y libwww-perl g++-5 flex bison git
- apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
build:
Expand Down
4 changes: 2 additions & 2 deletions scripts/perf-test/codebuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Resources:
- apt-get install -y software-properties-common
- add-apt-repository ppa:ubuntu-toolchain-r/test
- apt-get update -y
- apt-get install -y libwww-perl g++-5 flex bison git
- apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
build:
Expand Down Expand Up @@ -108,7 +108,7 @@ Resources:
- apt-get install -y software-properties-common
- add-apt-repository ppa:ubuntu-toolchain-r/test
- apt-get update -y
- apt-get install -y libwww-perl g++-5 flex bison git
- apt-get install -y libwww-perl g++-5 flex bison git openjdk-7-jdk
- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
build:
Expand Down
1 change: 1 addition & 0 deletions src/java_bytecode/java_bytecode_parse_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Author: Daniel Kroening, [email protected]
#define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H

#include <set>
#include <map>

#include <util/optional.h>
#include <util/std_code.h>
Expand Down
1 change: 1 addition & 0 deletions src/java_bytecode/java_enum_static_init_unwind_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Author: Chris Smowton, [email protected]

#include "java_enum_static_init_unwind_handler.h"

#include <util/invariant.h>
#include <util/suffix.h>

/// Unwind handler that special-cases the clinit (static initializer) functions
Expand Down