cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make versioning semver compatible and force commit hash availability.

Browse Source
This commit is contained in:
chriseth 2016-08-23 16:04:50 +02:00
parent d209e65b1d
commit 54ab787b83
4 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/EthBuildInfo.cmake
View File

@ -19,7 +19,7 @@ function(create_build_info NAME)
set(ETH_BUILD_COMPILER "unknown") set(ETH_BUILD_COMPILER "unknown")
endif () endif ()
set(ETH_BUILD_PLATFORM "${ETH_BUILD_OS}/${ETH_BUILD_COMPILER}") set(ETH_BUILD_PLATFORM "${ETH_BUILD_OS}.${ETH_BUILD_COMPILER}")
#cmake build type may be not speCified when using msvc #cmake build type may be not speCified when using msvc
if (CMAKE_BUILD_TYPE) if (CMAKE_BUILD_TYPE)
@ -36,8 +36,6 @@ function(create_build_info NAME)
-DETH_BUILD_OS="${ETH_BUILD_OS}" -DETH_BUILD_OS="${ETH_BUILD_OS}"
-DETH_BUILD_COMPILER="${ETH_BUILD_COMPILER}" -DETH_BUILD_COMPILER="${ETH_BUILD_COMPILER}"
-DETH_BUILD_PLATFORM="${ETH_BUILD_PLATFORM}" -DETH_BUILD_PLATFORM="${ETH_BUILD_PLATFORM}"
-DETH_BUILD_NUMBER="${BUILD_NUMBER}"
-DETH_VERSION_SUFFIX="${VERSION_SUFFIX}"
-DPROJECT_VERSION="${PROJECT_VERSION}" -DPROJECT_VERSION="${PROJECT_VERSION}"
-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake" -P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
) )

48
cmake/scripts/buildinfo.cmake
View File

@ -5,11 +5,11 @@
# ETH_DST_DIR - main CMAKE_BINARY_DIR # ETH_DST_DIR - main CMAKE_BINARY_DIR
# ETH_BUILD_TYPE # ETH_BUILD_TYPE
# ETH_BUILD_PLATFORM # ETH_BUILD_PLATFORM
# ETH_BUILD_NUMBER
# ETH_VERSION_SUFFIX
# #
# example usage: # example usage:
# cmake -DETH_SOURCE_DIR=. -DETH_DST_DIR=build -DETH_BUILD_TYPE=Debug -DETH_BUILD_PLATFORM=Darwin/appleclang -P scripts/buildinfo.cmake # cmake -DETH_SOURCE_DIR=. -DETH_DST_DIR=build -DETH_BUILD_TYPE=Debug -DETH_BUILD_PLATFORM=Darwin.appleclang -P scripts/buildinfo.cmake
#
# Its main output variables are SOL_VERSION_BUILDINFO and SOL_VERSION_PRERELEASE
if (NOT ETH_BUILD_TYPE) if (NOT ETH_BUILD_TYPE)
set(ETH_BUILD_TYPE "unknown") set(ETH_BUILD_TYPE "unknown")
@ -19,26 +19,44 @@ if (NOT ETH_BUILD_PLATFORM)
set(ETH_BUILD_PLATFORM "unknown") set(ETH_BUILD_PLATFORM "unknown")
endif() endif()
# Logic here: If prereleases.txt exists but is empty, it is a non-pre release.
# If it does not exist, create our own prerelease string
if (EXISTS ${ETH_SOURCE_DIR}/prerelease.txt)
file(READ ${ETH_SOURCE_DIR}/prerelease.txt SOL_VERSION_PRERELEASE)
else()
string(TIMESTAMP SOL_VERSION_PRERELEASE "develop.%Y.%m.%d" UTC)
endif()
if (EXISTS ${ETH_SOURCE_DIR}/commit_hash.txt)
file(READ ${ETH_SOURCE_DIR}/commit_hash.txt SOL_COMMIT_HASH)
string(STRIP ${SOL_COMMIT_HASH} SOL_COMMIT_HASH)
else()
execute_process( execute_process(
COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} rev-parse HEAD COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} rev-parse HEAD
OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET OUTPUT_VARIABLE SOL_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
) )
if (NOT ETH_COMMIT_HASH)
set(ETH_COMMIT_HASH 0)
endif()
execute_process( execute_process(
COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} diff HEAD --shortstat COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} diff HEAD --shortstat
OUTPUT_VARIABLE ETH_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET OUTPUT_VARIABLE SOL_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
) )
if (ETH_LOCAL_CHANGES)
set(ETH_CLEAN_REPO 0)
else()
set(ETH_CLEAN_REPO 1)
endif() endif()
if (SOL_COMMIT_HASH)
string(STRIP ${SOL_COMMIT_HASH} SOL_COMMIT_HASH)
string(SUBSTRING ${SOL_COMMIT_HASH} 0 8 SOL_COMMIT_HASH)
endif()
if (SOL_COMMIT_HASH AND SOL_LOCAL_CHANGES)
set(SOL_COMMIT_HASH "${SOL_COMMIT_HASH}-mod")
endif()
if (NOT SOL_COMMIT_HASH)
message(FATAL_ERROR "Unable to determine commit hash. Either compile from within git repository or "
"supply a file called commit_hash.txt")
endif()
set(SOL_VERSION_BUILDINFO "commit.${SOL_COMMIT_HASH}.${ETH_BUILD_PLATFORM}")
set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp") set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp")
set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h") set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")

