Merge pull request #1317 from ethereum/timelock

Compile all contracts in the std directory
This commit is contained in:
Alex Beregszaszi 2016-11-14 23:39:42 +00:00 committed by GitHub
commit 42617cb8dd
6 changed files with 26 additions and 2 deletions

View File

@ -28,8 +28,22 @@
set -e set -e
# There is an implicit assumption here that we HAVE to run from root directory. REPO_ROOT="$(dirname "$0")"/..
REPO_ROOT=$(pwd)
# Compile all files in std and examples.
for f in "$REPO_ROOT"/std/*.sol
do
echo "Compiling $f..."
set +e
output=$("$REPO_ROOT"/build/solc/solc "$f" 2>&1)
failed=$?
# Remove the pre-release warning from the compiler output
output=$(echo "$output" | grep -v 'pre-release')
echo "$output"
set -e
test -z "$output" -a "$failed" -eq 0
done
# This conditional is only needed because we don't have a working Homebrew # This conditional is only needed because we don't have a working Homebrew
# install for `eth` at the time of writing, so we unzip the ZIP file locally # install for `eth` at the time of writing, so we unzip the ZIP file locally

View File

@ -1,3 +1,5 @@
pragma solidity ^0.4.0;
import "./Token.sol"; import "./Token.sol";
contract StandardToken is Token { contract StandardToken is Token {

View File

@ -1,3 +1,5 @@
pragma solidity ^0.4.0;
contract Token { contract Token {
event Transfer(address indexed _from, address indexed _to, uint256 _value); event Transfer(address indexed _from, address indexed _to, uint256 _value);
event Approval(address indexed _owner, address indexed _spender, uint256 _value); event Approval(address indexed _owner, address indexed _spender, uint256 _value);

View File

@ -1,3 +1,5 @@
pragma solidity ^0.4.0;
import "./owned.sol"; import "./owned.sol";
contract mortal is owned { contract mortal is owned {

View File

@ -1,3 +1,5 @@
pragma solidity ^0.4.0;
contract owned { contract owned {
address owner; address owner;

View File

@ -1,3 +1,5 @@
pragma solidity ^0.4.0;
import "./owned.sol"; import "./owned.sol";
import "./mortal.sol"; import "./mortal.sol";
import "./Token.sol"; import "./Token.sol";