You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2020/07/04 18:44:09 UTC
[openoffice] 06/11: Fix dependencies, installation.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b3ff12814c870769ef0b59e0ac5a4749ebe3a62a
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Mon Jun 29 18:42:31 2020 +0200
Fix dependencies, installation.
Patch by: me
---
main/site_scons/AllLangRes.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/main/site_scons/AllLangRes.py b/main/site_scons/AllLangRes.py
index 1756a32..794cf5a 100644
--- a/main/site_scons/AllLangRes.py
+++ b/main/site_scons/AllLangRes.py
@@ -71,8 +71,10 @@ class AOOResTarget:
if os.path.exists(Dir(self.env.subst('${AOO_DEFIMAGESLOCATION}') + self.resLocation).abspath):
submodulePath = Dir(self.env.subst('${AOO_DEFIMAGESLOCATION}') + self.resLocation)
self.env['AOO_SUBMODULE'] = submodulePath
- self.env['AOO_IMAGELISTDIR'] = File('Res/ResTarget/' + library + lang + '.ilst').Dir('.').abspath
+ imageListFile = File('Res/ResTarget/' + library + lang + '.ilst')
+ self.env['AOO_IMAGELISTDIR'] = imageListFile.Dir('.').abspath
targetFile = File('Res/ResTarget/' + library + lang + '.res')
+ self.env.SideEffect(imageListFile, targetFile)
self.env.Command(targetFile, srsTargets, ' '.join([
'${OUTDIR}/bin/rsc',
'-r',
@@ -86,6 +88,8 @@ class AOOResTarget:
'-subGLOBALRES=${AOO_DEFIMAGESLOCATION}res',
'-oil=${AOO_IMAGELISTDIR}',
'${SOURCE}']))
+ self.env.Install('${OUTDIR}/bin', targetFile)
+ self.env.Install('${OUTDIR}/res/img', imageListFile)
def SetReslocation(self, resLocation):
self.resLocation = resLocation
@@ -163,10 +167,10 @@ class AOOSrsPartTarget:
translatedFile = srcFile
else:
sdf = '${LOCDIR}/l10n/${INPATH}/misc/sdf/' + srcFile.Dir('.').srcnode().path + '/localize.sdf'
- self.env.Depends(dstFile, sdf)
self.env['AOO_SDF'] = sdf
self.env['AOO_PRJ'] = srcFile.srcnode().path.split('/')[0]
translatedFile = File('Res/SrsPartMergeTarget/' + file + '.partmerge')
+ self.env.Depends(translatedFile, sdf)
self.env.Command(translatedFile, srcFile.srcnode(), ' '.join([
'${OUTDIR}/bin/transex3',
'-p ${AOO_PRJ}',