Remove leading zeroes in prerelease components.

Author: chriseth

.gitignore

@@ -1,3 +1,6 @@
+.commit_hash.txt
+.prerelease.txt
+
 # Compiled Object files
 *.slo
 *.lo

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)

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

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 ]

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"