aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-27 13:58:32 +0800
committerGitHub <noreply@github.com>2016-08-27 13:58:32 +0800
commit91d4fa477c1e2a557baa1650dc02eb9dd3a32c47 (patch)
treef6bc02c7cb0790789cf6533ebb1b6c28ba41b4c1 /scripts
parentd14d7109b669a93e0f93784a2e6585c496cd8027 (diff)
parent4588eda622c9ef2cb62252ec12ea7bb9ae057bd1 (diff)
downloaddexon-solidity-91d4fa477c1e2a557baa1650dc02eb9dd3a32c47.tar.gz
dexon-solidity-91d4fa477c1e2a557baa1650dc02eb9dd3a32c47.tar.zst
dexon-solidity-91d4fa477c1e2a557baa1650dc02eb9dd3a32c47.zip
Merge pull request #941 from chriseth/versionString
Version string
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_emscripten.sh1
-rwxr-xr-xscripts/release_ppa.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 6046978e..da2c7df3 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -29,6 +29,7 @@
set -e
if [[ "$OSTYPE" != "darwin"* ]]; then
+ date -u +"nightly.%Y.%m.%d" > prerelease.txt
./scripts/travis-emscripten/install_deps.sh
docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 2fd286fd..8e9dc282 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -56,13 +56,13 @@ commithash=`git rev-parse --short HEAD`
committimestamp=`git show --format=%ci HEAD | head -n 1`
commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10`
-# TODO store the commit hash in a file so that the build info mechanism can pick it up even without git
-
+echo "$commithash" > commit_hash.txt
if [ $branch = develop ]
then
debversion="$version-nightly-$commitdate-$commithash"
else
debversion="$version"
+ echo -n > prerelease.txt # proper release
fi
# gzip will create different tars all the time and we are not allowed