diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 13:29:00 +0100 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 15:33:30 +0100 |
commit | c906ac8e8a06dc5df980e56d7d6776dfcb08aa2a (patch) | |
tree | bd343c4542f438eeba022c6e3f6c149544afa0f1 /cpputools/scripts | |
parent | 326351e2b342eae5ca0154b2ba303b937a696577 (diff) |
Don't install the uno script when uno is not build
... move it into cpputools and rename ure/Package_install.mk to
ure/Package_ure_install.mk, to match the module name.
Follow up from commit 92a90cf5ccb998d2fcc77a62bb971534e410cdec
("Don't build the static uno binary"). I missed that hunk in a
larger patch, because the script was in a different module, then
the binary.
Change-Id: If7f3152be9567cf84be176d3fedefbcd5ad8d387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128138
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'cpputools/scripts')
-rwxr-xr-x | cpputools/scripts/uno.sh | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/cpputools/scripts/uno.sh b/cpputools/scripts/uno.sh new file mode 100755 index 000000000000..f5222ba1c025 --- /dev/null +++ b/cpputools/scripts/uno.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +# Pass -env arguments on to javaldx; needs to be fixed: +my_envargs= +for my_arg in "$@" ; do + case ${my_arg} in + -env:*) my_envargs="${my_envargs} ${my_arg}" ;; + esac +done + +# Extend the LD_LIBRARY_PATH for Java: +epath=$(dirname "$0") +if [ -x "${epath}/javaldx" ] ; then + jpath=$("${epath}/javaldx" $my_envargs) + if [ -n "${jpath}" ]; then + sd_platform=$(uname -s) + case $sd_platform in + AIX) + LIBPATH=${jpath}${LIBPATH:+:${LIBPATH}} + export LIBPATH + ;; + *) + LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + export LD_LIBRARY_PATH + ;; + esac + fi +fi + +exec "$0.bin" "$@" |