From c7364f149634940be6821880bc3788c8adb5fb7f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 21 Apr 2008 14:00:24 +0000 Subject: * mount.cc (mount_info::init): Remove call to from_registry. Print message that fstab is missing. (mount_info::from_fstab): Use CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX instead of constant string. (mount_info::read_mounts): Remove. (mount_info::from_registry): Remove. (mount_info::read_cygdrive_info_from_registry): Remove. * postinstall: Enable code to create fstab entries from old registry entries. * registry.cc (reg_key::reg_key): Drop CYGWIN_INFO_CYGNUS_REGISTRY_NAME from registry key. * shared_info.h (mount_info::read_mounts): Remove declaration. (mount_info::from_registry): Ditto. (mount_info::to_registry): Ditto. (mount_info::read_cygdrive_info_from_registry): Ditto. * winver.rc (CYGWIN_REGISTRY_KEY): Remove. (LegalCopyright): Fix to include 2008. (RegistryKey): Set to CYGWIN_INFO_CYGWIN_REGISTRY_NAME. * include/cygwin/version.h (CYGWIN_INFO_CYGNUS_REGISTRY_NAME): Remove. --- winsup/cygwin/winver.rc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'winsup/cygwin/winver.rc') diff --git a/winsup/cygwin/winver.rc b/winsup/cygwin/winver.rc index 5fc130440..bb81349a4 100644 --- a/winsup/cygwin/winver.rc +++ b/winsup/cygwin/winver.rc @@ -6,9 +6,6 @@ #define CYGWIN_DLL_NAME CYGWIN_VERSION_DLL_IDENTIFIER STRINGIFY(.dll) -#define CYGWIN_REGISTRY_KEY CYGWIN_INFO_CYGNUS_REGISTRY_NAME "\\" \ - CYGWIN_INFO_CYGWIN_REGISTRY_NAME - #define CYGWIN_API_VERSION STRINGIFY(CYGWIN_VERSION_API_MAJOR) "." \ STRINGIFY(CYGWIN_VERSION_API_MINOR) @@ -36,13 +33,13 @@ BEGIN VALUE "FileDescription", "Cygwin\256 POSIX Emulation DLL" VALUE "FileVersion", STRINGIFY(CYGWIN_VERSION) VALUE "InternalName", CYGWIN_DLL_NAME - VALUE "LegalCopyright", "Copyright \251 Red Hat, Inc. 1996-2003" + VALUE "LegalCopyright", "Copyright \251 Red Hat, Inc. 1996-2008" VALUE "OriginalFilename", CYGWIN_DLL_NAME VALUE "ProductName", "Cygwin" VALUE "ProductVersion", STRINGIFY(CYGWIN_VERSION) VALUE "APIVersion", CYGWIN_API_VERSION VALUE "SharedMemoryVersion", STRINGIFY(CYGWIN_VERSION_SHARED_DATA) - VALUE "RegistryKey", CYGWIN_REGISTRY_KEY + VALUE "RegistryKey", CYGWIN_INFO_CYGWIN_REGISTRY_NAME VALUE "BuildDate", CYGWIN_BUILD_DATE_TIME END END -- cgit v1.2.3