[mpiulachs] 34225: - Fix a bug in cdfile that was preventing to use the 'nameoncd' attribute

Author: mpiulachs
Date: Mon Jun 30 14:12:16 2008
New Revision: 34225

URL: http://svn.reactos.org/svn/reactos?rev=34225&view=rev
Log:
- Fix a bug in cdfile that was preventing to use the 'nameoncd' attribute

Modified:
    trunk/reactos/boot/bootdata/bootdata.rbuild
    trunk/reactos/tools/rbuild/cdfile.cpp

Modified: trunk/reactos/boot/bootdata/bootdata.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbui...
==============================================================================
--- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Jun 30 14:12:16 2008
@@ -5,10 +5,10 @@
    <cdfile>icon.ico</cdfile>
    <cdfile>readme.txt</cdfile>

-	<cdfile installbase="$(CDOUTPUT)">hivecls_$(ARCH).inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivedef_$(ARCH).inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesft_$(ARCH).inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesys_$(ARCH).inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)" nameoncd="hivecls.inf">hivecls_$(ARCH).inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)" nameoncd="hivedef.inf">hivedef_$(ARCH).inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)" nameoncd="hivesft.inf">hivesft_$(ARCH).inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)" nameoncd="hivesys.inf">hivesys_$(ARCH).inf</cdfile>
    <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
    <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>

Modified: trunk/reactos/tools/rbuild/cdfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?rev...
==============================================================================
--- trunk/reactos/tools/rbuild/cdfile.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/cdfile.cpp [iso-8859-1] Mon Jun 30 14:12:16 2008
@@ -60,6 +60,6 @@
                                &cdfileNode );
    target = new FileLocation ( OutputDirectory,
                                target_relative_directory,
-	                            nameoncd ? att->value : cdfileNode.value,
+	                            nameoncd ? nameoncd->value : cdfileNode.value,
                                &cdfileNode );
 }