diff --git a/bus/Makefile.am b/bus/Makefile.am index c0bc154..5d3644b 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -1,12 +1,23 @@ configdir=$(sysconfdir)/dbus-1 dbus_daemon_execdir = $(DBUS_DAEMONDIR) +# +# Deal with W32 version-info.rc stuff +# +#if DBUS_WIN + +%.o: %.rc + $(WINDRES) $< -o $@ + +#endif + DBUS_BUS_LIBS = \ $(XML_LIBS) \ $(SELINUX_LIBS) \ $(THREAD_LIBS) \ $(ADT_LIBS) \ $(NETWORK_libs) \ + versioninfo.o \ $(NULL) DBUS_LAUNCHER_LIBS = \ diff --git a/configure.ac b/configure.ac index 2f62269..0ba1812 100644 --- a/configure.ac +++ b/configure.ac @@ -1758,6 +1758,7 @@ bus/org.freedesktop.dbus-session.plist bus/rc.messagebus bus/dbus.service bus/dbus.socket +bus/versioninfo.rc Makefile dbus/Makefile bus/Makefile diff --git a/bus/dbus.manifest b/bus/dbus.manifest new file mode 100755 index 0000000..4878d5d --- /dev/null +++ b/bus/dbus.manifest @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" + xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> +<description>DBus</description> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> +</trustInfo> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- The ID below indicates app support for Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + <!-- The ID below indicates app support for Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- The ID below indicates app support for Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- The ID below indicates app support for Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- The ID below indicates app support for Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + </application> +</compatibility> +</assembly> diff --git a/bus/versioninfo.rc.in b/bus/versioninfo.rc.in new file mode 100644 index 0000000..cd3d74b --- /dev/null +++ b/bus/versioninfo.rc.in @@ -0,0 +1,55 @@ +/* versioninfo.rc.in - for dbus + * Copyright (C) 2005 g10 Code GmbH + * + * This file is free software; as a special exception the author gives + * unlimited permission to copy and/or distribute it, with or without + * modifications, as long as this notice is preserved. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/* This file is processed by configure to create versioninfo.rc */ + +#line __LINE__ "versioninfo.rc.in" + +#include <afxres.h> + +/* IDI_ICON1 ICON DISCARDABLE "dbus.ico" */ +#define MANIFEST_RESOURCE_ID 1 +MANIFEST_RESOURCE_ID RT_MANIFEST "dbus.manifest" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @BUILD_FILEVERSION@ + PRODUCTVERSION @BUILD_FILEVERSION@ + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x21L +#else + FILEFLAGS 0x20L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License.\0" + VALUE "CompanyName", "FreeDesktop.org\0" + VALUE "FileDescription", "dbus - FreeDesktop message bus system\0" + VALUE "FileVersion", "@DBUS_VERSION@\0" + VALUE "InternalName", "dbus\0" + VALUE "LegalCopyright", "Copyright © 2009 - 2014 FreeDesktop.org\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "dbus-1.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "dbus\0" + VALUE "ProductVersion", "@DBUS_VERSION@\0" + VALUE "SpecialBuild", "@BUILD_TIMESTAMP@\0" + END + END +END +