Add build time to reproducible builds

Author: szapp

Makefile

@@ -29,6 +29,7 @@ include $(META)
 export VERSION	:=	$(VBASE).$(VMAJOR).$(VMINOR)
 export PATH 	:=	$(subst ;;,;,$(PATH);$(shell getGnuWin32Path))
 export BUILD_TIME:=$(shell getCommitTime)
+export BUILD_TIME_UNIX:=$(shell getCommitTime unix)
 ifneq ($(BUILD_TIME),)
 $(info Build time is set to $(BUILD_TIME))
 else
@@ -63,7 +64,6 @@ NSIS			:=	makensis
 NASM			:=	nasm
 LINKER			:=	golink
 RCCOMP			:=	gorc
-REPRO			:=	ducible
 GETBINLIST		:=	$(call FixPath,./getBinList)$(SCRIPTEXT)
 EXTRACTSYM		:=	$(call FixPath,./extractSymbols)$(SCRIPTEXT)
 VERIFYSIZE		:=	$(call FixPath,./verifySize)$(SCRIPTEXT)
@@ -246,13 +246,11 @@ $(SETUP) : $(LOADER) $(TARGET) LICENSE $(SETUPSCR) $(SETUPINI)
 $(LOADER) : $(LOADER_OBJ) $(TARGET)
 	@$(call mkdir,$(BUILDDIR))
 	$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(LOADER_SYSDEP)
-	$(REPRO) $@
 	$(PATCHREPRO) $(call FixPath,$@)
 
 $(TARGET) : $(OBJ) $(RSC)
 	@$(call mkdir,$(BUILDDIR))
 	$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(SYSDEP)
-	$(REPRO) $@
 	$(PATCHREPRO) $(call FixPath,$@)
 
 $(LOADER_OBJ) : $(LOADER_SRC)
@@ -266,7 +264,7 @@ $(OBJ) : $(SRCDLL) $(CONTENT) $(IKLG)
 # Overwrite MemoryFlags (0x36 WORD) in the RES Header which sometimes varies across builds on different machines
 $(RSC) : $(RC)
 	$(RCCOMP) $(FLAGS_RC) /fo $@ /r $^
-	ECHO -n 0000 | xxd -r -p | dd of=$@ bs=1 seek=54 count=2 conv=notrunc > nul 2>&1
+	ECHO -n 0000 | xxd -r -p | dd of=$@ bs=1 seek=54 count=2 conv=notrunc status=none
 
 $(CONTENT) : $(BINARIES_G1) $(BINARIES_G112) $(BINARIES_G130) $(BINARIES_G2)
 	$(GETBINLIST) $(call FixPath,$@) $(SRCDIR)

README.md

