[ros-arm-bringup] 34446: - 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.

Author: ros-arm-bringup
Date: Sat Jul 12 21:32:24 2008
New Revision: 34446

URL: http://svn.reactos.org/svn/reactos?rev=34446&view=rev
Log:
- 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.

Modified:
    trunk/reactos/tools/mkhive/mkhive.c
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: trunk/reactos/tools/mkhive/mkhive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=…
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Sat Jul 12 21:32:24 2008
@@ -88,9 +88,9 @@
 	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 @@
 
 	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);

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Jul 12 21:32:24
2008
@@ -1200,11 +1200,11 @@
 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 @@
 	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" );
 }