From c906ac8e8a06dc5df980e56d7d6776dfcb08aa2a Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Sat, 8 Jan 2022 13:29:00 +0100
Subject: 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>
---
 ure/Module_ure.mk          |  2 +-
 ure/Package_install.mk     | 22 ----------------------
 ure/Package_ure_install.mk | 18 ++++++++++++++++++
 ure/source/uno             | 47 ----------------------------------------------
 4 files changed, 19 insertions(+), 70 deletions(-)
 delete mode 100644 ure/Package_install.mk
 create mode 100644 ure/Package_ure_install.mk
 delete mode 100755 ure/source/uno

(limited to 'ure')

diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 88cbc71b31f2..d7f436883c44 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
-	Package_install \
+	Package_ure_install \
 	Rdb_ure \
 ))
 
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
deleted file mode 100644
index e8b6515fdf10..000000000000
--- a/ure/Package_install.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- 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,ure_install,$(SRCDIR)/ure/source))
-
-ifneq (,$(filter-out MACOSX WNT,$(OS)))
-$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
-endif
-
-ifeq (MACOSX,$(OS))
-ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
-$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
-endif
-endif
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_ure_install.mk b/ure/Package_ure_install.mk
new file mode 100644
index 000000000000..e73c3c3618d6
--- /dev/null
+++ b/ure/Package_ure_install.mk
@@ -0,0 +1,18 @@
+# -*- 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,ure_install,$(SRCDIR)/ure/source))
+
+ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
+endif
+endif
+
+# vim:set noet sw=4 ts=4:
diff --git a/ure/source/uno b/ure/source/uno
deleted file mode 100755
index f5222ba1c025..000000000000
--- a/ure/source/uno
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/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" "$@"
-- 
cgit