- Registry configuration will likely end up having arch-specific settings, so separat...

- If we move away from a standard inf file (not necessarly a good idea), we may be able to return back to a single directory and dynamically generate .inf data.
- Update rbuild to deal with this new fact.

svn path=/trunk/; revision=34211

diff --git a/reactos/boot/bootdata/arm/.gitignore b/reactos/boot/bootdata/arm/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/reactos/boot/bootdata/hivecls.inf b/reactos/boot/bootdata/i386/hivecls.inf
similarity index 100%
rename from reactos/boot/bootdata/hivecls.inf
rename to reactos/boot/bootdata/i386/hivecls.inf

diff --git a/reactos/boot/bootdata/hivedef.inf b/reactos/boot/bootdata/i386/hivedef.inf
similarity index 100%
rename from reactos/boot/bootdata/hivedef.inf
rename to reactos/boot/bootdata/i386/hivedef.inf

diff --git a/reactos/boot/bootdata/hiveinst.inf b/reactos/boot/bootdata/i386/hiveinst.inf
similarity index 100%
rename from reactos/boot/bootdata/hiveinst.inf
rename to reactos/boot/bootdata/i386/hiveinst.inf

diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/i386/hivesft.inf
similarity index 100%
rename from reactos/boot/bootdata/hivesft.inf
rename to reactos/boot/bootdata/i386/hivesft.inf

diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/i386/hivesys.inf
similarity index 100%
rename from reactos/boot/bootdata/hivesys.inf
rename to reactos/boot/bootdata/i386/hivesys.inf

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index ae2e4d4..f0cee4d 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -1201,11 +1201,11 @@ MingwBackend::OutputModuleInstallTargets ()
 string
 MingwBackend::GetRegistrySourceFiles ()
 {
-       return "boot" + sSep + "bootdata" + sSep + "hivecls.inf "
-               "boot" + sSep + "bootdata" + sSep + "hivedef.inf "
-               "boot" + sSep + "bootdata" + sSep + "hiveinst.inf "
-               "boot" + sSep + "bootdata" + sSep + "hivesft.inf "
-               "boot" + sSep + "bootdata" + sSep + "hivesys.inf";
+       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";
 }
 
 string
@@ -1242,9 +1242,9 @@ MingwBackend::OutputRegistryInstallTarget ()
        fprintf ( fMakefile,
                  "\t$(ECHO_MKHIVE)\n" );
        fprintf ( fMakefile,
-                 "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst.inf\n",
-                 cSep, GetFullPath ( system32 ).c_str (),
-                 cSep, cSep );
+                 "\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 );
        fprintf ( fMakefile,
                  "\n" );
 }