remove hash from git describe

jakobharder · Feb 25, 2024 · 9a6c460 · 9a6c460
1 parent cf24c2a
commit 9a6c460
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 29 deletions.
diff --git a/source/Burntime.MonoGame/get-file-version.bat b/source/Burntime.MonoGame/get-file-version.bat
@@ -5,23 +5,25 @@
 :: v1.2.3-1-asdf -> 1.2.3.1
 :: v1.2-1-asdf -> 1.2.0.1
 
-FOR /F "tokens=1-3 delims==v-" %%i IN ('git describe --tags') DO (
-  IF "%%j%%k" == "" (
-    echo %%i
-  )
-  IF NOT "%%j" == "" (
-    IF "%%k" == "" (
+FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags') DO (
+  FOR /F "tokens=1-3 delims==-" %%i IN ("%%n") DO (
+    IF "%%j%%k" == "" (
       echo %%i
     )
-    IF NOT "%%k" == "" (
-      FOR /F "tokens=1-3 delims==." %%s IN ("%%i") DO (
-        IF "%%u" == "" (
-          echo %%i.0.%%j
-        )
-        IF NOT "%%u" == "" (
-          echo %%i.%%j
+    IF NOT "%%j" == "" (
+      IF "%%k" == "" (
+        echo %%i
+      )
+      IF NOT "%%k" == "" (
+        FOR /F "tokens=1-3 delims==." %%s IN ("%%i") DO (
+          IF "%%u" == "" (
+            echo %%i.0.%%j
+          )
+          IF NOT "%%u" == "" (
+            echo %%i.%%j
+          )
         )
       )
     )
   )
-)
+)
diff --git a/source/Burntime.MonoGame/get-product-version.bat b/source/Burntime.MonoGame/get-product-version.bat
@@ -4,6 +4,6 @@
 :: v1.2.3-rc1 -> 1.2.3-rc1
 :: v1.2.3-1-asdf -> 1.2.3-1-asdf
 
-FOR /F "tokens=1-2 delims==v" %%i IN ('git describe --tags') DO (
+FOR /F "tokens=1-2 delims==v+" %%i IN ('git describe --tags') DO (
   echo %%i
 )
diff --git a/source/Burntime.MonoGame/get-semver-version.bat b/source/Burntime.MonoGame/get-semver-version.bat
@@ -4,22 +4,25 @@
 :: v1.2.3-rc1 -> 1.2.3-rc1
 :: v1.2.3-1-asdf -> 1.2.3.1
 :: v1.2-1-asdf -> 1.2.0.1
+:: v1.2.3-rc1+abc -> 1.2.3-rc1
 
-FOR /F "tokens=1-3 delims==v-" %%i IN ('git describe --tags') DO (
-  IF "%%j%%k" == "" (
-    echo %%i
-  )
-  IF NOT "%%j" == "" (
-    IF "%%k" == "" (
-      echo %%i-%%j
+FOR /F "tokens=1 delims==v+" %%n IN ('git describe --tags') DO (
+  FOR /F "tokens=1-3 delims==-" %%i IN ("%%n") DO (
+    IF "%%j%%k" == "" (
+      echo %%i
     )
-    IF NOT "%%k" == "" (
-      FOR /F "tokens=1-3 delims==." %%s IN ("%%i") DO (
-        IF "%%u" == "" (
-          echo %%i.0.%%j
-        )
-        IF NOT "%%u" == "" (
-          echo %%i.%%j
+    IF NOT "%%j" == "" (
+      IF "%%k" == "" (
+        echo %%i-%%j
+      )
+      IF NOT "%%k" == "" (
+        FOR /F "tokens=1-3 delims==." %%s IN ("%%i") DO (
+          IF "%%u" == "" (
+            echo %%i.0.%%j
+          )
+          IF NOT "%%u" == "" (
+            echo %%i.%%j
+          )
         )
       )
     )