TDE: move stuff into the tde-integration package

Currently the package just contains the TDE shell backend library.
This moves the URL handler tde-url-open and the vcl plugin into
the integration package, like the KDE3 based kde-integration.

The TDE address book driver is left in the core package.

Change-Id: I2687b313d7f106bb344c65c50ae0a07b0140def0

7 files changed, 35 insertions, 8 deletions

diff --git a/Repository.mk b/Repository.mk
index 7e39aab690c1..9d278927cc6b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -146,7 +146,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 	$(if $(filter TRUE-TRUE,$(USING_X11)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
-	$(if $(ENABLE_TDE),tdefilepicker) \
 	$(if $(filter WNT,$(OS)),,uri-encode) \
 	ui-previewer \
 	$(if $(filter WNT,$(OS)), \
@@ -223,6 +222,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,tde, \
 	$(if $(ENABLE_TDE),tdebe1) \
+	$(if $(USING_X11), \
+		$(if $(ENABLE_TDE),vclplug_tde) \
+	) \
+))
+
+$(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
+       $(if $(ENABLE_TDE),tdefilepicker) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
@@ -426,7 +432,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	vclcanvas \
 	$(if $(USING_X11), \
 		vclplug_gen \
-		$(if $(ENABLE_TDE),vclplug_tde) \
 	) \
 	writerperfect \
 	xmlscript \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7d2a3472fe57..3f6de8c6f8da 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)
 $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b0f338290b94..ab8daafa16f1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -82,6 +82,13 @@ File gid_File_Bin_Kde_Open_Url
     Styles = (FILELIST, PACKED);
 End
 
+File gid_File_Bin_Tde_Open_Url
+    BIN_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "shell_scripts_tde.filelist";
+    Styles = (FILELIST, PACKED);
+End
+
 #endif
 
 #if defined UNX
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 24725de25303..8e273ab9385a 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,6 +19,8 @@ Module gid_Module_Optional_Tde
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
     Styles = ();
-    Files = (auto_tde_ALL);
+    Files = (auto_tde_ALL,
+        gid_File_Bin_Tde_Open_Url
+    );
 End
 
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 0c4875d2842b..aa4700f7b56e 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Module_add_targets,shell,\
 	Package_scripts \
 	Package_scripts_gnome \
 	Package_scripts_kde \
+	Package_scripts_tde \
 ))
 endif
 
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index e4f5a6efc5ec..1b310ca42a57 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)
 
 $(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh))
 
-ifeq ($(ENABLE_TDE),TRUE)
-$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
-endif
-
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_tde.mk b/shell/Package_scripts_tde.mk
new file mode 100644
index 000000000000..0d1111fe8c10
--- /dev/null
+++ b/shell/Package_scripts_tde.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,shell_scripts_tde,$(SRCDIR)/shell/source/unix/misc))
+
+ifeq ($(ENABLE_TDE),TRUE)
+$(eval $(call gb_Package_add_file,shell_scripts_tde,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab: