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: [PATCH] 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>
---
 Repository.mk                                    |  1 +
 cpputools/Module_cpputools.mk                    |  5 ++++-
 cpputools/Package_uno_sh.mk                      | 16 ++++++++++++++++
 ure/source/uno => cpputools/scripts/uno.sh       |  0
 ure/Module_ure.mk                                |  2 +-
 ...Package_install.mk => Package_ure_install.mk} |  4 ----
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 cpputools/Package_uno_sh.mk
 rename ure/source/uno => cpputools/scripts/uno.sh (100%)
 rename ure/{Package_install.mk => Package_ure_install.mk} (81%)

diff --git a/Repository.mk b/Repository.mk
index c6210625338a..23dbc470dbcc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,6 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\
 
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
 	instsetoo_native_setup_ure \
+    $(call gb_CondExeUno,uno_sh) \
 	ure_install \
 	$(if $(ENABLE_JAVA),\
 		jvmfwk_jvmfwk3_ini \
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/ure/source/uno b/cpputools/scripts/uno.sh
similarity index 100%
rename from ure/source/uno
rename to cpputools/scripts/uno.sh
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_ure_install.mk
similarity index 81%
rename from ure/Package_install.mk
rename to ure/Package_ure_install.mk
index e8b6515fdf10..e73c3c3618d6 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_ure_install.mk
@@ -9,10 +9,6 @@
 
 $(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))