Merge pull request #2977

f55bf48 cmake: fix git tag + commit detection and version.js generation (xiphon)

cmake/GitGetVersionTag.cmake

@@ -28,37 +28,40 @@
 # 
 # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
-# Check what commit we're on
+function (git_get_version_tag git directory result_var)
-execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND "${git}" rev-parse --short HEAD
-
+    WORKING_DIRECTORY ${directory}
-if(RET)
+    OUTPUT_VARIABLE COMMIT
-	# Something went wrong, set the version tag to -unknown
+    OUTPUT_STRIP_TRAILING_WHITESPACE
-	
+  )
-    message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
+  if(NOT COMMIT)
-    set(VERSIONTAG "unknown")
+    message(WARNING "${directory}: cannot determine current commit. Make sure that you are building from a Git working tree")
-    configure_file("src/version.js.in" "${TO}")
+    set(${result_var} "unknown" PARENT_SCOPE)
-else()
+    return()
-	string(SUBSTRING ${COMMIT} 0 9 COMMIT)
-	message(STATUS "You are currently on commit ${COMMIT}")
-	
-	# Get all the tags
-	execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
-	
-    if(NOT TAGGEDCOMMIT)
-        message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
-        set(VERSIONTAG "${COMMIT}")
-    else()
-        message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
-        
-        # Check if we're building that tagged commit or a different one
-        if(COMMIT STREQUAL TAGGEDCOMMIT)
-            message(STATUS "You are building a tagged release")
-            set(VERSIONTAG "release")
-        else()
-            message(STATUS "You are ahead of or behind a tagged release")
-            set(VERSIONTAG "${COMMIT}")
-        endif()
   endif()
 
-    configure_file("src/version.js.in" "${TO}")
+  execute_process(COMMAND "${git}" describe --tags --exact-match
+    WORKING_DIRECTORY ${directory}
+    OUTPUT_VARIABLE TAG
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(TAG)
+    message(STATUS "${directory}: building tagged release ${TAG}-${COMMIT}")
+    set(${result_var} "${TAG}-${COMMIT}" PARENT_SCOPE)
+    return()
   endif()
+
+  execute_process(COMMAND "${git}" describe --tags --long
+    WORKING_DIRECTORY ${directory}
+    OUTPUT_VARIABLE MOST_RECENT_TAG
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(MOST_RECENT_TAG)
+    message(STATUS "${directory}: ahead of or behind a tagged release, building ${MOST_RECENT_TAG}")
+    set(${result_var} "${MOST_RECENT_TAG}" PARENT_SCOPE)
+    return()
+  endif()
+
+  message(STATUS "${directory}: building ${COMMIT} commit")
+  set(${result_var} "${COMMIT}" PARENT_SCOPE)
+endfunction()

cmake/VersionGui.cmake

@@ -26,27 +26,24 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-function (write_static_version_header hash)
+function (write_static_version_header VERSION_TAG_GUI VERSION_TAG_CORE)
-  set(VERSIONTAG "${hash}")
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
-  configure_file("${CMAKE_SOURCE_DIR}/version.js.in" "${CMAKE_SOURCE_DIR}/version.js")
 endfunction ()
 
 find_package(Git QUIET)
 if ("$Format:$" STREQUAL "")
   # We're in a tarball; use hard-coded variables.
-  write_static_version_header("release")
+  write_static_version_header("release" "release")
 elseif (GIT_FOUND OR Git_FOUND)
   message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-  add_custom_command(
+
-    OUTPUT            "${CMAKE_SOURCE_DIR}/version.js"
+  include(GitGetVersionTag)
-    COMMAND           "${CMAKE_COMMAND}"
+  git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI)
-                      "-D" "GIT=${GIT_EXECUTABLE}"
+  git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/monero VERSION_TAG_CORE)
-                      "-D" "TO=${CMAKE_SOURCE_DIR}/version.js"
+  write_static_version_header(${VERSION_TAG_GUI} ${VERSION_TAG_CORE})
-                      "-P" "cmake/GenVersionGui.cmake"
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 else()
   message(STATUS "WARNING: Git was not found!")
-  write_static_version_header("unknown")
+  write_static_version_header("unknown" "unknown")
 endif ()
 add_custom_target(genversiongui ALL
-    DEPENDS "${CMAKE_SOURCE_DIR}/version.js")
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js")

src/version.js.in

@@ -1,3 +1,2 @@
-var GUI_VERSION = "@VERSIONTAG@"
+var GUI_VERSION = "@VERSION_TAG_GUI@";
-var GUI_MONERO_VERSION = "@VERSIONTAG@"
+var GUI_MONERO_VERSION = "@VERSION_TAG_CORE@";
-