Module: wine Branch: master Commit: ae1afb82d2db69fe35d6060278a28ca2f98b8cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1afb82d2db69fe35d6060278...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jul 9 12:54:39 2009 +0200
winetest: Create a separate resource file with the SHA1 build id.
---
.gitignore | 1 + programs/winetest/Makefile.in | 7 ++++--- programs/winetest/winetest.rc | 7 ------- tools/make_makefiles | 1 + 4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore index 5303e1c..cc746dd 100644 --- a/.gitignore +++ b/.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 diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 90cd983..9e43465 100644 --- a/programs/winetest/Makefile.in +++ b/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 diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8056a25..52c3430 100644 --- a/programs/winetest/winetest.rc +++ b/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" diff --git a/tools/make_makefiles b/tools/make_makefiles index b1766a7..f23706c 100755 --- a/tools/make_makefiles +++ b/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