[mpiulachs] 33531: - Add specific module type for keyboard layouts - Added a description attribute to modules - Added a lcid attribute to modules (KeyboardLayout only)
Author: mpiulachs Date: Thu May 15 09:46:15 2008 New Revision: 33531
URL: http://svn.reactos.org/svn/reactos?rev=33531&view=rev Log: - Add specific module type for keyboard layouts - Added a description attribute to modules - Added a lcid attribute to modules (KeyboardLayout only)
Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codebl... ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -640,7 +640,7 @@ fprintf ( OUT, "\t\t\t\t\t<Add option="-Wl,--entry,%s%s" />\r\n", "_", module.GetEntryPoint(false).c_str () ); fprintf ( OUT, "\t\t\t\t\t<Add option="-Wl,--image-base,%s" />\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str () );
- if ( module.type == Win32DLL ) + if ( module.type == Win32DLL) fprintf ( OUT, "\t\t\t\t\t<Add option="-Wl,--shared" />\r\n" ); else if ( module.type == NativeDLL) fprintf ( OUT, "\t\t\t\t\t<Add option="-Wl,--shared" />\r\n" );
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -190,6 +190,7 @@ case Win32GUI: handler = new MingwWin32GUIModuleHandler ( module ); break; + case KeyboardLayout: case KernelModeDLL: handler = new MingwKernelModeDLLModuleHandler ( module ); break; @@ -2921,7 +2922,7 @@ && module.type != Win32OCX && module.type != Win32CUI && module.type != Win32GUI - && module.type != Win32SCR ) + && module.type != Win32SCR) { // no implicit libraries return;
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v... ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -356,7 +356,8 @@ if (getenv ( "BASEDIR" ) != NULL && (module.type == Kernel || module.type == KernelModeDLL || - module.type == KernelModeDriver)) + module.type == KernelModeDriver || + module.type == KeyboardLayout)) { string WdkBase, SdkPath, CrtPath, DdkPath; WdkBase = getenv ( "BASEDIR" ); @@ -514,7 +515,8 @@ if (getenv ( "BASEDIR" ) != NULL && (module.type == Kernel || module.type == KernelModeDLL || - module.type == KernelModeDriver)) + module.type == KernelModeDriver || + module.type == KeyboardLayout)) { string WdkBase, CrtPath, DdkPath; WdkBase = getenv ( "BASEDIR" );
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?... ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -43,6 +43,7 @@ { case Kernel: case KernelModeDLL: + case KeyboardLayout: case NativeDLL: case NativeCUI: case Win32DLL:
Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev... ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu May 15 09:46:15 2008 @@ -465,6 +465,20 @@ buildtype = "BOOTPROG"; } } + + att = moduleNode.GetAttribute ( "description", false ); + if (att != NULL ) + { + description = project.ResolveProperties(att->value); + } + else + description = ""; + + att = moduleNode.GetAttribute ( "lcid", false ); + if (type == KeyboardLayout && att != NULL ) + lcid = att->value; + else + lcid = "";
SetImportLibrary ( NULL ); } @@ -899,6 +913,8 @@ return NativeDLL; if ( attribute.value == "nativecui" ) return NativeCUI; + if ( attribute.value == "keyboardlayout" ) + return KeyboardLayout; if ( attribute.value == "win32dll" ) return Win32DLL; if ( attribute.value == "win32ocx" ) @@ -953,6 +969,7 @@ { case Kernel: case KernelModeDLL: + case KeyboardLayout: case NativeDLL: case Win32DLL: case Win32OCX: @@ -1015,6 +1032,7 @@
case KernelModeDLL: case NativeDLL: + case KeyboardLayout: case Win32DLL: return ".dll"; case Win32OCX: @@ -1057,6 +1075,7 @@ { case Kernel: return "KiSystemStartup"; + case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: return "DriverEntry@8"; @@ -1124,6 +1143,7 @@ case Win32SCR: case Win32GUI: return "0x00400000"; + case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: return "0x00010000"; @@ -1169,6 +1189,7 @@ case Kernel: case KernelModeDLL: case NativeDLL: + case KeyboardLayout: case Win32DLL: case Win32OCX: case KernelModeDriver:
Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=3... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Thu May 15 09:46:15 2008 @@ -303,7 +303,8 @@ RpcProxy, HostStaticLibrary, TypeDontCare, - Cabinet + Cabinet, + KeyboardLayout };
enum HostType @@ -375,6 +376,8 @@ FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; + std::string description; + std::string lcid;
Module ( const Project& project, const XMLElement& moduleNode,
-
mpiulachs＠svn.reactos.org