Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't generate intermediate archives

Browse source 
svn path=/branches/xmlbuildsystem/; revision=13854
This commit is contained in:
Casper Hornstrup 2005-03-06 13:49:10 +00:00
parent 8fa490af68
commit 9fbf269e59
6 changed files with 78 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/drivers/net/tcpip/tcpip.xml
View file

@ -25,11 +25,6 @@
<file>irp.c</file> <file>irp.c</file>
<file>lock.c</file> <file>lock.c</file>
<file>main.c</file> <file>main.c</file>
<file>mockbuffer.c</file>
<file>mockbug.c</file>
<file>mocklock.c</file>
<file>mockpool.c</file>
<file>mockwait.c</file>
<file>ninfo.c</file> <file>ninfo.c</file>
<file>pool.c</file> <file>pool.c</file>
<file>proto.c</file> <file>proto.c</file>

64
reactos/hal/halx86/generic/generic.xml
View file

@ -1,31 +1,43 @@
<module name="hal_generic" type="staticlibrary"> <module name="hal_generic" type="objectlibrary">
<include base="hal_generic">../include</include> <include base="hal_generic">../include</include>
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" /> <define name="_DISABLE_TIDENTS" />
<define name="__NTHAL__" /> <define name="__NTHAL__" />
<file>adapter.c</file> <file>adapter.c</file>
<file>beep.c</file> <file>beep.c</file>
<file>bus.c</file> <file>bus.c</file>
<file>display.c</file> <file>dma.c</file>
<file>dma.c</file> <file>drive.c</file>
<file>drive.c</file> <file>enum.c</file>
<file>enum.c</file> <file>fmutex.c</file>
<file>fmutex.c</file> <file>halinit.c</file>
<file>halinit.c</file> <file>isa.c</file>
<file>ipi.c</file> <file>kdbg.c</file>
<file>irql.c</file> <file>mca.c</file>
<file>isa.c</file> <file>misc.c</file>
<file>kdbg.c</file> <file>pci.c</file>
<file>mca.c</file> <file>portio.c</file>
<file>misc.c</file> <file>reboot.c</file>
<file>pci.c</file> <file>spinlock.c</file>
<file>portio.c</file> <file>sysbus.c</file>
<file>processor.c</file> <file>sysinfo.c</file>
<file>reboot.c</file> <file>time.c</file>
<file>resource.c</file> <file>timer.c</file>
<file>spinlock.c</file> </module>
<file>sysbus.c</file> <module name="hal_generic_up" type="objectlibrary">
<file>sysinfo.c</file> <include base="hal_generic_up">../include</include>
<file>time.c</file> <include base="ntoskrnl">include</include>
<file>timer.c</file> <define name="_DISABLE_TIDENTS" />
<define name="__NTHAL__" />
<file>ipi.c</file>
<file>irql.c</file>
<file>processor.c</file>
<file>resource.c</file>
</module>
<module name="hal_generic_pc" type="objectlibrary">
<include base="hal_generic_pc">../include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
<define name="__NTHAL__" />
<file>display.c</file>
</module> </module>

3
reactos/hal/halx86/mp/halmp.xml
View file

@ -4,6 +4,9 @@
<define name="_DISABLE_TIDENTS" /> <define name="_DISABLE_TIDENTS" />
<define name="CONFIG_SMP" /> <define name="CONFIG_SMP" />
<define name="__NTHAL__" /> <define name="__NTHAL__" />
<library>hal_generic</library>
<library>hal_generic_pc</library>
<library>ntoskrnl</library>
<file>apic.c</file> <file>apic.c</file>
<file>halinit_mp.c</file> <file>halinit_mp.c</file>
<file>ipi_mp.c</file> <file>ipi_mp.c</file>

4
reactos/hal/halx86/up/halup.xml
View file

@ -4,6 +4,10 @@
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" /> <define name="_DISABLE_TIDENTS" />
<define name="__NTHAL__" /> <define name="__NTHAL__" />
<library>hal_generic</library>
<library>hal_generic_up</library>
<library>hal_generic_pc</library>
<library>ntoskrnl</library>
<file>halinit_up.c</file> <file>halinit_up.c</file>
<file>halup.rc</file> <file>halup.rc</file>
</module> </module>

3
reactos/hal/halx86/xbox/halxbox.xml
View file

@ -4,6 +4,9 @@
<define name="_DISABLE_TIDENTS" /> <define name="_DISABLE_TIDENTS" />
<define name="UP" /> <define name="UP" />
<define name="__NTHAL__" /> <define name="__NTHAL__" />
<library>hal_generic</library>
<library>hal_generic_up</library>
<library>ntoskrnl</library>
<file>display_xbox.c</file> <file>display_xbox.c</file>
<file>font.c</file> <file>font.c</file>
<file>halinit_xbox.c</file> <file>halinit_xbox.c</file>

