From bf5c6b7acb0d1797ce0d7a41bc7db4d7445920b3 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 5 May 2017 12:50:54 +0200
Subject: Remove wily and add zesty.

---
 scripts/release_ppa.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 86288c47..5e01347b 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -39,7 +39,7 @@ keyid=703F83D0
 email=builds@ethereum.org
 packagename=solc
 
-for distribution in trusty vivid wily xenial yakkety
+for distribution in trusty vivid xenial yakkety zesty
 do
 cd /tmp/
 mkdir $distribution
-- 
cgit 


From 1ce9b91275fedb3a69e68336ba5fb0819dce9ce2 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 19 May 2017 15:43:26 +0200
Subject: Make bytecode upload more robust and use date for directory name.

---
 scripts/bytecodecompare/storebytecode.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 9a40bc6d..b3491cfa 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -87,18 +87,27 @@ EOF
         eval `ssh-agent -s`
         ssh-add deploy_key
 
+        COMMIT_DATE=$(cd "$REPO_ROOT" && git show -s --format="%cd" --date=short "$TRAVIS_COMMIT")
+
         git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git
         cd solidity-test-bytecode
         git config user.name "travis"
         git config user.email "chris@ethereum.org"
         git clean -f -d -x
 
-        mkdir -p "$TRAVIS_COMMIT"
-        REPORT="$TRAVIS_COMMIT/$ZIP_SUFFIX.txt"
+        DIRECTORY=$COMMIT_DATE"_"$TRAVIS_COMMIT
+        mkdir -p "$DIRECTORY"
+        REPORT="$DIRECTORY/$ZIP_SUFFIX.txt"
         cp ../report.txt "$REPORT"
-        git add "$REPORT"
-        git commit -a -m "Added report $REPORT"
-        git push origin
+        # Only push if adding actually worked, i.e. there were changes.
+        if git add "$REPORT"
+        then
+            git commit -a -m "Added report $REPORT"
+            git pull --rebase
+            git push origin
+        else
+            echo "Adding report failed, it might already exist in the repository."
+        fi
     fi
 )
 rm -rf "$TMPDIR"
\ No newline at end of file
-- 
cgit 


From e12b9900380780d2fb3edab21cbfabdc45ecfdfe Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 24 May 2017 11:03:38 +0100
Subject: Move COMMIT_DATE

