[Libreoffice-commits] .: Branch 'feature/tubes' - sc/CustomTarget_uiconfig.mk sc/Module_sc.mk sc/Package_uiconfig.mk sc/uiconfig solenv/gbuild

[Matus Kukan]

 sc/CustomTarget_uiconfig.mk           |   22 ++++++++++++++++++++++
 sc/Module_sc.mk                       |    1 +
 sc/Package_uiconfig.mk                |    2 ++
 sc/uiconfig/scalc/menubar/menubar.xml |    3 +--
 solenv/gbuild/CustomTarget.mk         |    1 +
 5 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit a6cd97c29c1cfdb0679d693b7b350f34427a9da6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Jul 3 12:40:14 2012 +0200

    tubes: add Collaborate menu item only in telepathy enabled build
    
    Change-Id: Ibfd90941a64540d0e59f1e884a0992758cbc3bb8

diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk
new file mode 100644
index 0000000..8e4e1ae
--- /dev/null
+++ b/sc/CustomTarget_uiconfig.mk
@@ -0,0 +1,22 @@
+# -*- 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_CustomTarget_CustomTarget,sc/uiconfig))
+
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(call gb_CustomTarget_get_target,sc/uiconfig) : \
+	$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml
+
+$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml \
+		| $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/.dir
+	sed 's/.*.uno:Collaborate.*/            <menu:menuseparator\/>\n            <menu:menuitem menu:id=".uno:Collaborate"\/>/' $< > $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3afcaf2..6f5b034 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,sc))
 
 $(eval $(call gb_Module_add_targets,sc,\
 	AllLangResTarget_sc \
+	CustomTarget_uiconfig \
 	Library_sc \
 	Library_scd \
 	Library_scfilt \
diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk
index bc3ec4d..f85a789 100644
--- a/sc/Package_uiconfig.mk
+++ b/sc/Package_uiconfig.mk
@@ -21,7 +21,9 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,sc_uiconfig,$(SRCDIR)/sc/uiconfig))
+ifneq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml))
+endif
 $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml))
 $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml))
 $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/arrowshapes.xml,scalc/toolbar/arrowshapes.xml))
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 6104095..71ad4f8 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -15,8 +15,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:Reload"/>
             <menu:menuitem menu:id=".uno:VersionDialog"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Collaborate"/>
+            <!-- .uno:Collaborate menuitem, see CustomTarget_uiconfig.mk -->
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ExportTo"/>
             <menu:menuitem menu:id=".uno:ExportToPDF"/>
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 31c5e9c..d8b59d2 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_clean_target,%) :
 
 define gb_CustomTarget_CustomTarget
 $(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
+$(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir
 
 endef