Don't generate intermediate archives Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____
Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -25,11 +25,6 @@
<file>irp.c</file> <file>lock.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>pool.c</file> <file>proto.c</file> Property changes on: branches/xmlbuildsystem/reactos/hal/halx86/generic ___________________________________________________________________ Name: svn:ignore + *.o _____
Modified: branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml --- branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -1,31 +1,43 @@
-<module name="hal_generic" type="staticlibrary"> +<module name="hal_generic" type="objectlibrary"> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTHAL__" /> - <file>adapter.c</file> - <file>beep.c</file> - <file>bus.c</file> - <file>display.c</file> - <file>dma.c</file> - <file>drive.c</file> - <file>enum.c</file> - <file>fmutex.c</file> - <file>halinit.c</file> - <file>ipi.c</file> - <file>irql.c</file> - <file>isa.c</file> - <file>kdbg.c</file> - <file>mca.c</file> - <file>misc.c</file> - <file>pci.c</file> - <file>portio.c</file> - <file>processor.c</file> - <file>reboot.c</file> - <file>resource.c</file> - <file>spinlock.c</file> - <file>sysbus.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> + <file>adapter.c</file> + <file>beep.c</file> + <file>bus.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>enum.c</file> + <file>fmutex.c</file> + <file>halinit.c</file> + <file>isa.c</file> + <file>kdbg.c</file> + <file>mca.c</file> + <file>misc.c</file> + <file>pci.c</file> + <file>portio.c</file> + <file>reboot.c</file> + <file>spinlock.c</file> + <file>sysbus.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timer.c</file> </module> +<module name="hal_generic_up" type="objectlibrary"> + <include base="hal_generic_up">../include</include> + <include base="ntoskrnl">include</include> + <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> _____
Modified: branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml --- branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,9 @@
<define name="_DISABLE_TIDENTS" /> <define name="CONFIG_SMP" /> <define name="__NTHAL__" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> <file>apic.c</file> <file>halinit_mp.c</file> <file>ipi_mp.c</file> _____
Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml --- branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,10 @@
<include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <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>halup.rc</file> </module> _____
Modified: branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml --- branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,9 @@
<define name="_DISABLE_TIDENTS" /> <define name="UP" /> <define name="__NTHAL__" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> <file>display_xbox.c</file> <file>font.c</file> <file>halinit_xbox.c</file> _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-06 13:49:10 UTC (rev 13854) @@ -481,7 +481,7 @@
{ size_t i;
- if ( includes.size() || defines.size() ) + if ( includes.size () > 0 || defines.size () > 0 ) { GenerateMacro ( assignmentOperation, cflags_macro, @@ -509,9 +509,9 @@ } } - 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 ) { @@ -525,14 +525,11 @@ fprintf ( fMakefile, "%s %s", - objs_macro.c_str(), + objs_macro.c_str (), assignmentOperation ); for ( i = 0; i < files.size(); i++ ) { - string extension = GetExtension ( files[i]->name ); - if ( extension != ".spec" - && extension != ".SPEC" - && !files[i]->first ) + if ( !files[i]->first ) { fprintf ( fMakefile, @@ -1308,7 +1305,7 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module ) { string target ( FixupTargetFilename ( module.GetPath () ) ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateMacrosAndTargetsHost ( module ); @@ -1321,14 +1318,14 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); fprintf ( fMakefile, "\t%s %s -o %s %s %s\n\n", linker.c_str (), GetLinkerMacro ( module ).c_str (), target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); }
@@ -1473,7 +1470,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); @@ -1484,7 +1481,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.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", @@ -1493,7 +1490,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - archiveFilename ); + objectsMacro ); } else { @@ -1526,8 +1523,8 @@ { static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) ); - string workingDirectory = GetWorkingDirectory ( ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string workingDirectory = GetWorkingDirectory (); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); @@ -1542,7 +1539,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.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", @@ -1551,7 +1548,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - archiveFilename ); + objectsMacro ); } else { @@ -1584,8 +1581,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1596,7 +1592,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.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", @@ -1605,7 +1601,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1638,8 +1634,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1654,7 +1649,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.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", @@ -1663,7 +1658,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1718,7 +1713,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string linkingDependencies = GetLinkingDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); @@ -1728,7 +1723,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), linkingDependencies.c_str () );
string linker; @@ -1743,7 +1738,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1776,7 +1771,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); @@ -1787,7 +1782,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () );
string linker; @@ -1802,7 +1797,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1835,7 +1830,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module );
GenerateImportLibraryTargetIfNeeded ( module ); @@ -1846,7 +1841,7 @@
fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () );
string linker; @@ -1861,7 +1856,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else {
-
chorns＠svn.reactos.com