---
 scripts/bytecodecompare/storebytecode.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index b3491cfa..057eaf0c 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -34,6 +34,10 @@ TMPDIR=$(mktemp -d)
 (
     cd "$REPO_ROOT"
     REPO_ROOT=$(pwd) # make it absolute
+
+    echo "Running for commit $TRAVIS_COMMIT"
+    COMMIT_DATE=$(git show -s --format="%cd" --date=short "$TRAVIS_COMMIT")
+
     cd "$TMPDIR"
 
     "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
@@ -87,8 +91,6 @@ EOF
         eval `ssh-agent -s`
         ssh-add deploy_key
 
-        COMMIT_DATE=$(cd "$REPO_ROOT" && git show -s --format="%cd" --date=short "$TRAVIS_COMMIT")
-
         git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git
         cd solidity-test-bytecode
         git config user.name "travis"
-- 
cgit 


From 0ca941942b78aaa4b9b71b0fccc41d2cfdb9551a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 24 May 2017 14:36:46 +0200
Subject: Use HEAD for report directory name

---
 scripts/bytecodecompare/storebytecode.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 057eaf0c..653c86ba 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -34,10 +34,6 @@ TMPDIR=$(mktemp -d)
 (
     cd "$REPO_ROOT"
     REPO_ROOT=$(pwd) # make it absolute
-
-    echo "Running for commit $TRAVIS_COMMIT"
-    COMMIT_DATE=$(git show -s --format="%cd" --date=short "$TRAVIS_COMMIT")
-
     cd "$TMPDIR"
 
     "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
@@ -97,9 +93,9 @@ EOF
         git config user.email "chris@ethereum.org"
         git clean -f -d -x
 
-        DIRECTORY=$COMMIT_DATE"_"$TRAVIS_COMMIT
-        mkdir -p "$DIRECTORY"
-        REPORT="$DIRECTORY/$ZIP_SUFFIX.txt"
+        DIRNAME=$(cd "$REPO_ROOT" && git show -s --format="%cd-H" --date=short)
+        mkdir -p "$DIRNAME"
+        REPORT="$DIRNAME/$ZIP_SUFFIX.txt"
         cp ../report.txt "$REPORT"
         # Only push if adding actually worked, i.e. there were changes.
         if git add "$REPORT"
@@ -112,4 +108,4 @@ EOF
         fi
     fi
 )
-rm -rf "$TMPDIR"
\ No newline at end of file
+rm -rf "$TMPDIR"
-- 
cgit 


From 6d8afab9287df3d4dbb2b4c012cf4218b0fab4f3 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 29 May 2017 15:53:15 +0200
Subject: Use actual hash.

---
 scripts/bytecodecompare/storebytecode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 653c86ba..564de3f8 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -93,7 +93,7 @@ EOF
         git config user.email "chris@ethereum.org"
         git clean -f -d -x
 
-        DIRNAME=$(cd "$REPO_ROOT" && git show -s --format="%cd-H" --date=short)
+        DIRNAME=$(cd "$REPO_ROOT" && git show -s --format="%cd-%H" --date=short)
         mkdir -p "$DIRNAME"
         REPORT="$DIRNAME/$ZIP_SUFFIX.txt"
         cp ../report.txt "$REPORT"
-- 
cgit 


From a87b22c1229f9f5bec8dafd43d42365c7459a7c7 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 9 Jun 2017 17:17:41 +0200
Subject: Change windows CI to use the same bytecode directory as linux.

---
 scripts/bytecodecompare/storebytecode.bat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/storebytecode.bat b/scripts/bytecodecompare/storebytecode.bat
index 969a42a4..aa829d20 100644
--- a/scripts/bytecodecompare/storebytecode.bat
+++ b/scripts/bytecodecompare/storebytecode.bat
@@ -20,7 +20,7 @@ REM Copyright (c) 2017 solidity contributors.
 REM ---------------------------------------------------------------------------
 
 set CONFIGURATION=%1
-set COMMIT=%2
+set DIRECTORY=%2
 
 mkdir bytecode
 cd bytecode
@@ -33,8 +33,8 @@ git config user.name "travis"
 git config user.email "chris@ethereum.org"
 git clean -f -d -x
 
-mkdir %COMMIT%
-set REPORT=%COMMIT%/windows.txt
+if not exist %DIRECTORY% mkdir %DIRECTORY%
+set REPORT=%DIRECTORY%/windows.txt
 cp ../report.txt %REPORT%
 git add %REPORT%
 git commit -a -m "Added report."
-- 
cgit 


From 314f8beef147002adb6a090b203a6fa6ce983c6e Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 20 Jun 2017 14:31:09 +0200
Subject: This might fix our windows tests.

---
 scripts/bytecodecompare/prepare_report.py | 2 +-
 scripts/bytecodecompare/storebytecode.bat | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 5a770981..427724b7 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -6,7 +6,7 @@ import subprocess
 import json
 
 solc = sys.argv[1]
-report = open("report.txt", "w")
+report = open("report.txt", "wb")
 
 for optimize in [False, True]:
     for f in sorted(glob.glob("*.sol")):
diff --git a/scripts/bytecodecompare/storebytecode.bat b/scripts/bytecodecompare/storebytecode.bat
index aa829d20..e64e9276 100644
--- a/scripts/bytecodecompare/storebytecode.bat
+++ b/scripts/bytecodecompare/storebytecode.bat
@@ -27,15 +27,16 @@ cd bytecode
 ..\scripts\isolate_tests.py ..\test\
 ..\scripts\bytecodecompare\prepare_report.py ..\build\solc\%CONFIGURATION%\solc.exe
 
-git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git
+REM Send to stdout instead of stderr to not confuse powershell
+git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git 2>&1
 cd solidity-test-bytecode
 git config user.name "travis"
 git config user.email "chris@ethereum.org"
-git clean -f -d -x
+git clean -f -d -x 2>&1
 
 if not exist %DIRECTORY% mkdir %DIRECTORY%
 set REPORT=%DIRECTORY%/windows.txt
 cp ../report.txt %REPORT%
 git add %REPORT%
 git commit -a -m "Added report."
-git push origin
+git push origin 2>&1
-- 
cgit 


From 913b9c0e6b0c58a1983f676f8c73e4f6581a3e68 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Jun 2017 10:50:42 +0100
Subject: Run solc-js tests on emscripten build

---
 scripts/test_emscripten.sh                    | 53 +++++++++++++++++++++++++++
 scripts/travis-emscripten/build_emscripten.sh |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100755 scripts/test_emscripten.sh

(limited to 'scripts')

diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
new file mode 100755
index 00000000..df1ebaee
--- /dev/null
+++ b/scripts/test_emscripten.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Bash script to execute the Solidity tests.
+#
+# The documentation for solidity is hosted at:
+#
+#     https://solidity.readthedocs.org
+#
+# ------------------------------------------------------------------------------
+# This file is part of solidity.
+#
+# solidity is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# solidity is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with solidity.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2017 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+REPO_ROOT="$(dirname "$0")"/..
+
+cd $REPO_ROOT/build
+
+echo "Preparing solc-js..."
+rm -rf solc-js
+git clone https://github.com/ethereum/solc-js
+cd solc-js
+npm install
+
+# Replace soljson with current build
+echo "Replacing soljson.js"
+rm -f soljson.js
+# Make a copy because paths might not be absolute
+cp ../solc/soljson.js soljson.js
+
+# Update version (needed for some tests)
+VERSION=`$REPO_ROOT/build/solc/solc --version | sed -ne "s/^Version: \([0-9]*.[0-9]*.[0-9]*\).*/\1/p"`
+echo "Updating package.json to version $VERSION"
+npm version $VERSION
+
+echo "Running solc-js tests..."
+npm run test
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 02740e6c..f92b3c44 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -99,6 +99,6 @@ cp soljson.js upload/
 
 OUTPUT_SIZE=`ls -la build/solc/soljson.js`
 
-echo "Emscripten output size: ${OUTPUT_SIZE}"
+echo "Emscripten output size: $OUTPUT_SIZE"
 
 echo -en 'travis_fold:end:compiling_solidity\\r'
-- 
cgit 


From cc4f2500fb1b8313ebfcb6e4d28c3adb3cd0a470 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Jun 2017 11:39:48 +0100
Subject: Use BuildInfo.h to retrieve version

---
 scripts/test_emscripten.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
index df1ebaee..3bb16aa4 100755
--- a/scripts/test_emscripten.sh
+++ b/scripts/test_emscripten.sh
@@ -45,7 +45,20 @@ rm -f soljson.js
 cp ../solc/soljson.js soljson.js
 
 # Update version (needed for some tests)
-VERSION=`$REPO_ROOT/build/solc/solc --version | sed -ne "s/^Version: \([0-9]*.[0-9]*.[0-9]*\).*/\1/p"`
+echo "Creating version.c"
+rm -f version version.c
+cat <<EOF > version.c
+#include <stdio.h>
+#include "../include/solidity/BuildInfo.h"
+int main(int argc, char **argv) {
+  printf(ETH_PROJECT_VERSION);
+  return 0;
+}
+EOF
+echo "Compiling version.c"
+gcc -o version version.c
+echo "Running version"
+VERSION=`./version`
 echo "Updating package.json to version $VERSION"
 npm version $VERSION
 
-- 
cgit 


From b0e4555db37006f1a72c4dd793aef6d69f70f4df Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 30 Jun 2017 11:26:30 +0100
Subject: Read version from CMakeLists in test_emscripten

---
 scripts/test_emscripten.sh | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
index 3bb16aa4..aa93ed94 100755
--- a/scripts/test_emscripten.sh
+++ b/scripts/test_emscripten.sh
@@ -45,20 +45,7 @@ rm -f soljson.js
 cp ../solc/soljson.js soljson.js
 
 # Update version (needed for some tests)
-echo "Creating version.c"
-rm -f version version.c
-cat <<EOF > version.c
-#include <stdio.h>
-#include "../include/solidity/BuildInfo.h"
-int main(int argc, char **argv) {
-  printf(ETH_PROJECT_VERSION);
-  return 0;
-}
-EOF
-echo "Compiling version.c"
-gcc -o version version.c
-echo "Running version"
-VERSION=`./version`
+VERSION=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/../CMakeLists.txt)
 echo "Updating package.json to version $VERSION"
 npm version $VERSION
 
