[winetest] Compute and send the current Wine version as a default 'build id', which allows for more direct use of Winetest.

[Jeremy White]

---
 programs/winetest/.gitignore  |    2 ++
 programs/winetest/Makefile.in |   10 +++++++++-
 programs/winetest/main.c      |    7 ++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 programs/winetest/.gitignore

diff --git a/programs/winetest/.gitignore b/programs/winetest/.gitignore
new file mode 100644
index 0000000..b047063
--- /dev/null
+++ b/programs/winetest/.gitignore
@@ -0,0 +1,2 @@
+/version-stamp
+/version.c
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 02448ab..91f7601 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -10,7 +10,8 @@ C_SRCS = \
 	gui.c \
 	main.c \
 	send.c \
-	util.c
+	util.c \
+	version.c

 RC_SRCS = \
 	winetest.rc
@@ -274,4 +275,11 @@ tests.rc: maketest Makefile.in

 dist.res: winetest.rc tests.rc build.id build.nfo tests.url wine.ico $(TESTBINS)

+version-stamp: dummy
+	(GIT_DIR=$(TOPSRCDIR)/.git git-describe HEAD 2>/dev/null || echo "wine- at PACKAGE_VERSION@") | sed -e 's/\(.*\)/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1)
+
+version.c: version-stamp
+	@cmp -s version-stamp $@ || cp version-stamp $@
+
+
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 41879b4..f88b7cb 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -40,6 +40,8 @@
 #include "winetest.h"
 #include "resource.h"

+extern const char wine_version[];
+
 struct wine_test
 {
     char *name;
@@ -536,7 +538,10 @@ run_tests (char *logname)
     strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize);
     xprintf ("Tests from build ");
     if (strres) xprintf ("%.*s", strsize, strres);
-    else xprintf ("-\n");
+    else if (wine_version && strlen(wine_version) > 0)
+        xprintf ("%s\n", wine_version);
+    else
+        xprintf ("-\n");
     strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize);
     xprintf ("Archive: ");
     if (strres) xprintf ("%.*s", strsize, strres);
-- 
1.5.3.7