<div dir="ltr">From f262afa2155404f6f4eb28c4f0dd1aa086c1feb4 Mon Sep 17 00:00:00 2001<br>From: Srikanth Kurapati <<a href="mailto:srikanth.kurapati@multicorewareinc.com">srikanth.kurapati@multicorewareinc.com</a>><br>Date: Thu, 5 Nov 2020 19:10:55 +0530<br>Subject: [PATCH] perform version data integrity checks for git archive<br> repositories.<br><br>---<br> source/cmake/Version.cmake | 50 +++++++++++++++++++++-----------------<br> 1 file changed, 28 insertions(+), 22 deletions(-)<br><br>diff --git a/source/cmake/Version.cmake b/source/cmake/Version.cmake<br>index 37c759268..71c3489de 100644<br>--- a/source/cmake/Version.cmake<br>+++ b/source/cmake/Version.cmake<br>@@ -166,28 +166,34 @@ elseif(GIT_ARCHETYPE STREQUAL "1")<br>     endif()<br> endif()<br> <br>-# formatting based on positive or negative distance from tag<br>-if(X265_TAG_DISTANCE STREQUAL "0")<br>-    if(X265_REVISION_ID STREQUAL X265_REPO_ID)<br>-        set(X265_VERSION "${X265_LATEST_TAG}")<br>-    else()<br>-        message(WARNING "REPO AND RELEASE CHANGESETS NOT MATCHING")<br>-    endif()<br>-elseif(X265_TAG_DISTANCE STRGREATER "0")<br>-    if(X265_REVISION_ID STRLESS X265_REPO_ID)<br>-        set(X265_VERSION "${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${X265_REVISION_ID}")<br>-    else()<br>-        message(WARNING "ARCCHIVE TIP CHANGESET TO BE GREATER THAN REVISION ID")<br>-    endif()<br>-elseif(X265_TAG_DISTANCE STRLESS "0")<br>-    if(X265_REVISION_ID STRGREATER X265_REPO_ID)<br>-       set(X265_VERSION "${X265_LATEST_TAG}${X265_TAG_DISTANCE}+${X265_REPO_ID}")<br>-    else()<br>-        message(WARNING "REVISION ID EXPECTED TO BE LARGER THAN ARCHIVE TIP CHANGESET")<br>-    endif()<br>+#Formatting based on positive or negative distance from tag for git archive<br>+if(GIT_ARCHETYPE EQUAL "1")<br>+       if(X265_TAG_DISTANCE STREQUAL "0")<br>+         if(X265_REVISION_ID STREQUAL X265_REPO_ID)<br>+                   set(X265_VERSION "${X265_LATEST_TAG}")<br>+             else()<br>+                       message(WARNING "REPO AND RELEASE CHANGESETS NOT MATCHING")<br>+                endif()<br>+      elseif(X265_TAG_DISTANCE STRGREATER "0")<br>+           if(X265_REVISION_ID STRLESS X265_REPO_ID)<br>+                    set(X265_VERSION "${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${X265_REVISION_ID}")<br>+            else()<br>+                       message(WARNING "ARCHIVE TIP CHANGESET TO BE GREATER THAN REVISION ID")<br>+            endif()<br>+      elseif(X265_TAG_DISTANCE STRLESS "0")<br>+              if(X265_REVISION_ID STRGREATER X265_REPO_ID)<br>+             set(X265_VERSION "${X265_LATEST_TAG}${X265_TAG_DISTANCE}+${X265_REPO_ID}")<br>+           else()<br>+                       message(WARNING "REVISION ID EXPECTED TO BE LARGER THAN ARCHIVE TIP CHANGESET")<br>+            endif()<br>+      else()<br>+               message(ERROR "Inappropriate set of version information")<br>+  endif()<br> else()<br>-    message(ERROR "Inappropriate set of version information")<br>+        if(X265_TAG_DISTANCE STREQUAL "0")<br>+         set(X265_VERSION "${X265_LATEST_TAG}")<br>+     else()<br>+               set(X265_VERSION "${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${X265_REVISION_ID}")<br>+    endif()<br> endif()<br>-<br>-#will always be printed in its entirety based on version file configuration to avail revision monitoring by repo owners<br> message(STATUS "x265 RELEASE VERSION ${X265_VERSION}")<br>-- <br>2.20.1.windows.1<br><br></div>