From 0e87f19d40566413b366febdbd7784c0d7f759ff Mon Sep 17 00:00:00 2001 From: ReactOS Portable Systems Group Date: Sun, 13 Jul 2008 02:32:24 +0000 Subject: [PATCH] - To whom it may concern: thanks for completly fucking up mkhive support with your "fix". It broken make install and livecd on i386 AND ARM. - Made the necessary changes to make it work properly by fixing mkhive and rbuild. svn path=/trunk/; revision=34446 --- reactos/tools/mkhive/mkhive.c | 22 +++++++++++++------- reactos/tools/rbuild/backend/mingw/mingw.cpp | 16 +++++++------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/reactos/tools/mkhive/mkhive.c b/reactos/tools/mkhive/mkhive.c index 4a9fce6fc9e..1134140a292 100644 --- a/reactos/tools/mkhive/mkhive.c +++ b/reactos/tools/mkhive/mkhive.c @@ -88,9 +88,9 @@ int main (int argc, char *argv[]) char FileName[PATH_MAX]; int Param; - printf ("Binary hive maker\n"); + printf ("Binary hive maker: %s\n", argv[3]); - if (argc < 3) + if (argc < 4) { usage (); return 1; @@ -100,25 +100,33 @@ int main (int argc, char *argv[]) convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesys.inf"); + strcat (FileName, "hivesys_"); + strcat (FileName, argv[3]); + strcat (FileName, ".inf"); ImportRegistryFile (FileName); convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivecls.inf"); + strcat (FileName, "hivecls_"); + strcat (FileName, argv[3]); + strcat (FileName, ".inf"); ImportRegistryFile (FileName); convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesft.inf"); + strcat (FileName, "hivesft_"); + strcat (FileName, argv[3]); + strcat (FileName, ".inf"); ImportRegistryFile (FileName); convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivedef.inf"); + strcat (FileName, "hivedef_"); + strcat (FileName, argv[3]); + strcat (FileName, ".inf"); ImportRegistryFile (FileName); - for (Param = 3; Param < argc; Param++) + for (Param = 4; Param < argc; Param++) { convert_path (FileName, argv[Param]); ImportRegistryFile (FileName); diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp index 73304721734..5c178dd4f40 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.cpp +++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp @@ -1200,11 +1200,11 @@ MingwBackend::OutputModuleInstallTargets () string MingwBackend::GetRegistrySourceFiles () { - return "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivecls.inf " - "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivedef.inf " - "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hiveinst.inf " - "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivesft.inf " - "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivesys.inf"; + return "boot" + sSep + "bootdata" + sSep + "hivecls_" + Environment::GetArch() + ".inf " + "boot" + sSep + "bootdata" + sSep + "hivedef_" + Environment::GetArch() + ".inf " + "boot" + sSep + "bootdata" + sSep + "hiveinst_" + Environment::GetArch() + ".inf " + "boot" + sSep + "bootdata" + sSep + "hivesft_" + Environment::GetArch() + ".inf " + "boot" + sSep + "bootdata" + sSep + "hivesys_" + Environment::GetArch() + ".inf "; } string @@ -1241,9 +1241,9 @@ MingwBackend::OutputRegistryInstallTarget () fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata%c$(ROS_ARCH) %s boot%cbootdata%c$(ROS_ARCH)%chiveinst.inf\n", - cSep, cSep, GetFullPath ( system32 ).c_str (), - cSep, cSep, cSep ); + "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ROS_ARCH) boot%cbootdata%chiveinst_$(ROS_ARCH).inf\n", + cSep, GetFullPath ( system32 ).c_str (), + cSep, cSep ); fprintf ( fMakefile, "\n" ); }