versioning

CMakeLists.txt

@@ -31,27 +31,27 @@ if(DEFINED CLRSYNC_SEMVER)
 else()
   find_package(Git QUIET)
 
-  if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     execute_process(
-      COMMAND git describe --tags --long --always
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE GIT_DESCRIBE
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      ERROR_QUIET
+        COMMAND git describe --tags --long --always
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_DESCRIBE
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
     )
-  endif()
+    endif()
 
-  if(GIT_DESCRIBE MATCHES "^[vV]?[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-g[0-9a-f]+")
+    if(GIT_DESCRIBE MATCHES "^[vV]?[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-g[0-9a-f]+")
     string(REGEX REPLACE
-      "^[vV]?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-g([0-9a-f]+)"
-      "\\1+\\2.git.g\\3"
-      SEMVER "${GIT_DESCRIBE}"
+        "^[vV]?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-g([0-9a-f]+)"
+        "\\1+git.g\\3"
+        SEMVER "${GIT_DESCRIBE}"
     )
-  elseif(GIT_DESCRIBE)
-    set(SEMVER "${PROJECT_VERSION}+0.git.${GIT_DESCRIBE}")
-  else()
+    elseif(GIT_DESCRIBE)
+    set(SEMVER "${PROJECT_VERSION}.git.${GIT_DESCRIBE}")
+    else()
     set(SEMVER "${PROJECT_VERSION}")
-  endif()
+    endif()
 endif()
 
 message(STATUS "clrsync version: ${SEMVER}")
@@ -62,6 +62,12 @@ configure_file(
     @ONLY
 )
 
+configure_file(
+    ${CMAKE_SOURCE_DIR}/VERSION.in
+    ${CMAKE_SOURCE_DIR}/VERSION
+    @ONLY
+)
+
 configure_file(
     ${CMAKE_SOURCE_DIR}/AUR/PKGBUILD.in
     ${CMAKE_SOURCE_DIR}/AUR/PKGBUILD

VERSION

@@ -0,0 +1 @@
+0.1.4

VERSION.in

@@ -0,0 +1 @@
+@PROJECT_VERSION@

flake.nix

@@ -14,12 +14,12 @@
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
       nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
 
-      baseVersion = "0.1.4";
+      baseVersion = nixpkgs.lib.removeSuffix "\n" (builtins.readFile ./VERSION);
 
-semver = 
-  if self ? rev 
-  then "${baseVersion}+${toString self.revCount}.git.${builtins.substring 0 7 self.rev}"
-  else "${baseVersion}+dev";  # Accept that local builds show "+dev"
+      semver = 
+        if self ? rev 
+        then "${baseVersion}+git.${builtins.substring 0 7 self.rev}"
+        else "${baseVersion}+dev";
     in
     {
       packages = forAllSystems (

src/core/version.hpp

@@ -7,7 +7,7 @@
 namespace clrsync::core
 {
 
-const std::string GIT_SEMVER = "0.1.4+4.git.ga5d6503";
+const std::string GIT_SEMVER = "0.1.4+git.gcd81744";
 
 const std::string version_string();
 } // namespace clrsync::core