Apache OpenOffice (AOO) Bugzilla – Issue 91158
[cws ab52] lucene added without system-lucene
Last modified: 2009-07-20 15:58:25 UTC
Hi, "of course" ab52 didn't add a system-lucene option when adding lucene. The attached patch does this (with Class-Path: probably needing manual adaptions, but reportdesign has that minor shortcoming, too, no reason to not integrate in its current form yet) xmlhelp builds with lucene2 2.3.1 from Debian (contrib!)
Created attachment 54796 [details] patch
+ if test -z $LUCENE_JAR; then must be LUCENE_CORE_JAR of course (renamed tha veriable later and forgot that clause)
(and for consistency, the default should be 2.3.2, anything else can be set by the configure flag. That matches all the other ones, too where we default to the name which it has inside OOo. Admittedly very minor.., I just had 2.3.1 there because that's what Debian unstable currently has)
Created attachment 54800 [details] updated patch
attached an updated patch fixing my comments (I meant -2.3, not -2.3.2..) and adding the change to helpcontent2 I oversaw needing be done. (although it didn't fail although the referenced jar was not there, but let's do it for completeness)
ab->hjs: Could you please have a look at the patch? I simply don't know if it's ok or not as it's all makefile related. If you think it's ok you can send the issue back to me and I will create a cws for it and apply the patch.
ab: ah, you have no clue about makefiles? why did you then add the stuff at all without caring about other environments? Sorry, this is a completely bogus argument. What if I would say "oh, I don't know Suns environment I would simply do my cws without even caring about it? And this patch is tested. Do what you are supposed to do (what you even were supposed to do in ab52).
I don't know why diff didn't pick it up, but this one's missing in the patch (otherwise the define doesn't get set properly) --- scp2/source/ooo/makefile.mk 30 Jun 2008 15:24:20 -0000 1.70 +++ scp2/source/ooo/makefile.mk 30 Jun 2008 17:46:41 -0000 @@ -179,6 +179,10 @@ SCPDEFS+=-DENABLE_CAIRO .ENDIF +.IF "$(SYSTEM_LUCENE)" == "YES" +SCPDEFS+=-DSYSTEM_LUCENE +.ENDIF + .IF "$(SYSTEM_ICU)" == "YES" SCPDEFS+=-DSYSTEM_ICU .ELSE can this (attached patch + the above) please be masterfixed?
ab->rene: First, please calm down. There's no reason for getting personal. You had to change your patch several times, even after you said it is tested. So it was a good idea to let another expert have a look, wasn't it? But anyway in your last comment you ask if this could be masterfixed. This could make sense, but this then really should be done by hjs. I don't even have the rights. So I will assign this issue back to him now and it surely will speed up things if you don't assign it back to me this time. ab->hjs: Do you think we should apply this patch as a masterfix? Otherwise I will create a cws for it. We also have to take #i91232 into account. It should be fixed in the same scope, but there's still a problem of getting some files correctly zipped in the !Java version.
> ab->rene: First, please calm down. There's no reason for getting > personal. I disagree. You didn't do your work on your cws. Simple. When adding a new piece of software, adding correct build options is normally your task, not mine. > So it was a good idea to let another expert have a look, wasn't it? No. You refused to look at it yourself while you broke it yourself. > But anyway in your last comment you ask if this could be masterfixed. This > could make sense, but this then really should be done by hjs. Or rt who did m22 iirc. Unfortunately m22 is already ready... > and it surely will speed up things if you don't assign it back to me this time. I don't believe it will. Just do a quick cws, get the other issue fixed and get the cws into m23.
FIXED
patch is applied and changes look reasonable. one small change in the if logic for xmlhelp/source/com/sun/star/help/makefile.mk
This issue is closed automatically and wasn't rechecked in a current version of OOo. The fixed issue should be integrated in OOo since more than half a year. If you think this issue isn't fixed in a current version (OOo 3.1), please reopen it and change the field 'Target Milestone' accordingly. If you want to download a current version of OOo => http://download.openoffice.org/index.html If you want to know more about the handling of fixed/verified issues => http://wiki.services.openoffice.org/wiki/Handle_fixed_verified_issues