-- 
cgit 


From f13feed7f26aba22396ec1728a51a96fd9bd65e3 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 30 Jun 2017 11:30:57 +0100
Subject: Add script to retrieve version

---
 scripts/create_source_tarball.sh |  2 +-
 scripts/docker_deploy.sh         |  2 +-
 scripts/get_version.sh           | 31 +++++++++++++++++++++++++++++++
 scripts/release_ppa.sh           |  8 ++++----
 scripts/test_emscripten.sh       |  2 +-
 5 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100755 scripts/get_version.sh

(limited to 'scripts')

diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh
index 9ca72c31..7339e106 100755
--- a/scripts/create_source_tarball.sh
+++ b/scripts/create_source_tarball.sh
@@ -6,7 +6,7 @@ set -e
 REPO_ROOT="$(dirname "$0")"/..
 (
     cd "$REPO_ROOT"
-    version=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? CMakeLists.txt)
+    version=$(scripts/get_version.sh)
     commithash=$(git rev-parse --short=8 HEAD)
     commitdate=$(git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0?/./' | sed -e 's/-0?/./')
 
diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh
index 0abde840..00705725 100755
--- a/scripts/docker_deploy.sh
+++ b/scripts/docker_deploy.sh
@@ -3,7 +3,7 @@
 set -e
 
 docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-version=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/../CMakeLists.txt)
