[ros-diffs] [mpiulachs] 34215: - try to fix build (NOT TESTED). This is a temporary solution however. Most of the registry information must be dynamically generated by rbuild and the rest in from of .inf files during 2nd stage setup
mpiulachs at svn.reactos.org
mpiulachs at svn.reactos.org
Mon Jun 30 11:28:28 CEST 2008
Author: mpiulachs
Date: Mon Jun 30 04:28:28 2008
New Revision: 34215
URL: http://svn.reactos.org/svn/reactos?rev=34215&view=rev
Log:
- try to fix build (NOT TESTED). This is a temporary solution however. Most of the registry information must be dynamically generated by rbuild and the rest in from of .inf files during 2nd stage setup
Added:
trunk/reactos/boot/bootdata/arm/directory.rbuild (with props)
trunk/reactos/boot/bootdata/i386/directory.rbuild (with props)
Modified:
trunk/reactos/boot/bootdata/bootdata.rbuild
Added: trunk/reactos/boot/bootdata/arm/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/arm/directory.rbuild?rev=34215&view=auto
==============================================================================
--- trunk/reactos/boot/bootdata/arm/directory.rbuild (added)
+++ trunk/reactos/boot/bootdata/arm/directory.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008
@@ -1,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+</group>
Propchange: trunk/reactos/boot/bootdata/arm/directory.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/boot/bootdata/bootdata.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbuild?rev=34215&r1=34214&r2=34215&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008
@@ -4,12 +4,25 @@
<cdfile>autorun.inf</cdfile>
<cdfile>icon.ico</cdfile>
<cdfile>readme.txt</cdfile>
- <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
- <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
- <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
- <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
- <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
- <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <xi:include href="i386/directory.rbuild" />
+ </directory>
+ </if>
+<!--
+ <if property="ARCH" value="powerpc">
+ <directory name="ppc">
+ <xi:include href="ppc/directory.rbuild" />
+ </directory>
+ </if>
+-->
+ <if property="ARCH" value="arm">
+ <directory name="arm">
+ <xi:include href="arm/directory.rbuild" />
+ </directory>
+ </if>
+
<directory name="bootcd">
<xi:include href="bootcd/bootcd.rbuild" />
</directory>
Added: trunk/reactos/boot/bootdata/i386/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/i386/directory.rbuild?rev=34215&view=auto
==============================================================================
--- trunk/reactos/boot/bootdata/i386/directory.rbuild (added)
+++ trunk/reactos/boot/bootdata/i386/directory.rbuild [iso-8859-1] Mon Jun 30 04:28:28 2008
@@ -1,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+</group>
Propchange: trunk/reactos/boot/bootdata/i386/directory.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list