winetest: Create a separate resource file with the SHA1 build id.

.gitignore

@@ -198,6 +198,7 @@ programs/winedbg/debug.yy.c
 programs/winedbg/winedbg.man
 programs/winetest/*_test.exe
 programs/winetest/*_test.rc
+programs/winetest/build.rc
 programs/winhlp32/macro.lex.yy.c
 server/wineserver
 server/wineserver-installed

programs/winetest/Makefile.in

@@ -7,8 +7,6 @@ APPMODE   = -mconsole
 IMPORTS   = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32
 DELAYIMPORTS = ole32
 
-EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\"
-
 C_SRCS = \
 	gui.c \
 	main.c \
@@ -23,7 +21,7 @@ SVG_SRCS = winetest.svg
 ALL_TEST_DIRS = @ALL_TEST_DIRS@
 
 TESTBINS   = $(ALL_TEST_DIRS:%/tests=%_test.exe)
-TESTRCS    = $(TESTBINS:.exe=.rc)
+TESTRCS    = build.rc $(TESTBINS:.exe=.rc)
 EXTRA_OBJS = $(TESTRCS:.rc=.res)
 
 @MAKE_PROG_RULES@
@@ -33,6 +31,9 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res)
 clean::
 	$(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS)
 
+build.rc: dummy
+	build="STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
+
 # Rules for building distributable executable
 
 .PHONY: dist

programs/winetest/winetest.rc

@@ -24,13 +24,6 @@
 
 #include "resource.h"
 
-#ifdef BUILD_SHA1
-STRINGTABLE
-BEGIN
-    IDS_BUILD_ID BUILD_SHA1
-END
-#endif
-
 IDD_TAG DIALOG 0, 0, 150, 65
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "No tag supplied"

tools/make_makefiles

@@ -76,6 +76,7 @@ my @ignores = (
     "include/stamp-h",
     "programs/winetest/*_test.exe",
     "programs/winetest/*_test.rc",
+    "programs/winetest/build.rc",
 );
 
 # Source files and their resulting target to ignore