From 8aca8b4bd7dafcc4dbb62513754004968f7c444e Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Sun, 27 Jan 2008 18:02:22 +0000 Subject: [PATCH] Merged @SF patch by Sebastian 1880755 Win32 version information for bochs.exe --- bochs/Makefile.in | 11 +---------- bochs/bxversion.rc.in | 14 ++++++++++++++ bochs/configure | 5 +++-- bochs/configure.in | 4 ++-- bochs/win32res.rc | 1 + 5 files changed, 21 insertions(+), 14 deletions(-) create mode 100755 bochs/bxversion.rc.in diff --git a/bochs/Makefile.in b/bochs/Makefile.in index 6824d317d..b7fb3d0db 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -247,15 +247,6 @@ misc/niclist.o: $(srcdir)/misc/niclist.c $(BX_OBJS): $(BX_INCLUDES) -bxversion.h: - $(RM) -f bxversion.h - echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h - echo '// $$Id: Makefile.in,v 1.187 2008-01-19 22:32:28 sshwarts Exp $$' >> bxversion.h - echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h - echo '// This file is generated by "make bxversion.h"' >> bxversion.h - echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h - echo "#define REL_STRING \"$(REL_STRING)\"" >> bxversion.h - iodev/libiodev.a:: cd iodev @COMMAND_SEPARATOR@ $(MAKE) $(MDEFINES) libiodev.a @@ -311,7 +302,7 @@ wxbochs_resources.o: wxbochs.rc windres $(srcdir)/wxbochs.rc -o $@ --include-dir=`@WX_CONFIG@ --prefix`/include # for win32 gui -win32res.o: win32res.rc +win32res.o: win32res.rc bxversion.rc $(RC_CMD)$@ $(srcdir)/win32res.rc ##################################################################### diff --git a/bochs/bxversion.rc.in b/bochs/bxversion.rc.in new file mode 100755 index 000000000..d0951f656 --- /dev/null +++ b/bochs/bxversion.rc.in @@ -0,0 +1,14 @@ +1 VERSIONINFO +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "FileDescription", "The cross platform IA-32 emulator" + VALUE "FileVersion", "@VER_STRING@" + VALUE "LegalCopyright", "GNU Lesser General Public License" + VALUE "ProductName", "Bochs" + VALUE "ProductVersion", "@REL_STRING@" + } + } +} diff --git a/bochs/configure b/bochs/configure index 53f7fafdf..2f121b9b0 100755 --- a/bochs/configure +++ b/bochs/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.357 2008/01/21 21:03:34 sshwarts Exp . +# From configure.in Id: configure.in,v 1.358 2008/01/21 21:36:54 sshwarts Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60. # @@ -43051,7 +43051,7 @@ fi -ac_config_files="$ac_config_files Makefile iodev/Makefile bx_debug/Makefile bios/Makefile cpu/Makefile memory/Makefile gui/Makefile disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile fpu/Makefile doc/docbook/Makefile build/linux/bochs-dlx bxversion.h build/macosx/Info.plist build/win32/nsis/Makefile build/win32/nsis/bochs.nsi host/linux/pcidev/Makefile" +ac_config_files="$ac_config_files Makefile iodev/Makefile bx_debug/Makefile bios/Makefile cpu/Makefile memory/Makefile gui/Makefile disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile fpu/Makefile doc/docbook/Makefile build/linux/bochs-dlx bxversion.h bxversion.rc build/macosx/Info.plist build/win32/nsis/Makefile build/win32/nsis/bochs.nsi host/linux/pcidev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -43608,6 +43608,7 @@ do "doc/docbook/Makefile") CONFIG_FILES="$CONFIG_FILES doc/docbook/Makefile" ;; "build/linux/bochs-dlx") CONFIG_FILES="$CONFIG_FILES build/linux/bochs-dlx" ;; "bxversion.h") CONFIG_FILES="$CONFIG_FILES bxversion.h" ;; + "bxversion.rc") CONFIG_FILES="$CONFIG_FILES bxversion.rc" ;; "build/macosx/Info.plist") CONFIG_FILES="$CONFIG_FILES build/macosx/Info.plist" ;; "build/win32/nsis/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/nsis/Makefile" ;; "build/win32/nsis/bochs.nsi") CONFIG_FILES="$CONFIG_FILES build/win32/nsis/bochs.nsi" ;; diff --git a/bochs/configure.in b/bochs/configure.in index be6300a82..253c1a3bc 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) AC_INIT(bochs.h) -AC_REVISION([[$Id: configure.in,v 1.358 2008-01-21 21:36:54 sshwarts Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.359 2008-01-27 18:02:21 sshwarts Exp $]]) AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(ltdlconf.h) @@ -2922,6 +2922,6 @@ AC_OUTPUT(Makefile iodev/Makefile bx_debug/Makefile bios/Makefile \ disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile \ fpu/Makefile doc/docbook/Makefile \ build/linux/bochs-dlx \ - bxversion.h build/macosx/Info.plist \ + bxversion.h bxversion.rc build/macosx/Info.plist \ build/win32/nsis/Makefile build/win32/nsis/bochs.nsi \ host/linux/pcidev/Makefile) diff --git a/bochs/win32res.rc b/bochs/win32res.rc index 08d94d230..f99967c67 100644 --- a/bochs/win32res.rc +++ b/bochs/win32res.rc @@ -183,3 +183,4 @@ BEGIN EDITTEXT IDCPUVAL15, 380, 170, 50, 14, ES_READONLY | ES_RIGHT END +#include "bxversion.rc"