Handle non-.git checkout with .relver in .bat-file builds.

Thanks to Simon Cooke.

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 44781e10ea21fd289aabdde0d608490e65e70e0c..1f60b8f409dbd72cb834bbcdbc363ad576055423 100644 (file)
--- 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\r
 @if errorlevel 1 goto :BAD\r
 \r
-git show -s --format=%%ct >luajit_relver.txt\r
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )\r
 minilua host\genversion.lua\r
 \r
 %LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c\r

diff --git a/src/ps4build.bat b/src/ps4build.bat
index 306b06efc7f219084ed31a84dc3cd57cafc31e4b..5ae9217188b4223c3b96453205d8e00a61e2bd88 100644 (file)
--- 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\r
 @if errorlevel 1 goto :BAD\r
 \r
-git show -s --format=%%ct >luajit_relver.txt\r
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )\r
 minilua host\genversion.lua\r
 \r
 %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\r

diff --git a/src/psvitabuild.bat b/src/psvitabuild.bat
index 9be485ae34fbfc72e554630b9943eca0b2895dad..132fed0a9db224c726703d6d85a14c700362b3e0 100644 (file)
--- 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\r
 @if errorlevel 1 goto :BAD\r
 \r
-git show -s --format=%%ct >luajit_relver.txt\r
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )\r
 minilua host\genversion.lua\r
 \r
 %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\r

diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat
index 145219c8c33be067f283368e6bbf8a53288cd977..b07f3bc27f952e78ab2f394869603beb1b3cfb94 100644 (file)
--- 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\r
 @if errorlevel 1 goto :BAD\r
 \r
-git show -s --format=%%ct >luajit_relver.txt\r
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )\r
 minilua host\genversion.lua\r
 \r
 %LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC  host\buildvm*.c\r