diff options
| author | chriseth <chris@ethereum.org> | 2016-09-10 00:01:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 00:01:08 +0800 |
| commit | 51a98ab84a59fd5fb34378763fd9ed635cf06d8d (patch) | |
| tree | 6157a938450843d33de3eb4b25d7a213ec13f7bb | |
| parent | 2c4e9ece07216e4077dc94b10104237df0e6114a (diff) | |
| parent | 6c757ce4b8b8bef51de77180d1b914453655e238 (diff) | |
| download | dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar.gz dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar.bz2 dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar.lz dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar.xz dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.tar.zst dexon-solidity-51a98ab84a59fd5fb34378763fd9ed635cf06d8d.zip | |
Merge pull request #1074 from ethereum/noleadingzeros
Remove leading zeroes in prerelease components.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | cmake/scripts/buildinfo.cmake | 1 | ||||
| -rwxr-xr-x | scripts/build_emscripten.sh | 2 | ||||
| -rwxr-xr-x | scripts/release_ppa.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/publish_binary.sh | 5 |
5 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,6 @@ +.commit_hash.txt +.prerelease.txt + # Compiled Object files *.slo *.lo diff --git a/cmake/scripts/buildinfo.cmake b/cmake/scripts/buildinfo.cmake index e2f8cb3e..f0e39906 100644 --- a/cmake/scripts/buildinfo.cmake +++ b/cmake/scripts/buildinfo.cmake @@ -26,6 +26,7 @@ if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt) string(STRIP "${SOL_VERSION_PRERELEASE}" SOL_VERSION_PRERELEASE) else() string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC) + string(REPLACE .0 . SOL_VERSION_PRERELEASE "${SOL_VERSION_PRERELEASE}") endif() if (EXISTS ${ETH_SOURCE_DIR}/commit_hash.txt) diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index da2c7df3..fe7ea11d 100755 --- a/scripts/build_emscripten.sh +++ b/scripts/build_emscripten.sh @@ -29,7 +29,7 @@ set -e if [[ "$OSTYPE" != "darwin"* ]]; then - date -u +"nightly.%Y.%m.%d" > prerelease.txt + 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 8e9dc282..23c374e1 100755 --- a/scripts/release_ppa.sh +++ b/scripts/release_ppa.sh @@ -54,7 +54,7 @@ cd solc version=`grep -oP "PROJECT_VERSION \"?\K[0-9.]+(?=\")"? CMakeLists.txt` 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` +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/travis-emscripten/publish_binary.sh b/scripts/travis-emscripten/publish_binary.sh index e89e3ce3..bfdf9906 100755 --- a/scripts/travis-emscripten/publish_binary.sh +++ b/scripts/travis-emscripten/publish_binary.sh @@ -34,7 +34,10 @@ VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_ test -n "$VER" VER="v$VER" COMMIT=$(git rev-parse --short HEAD) -DATE=$(date --date="$(git log -1 --date=iso --format=%ad HEAD)" --utc +%Y.%m.%d) +DATE=$(date --date="$(git log -1 --date=iso --format=%ad HEAD)" --utc +%Y.%-m.%-d) + +# remove leading zeros in components - they are not semver-compatible +COMMIT=$(echo "$COMMIT" | sed -e 's/^0*//') ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" |