Revert "build.cmd: github is source of truth now"

[factor.git] / build.cmd

diff --git a/build.cmd b/build.cmd
index 590265b0d9774c6f7e1175404b4958f11bb8ec8c..6d964ec6604f12dc2dbff9265bd739f7a813c94a 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -1,14 +1,20 @@
 @echo off
 setlocal
 
+: Check which branch we are on, or just assume master if we are not in a git repository
+for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z
+if not defined GIT_BRANCH (
+    set GIT_BRANCH=master
+)
+
 if "%1"=="/?" (
     goto usage
 ) else if "%1"=="" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="latest" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="update" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="clean" (
     set _bootimage_version=clean
 ) else goto usage
@@ -29,14 +35,6 @@ if not errorlevel 1 (
     ) else goto nocl
 )
 
-: Fun syntax
-for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
-for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
-for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z
-
-set git_label=%GIT_DESCRIBE%-%GIT_ID%
-set version=0.98
-
 echo Deleting staging images from temp/...
 del temp\staging.*.image