Apache OpenOffice (AOO) Bugzilla – Issue 55647
OOO_LICENSE and OOO_VENDOR cleanup
Last modified: 2006-03-14 21:02:56 UTC
Clean up the usage of OOO_LICENSE and OOO_VENDOR macros/defines. OOO_LICENSE is used only in the directory svx/source/intro. makefile defines it twice, once for BUILD_SPECIAL and once for !BUILD_SPECIAL (the define is the same, BTW). I think we can get rid of it completely. In fact, I think it is not used anymore because of license simplification. So, lets just remove it. Any objections? Strings in localize.sdf are not uptodate anyway, so they have to be checked in the database anyway. OOO_VENDOR is different beast ;-) It is used in the files right now: svx/source/intro/localize.sdf svx/source/intro/ooo.src svx/source/intro/makefile.mk The OOO_VENDOR is used in ABOUT_FTXT_COPYRIGHT string. It is defined as: #ifdef BUILD_SPECIAL #define OOO_VENDOR "Sun Microsystems Inc." #else //#define OOO_VENDOR "my company" #endif and also in makefile.mk as: .IF "$(BUILD_SPECIAL)"=="" RSCDEFS+=-DOOO_VENDOR="$(USER)$(USERNAME)" -DOOO_LICENSE="LGPL" .ELSE RSCDEFS+=-DBUILD_SPECIAL=True -DOOO_LICENSE="LGPL" .ENDIF so: if BUILD_SPECIAL is set, OOO_VENDOR is "Sun Microsystems Inc." If it is not, OOO_VENDOR is pre-initialized with $(USER)$(USERNAME). So if you want to set OO_VENDOR to some value like "me, Inc." you have to patch it. This is sub-optimal. Proposal: set the variable OOO_VENDOR in the environment directly. Sun in their pieces, community in the same way as BUILD_VER_STRING is set. I'll do this, but first, I'd like to hear your opinions first.
.
OOO_LICENSE - if it's not used, bin it... OOO_VENDOR - my suggestion: ----------------------------------- .IF "$(BUILD_SPECIAL)"=="" OOO_VENDOR*="$(USER)$(USERNAME)" .ELSE OOO_VENDOR*="Sun Microsystems Inc." .ENDIF RSCDEFS+=-DOOO_VENDOR=$(OOO_VENDOR) ... ----------------------------------- - no more ifdef/defining in ooo.src - assumption that a vendors name isn't localizable anyway - defining an additional environment variable is optional (we already have some...)
ause: What about even simpler OOO_VENDOR*="$(USER)$(USERNAME)" RSCDEFS+=-DOOO_VENDOR=$(OOO_VENDOR) ... and Sun defining their OOO_VENDOR in their environment? It is IMO more clean...
i'd like to keep the two vendor flavours in the makefile because - the environment is already stuffed with lots of settings used only in a single place - handling such strings gets more complicated with every shell that's involved (quoting) - last but not least it's a makefile :)
change the target to 2.0.2. ause wants to have separate vendor makefile, removing OOO_LICENSE changes one string in translations, etc.
i would like to handle this issue in a CWS hosted by me as it would allow me to introduce a "vendor.mk" in a SO only module at the same time. @pavel: if this is ok for you, i would start to commit what we already have.
hjs: of course. No problem on my side.
my current patch is attached. It also modifies localize.sdf, but we have to do that in the right way, ie. remove wrong strings in the database...
Created attachment 30861 [details] My current patch
applied comment changes from patch to makefile. @ihi: i just kicked the lines still containing OOO_LICENSE from localize.sdf. does this conflict with your changes (merge conflicts)?
handover to care for database removal
ause, please trigger AFTER the cws integration
done some reworking as proposed
please verify re-open issue and reassign to hr@openoffice.org
reassign to hr@openoffice.org
reset resolution to FIXED
verified
closed