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) diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 44d9e48b..f9bf2528 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat @@ -51,7 +51,7 @@ if exist minilua.exe.manifest^ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %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/nxbuild.bat b/src/nxbuild.bat index ab36dd8b..7f84b747 100644 --- a/src/nxbuild.bat +++ b/src/nxbuild.bat @@ -73,7 +73,7 @@ if exist minilua.exe.manifest^ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %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% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c diff --git a/src/ps4build.bat b/src/ps4build.bat index 52a9e7d7..d6f73e5a 100644 --- a/src/ps4build.bat +++ b/src/ps4build.bat @@ -51,7 +51,7 @@ if exist minilua.exe.manifest^ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %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% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c diff --git a/src/ps5build.bat b/src/ps5build.bat index ec98a88a..30b719d6 100644 --- a/src/ps5build.bat +++ b/src/ps5build.bat @@ -51,7 +51,7 @@ if exist minilua.exe.manifest^ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %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% %GC64% -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 770dd80e..8d176e52 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/xb1build.bat b/src/xb1build.bat index 250138ad..019d6ebe 100644 --- a/src/xb1build.bat +++ b/src/xb1build.bat @@ -31,7 +31,7 @@ if exist minilua.exe.manifest^ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.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_DURANGO host\buildvm*.c diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat index b8fd0461..5444024e 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