Re: [dev] Update: Removing external header guards

2008-04-15 Thread Thorsten Behrens
On Tue, Apr 01, 2008 at 01:53:21PM +0200, Frank Schönheit - Sun Microsystems 
Germany wrote:
 I still hope to be wrong in assuming that this will cost us a lot of
 work in resyncing, but well ... 

Hi Frank, all,

well, now is the time to check - DEV300_m7 should be almost clean
from external header guards.

Cheers,

-- Thorsten

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-02 Thread Thorsten Behrens
On Tue, Apr 01, 2008 at 10:39:33PM +0200, Thorsten Behrens wrote:
 Done with the first two rounds of guard removals. Linux builds
 cleanly, I'm currently doing Win32  Aqua builds.

Win32  Aqua now clean as well.

Cheers,

-- Thorsten

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-02 Thread Stephan Bergmann

Thorsten Behrens wrote:

On Tue, Apr 01, 2008 at 03:21:01PM +0200, Stephan Bergmann wrote:
Is your tooling defective?  Why is the external header around  
rtl/string.hxx not removed below?



Nope. The script first collects all headers, extracts the header
guards from it, and then removes those guards in all files where
they externally guard the corresponding include statements.

Following from that, 
 - typos are not removed

 - headers that are not visible to the script are not considered at
   all

Your case fits in the latter category (I've been a bit conservative
in the first strip run).


But why is rtl/string.hxx not visible to the script?

Do occurences of external guards around including rtl/string.hxx (and 
others?) need to be removed manually?


-Stephan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-02 Thread Thorsten Behrens
On Wed, Apr 02, 2008 at 09:16:21AM +0200, Stephan Bergmann wrote:
 But why is rtl/string.hxx not visible to the script?

 Do occurences of external guards around including rtl/string.hxx (and  
 others?) need to be removed manually?

No. Please check the file again. ;-)

Cheers,

-- Thorsten


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Frank Schönheit - Sun Microsystems Germany
Hi Thorsten,

 Frank Schönheit - Sun Microsystems Germany schrieb:
 I'm all in for somebody else doing work :), and I do not doubt that it
 is *reasonable* to remove external include guards /in general/.
 I only suspect that the minor gain we get from this is not worth the
 potential medium or big pain it will cause. 
 Frank, are your objections still valid?

I still hope to be wrong in assuming that this will cost us a lot of
work in resyncing, but well ... My CWS which did the most changes in
this area is meanwhile integrated, the other open CWS'es don't touch
that much of the includes, so go ahead 

Ciao
Frank

-- 
- Frank Schönheit, Software Engineer [EMAIL PROTECTED] -
- Sun Microsystems  http://www.sun.com/staroffice -
- OpenOffice.org Base   http://dba.openoffice.org -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Thorsten Behrens
On Tue, Apr 01, 2008 at 01:53:21PM +0200, Frank Schönheit - Sun Microsystems 
Germany wrote:
 I still hope to be wrong in assuming that this will cost us a lot of
 work in resyncing, but well ... My CWS which did the most changes in
 this area is meanwhile integrated, the other open CWS'es don't touch
 that much of the includes, so go ahead 
 
With dbaccess as well?

-- Thorsten


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Frank Schönheit - Sun Microsystems Germany
Hi Thorsten,

 With dbaccess as well?

Yes.

Ciao
Frank

-- 
- Frank Schönheit, Software Engineer [EMAIL PROTECTED] -
- Sun Microsystems  http://www.sun.com/staroffice -
- OpenOffice.org Base   http://dba.openoffice.org -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Stephan Bergmann

Thorsten Behrens wrote:

Hi,

as the license change for 3.0 will touch ~every file anyway, we
decided it to be advantageous to do that jointly with the incguards
removal. Both is currently happening in CWS changefileheader.


Hi Thorsten,

Is your tooling defective?  Why is the external header around 
rtl/string.hxx not removed below?


-Stephan


File [changed]: exceptiontree.hxx
Url: 
http://udk.openoffice.org/source/browse/udk/codemaker/inc/codemaker/exceptiontree.hxx?r1=1.7.48.1r2=1.7.48.2
Delta lines:  +2 -4
---
--- exceptiontree.hxx   2008-03-31 07:22:51+1.7.48.1
+++ exceptiontree.hxx   2008-04-01 12:26:07+1.7.48.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: exceptiontree.hxx,v $
- * $Revision: 1.7.48.1 $
+ * $Revision: 1.7.48.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,9 +31,7 @@
 #ifndef INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX
 #define INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX
 
-#ifndef INCLUDED_CODEMAKER_GLOBAL_HXX

 #include codemaker/global.hxx
-#endif
 #ifndef _RTL_STRING_HXX_
 #include rtl/string.hxx
 #endif


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Thorsten Behrens
On Tue, Apr 01, 2008 at 03:21:01PM +0200, Stephan Bergmann wrote:
 Is your tooling defective?  Why is the external header around  
 rtl/string.hxx not removed below?

Nope. The script first collects all headers, extracts the header
guards from it, and then removes those guards in all files where
they externally guard the corresponding include statements.

Following from that, 
 - typos are not removed
 - headers that are not visible to the script are not considered at
   all

Your case fits in the latter category (I've been a bit conservative
in the first strip run).

There will be more changes, am currently trying to capture the most
prominent typos as well.

Cheers,

-- Thorsten


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] Update: Removing external header guards

2008-04-01 Thread Thorsten Behrens
On Tue, Apr 01, 2008 at 12:06:39PM +0200, Thorsten Behrens wrote:
 as the license change for 3.0 will touch ~every file anyway, we
 decided it to be advantageous to do that jointly with the incguards
 removal. Both is currently happening in CWS changefileheader.
 
Done with the first two rounds of guard removals. Linux builds
cleanly, I'm currently doing Win32  Aqua builds. There's been quite
some (semi-)manual work needed, as the script only removes _correct_
header guards (i.e. where the macro name in the header matches that
at the inclusion place) - I surely did not remove every instance of
those misspelled cases.

So, if someone (in Hamburg, preferrably, as Rudiger will have
checkouts readily available) wants to have a look at his or her
project and remove some more bogus guards, I'd say _now_ is the time
- please coordinate with Rudiger, we want to provide install sets
ASAP.

Cheers,

-- Thorsten


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]