From a0b52aae33ffaeff2cc3f28b6e125f9582b133d6 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 28 Aug 2023 21:59:01 +0200
Subject: [PATCH 1/2] Handle non-.git checkout with .relver in .bat-file
 builds.

Thanks to Simon Cooke.
---
 src/msvcbuild.bat   | 2 +-
 src/ps4build.bat    | 2 +-
 src/psvitabuild.bat | 2 +-
 src/xedkbuild.bat   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 44781e10..1f60b8f4 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -42,7 +42,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%%ct >luajit_relver.txt
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
diff --git a/src/ps4build.bat b/src/ps4build.bat
index 306b06ef..5ae92171 100644
--- a/src/ps4build.bat
+++ b/src/ps4build.bat
@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%%ct >luajit_relver.txt
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c
diff --git a/src/psvitabuild.bat b/src/psvitabuild.bat
index 9be485ae..132fed0a 100644
--- a/src/psvitabuild.bat
+++ b/src/psvitabuild.bat
@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%%ct >luajit_relver.txt
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat
index 145219c8..b07f3bc2 100644
--- a/src/xedkbuild.bat
+++ b/src/xedkbuild.bat
@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%%ct >luajit_relver.txt
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC  host\buildvm*.c

From 6a3111a57f817cb00ef2ab6f2553cd887ec36462 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 28 Aug 2023 21:25:51 +0200
Subject: [PATCH 2/2] Use fallback name for install files without valid .git or
 .relver.

---
 src/host/genversion.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/host/genversion.lua b/src/host/genversion.lua
index a38cec56..42b5e6fe 100644
--- a/src/host/genversion.lua
+++ b/src/host/genversion.lua
@@ -5,9 +5,9 @@
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 
-local FILE_INPUT_H = "luajit_rolling.h"
-local FILE_INPUT_R = "luajit_relver.txt"
-local FILE_OUTPUT_H = "luajit.h"
+local FILE_ROLLING_H = "luajit_rolling.h"
+local FILE_RELVER_TXT = "luajit_relver.txt"
+local FILE_LUAJIT_H = "luajit.h"
 
 local function file_read(file)
   local fp = assert(io.open(file, "rb"), "run from the wrong directory")
@@ -28,8 +28,8 @@ local function file_write_mod(file, data)
   assert(fp:close())
 end
 
-local text = file_read(FILE_INPUT_H)
-local relver = file_read(FILE_INPUT_R):match("(%d+)")
+local text = file_read(FILE_ROLLING_H)
+local relver = file_read(FILE_RELVER_TXT):match("(%d+)")
 
 if relver then
   text = text:gsub("ROLLING", relver)
@@ -38,6 +38,7 @@ else
 **** WARNING Cannot determine rolling release version from git log.
 **** WARNING The 'git' command must be available during the build.
 ]])
+  file_write_mod(FILE_RELVER_TXT, "ROLLING\n") -- Fallback for install target.
 end
 
-file_write_mod(FILE_OUTPUT_H, text)
+file_write_mod(FILE_LUAJIT_H, text)