[ros-diffs] [ion] 8: - Update directory change in rbuild/xml files too.

- Update directory change in rbuild/xml files too.
Modified: trunk/reactos/ReactOS.xml
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
  _____

Modified: trunk/reactos/ReactOS.xml
--- trunk/reactos/ReactOS.xml	2006-01-28 06:22:12 UTC (rev 7)
+++ trunk/reactos/ReactOS.xml	2006-01-28 06:35:12 UTC (rev 8)
@@ -50,8 +50,8 @@

<xi:include href="boot/boot.xml" />
    </directory>
 -->
-	<directory name="bootdata">
-		<xi:include href="bootdata/bootdata.xml" />
+	<directory name="boot">
+		<xi:include href="boot/bootdata.xml" />
    </directory>
 <!--
    <directory name="drivers">
  _____

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp	2006-01-28
06:22:12 UTC (rev 7)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp	2006-01-28
06:35:12 UTC (rev 8)
@@ -1023,11 +1023,11 @@

string
 MingwBackend::GetRegistrySourceFiles ()
 {
-	return "bootdata" + sSep + "hivecls.inf "
-		"bootdata" + sSep + "hivedef.inf "
-		"bootdata" + sSep + "hiveinst.inf "
-		"bootdata" + sSep + "hivesft.inf "
-		"bootdata" + sSep + "hivesys.inf";
+	return "boot" + sSep + "hivecls.inf "
+		"boot" + sSep + "hivedef.inf "
+		"boot" + sSep + "hiveinst.inf "
+		"boot" + sSep + "hivesft.inf "
+		"boot" + sSep + "hivesys.inf";
 }

string
@@ -1065,7 +1065,7 @@
    fprintf ( fMakefile,
              "\t$(ECHO_MKHIVE)\n" );
    fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s
bootdata%chiveinst.inf\n",
+	          "\t$(MKHIVE_TARGET) bootdata %s boot%chiveinst.inf\n",
              system32ConfigDirectory.c_str (),
                   cSep );
    fprintf ( fMakefile,
  _____

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2006-01-28 06:22:12 UTC (rev 7)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
2006-01-28 06:35:12 UTC (rev 8)
@@ -2937,7 +2937,7 @@

string reactosInf = PassThruCacheDirectory (
    	NormalizeFilename ( bootcdReactosNoFixup + sSep +
"reactos.inf" ),
    	backend->outputDirectory );
-	string reactosDff = NormalizeFilename ( "bootdata" + sSep +
"packages" + sSep + "reactos.dff" );
+	string reactosDff = NormalizeFilename ( "boot" + sSep +
"packages" + sSep + "reactos.dff" );
    string cdDirectories = GetCdDirectories ( bootcdDirectory );
    vector<string> vCdFiles;
    GetCdFiles ( vCdFiles );
@@ -3061,7 +3061,7 @@
    CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep +
"Default User" + sSep + "Desktop" );
    CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep +
"Default User" + sSep + "My Documents" );

-	string livecdIni = "bootdata" + sSep + "livecd.ini";
+	string livecdIni = "boot" + sSep + "livecd.ini";
    OutputCopyCommand ( livecdIni,
                         "freeldr.ini",
                         livecdDirectory );
@@ -3089,7 +3089,7 @@
    fprintf ( fMakefile,
              "\t$(ECHO_MKHIVE)\n" );
    fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s bootdata%clivecd.inf
bootdata%chiveinst.inf\n",
+	          "\t$(MKHIVE_TARGET) bootdata %s boot%clivecd.inf
boot%chiveinst.inf\n",
              reactosSystem32ConfigDirectory.c_str (),
                   cSep,
                   cSep );