Don't put modules in project root to avoid overwriting the top-level makefile with...

svn path=/branches/xmlbuildsystem/; revision=15411

diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index 1e8a2b5..36141b9 100644 (file)
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -65,11 +65,4 @@
        <directory name="subsys">\r
                <xi:include href="subsys/directory.xml" />\r
        </directory>\r
-\r
-       <module name="bootcd" type="iso">\r
-       </module>\r
-\r
-       <module name="livecd" type="liveiso">\r
-       </module>\r
-\r
 </project>\r

diff --git a/reactos/bootdata/bootcd/bootcd.xml b/reactos/bootdata/bootcd/bootcd.xml
new file mode 100644 (file)
index 0000000..04a20a5
--- /dev/null
+++ b/reactos/bootdata/bootcd/bootcd.xml
@@ -0,0 +1,2 @@
+<module name="bootcd" type="iso">
+</module>

diff --git a/reactos/bootdata/bootdata.xml b/reactos/bootdata/bootdata.xml
index 7eca69a..d0da350 100644 (file)
--- a/reactos/bootdata/bootdata.xml
+++ b/reactos/bootdata/bootdata.xml
@@ -6,3 +6,9 @@
 <cdfile base="reactos">hivesft.inf</cdfile>\r
 <cdfile base="reactos">hivesys.inf</cdfile>\r
 <cdfile base="reactos">txtsetup.sif</cdfile>\r
+<directory name="bootcd">\r
+       <xi:include href="bootcd/bootcd.xml" />\r
+</directory>\r
+<directory name="livecd">\r
+       <xi:include href="livecd/livecd.xml" />\r
+</directory>\r

diff --git a/reactos/bootdata/livecd/livecd.xml b/reactos/bootdata/livecd/livecd.xml
new file mode 100644 (file)
index 0000000..766fa73
--- /dev/null
+++ b/reactos/bootdata/livecd/livecd.xml
@@ -0,0 +1,2 @@
+<module name="livecd" type="liveiso">
+</module>