@@ -64,7 +64,6 @@ Additionally, you'll need the following binaries:
 - [GNU Make](http://gnuwin32.sourceforge.net/packages/make.htm) (3.81)
 - [Git for Windows](https://git-scm.com/download/win) (2.45.1) for various included GNU Win32 tools
 - [BinUtils](https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/) (2.28) for `objdump`
-- [ducible](https://github.com/jasonwhite/ducible) (1.2.2)
 
 The binaries of the listed software must be added to your `PATH` environment variable or placed in the root directory.
 

getCommitTime.bat

@@ -2,11 +2,19 @@
 :: Get build time from last git revision
 :: To be effetive, requires git and this project to be cloned
 ::
-:: Arguments: none
+:: Arguments: [UNIX]
 ::
 @ECHO OFF
 SETLOCAL
 
+:: Sanity check
+IF "%~1"==""     SET unix=0&& GOTO start
+IF "%~1"=="unix" SET unix=1&& GOTO start
+IF "%~1"=="UNIX" SET unix=1&& GOTO start
+ECHO Usage: %~nx0 [UNIX]
+EXIT /B 0
+:start
+
 :: Check for git
 where git> nul 2>&1
 IF NOT %ERRORLEVEL%==0 EXIT /B 0
@@ -19,6 +27,9 @@ IF NOT %ERRORLEVEL%==0 EXIT /B 0
 FOR /F "usebackq" %%i IN (`git log -1 --format^=%%at`) DO SET "timestamp=%%i"
 SET parameters=-u -d @"%timestamp%" +"%%Y-%%m-%%d %%H:%%M:%%S"
 
+:: Unix time stamp
+IF "%unix%"=="1" ECHO %timestamp% && EXIT /B 0
+
 :: Attempt to find unix "date"
 where date> nul 2>&1
 IF NOT %ERRORLEVEL%==0 EXIT /B 0

patchBuildBytes.bat

@@ -14,6 +14,11 @@ IF [%1] == [] GOTO usage
 SET "file=%~1"
 SET filebase=%~n1
 
+:: Convert unix timestamp to hexadecimal and flip endianness
+CMD /C EXIT %BUILD_TIME_UNIX%
+SET "BUILD_TIME_HEX=%=ExitCode%"
+SET "BUILD_TIME_HEX=%BUILD_TIME_HEX:~-4,4%%BUILD_TIME_HEX:~0,4%"
+
 :: Use objdump to get a summary of the file to later compare patched bytes
 objdump -x %file% > %file%.txt
 
@@ -55,7 +60,7 @@ FOR /F "tokens=1" %%A IN (iat.txt) DO (
     SET /A "hex_dec=0x!hex!"
     SET /A "addr=!hex_dec!-!idata_vma!+!idata_offset!"
     :: Zero out ordinal number at address (WORD)
-    ECHO -n 0000 | xxd -r -p | dd of=%file% bs=1 seek=!addr! count=2 conv=notrunc > nul 2>&1
+    ECHO -n 0000 | xxd -r -p | dd of=%file% bs=1 seek=!addr! count=2 conv=notrunc status=none
 )
 DEL /Q iat.txt
 
@@ -91,10 +96,69 @@ FOR /F "tokens=5" %%A IN (dlltables.txt) DO (
     )
     CALL :strlen name len
     :: Convert name to uppercase
-    dd if=%file% of=%file% bs=1 seek=!addr! skip=!addr! count=!len! conv=ucase,notrunc > nul 2>&1
+    dd if=%file% of=%file% bs=1 seek=!addr! skip=!addr! count=!len! conv=ucase,notrunc status=none
 )
 DEL /Q dlltables.txt
 
+:: Next: Remove time stamps from file header
+
+:: Find offset of FILE_HEADER
+dd if=%file% bs=1 skip=60 count=4 2> nul | od -An -t u4 -N4 > header.txt
+FOR /F "tokens=1" %%a IN (header.txt) DO (
+    SET /A "file_header_offset=%%a+4"
+)
+DEL /Q header.txt
+
+ECHO FILE_HEADER: %file_header_offset%
+
+:: Set FILE_HEADER time stamp
+SET /A "timestamp_offset=file_header_offset + 4"
+ECHO -n %BUILD_TIME_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc,swab status=none
+
+:: Next: Remove the check sum from optional header
+
+:: Find offset of the optional header
+SET /A "optional_header_offset=file_header_offset+32"
+ECHO OPTIONAL_HEADER: %optional_header_offset%
+
+:: Set optional header checksum
+SET /A "checksum_offset=optional_header_offset + 52"
+ECHO -n 00000000 | xxd -r -p | dd of=%file% bs=1 seek=%checksum_offset% count=4 conv=notrunc status=none
+
+:: Next: Set the image version
+
+:: Find the version offset
+SET /A "image_version_offset=optional_header_offset + 32"
+ECHO IMAGE_VERSION: %image_version_offset%
+
+:: Build hexadecimal version with switched endianness
+SET "VERSION_H_DEC=%VBASE%%VMAJOR%"
+CMD /C EXIT %VERSION_H_DEC%
+SET "VERSION_H_HEX=%=ExitCode%"
+SET "VERSION_H_HEX=%VERSION_H_HEX:~-2,2%%VERSION_H_HEX:~-4,2%"
+CMD /C EXIT %VMINOR%
+SET "VERSION_L_HEX=%=ExitCode%"
+SET "VERSION_L_HEX=%VERSION_L_HEX:~-2,2%%VERSION_L_HEX:~-4,2%"
+SET "VERSION_HEX=%VERSION_H_HEX%%VERSION_L_HEX%"
+
+:: Set the image version
+ECHO -n %VERSION_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%image_version_offset% count=4 conv=notrunc status=none
+
+:: Next: Remove time stamps from export table
+
+:: Find offset of .edata section
+objdump -h -j .edata %file% | findstr "\.edata" > header.txt
+FOR /F "tokens=6" %%a IN (header.txt) DO (
+    SET /A "edata_offset=0x%%a"
+)
+DEL /Q header.txt
+
+ECHO IMAGE_EXPORT_DIRECTORY: %edata_offset%
+
+:: Set IMAGE_EXPORT_DIRECTORY time stamp
+SET /A "timestamp_offset=edata_offset + 4"
+ECHO -n %BUILD_TIME_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc,swab status=none
+
 :: Next: Remove time stamps from resource table
 
 :: Find size and offset of .rsrc section
@@ -113,15 +177,15 @@ IF "%rsrc_size%" NEQ "768" ECHO Warning: Resource directory sections is of unexp
 
 :: Type Table Time
 SET /A "timestamp_offset=rsrc_offset + 4"
-ECHO -n 003b3d4b | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc > nul 2>&1
+ECHO -n %BUILD_TIME_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc,swab status=none
 
 :: Name Table Time
 SET /A "timestamp_offset=rsrc_offset + 28"
-ECHO -n 003b3d4b | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc > nul 2>&1
+ECHO -n %BUILD_TIME_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc,swab status=none
 
 :: Language Table Time
 SET /A "timestamp_offset=rsrc_offset + 52"
-ECHO -n 003b3d4b | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc > nul 2>&1
+ECHO -n %BUILD_TIME_HEX% | xxd -r -p | dd of=%file% bs=1 seek=%timestamp_offset% count=4 conv=notrunc,swab status=none
 
 :CLEANUP
 

src/dll/Ninja.asm

@@ -63,7 +63,7 @@ extern WriteFile
 extern CloseHandle
 extern DeleteFileA
 
-export DllMain
+global DllMain
 export Ninja
 
 section .data