[ros-diffs] [cfinck] 31840: - Define the copyright year one time and then use this constant everywhere instead of redefining it at X places - Get rid of the "include/reactos/resource.h" header file. It contained outdated strings and had no effect on the resource files anymore. The "version.rc" file has the same purpose and does a better job.
cfinck at svn.reactos.org
cfinck at svn.reactos.org
Thu Jan 17 15:50:37 CET 2008
Author: cfinck
Date: Thu Jan 17 17:50:36 2008
New Revision: 31840
URL: http://svn.reactos.org/svn/reactos?rev=31840&view=rev
Log:
- Define the copyright year one time and then use this constant everywhere instead of redefining it at X places
- Get rid of the "include/reactos/resource.h" header file.
It contained outdated strings and had no effect on the resource files anymore. The "version.rc" file has the same purpose and does a better job.
Removed:
trunk/reactos/include/reactos/resource.h
Modified:
trunk/reactos/base/applications/control/control.rc
trunk/reactos/base/applications/regedit/clb/clb.rc
trunk/reactos/base/shell/cmd/cmd.c
trunk/reactos/base/shell/cmd/precomp.h
trunk/reactos/base/shell/cmd/ver.c
trunk/reactos/dll/win32/aclui/aclui.rc
trunk/reactos/dll/win32/authz/authz.rc
trunk/reactos/dll/win32/modemui/modemui.rc
trunk/reactos/dll/win32/netid/netid.rc
trunk/reactos/dll/win32/ntmarta/ntmarta.rc
trunk/reactos/dll/win32/rasdlg/rasdlg.rc
trunk/reactos/dll/win32/rasman/rasman.rc
trunk/reactos/dll/win32/tapiui/tapiui.rc
trunk/reactos/dll/win32/user32/user32.rc
trunk/reactos/drivers/base/bootvid/bootvid.rc (contents, props changed)
trunk/reactos/include/reactos/version.h
trunk/reactos/include/reactos/version.rc
trunk/reactos/include/reactos/wine/wine_common_ver.rc
trunk/rosapps/templates/dialog/dialog.rc
trunk/rostests/tests/dirdlg/dirdlg.rc
trunk/rostests/tests/icontest/icontest.rc
trunk/rostests/tests/mdi/mdi.rc
trunk/rostests/tests/miditest/miditest.rc
trunk/rostests/tests/popupmenu/popupmenu.rc
trunk/rostests/win32/smss/movefile/movefile.rc
Modified: trunk/reactos/base/applications/control/control.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/control.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/base/applications/control/control.rc (original)
+++ trunk/reactos/base/applications/control/control.rc Thu Jan 17 17:50:36 2008
@@ -1,17 +1,12 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
-#include <reactos/resource.h>
#include <windows.h>
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0"
#define REACTOS_STR_INTERNAL_NAME "control\0"
#define REACTOS_STR_ORIGINAL_FILENAME "control.exe\0"
-#ifndef MS_COMPILER
#include <reactos/version.rc>
-#else
-#include <../../../include/reactos/version.rc>
-#endif
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/reactos/base/applications/regedit/clb/clb.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/clb/clb.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/base/applications/regedit/clb/clb.rc (original)
+++ trunk/reactos/base/applications/regedit/clb/clb.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/base/shell/cmd/cmd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c (original)
+++ trunk/reactos/base/shell/cmd/cmd.c Thu Jan 17 17:50:36 2008
@@ -1794,7 +1794,7 @@
_T(KERNEL_RELEASE_STR),
_T(KERNEL_VERSION_BUILD_STR));
- ConOutPuts (_T("(C) Copyright 1998-2008 ReactOS Team.\n"));
+ ConOutPuts (_T("(C) Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team.\n"));
}
ExecuteAutoRunFile ();
Modified: trunk/reactos/base/shell/cmd/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/precomp.h (original)
+++ trunk/reactos/base/shell/cmd/precomp.h Thu Jan 17 17:50:36 2008
@@ -33,6 +33,7 @@
#include "config.h"
#include "batch.h"
-#include <reactos/resource.h>
+#include <reactos/buildno.h>
+#include <reactos/version.h>
#endif /* __CMD_PRECOMP_H */
Modified: trunk/reactos/base/shell/cmd/ver.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/ver.c (original)
+++ trunk/reactos/base/shell/cmd/ver.c Thu Jan 17 17:50:36 2008
@@ -73,7 +73,7 @@
ShortVersion();
ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others."));
- ConOutPuts (_T(RES_STR_LEGAL_COPYRIGHT));
+ ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team"));
/* Basic copyright notice */
if (param[0] == _T('\0'))
Modified: trunk/reactos/dll/win32/aclui/aclui.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/aclui/aclui.rc (original)
+++ trunk/reactos/dll/win32/aclui/aclui.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/authz/authz.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/authz/authz.rc (original)
+++ trunk/reactos/dll/win32/authz/authz.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
@@ -7,4 +6,3 @@
#define REACTOS_STR_INTERNAL_NAME "authz\0"
#define REACTOS_STR_ORIGINAL_FILENAME "authz.dll\0"
#include <reactos/version.rc>
-
Modified: trunk/reactos/dll/win32/modemui/modemui.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/modemui/modemui.rc (original)
+++ trunk/reactos/dll/win32/modemui/modemui.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/netid/netid.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netid/netid.rc (original)
+++ trunk/reactos/dll/win32/netid/netid.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ntmarta/ntmarta.rc (original)
+++ trunk/reactos/dll/win32/ntmarta/ntmarta.rc Thu Jan 17 17:50:36 2008
@@ -1,9 +1,7 @@
#include <windows.h>
-#include <reactos/resource.h>
#define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MARTA Provider\0"
#define REACTOS_STR_INTERNAL_NAME "ntmarta\0"
#define REACTOS_STR_ORIGINAL_FILENAME "ntmarta.dll\0"
#include <reactos/version.rc>
-
Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rasdlg/rasdlg.rc (original)
+++ trunk/reactos/dll/win32/rasdlg/rasdlg.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/rasman/rasman.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rasman/rasman.rc (original)
+++ trunk/reactos/dll/win32/rasman/rasman.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/tapiui/tapiui.rc (original)
+++ trunk/reactos/dll/win32/tapiui/tapiui.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL
Modified: trunk/reactos/dll/win32/user32/user32.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.rc (original)
+++ trunk/reactos/dll/win32/user32/user32.rc Thu Jan 17 17:50:36 2008
@@ -1,8 +1,7 @@
/* $Id$ */
#include <windows.h>
-
-#include <resource.h>
+#include "resource.h"
#define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0"
@@ -12,7 +11,7 @@
#define IDS_MDI_MOREWINDOWS 13
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/drivers/base/bootvid/bootvid.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootvid.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/drivers/base/bootvid/bootvid.rc (original)
+++ trunk/reactos/drivers/base/bootvid/bootvid.rc Thu Jan 17 17:50:36 2008
@@ -1,6 +1,4 @@
/* $Id$ */
-
-#include "resource.h"
#define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "VGA Boot Driver\0"
Propchange: trunk/reactos/drivers/base/bootvid/bootvid.rc
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Removed: trunk/reactos/include/reactos/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/resource.h?rev=31839&view=auto
==============================================================================
--- trunk/reactos/include/reactos/resource.h (original)
+++ trunk/reactos/include/reactos/resource.h (removed)
@@ -1,40 +1,0 @@
-#ifndef _INC_REACTOS_RESOURCE_H
-#define _INC_REACTOS_RESOURCE_H
-#include "version.h"
-#include "buildno.h"
-
-/* Global File Version UINTs */
-
-#define RES_UINT_FV_DLL_MAJOR 42
-#define RES_UINT_FV_EXE_MAJOR KERNEL_VERSION_MAJOR
-#define RES_UINT_FV_MINOR KERNEL_VERSION_MINOR
-#define RES_UINT_FV_REVISION KERNEL_VERSION_PATCH_LEVEL
-/* Can't use KERNEL_VERSION_BUILD, would overflow */
-#define RES_UINT_FV_BUILD 0
-
-/* ReactOS Product Version UINTs */
-
-#define RES_UINT_PV_MAJOR KERNEL_VERSION_MAJOR
-#define RES_UINT_PV_MINOR KERNEL_VERSION_MINOR
-#define RES_UINT_PV_REVISION KERNEL_VERSION_PATCH_LEVEL
-#define RES_UINT_PV_BUILD 0
-
-/* Common version strings for rc scripts */
-
-#define RES_STR_COMPANY_NAME "ReactOS Development Team\0"
-#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2006 ReactOS Team\0"
-#define RES_STR_PRODUCT_NAME "ReactOS Operating System\0"
-#define RES_STR_PRODUCT_VERSION KERNEL_VERSION_RC
-#define RES_STR_BUILD_DATE KERNEL_VERSION_BUILD_RC
-
-/* FILE_VERSION defaults to PRODUCT_VERSION */
-#define RES_STR_FILE_VERSION KERNEL_RELEASE_RC
-
-/* ReactOS default Application Registry Root Path */
-#define RES_STR_ROSAPP_REGISTRY_ROOT "Software\\ReactWare"
-
-/* Bitmaps */
-#define IDB_BOOTIMAGE 100
-
-#endif /* ndef _INC_REACTOS_RESOURCE_H */
-
Modified: trunk/reactos/include/reactos/version.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.h?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/include/reactos/version.h (original)
+++ trunk/reactos/include/reactos/version.h Thu Jan 17 17:50:36 2008
@@ -17,12 +17,14 @@
#ifndef __VERSION_H
#define __VERSION_H
-#define KERNEL_VERSION_MAJOR 0
-#define KERNEL_VERSION_MINOR 4
-#define KERNEL_VERSION_PATCH_LEVEL 0
+#define KERNEL_VERSION_MAJOR 0
+#define KERNEL_VERSION_MINOR 4
+#define KERNEL_VERSION_PATCH_LEVEL 0
+
+#define COPYRIGHT_YEAR "2008"
/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */
-#define KERNEL_VERSION_BUILD_TYPE L"SVN"
+#define KERNEL_VERSION_BUILD_TYPE L"SVN"
#endif
Modified: trunk/reactos/include/reactos/version.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/include/reactos/version.rc (original)
+++ trunk/reactos/include/reactos/version.rc Thu Jan 17 17:50:36 2008
@@ -20,7 +20,7 @@
#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0"
#define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0"
#define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0"
-#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2008 ReactOS Team\0"
+#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team\0"
#define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0"
/* Set defaults for everything, unless overridden */
Modified: trunk/reactos/include/reactos/wine/wine_common_ver.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wine_common_ver.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/wine_common_ver.rc (original)
+++ trunk/reactos/include/reactos/wine/wine_common_ver.rc Thu Jan 17 17:50:36 2008
@@ -54,8 +54,8 @@
/* Credit the Wine team */
#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/Wine Team\0"
-#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2004 ReactOS Team, 1993-2004 the Wine project authors\0"
-#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-2001 the Wine project authors " \
+#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team, 1993-" COPYRIGHT_YEAR " the Wine project authors\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-" COPYRIGHT_YEAR " the Wine project authors " \
"(see the file AUTHORS for a complete list)"
#define REACTOS_VERSION_DLL
Modified: trunk/rosapps/templates/dialog/dialog.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/dialog/dialog.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rosapps/templates/dialog/dialog.rc (original)
+++ trunk/rosapps/templates/dialog/dialog.rc Thu Jan 17 17:50:36 2008
@@ -8,7 +8,6 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/rostests/tests/dirdlg/dirdlg.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dirdlg/dirdlg.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/tests/dirdlg/dirdlg.rc (original)
+++ trunk/rostests/tests/dirdlg/dirdlg.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
IDD_MAIN DIALOG DISCARDABLE 20, 20, 220, 140
Modified: trunk/rostests/tests/icontest/icontest.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/icontest/icontest.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/tests/icontest/icontest.rc (original)
+++ trunk/rostests/tests/icontest/icontest.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
IDI_ICON ICON DISCARDABLE "icon.ico"
Modified: trunk/rostests/tests/mdi/mdi.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mdi/mdi.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/tests/mdi/mdi.rc (original)
+++ trunk/rostests/tests/mdi/mdi.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
IDR_MAINMENU MENU DISCARDABLE
@@ -26,5 +25,3 @@
MENUITEM "&Cascade", ID_WINDOW_CASCADE
END
END
-
-
Modified: trunk/rostests/tests/miditest/miditest.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/miditest/miditest.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/tests/miditest/miditest.rc (original)
+++ trunk/rostests/tests/miditest/miditest.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-//#include <reactos/resource.h>
#include "resource.h"
IDR_MAINMENU MENU DISCARDABLE
@@ -26,5 +25,3 @@
MENUITEM "&Cascade", ID_WINDOW_CASCADE
END
END
-
-
Modified: trunk/rostests/tests/popupmenu/popupmenu.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/popupmenu/popupmenu.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/tests/popupmenu/popupmenu.rc (original)
+++ trunk/rostests/tests/popupmenu/popupmenu.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include <reactos/resource.h>
#include "resource.h"
IDM_MAINMENU MENU LOADONCALL MOVEABLE DISCARDABLE
Modified: trunk/rostests/win32/smss/movefile/movefile.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/smss/movefile/movefile.rc?rev=31840&r1=31839&r2=31840&view=diff
==============================================================================
--- trunk/rostests/win32/smss/movefile/movefile.rc (original)
+++ trunk/rostests/win32/smss/movefile/movefile.rc Thu Jan 17 17:50:36 2008
@@ -1,5 +1,4 @@
#include <windows.h>
-#include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Move File after reboot test\0"
#define REACTOS_STR_INTERNAL_NAME "movefiletest\0"
More information about the Ros-diffs
mailing list