winetest: Include the build info also in the standard build.

This commit is contained in:
Alexandre Julliard 2010-08-21 17:19:48 +02:00
parent 740e4ffb63
commit 9188bd647b
4 changed files with 12 additions and 29 deletions

1
.gitignore vendored
View File

@ -258,6 +258,7 @@ programs/winedbg/debug.yy.c
programs/winedbg/winedbg.man
programs/winetest/*_test.exe
programs/winetest/*_test.rc
programs/winetest/build.nfo
programs/winetest/build.rc
programs/winhlp32/macro.lex.yy.c
programs/wscript/ihost.h

View File

@ -24,13 +24,16 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res)
@MAKE_PROG_RULES@
@ALL_WINETEST_DEPENDS@
clean::
$(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS)
$(RM) build.nfo 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)
build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
build.nfo:
-$(CC) -v 2>$@
build.res: build.nfo
# Rules for building distributable executable
@ -38,8 +41,8 @@ build.rc: dummy
dist: winetest-dist.exe$(DLLEXT)
winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in
$(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT)
cp winetest.exe$(DLLEXT) $@
-upx -9 -qqq $@
dist.res: build.nfo
@ALL_WINETEST_DEPENDS@

View File

@ -1,22 +0,0 @@
/*
* Resources for the binary we distribute to testers
*
* Copyright 2004 Ferenc Wagner
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* @makedep: build.nfo */
BUILD_INFO STRINGRES "build.nfo"

View File

@ -96,6 +96,7 @@ my @ignores = (
"include/stamp-h",
"programs/winetest/*_test.exe",
"programs/winetest/*_test.rc",
"programs/winetest/build.nfo",
"programs/winetest/build.rc",
"tools/makedep",
);