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>

3 files changed, 67 insertions, 1 deletions

diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 9e41264daee4..c71b68e446d7 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -11,7 +11,10 @@ $(eval $(call gb_Module_Module,cpputools))
 
 $(eval $(call gb_Module_add_targets,cpputools,\
     $(call gb_CondExeSp2bv,Executable_sp2bv) \
-    $(call gb_CondExeUno,Executable_uno) \
+    $(call gb_CondExeUno, \
+        Executable_uno \
+        Package_uno_sh \
+    ) \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/cpputools/Package_uno_sh.mk b/cpputools/Package_uno_sh.mk
new file mode 100644
index 000000000000..4df4d75f5c09
--- /dev/null
+++ b/cpputools/Package_uno_sh.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,uno_sh,$(SRCDIR)/cpputools/scripts))
+
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
+$(eval $(call gb_Package_add_file,uno_sh,$(LIBO_URE_BIN_FOLDER)/uno,uno.sh))
+endif
+
+# vim:set noet sw=4 ts=4:
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" "$@"