Andre Poenitz wrote:
> On Wed, Mar 21, 2007 at 12:14:49AM +0100, Peter Kümmel wrote:
>> Andre Poenitz wrote:
>>> On Tue, Mar 20, 2007 at 06:45:29PM +0000, Angus Leeming wrote:
>>>> Andre Poenitz <[EMAIL PROTECTED]> writes:
>>>> Given that your solution to the problems that the compiler has with these
>>>> 11
>>>> files is so simple, why don't we introduce a new rule to the makefile to
>>>> do
>>>> just as you suggest? Ie, let the makefile perform the concatenation?
>>> It's an interesting suggestion.
>> I've added this feature to the cmake build:
>>
>> cmake ../trunk/development/cmake -Dmerge=1
>>
>> then all *.C files but the files of the boost and the qt4 directories
>> are merged into one file. This happens while the configure process.
>> On windows it runs without changes to a actual co, for linux you need
>> the attached patch.
>> And it is faster!!
>
> Do you have numbers?
files multiple merged
----------------------------------------------
msvc debug 17min 8min + >1min configure
msvc release 19min 9min + >1min configure
>
> [I am not too surprised as in e.g src/*.C we pull in still more headers
> than all the *.C combined (53266 lines here)
>
>> Index: src/support/filetools.C
>> ===================================================================
>> --- src/support/filetools.C (Revision 17495)
>> +++ src/support/filetools.C (Arbeitskopie)
>> @@ -67,7 +66,20 @@
>>
>> namespace fs = boost::filesystem;
>>
>> +#include <boost/lexical_cast.hpp>
>> +
>> namespace lyx {
>> +
>> +template<>
>> +string convert<string>(int i)
>> +{
>> + return boost::lexical_cast<string>(i);
>> +}
>> +
>> +}
>> +
>> +
>> +namespace lyx {
>> namespace support {
>>
>> bool isLyXFilename(string const & filename)
>> Index: src/support/convert.C
>> ===================================================================
>> --- src/support/convert.C (Revision 17495)
>> +++ src/support/convert.C (Arbeitskopie)
>> @@ -51,13 +51,6 @@
>>
>>
>> template<>
>> -string convert<string>(int i)
>> -{
>> - return lexical_cast<string>(i);
>> -}
>> -
>> -
>> -template<>
>> docstring convert<docstring>(int i)
>> {
>> return lyx::from_ascii(lexical_cast<string>(i));
>
>
> This looks safe to apply anyway.
>
> Andre'
>
--
Peter Kümmel