+version=$($(dirname "$0")/get_version.sh)
 if [ "$TRAVIS_BRANCH" = "develop" ]
 then
     docker tag ethereum/solc:build ethereum/solc:nightly;
diff --git a/scripts/get_version.sh b/scripts/get_version.sh
new file mode 100755
index 00000000..3df2b4c4
--- /dev/null
+++ b/scripts/get_version.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Bash script to execute the Solidity tests.
+#
+# The documentation for solidity is hosted at:
+#
+#     https://solidity.readthedocs.org
+#
+# ------------------------------------------------------------------------------
+# This file is part of solidity.
+#
+# solidity is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# solidity is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with solidity.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2017 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/../CMakeLists.txt
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 5e01347b..7c9abecb 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -55,10 +55,10 @@ wget -O ./solc/deps/downloads/jsoncpp-1.7.7.tar.gz https://github.com/open-sourc
 
 # Determine version
 cd solc
-version=`grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? CMakeLists.txt`
-commithash=`git rev-parse --short=8 HEAD`
-committimestamp=`git show --format=%ci HEAD | head -n 1`
-commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0?/./' | sed -e 's/-0?/./'`
+version=$($(dirname "$0")/get_version.sh)
+commithash=$(git rev-parse --short=8 HEAD)
+committimestamp=$(git show --format=%ci HEAD | head -n 1)
+commitdate=$(git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0?/./' | sed -e 's/-0?/./')
 
 echo "$commithash" > commit_hash.txt
 if [ $branch = develop ]
diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh
index aa93ed94..a2dbe61c 100755
--- a/scripts/test_emscripten.sh
+++ b/scripts/test_emscripten.sh
@@ -45,7 +45,7 @@ rm -f soljson.js
 cp ../solc/soljson.js soljson.js
 
 # Update version (needed for some tests)
-VERSION=$(grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? $(dirname "$0")/../CMakeLists.txt)
+VERSION=$(../../scripts/get_version.sh)
 echo "Updating package.json to version $VERSION"
 npm version $VERSION
 
-- 
cgit