15
cmake/templates/BuildInfo.h.in
View File

@ -1,11 +1,10 @@
#pragma once #pragma once
#define ETH_PROJECT_VERSION "@PROJECT_VERSION@" #define ETH_PROJECT_VERSION "@PROJECT_VERSION@"
#define ETH_COMMIT_HASH @ETH_COMMIT_HASH@ #define SOL_COMMIT_HASH "@SOL_COMMIT_HASH@"
#define ETH_CLEAN_REPO @ETH_CLEAN_REPO@ #define ETH_BUILD_TYPE "@ETH_BUILD_TYPE@"
#define ETH_BUILD_TYPE @ETH_BUILD_TYPE@ #define ETH_BUILD_OS "@ETH_BUILD_OS@"
#define ETH_BUILD_OS @ETH_BUILD_OS@ #define ETH_BUILD_COMPILER "@ETH_BUILD_COMPILER@"
#define ETH_BUILD_COMPILER @ETH_BUILD_COMPILER@ #define ETH_BUILD_PLATFORM "@ETH_BUILD_PLATFORM@"
#define ETH_BUILD_PLATFORM @ETH_BUILD_PLATFORM@ #define SOL_VERSION_PRERELEASE "@SOL_VERSION_PRERELEASE@"
#define ETH_BUILD_NUMBER @ETH_BUILD_NUMBER@ #define SOL_VERSION_BUILDINFO "@SOL_VERSION_BUILDINFO@"
#define ETH_VERSION_SUFFIX "@ETH_VERSION_SUFFIX@"

6
libsolidity/interface/Version.cpp
View File

@ -35,10 +35,8 @@ char const* dev::solidity::VersionNumber = ETH_PROJECT_VERSION;
string const dev::solidity::VersionString = string const dev::solidity::VersionString =
string(dev::solidity::VersionNumber) + string(dev::solidity::VersionNumber) +
"-" + (string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
string(DEV_QUOTED(ETH_COMMIT_HASH)).substr(0, 8) + (string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO));
(ETH_CLEAN_REPO ? "" : "*") +
"/" DEV_QUOTED(ETH_BUILD_TYPE) "-" DEV_QUOTED(ETH_BUILD_PLATFORM);
bytes dev::solidity::binaryVersion() bytes dev::solidity::binaryVersion()