Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-23 14:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

- 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.

Browse source 
- Made the necessary changes to make it work properly by fixing mkhive and rbuild.

svn path=/trunk/; revision=34446
This commit is contained in:
ReactOS Portable Systems Group 2008-07-13 02:32:24 +00:00
parent ae45b8fbbb
commit 0e87f19d40
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/tools/mkhive/mkhive.c
View file

@ -88,9 +88,9 @@ int main (int argc, char *argv[])
char FileName[PATH_MAX]; char FileName[PATH_MAX];
int Param; int Param;
printf ("Binary hive maker\n"); printf ("Binary hive maker: %s\n", argv[3]);
if (argc < 3) if (argc < 4)
{ {
usage (); usage ();
return 1; return 1;
@ -100,25 +100,33 @@ int main (int argc, char *argv[])
convert_path (FileName, argv[1]); convert_path (FileName, argv[1]);
strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, DIR_SEPARATOR_STRING);
strcat (FileName, "hivesys.inf"); strcat (FileName, "hivesys_");
strcat (FileName, argv[3]);
strcat (FileName, ".inf");
ImportRegistryFile (FileName); ImportRegistryFile (FileName);
convert_path (FileName, argv[1]); convert_path (FileName, argv[1]);
strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, DIR_SEPARATOR_STRING);
strcat (FileName, "hivecls.inf"); strcat (FileName, "hivecls_");
strcat (FileName, argv[3]);
strcat (FileName, ".inf");
ImportRegistryFile (FileName); ImportRegistryFile (FileName);
convert_path (FileName, argv[1]); convert_path (FileName, argv[1]);
strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, DIR_SEPARATOR_STRING);
strcat (FileName, "hivesft.inf"); strcat (FileName, "hivesft_");
strcat (FileName, argv[3]);
strcat (FileName, ".inf");
ImportRegistryFile (FileName); ImportRegistryFile (FileName);
convert_path (FileName, argv[1]); convert_path (FileName, argv[1]);
strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, DIR_SEPARATOR_STRING);
strcat (FileName, "hivedef.inf"); strcat (FileName, "hivedef_");
strcat (FileName, argv[3]);
strcat (FileName, ".inf");
ImportRegistryFile (FileName); ImportRegistryFile (FileName);
for (Param = 3; Param < argc; Param++) for (Param = 4; Param < argc; Param++)
{ {
convert_path (FileName, argv[Param]); convert_path (FileName, argv[Param]);
ImportRegistryFile (FileName); ImportRegistryFile (FileName);

16
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -1200,11 +1200,11 @@ MingwBackend::OutputModuleInstallTargets ()
string string
MingwBackend::GetRegistrySourceFiles () MingwBackend::GetRegistrySourceFiles ()
{ {
return "boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivecls.inf " return "boot" + sSep + "bootdata" + sSep + "hivecls_" + Environment::GetArch() + ".inf "
"boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivedef.inf " "boot" + sSep + "bootdata" + sSep + "hivedef_" + Environment::GetArch() + ".inf "
"boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hiveinst.inf " "boot" + sSep + "bootdata" + sSep + "hiveinst_" + Environment::GetArch() + ".inf "
"boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivesft.inf " "boot" + sSep + "bootdata" + sSep + "hivesft_" + Environment::GetArch() + ".inf "
"boot" + sSep + "bootdata" + sSep + Environment::GetArch() + sSep + "hivesys.inf"; "boot" + sSep + "bootdata" + sSep + "hivesys_" + Environment::GetArch() + ".inf ";
} }
string string
@ -1241,9 +1241,9 @@ MingwBackend::OutputRegistryInstallTarget ()
fprintf ( fMakefile, fprintf ( fMakefile,
"\t$(ECHO_MKHIVE)\n" ); "\t$(ECHO_MKHIVE)\n" );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t$(MKHIVE_TARGET) boot%cbootdata%c$(ROS_ARCH) %s boot%cbootdata%c$(ROS_ARCH)%chiveinst.inf\n", "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ROS_ARCH) boot%cbootdata%chiveinst_$(ROS_ARCH).inf\n",
cSep, cSep, GetFullPath ( system32 ).c_str (), cSep, GetFullPath ( system32 ).c_str (),
cSep, cSep, cSep ); cSep, cSep );
fprintf ( fMakefile, fprintf ( fMakefile,
"\n" ); "\n" );
} }