From 29ecc6fe31d56feaf5d5a04e84b12138baa0d1e7 Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Fri, 9 Sep 2016 13:59:22 +0200
Subject: [PATCH] Remove leading zeroes in prerelease components.

---
 .gitignore                                  | 3 +++
 cmake/scripts/buildinfo.cmake               | 1 +
 scripts/build_emscripten.sh                 | 2 +-
 scripts/release_ppa.sh                      | 2 +-
 scripts/travis-emscripten/publish_binary.sh | 5 ++++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ad199c10f8a..e3e12421b733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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 e2f8cb3eb738..5f19df070b48 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 da2c7df320d2..fe7ea11d1660 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 8e9dc2822c8d..23c374e1afa6 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 e89e3ce3eefc..bfdf990658a0 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"