[ros-diffs] [tkreuzer] 46440: [BOOTCD/LIVECD] Add -$(ARCH) to non-x86 bootcd and livecd image names.

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Thu Mar 25 14:55:00 2010
New Revision: 46440

URL: http://svn.reactos.org/svn/reactos?rev=46440&view=rev
Log:
[BOOTCD/LIVECD]
Add -$(ARCH) to non-x86 bootcd and livecd image names.

Modified:
    trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
    trunk/reactos/boot/bootdata/livecd/livecd.rbuild

Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild?rev=46440&r1=46439&r2=46440&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Thu Mar 25 14:55:00 2010
@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="bootcd" type="iso" output="ReactOS.iso">
-	<bootsector>isoboot</bootsector>
-</module>
+<if property="ARCH" value="i386>
+	<module name="bootcd" type="iso" output="ReactOS.iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</if>
+<ifnot property="ARCH" value="i386>
+	<module name="bootcd" type="iso" output="ReactOS-$(ARCH).iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</ifnot>

Modified: trunk/reactos/boot/bootdata/livecd/livecd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd/livecd.rbuild?rev=46440&r1=46439&r2=46440&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] Thu Mar 25 14:55:00 2010
@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
-	<bootsector>isoboot</bootsector>
-</module>
+<if property="ARCH" value="i386>
+	<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</if>
+<ifnot property="ARCH" value="i386>
+	<module name="livecd" type="liveiso" output="ReactOS-LiveCD-$(ARCH).iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</ifnot>