Issue 55647

Summary: OOO_LICENSE and OOO_VENDOR cleanup
Product: Build Tools Reporter: pavel
Component: configureAssignee: jens-heiner.rechtien
Status: CLOSED FIXED QA Contact: issues@tools <issues>
Severity: Trivial    
Priority: P3 CC: hans-joachim.lankenau, issues, ivo.hinkelmann, rene
Version: current   
Target Milestone: OOo 2.0.2   
Hardware: All   
OS: All   
Issue Type: ENHANCEMENT Latest Confirmation in: ---
Developer Difficulty: ---
Attachments:
Description Flags
My current patch none

Description pavel 2005-10-08 12:50:57 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.
Comment 1 pavel 2005-10-08 18:07:17 UTC 
.
Comment 2 hjs 2005-10-12 11:46:28 UTC 
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...)
Comment 3 pavel 2005-10-16 12:51:04 UTC 
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...
Comment 4 hjs 2005-10-19 16:22:20 UTC 
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 :)
Comment 5 pavel 2005-10-20 21:09:46 UTC 
change the target to 2.0.2.

ause wants to have separate vendor makefile, removing OOO_LICENSE changes one
string in translations, etc.
Comment 6 hjs 2005-10-24 17:16:52 UTC 
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.
Comment 7 pavel 2005-10-24 21:48:59 UTC 
hjs: of course. No problem on my side.
Comment 8 pavel 2005-10-26 11:28:54 UTC 
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...
Comment 9 pavel 2005-10-26 11:30:38 UTC 
Created attachment 30861 [details]
My current patch
Comment 10 hjs 2005-10-26 12:12:26 UTC 
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)?
Comment 11 hjs 2005-10-26 15:21:22 UTC 
handover to care for database removal
Comment 12 ivo.hinkelmann 2005-11-24 15:52:13 UTC 
ause, please trigger AFTER the cws integration
Comment 13 hjs 2005-11-29 10:23:08 UTC 
done some reworking as proposed
Comment 14 hjs 2005-12-05 12:22:06 UTC 
please verify

re-open issue and reassign to hr@openoffice.org
Comment 15 hjs 2005-12-05 12:26:30 UTC 
reassign to hr@openoffice.org
Comment 16 hjs 2005-12-05 12:29:12 UTC 
reset resolution to FIXED
Comment 17 jens-heiner.rechtien 2005-12-05 17:04:33 UTC 
verified
Comment 18 jens-heiner.rechtien 2005-12-22 14:29:20 UTC 
closed