Merge pull request #2516 from ethereum/release

Merge release back into develop.

.travis.yml

@@ -180,7 +180,7 @@ cache:
 install:
     - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh)
     - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh)
-    - if [ "$TRAVIS_BRANCH" = release ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi
+    - if [ "$TRAVIS_BRANCH" = release -o -n "$TRAVIS_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi
     - echo -n "$TRAVIS_COMMIT" > commit_hash.txt
 
 before_script:

appveyor.yml

@@ -54,7 +54,7 @@ install:
     - git submodule update --init --recursive
     - ps: $prerelease = "nightly."
     - ps: $prerelease += Get-Date -format "yyyy.M.d"
-    - ps: Set-Content prerelease.txt $prerelease
+    - ps: if($env:appveyor_repo_branch -eq 'release') { Set-Content prerelease.txt $null } else { Set-Content prerelease.txt $prerelease }
     - scripts/install_deps.bat
     - set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps\install
 before_build:

scripts/bytecodecompare/storebytecode.sh

@@ -98,9 +98,8 @@ EOF
         REPORT="$DIRNAME/$ZIP_SUFFIX.txt"
         cp ../report.txt "$REPORT"
         # Only push if adding actually worked, i.e. there were changes.
-        if git add "$REPORT"
+        if git add "$REPORT" && git commit -a -m "Added report $REPORT"
         then
-            git commit -a -m "Added report $REPORT"
             git pull --rebase
             git push origin
         else

scripts/create_source_tarball.sh

@@ -26,6 +26,10 @@ REPO_ROOT="$(dirname "$0")"/..
     git submodule foreach 'git checkout-index -a --prefix="'"$SOLDIR"'/$path/"'
     # Store the commit hash
     echo "$commithash" > "$SOLDIR/commit_hash.txt"
+    if [ -e prerelease.txt -a ! -s prerelease.txt ]
+    then
+        cp prerelease.txt "$SOLDIR/"
+    fi
     # Add dependencies
     mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true
     wget -O "$SOLDIR/deps/downloads/jsoncpp-1.7.7.tar.gz" https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz