Apache OpenOffice (AOO) Bugzilla – Issue 31784
postset.mk: simplify handling of languages for build
Last modified: 2006-03-14 21:03:16 UTC
pavel@linux:~/.ooo/ooo_cws_src680_ooo20040704_src/solenv/inc> grep give_me_all_languages postset.mk |wc -l 32 There are 32 references to this variable in postset.mk. Remove them and leave only one. If it is non-empty, define alllangiso to be equal to completelangiso. Also think of using macros to define language. For every language we currently have: .IF "$(RES_CZECH)"!="" || "$(give_me_all_languages)"!="" alllangiso+=cs .ENDIF completelangiso+=cs After reducing the handling of give_me_all_languages, we will have: .IF "$(RES_CZECH)"!="" alllangiso+=cs .ENDIF completelangiso+=cs There are two parameters: RES_CZECH (or simply put CZECH) and cs. The same with only two variable parts will be repeated for all languages... This is only single step from using RES_cs for cs iso code...
i would rather focus on replacing multiple "RES_*" variables with a single blank seperated variable containing all active languages. "postset.mk" would just keep "completelangiso", the list of know languages which may be used to extend "alllangiso" if give_me_.... is set. this can be done in just one step, i think.
We discussed this more on IRC: - configure will use --with-lang="cs sk en de ..." - the default is en-US (if with-lang is not specified to empty) solenv/inc/postset.mk:defaultlangiso=en-US will contain the default value - allow using --with-lang="ALL cs"
Created attachment 18255 [details] micro-specification
Created attachment 18256 [details] Patch for config_office
Created attachment 18257 [details] Patch for solenv
Hi, I attached three files - micro-specification of how it should work and actual implementation of proposed changes in config_office and solenv modules. Please test and report results. As hjs is on vacation, I won't commit it and will test it in my build system from now on.
BUG: autocorr_en-US is not generated.
autocorr_en-US is fixed now. autocorr* files use completelangiso where en-US is missing. OK, I added it there. I'll attached fixed files tonight.
OK, new version of files coming. I'll attach all of them in one tar.gz file. Spec-#i31784#.sxw - updated specification, see TODOs section OOo_SRC680_m56_source-i31784-dmake-languages.diff - this file adds top-level target "languages" to print configured languages. This is mainly for debugging. OOo_SRC680_m56_source-i31784-config_office.diff OOo_SRC680_m56_source-i31784-solenv.diff Updated patches.
Created attachment 18264 [details] Updated specs and patches
Created attachment 18288 [details] new version of spec - some TODOs fixed or magically disappeared
Ause: welcome back from vacation. Hope you are fresh for providing comment :-)
ihi CC
solenv/config/ssrc680.ini solenv/config/ssrx645.ini Those files are needed by the localize_sl tool to fetch the module list, I think you can remove any RES_* , but please test/ensure that localize_sl is extracting source languages after the removal. When #i34408# is fixed those files are obsolete
ihi: these files are not used for anything else right now? Should I really edit also *645*? Why we have it in 680?
Pavel, I confound those files with stand.lst . Ause told me that those *.ini files will be importent in the future for OOo and are very importend for us here in HH, so do not thouch them!
I fixed everything (except en-US always first for which I have to find optimal solution) to withlang child workspace. Please test. New specs attached.
Created attachment 18623 [details] updated specification
en-US will always be the first one with this line (it should really be one line in postset.mk): alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) hjs: what do you think about it? Can it be simplified?
Created attachment 18630 [details] Final update of the specs.
OK, fixed in cws withlang. Reassigning to hjs for verification and update of RE environment.
Fixed.
.
closing.