65
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -481,7 +481,7 @@ MingwModuleHandler::GenerateMacros (
{ {
size_t i; size_t i;
if ( includes.size() || defines.size() ) if ( includes.size () > 0 || defines.size () > 0 )
{ {
GenerateMacro ( assignmentOperation, GenerateMacro ( assignmentOperation,
cflags_macro, cflags_macro,
@ -509,9 +509,9 @@ MingwModuleHandler::GenerateMacros (
} }
} }
if ( files.size() ) if ( files.size () > 0 )
{ {
for ( i = 0; i < files.size(); i++ ) for ( i = 0; i < files.size (); i++ )
{ {
if ( files[i]->first ) if ( files[i]->first )
{ {
@ -525,14 +525,11 @@ MingwModuleHandler::GenerateMacros (
fprintf ( fprintf (
fMakefile, fMakefile,
"%s %s", "%s %s",
objs_macro.c_str(), objs_macro.c_str (),
assignmentOperation ); assignmentOperation );
for ( i = 0; i < files.size(); i++ ) for ( i = 0; i < files.size(); i++ )
{ {
string extension = GetExtension ( files[i]->name ); if ( !files[i]->first )
if ( extension != ".spec"
&& extension != ".SPEC"
&& !files[i]->first )
{ {
fprintf ( fprintf (
fMakefile, fMakefile,
@ -1308,7 +1305,7 @@ void
MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module ) MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module )
{ {
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string archiveFilename = GetModuleArchiveFilename ( module ); string objectsMacro = GetObjectsMacro ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateMacrosAndTargetsHost ( module ); GenerateMacrosAndTargetsHost ( module );
@ -1321,14 +1318,14 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& modul
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t%s %s -o %s %s %s\n\n", "\t%s %s -o %s %s %s\n\n",
linker.c_str (), linker.c_str (),
GetLinkerMacro ( module ).c_str (), GetLinkerMacro ( module ).c_str (),
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
} }
@ -1473,7 +1470,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string archiveFilename = GetModuleArchiveFilename ( module ); string objectsMacro = GetObjectsMacro ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1484,7 +1481,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
@ -1493,7 +1490,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ( const Modul
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
"${gcc}", "${gcc}",
linkerParameters, linkerParameters,
archiveFilename ); objectsMacro );
} }
else else
{ {
@ -1526,8 +1523,8 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
{ {
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) ); string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ();
string archiveFilename = GetModuleArchiveFilename ( module ); string objectsMacro = GetObjectsMacro ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1542,7 +1539,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
@ -1551,7 +1548,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
"${gcc}", "${gcc}",
linkerParameters, linkerParameters,
archiveFilename ); objectsMacro );
} }
else else
{ {
@ -1584,8 +1581,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string objectFilenames = GetObjectFilenames ( module ); string objectsMacro = GetObjectsMacro ( module );
string archiveFilename = GetModuleArchiveFilename ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1596,7 +1592,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
@ -1605,7 +1601,7 @@ MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& modul
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
"${gcc}", "${gcc}",
linkerParameters, linkerParameters,
objectFilenames ); objectsMacro );
} }
else else
{ {
@ -1638,8 +1634,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string objectFilenames = GetObjectFilenames ( module ); string objectsMacro = GetObjectsMacro ( module );
string archiveFilename = GetModuleArchiveFilename ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1654,7 +1649,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
archiveFilename.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
@ -1663,7 +1658,7 @@ MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ( const Module& modul
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
"${gcc}", "${gcc}",
linkerParameters, linkerParameters,
objectFilenames ); objectsMacro );
} }
else else
{ {
@ -1718,7 +1713,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string objectFilenames = GetObjectFilenames ( module ); string objectsMacro = GetObjectsMacro ( module );
string linkingDependencies = GetLinkingDependencies ( module ); string linkingDependencies = GetLinkingDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1728,7 +1723,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
objectFilenames.c_str (), objectsMacro.c_str (),
linkingDependencies.c_str () ); linkingDependencies.c_str () );
string linker; string linker;
@ -1743,7 +1738,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
linker, linker,
linkerParameters, linkerParameters,
objectFilenames ); objectsMacro );
} }
else else
{ {
@ -1776,7 +1771,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string objectFilenames = GetObjectFilenames ( module ); string objectsMacro = GetObjectsMacro ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1787,7 +1782,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
objectFilenames.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linker; string linker;
@ -1802,7 +1797,7 @@ MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ( const Module& module
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
linker, linker,
linkerParameters, linkerParameters,
objectFilenames ); objectsMacro );
} }
else else
{ {
@ -1835,7 +1830,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
static string ros_junk ( "$(ROS_TEMPORARY)" ); static string ros_junk ( "$(ROS_TEMPORARY)" );
string target ( FixupTargetFilename ( module.GetPath () ) ); string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ( ); string workingDirectory = GetWorkingDirectory ( );
string objectFilenames = GetObjectFilenames ( module ); string objectsMacro = GetObjectsMacro ( module );
string importLibraryDependencies = GetImportLibraryDependencies ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); GenerateImportLibraryTargetIfNeeded ( module );
@ -1846,7 +1841,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
fprintf ( fMakefile, "%s: %s %s\n", fprintf ( fMakefile, "%s: %s %s\n",
target.c_str (), target.c_str (),
objectFilenames.c_str (), objectsMacro.c_str (),
importLibraryDependencies.c_str () ); importLibraryDependencies.c_str () );
string linker; string linker;
@ -1861,7 +1856,7 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
GenerateLinkerCommand ( module, GenerateLinkerCommand ( module,
linker, linker,
linkerParameters, linkerParameters,
objectFilenames ); objectsMacro );
} }
else else
{ {