On 07.09.2011 20:19, Pavel Janík wrote: > Hi, > >> sorry, apparently i was writing in too much of a hurry earlier today to >> mention that i had already committed my (partial) fix to SVN. >> >> it's almost the same as yours, except i've taught gbuild to live without >> RepositoryFixes.mk (empty one is kind of pointless), and the >> Repository.mk is in extras/l10n. > > Repo*mk should be in extras because extras is a repository holding only one > module - l10n. This repository is needed only when --with-lang is specified.
is extras a repository? i thought extras was supposed to be a container for repositories, each of which is optional (independent of other ones), and l10n is the only such repository currently existing. vaguely remember some mails about this, e.g.: http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/201108.mbox/%3c4e4aa8f9.3040...@gmx-topmail.de%3E only problem is that build.pl/source_config may be too inflexible to do it this way, but gbuild can :) so what we have currently is that build.pl thinks that extras is a repository, while gbuild thinks that extras/l10n is a repository. > - Repository.mk file should be moved level up from l10n to extras > > - your change reverted (../l10n.. brought back, *Fixes* removal is OK) > > - this patch applied: > > Index: trunk/main/solenv/inc/settings.mk > =================================================================== > --- trunk/main/solenv/inc/settings.mk (revision 1166296) > +++ trunk/main/solenv/inc/settings.mk (working copy) > @@ -810,7 +810,7 @@ > > .EXPORT : SOLARBINDIR > > -L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n > +L10N_MODULE*=$(SOURCE_ROOT_DIR)/extras/l10n > ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so > > .IF "$(WITH_LANG)"!="" > Index: trunk/main/set_soenv.in > =================================================================== > --- trunk/main/set_soenv.in (revision 1166296) > +++ trunk/main/set_soenv.in (working copy) > @@ -1502,7 +1502,7 @@ > > if ('@WITH_LANG@' ne "") > { > - $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/extras/l10n"; > + $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/extras"; > $BUILD_TYPE = "@BUILD_TYPE@ L10N"; > } that would work as well of course :) now, which way do you prefer? regards, michael
