5 Mar
2005
5 Mar
'05
11:22 p.m.
Put remaining files on the cd
Modified:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.xml
Modified:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_main.xml
Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr.xml
Added:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr_main.xml
Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml
Modified: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml
Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp
Added: branches/xmlbuildsystem/reactos/tools/wrc/makefile
_____
Modified:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.xml
--- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -1,4 +1,5 @@
<module name="freeldr" type="bootloader">
+ <bootstrap base="loader" />
<library>freeldr_startup</library>
<library>freeldr_base64k</library>
<library>freeldr_base</library>
_____
Modified:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_main.xml
---
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_main.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_main.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -8,9 +8,6 @@
<compilerflag>-fno-inline</compilerflag>
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
<compilerflag>-Os</compilerflag>
- <directory name="inffile">
- <file>inffile.c</file>
- </directory>
<file>bootmgr.c</file>
<file>drivemap.c</file>
<file>miscboot.c</file>
_____
Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr.xml
--- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -0,0 +1,8 @@
+<module name="setupldr" type="bootloader">
+ <bootstrap base="loader" />
+ <library>freeldr_startup</library>
+ <library>freeldr_base64k</library>
+ <library>freeldr_base</library>
+ <library>setupldr_main</library>
+ <library>rossym</library>
+</module>
_____
Added:
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr_main.xml
---
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr_main.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++
branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/setupldr_main.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -0,0 +1,17 @@
+<module name="setupldr_main" type="objectlibrary">
+ <include base="setupldr_main">include</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <compilerflag>-nostdlib</compilerflag>
+ <compilerflag>-ffreestanding</compilerflag>
+ <compilerflag>-fno-builtin</compilerflag>
+ <compilerflag>-fno-inline</compilerflag>
+ <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+ <compilerflag>-Os</compilerflag>
+ <directory name="inffile">
+ <file>inffile.c</file>
+ </directory>
+ <directory name="reactos">
+ <file>setupldr.c</file>
+ </directory>
+</module>
_____
Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml
--- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -6,5 +6,7 @@
<xi:include href="freeldr/freeldr_base64k.xml" />
<xi:include href="freeldr/freeldr_base.xml" />
<xi:include href="freeldr/freeldr_main.xml" />
+ <xi:include href="freeldr/setupldr_main.xml" />
<xi:include href="freeldr/freeldr.xml" />
+ <xi:include href="freeldr/setupldr.xml" />
</directory>
_____
Modified: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml
--- branches/xmlbuildsystem/reactos/bootdata/bootdata.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/bootdata/bootdata.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -3,6 +3,6 @@
<cdfile>readme.txt</cdfile>
<cdfile base="reactos">hivecls.inf</cdfile>
<cdfile base="reactos">hivedef.inf</cdfile>
-<cdfile base="reactos">hiveinst.inf</cdfile>
<cdfile base="reactos">hivesft.inf</cdfile>
<cdfile base="reactos">hivesys.inf</cdfile>
+<cdfile base="reactos">txtsetup.sif</cdfile>
_____
Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml
--- branches/xmlbuildsystem/reactos/subsys/system/directory.xml
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml
2005-03-05 23:22:44 UTC (rev 13840)
@@ -19,6 +19,9 @@
<directory name="notepad">
<xi:include href="notepad/notepad.xml" />
</directory>
+<directory name="reactos">
+ <xi:include href="reactos/reactos.xml" />
+</directory>
<directory name="regedit">
<xi:include href="regedit/regedit.xml" />
</directory>
_____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp
2005-03-05 23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp
2005-03-05 23:22:44 UTC (rev 13840)
@@ -33,11 +33,11 @@
case Win32GUI:
case KernelModeDriver:
case BootSector:
+ case BootLoader:
return true;
case BuildTool:
case StaticLibrary:
case ObjectLibrary:
- case BootLoader:
case Iso:
return false;
}
_____
Added: branches/xmlbuildsystem/reactos/tools/wrc/makefile
--- branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-05
23:19:42 UTC (rev 13839)
+++ branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-05
23:22:44 UTC (rev 13840)
@@ -0,0 +1,39 @@
+WRC_BASE = tools$(SEP)wrc
+
+WRC_TARGET = \
+ $(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX)
+
+WRC_SOURCES = \
+ $(WRC_BASE)$(SEP)dumpres.c \
+ $(WRC_BASE)$(SEP)genres.c \
+ $(WRC_BASE)$(SEP)newstruc.c \
+ $(WRC_BASE)$(SEP)readres.c \
+ $(WRC_BASE)$(SEP)translation.c \
+ $(WRC_BASE)$(SEP)utils.c \
+ $(WRC_BASE)$(SEP)wrc.c \
+ $(WRC_BASE)$(SEP)writeres.c \
+ $(WRC_BASE)$(SEP)y.tab.c \
+ $(WRC_BASE)$(SEP)lex.yy.c \
+ $(WRC_BASE)$(SEP)port$(SEP)mkstemps.o
+
+WRC_OBJECTS = \
+ $(WRC_SOURCES:.c=.o)
+
+WRC_HOST_CFLAGS = -I$(WRC_BASE) -g -Werror -Wall \
+ -D__USE_W32API -DWINE_UNICODE_API= \
+ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \
+ -I$(UNICODE_BASE) -I$(WPP_BASE) -I$(WRC_BASE) \
+ -Iinclude/wine -Iinclude -Iw32api/include
+
+WRC_HOST_LFLAGS = -g
+
+$(WRC_TARGET): $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET)
+ ${host_gcc} $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET)
$(WRC_HOST_LFLAGS) -o $(WRC_TARGET)
+
+$(WRC_OBJECTS): %.o : %.c
+ ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@
+
+.PHONY: wrc_clean
+wrc_clean:
+ -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL)
+clean: wrc_clean
7545
days inactive
7545
days old
0 comments
1 participants
participants (1)
-
chorns＠svn.reactos.com