Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
Just tested. It is broken. Saving/restoring env is more difficult than I expected. :-( Actually, with all the cached tests, I do not save much time either. Fast_start is back. I was trying to find a real fix other than an unnecessary io.h test, and forget to restore the test afterwards. BOOST

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
On 20 Jun 2006 18:20:16 +0200, Lars Gullik Bjønnes <[EMAIL PROTECTED]> wrote: "Bo Peng" <[EMAIL PROTECTED]> writes: | > That is what we have setup automake to do. | > (except that we have so far not bothered to split config.h) | | Really? src/config.h.in: Hmm da hmm... you are right... We shou

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Jose' Matos
On Tuesday 20 June 2006 17:20, Lars Gullik Bjønnes wrote: > "Bo Peng" <[EMAIL PROTECTED]> writes: > | > That is what we have setup automake to do. > | > (except that we have so far not bothered to split config.h) > | > | Really? src/config.h.in: > > Hmm da hmm... you are right... > > We should prob

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Lars Gullik Bjønnes
"Bo Peng" <[EMAIL PROTECTED]> writes: | > That is what we have setup automake to do. | > (except that we have so far not bothered to split config.h) | | Really? src/config.h.in: Hmm da hmm... you are right... We should probably create boost_config.h for autotools as well. That would avoid the i

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
That is what we have setup automake to do. (except that we have so far not bothered to split config.h) Really? src/config.h.in: #define BOOST_USER_CONFIG #if !defined(ENABLE_ASSERTIONS) # define BOOST_DISABLE_ASSERTS 1 #endif #define BOOST_ENABLE_ASSERT_HANDLER 1 You see, I am trying to be

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Lars Gullik Bjønnes
Abdelrazak Younes <[EMAIL PROTECTED]> writes: | Right, when compiling boost .cpp file you have to pass | DBOOST_USER_CONFIG= to the compiler. That's | what scons do already, isn't it? That is what we have setup automake to do. (except that we have so far not bothered to split config.h) --

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Abdelrazak Younes
Bo Peng wrote: I think it is the other way around Bo. BOOST_USER_CONFIG is defined in "common/config.h" for all lyx files. If a lyx file include some boost header, the boost_header will look automatically into the file defined by BOOST_USER_CONFIG. So no need to redefine this macro inside boost/c

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
I think it is the other way around Bo. BOOST_USER_CONFIG is defined in "common/config.h" for all lyx files. If a lyx file include some boost header, the boost_header will look automatically into the file defined by BOOST_USER_CONFIG. So no need to redefine this macro inside boost/config.h. lyx s

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Abdelrazak Younes
Bo Peng wrote: But do we need "#define BOOST_USER_CONFIG " in there also? It should be in boost/config.h, and passed to boost source files. You can check scons_lyx.log. I do not think this is need for lyx osurces, but I might be wrong. I think it is the other way around Bo. BOOST_USER_CONFIG

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
But do we need "#define BOOST_USER_CONFIG " in there also? It should be in boost/config.h, and passed to boost source files. You can check scons_lyx.log. I do not think this is need for lyx osurces, but I might be wrong. Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Abdelrazak Younes
Bo Peng wrote: > I did not test this > patch against msvc, but the previous version did work (the > boost_config.h one). I think it is a msvc problem indeed because I don't remember having it with mingw. This is indeed only with msvc. I guess you know the reason but I can explain again: With

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
>> Also, when I run scons again after the configuration was done, it insist >> on recompiling everything from the beginning. Running "scons >> fast_start=no" work as expected. Looks like your patch broke the >> fast_start=yes option. Just tested. It is broken. Saving/restoring env is more diff

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
> I did not test this > patch against msvc, but the previous version did work (the > boost_config.h one). I think it is a msvc problem indeed because I don't remember having it with mingw. This is indeed only with msvc. I guess you know the reason but I can explain again: With msvc, boost empl

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Abdelrazak Younes
Bo Peng wrote: It solved the intl include problem but not the boost library problem: LINK : fatal error LNK1104: cannot open file 'libboost_signals-vc80-mt-s-1_33_1.lib' Did not you report success with a previous patch? I don't think so. I did not test this patch against msvc, but the pre

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Bo Peng
It solved the intl include problem but not the boost library problem: LINK : fatal error LNK1104: cannot open file 'libboost_signals-vc80-mt-s-1_33_1.lib' Did not you report success with a previous patch? I did not test this patch against msvc, but the previous version did work (the boost_confi

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-20 Thread Abdelrazak Younes
Bo Peng wrote: Abdel, please check if the attached patch has addressed all your concerns. It solved the intl include problem but not the boost library problem: LINK : fatal error LNK1104: cannot open file 'libboost_signals-vc80-mt-s-1_33_1.lib' Also, when I run scons again after the configu

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: Abdel, please check if the attached patch has addressed all your concerns. Not now, sorry I have to hurry up. Tunisia is playing tonight. Abdel.

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Bo Peng
Abdel, please check if the attached patch has addressed all your concerns. Bo Index: development/scons/SConstruct === --- development/scons/SConstruct (revision 14150) +++ development/scons/SConstruct (working copy) @@ -254,7 +254,7

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: If I add /ID:\devel\lyx\GUI\src to it, it compiles fine. Why intl needs to include $TOP_SRCDIR/src? This was with the version in trunk, that is before your config.h separation. I guess that with your patch you need to add $TOP_SRCDIR/intl to the include path. Abdel.

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Bo Peng
If I add /ID:\devel\lyx\GUI\src to it, it compiles fine. Why intl needs to include $TOP_SRCDIR/src? Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Bo Peng
Please find attached a patch for restore the old behaviour for gcc/debug (by default we don't have debug libraries with mingw). I will change the patch. I have a problem with MSVC/debug. The binary complains about missing MSVCP80D.dll. I think you have to link with QtCored4.dll.manifest and Qt

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Abdelrazak Younes wrote: Bo Peng wrote: intl should have its own config.h. Do you see that generated (intl/config.h) Yes it is in trunk/intl/config.h which is bad (see my other mail). The problem lies in the include options I think. Yes that's an include path problem. With the unpatched

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Bo Peng
I think that instead of config/ subdir, you should put - boost_config.h in scons/build_dir/boost - intl config.h in scons/build_dir/intl (instead of the source dir) - lyx config.h in scons/build_dir/common Sounds reasonable. I will do it. Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: Abdel, Attached patch adds $BUILDDIR/config/config.h $BUILDDIR/config/boost_config.h with the following behaviors: 1. boost only uses boost_config.h 2. config.h includes boost_config.h 3. different builds have different config.h (nls etc may change from build to build). Tested

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: intl should have its own config.h. Do you see that generated (intl/config.h) Yes it is in trunk/intl/config.h which is bad (see my other mail). The problem lies in the include options I think. One scenario this fails is that the first run does not have gettext=included, s

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Abdelrazak Younes wrote: I have fixed with brute force the manifest problem. Feel free to find a better solution. Patch attached. Sorry, this patch was against my branch. Please find attached the patch against trunk. Abdel. Index: SConstruct ===

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Bo Peng
On 6/19/06, Abdelrazak Younes <[EMAIL PROTECTED]> wrote: Abdelrazak Younes wrote: > Bo Peng wrote: >> Abdel, >> >> Attached patch adds >> >> $BUILDDIR/config/config.h >> $BUILDDIR/config/boost_config.h >> >> with the following behaviors: >> 1. boost only uses boost_config.h >> 2. config.h include

Re: [PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Abdelrazak Younes wrote: Bo Peng wrote: Abdel, Attached patch adds $BUILDDIR/config/config.h $BUILDDIR/config/boost_config.h with the following behaviors: 1. boost only uses boost_config.h 2. config.h includes boost_config.h 3. different builds have different config.h (nls etc may change from

[PATCH] some scons correction (wa Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h)

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: Abdel, Attached patch adds $BUILDDIR/config/config.h $BUILDDIR/config/boost_config.h with the following behaviors: 1. boost only uses boost_config.h 2. config.h includes boost_config.h 3. different builds have different config.h (nls etc may change from build to build). Tested

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Peter Kümmel
Am Montag, 19. Juni 2006 12:02 schrieb Peter Kümmel: > Am Montag, 19. Juni 2006 11:50 schrieb Abdelrazak Younes: > > Jean-Marc Lasgouttes wrote: > > >> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: > > > > > > Abdelrazak> That looks all very nice Bo :-). I was very frustrated to

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Peter Kümmel
Am Montag, 19. Juni 2006 11:50 schrieb Abdelrazak Younes: > Jean-Marc Lasgouttes wrote: > >> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: > > > > Abdelrazak> That looks all very nice Bo :-). I was very frustrated to > > Abdelrazak> have to recompile everything when I switched c

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Abdelrazak Younes
Georg Baum wrote: Abdelrazak Younes wrote: Of course that's what I have (actually I have 4 build trees). The problem was that "config.h" was placed in the source tree. So does autotools IIRC. No, it goes to the build tree with autotools, and scons should do the same. I may have to check tha

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Georg Baum
Abdelrazak Younes wrote: > Of course that's what I have (actually I have 4 build trees). The > problem was that "config.h" was placed in the source tree. So does > autotools IIRC. No, it goes to the build tree with autotools, and scons should do the same. Georg

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Abdelrazak Younes
Jean-Marc Lasgouttes wrote: "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> That looks all very nice Bo :-). I was very frustrated to Abdelrazak> have to recompile everything when I switched compilers. Abdelrazak> I'll try to test it sometime today. It seems much safe

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Jean-Marc Lasgouttes
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> That looks all very nice Bo :-). I was very frustrated to Abdelrazak> have to recompile everything when I switched compilers. Abdelrazak> I'll try to test it sometime today. It seems much safer to have two build trees

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-19 Thread Abdelrazak Younes
Bo Peng wrote: Abdel, Attached patch adds $BUILDDIR/config/config.h $BUILDDIR/config/boost_config.h with the following behaviors: 1. boost only uses boost_config.h 2. config.h includes boost_config.h 3. different builds have different config.h (nls etc may change from build to build). Tested

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-18 Thread Bo Peng
Abdel, Attached patch adds $BUILDDIR/config/config.h $BUILDDIR/config/boost_config.h with the following behaviors: 1. boost only uses boost_config.h 2. config.h includes boost_config.h 3. different builds have different config.h (nls etc may change from build to build). Tested under linux. Ple

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Abdelrazak Younes
Bo Peng wrote: Ah... So please consider making this in src/boost_config.h instead. This config file should also be used for external boost. Then, what is the point of separating the config.h? For one, if you use the DBOOST_USER_CONFIG="libs/config.h" option then only the file using boost wil

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Bo Peng
Ah... So please consider making this in src/boost_config.h instead. This config file should also be used for external boost. Then, what is the point of separating the config.h? Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Abdelrazak Younes
Bo Peng wrote: > We need to make > sre libs/config.h exists though. ?? I don't understand... boost/libs/config.h is the file scons is generating for boost. Currently, it is generated only when boost=included. Ah... So please consider making this in src/boost_config.h instead. This config f

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Bo Peng
> We need to make > sre libs/config.h exists though. ?? I don't understand... boost/libs/config.h is the file scons is generating for boost. Currently, it is generated only when boost=included. Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Abdelrazak Younes
Bo Peng wrote: The version you committed seems to work fine for msvc2005. I gave you already what I think should go into boost/libs/config.h but let me repeat that: Do we need #include "libs/config.h" in src/config.h? either include it or pass DBOOST_USER_CONFIG="libs/config.h", AFAIU this i

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Bo Peng
The version you committed seems to work fine for msvc2005. I gave you already what I think should go into boost/libs/config.h but let me repeat that: Do we need #include "libs/config.h" in src/config.h? We need to make sre libs/config.h exists though. Bo

Re: [PATCH] Re-orgnization of scons and generatiion of multiple config.h

2006-06-17 Thread Abdelrazak Younes
Bo Peng wrote: Dear all, Major reorganization of scons has been done for scons. Basically, I pack everything into SConstruct which results in cleaner and shorter code (previously, we rely on env to pass messages so there are both dest_dir and env['DEST_DIR'] etc). The only user visible change i