scp2: move unix/gnome executables to AutoInstall

Change-Id: I0e0c3b5e3f130093f430f47c1730580105718c1e

Repository.mk

@@ -137,6 +137,10 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
 
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
+	$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
+	$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
+	$(if $(filter unx,$(GUIBASE)),uri-encode) \
+	ui-previewer \
 ))
 
 ifneq ($(ENABLE_CRASHDUMP),)
@@ -152,6 +156,15 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,python, \
 	) \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Helper_register_executables_for_install,OOO,gnome, \
+	gnome-open-url.bin \
+	$(if $(ENABLE_GTK),\
+		xid-fullscreen-on-all-monitors \
+	) \
+))
+endif
+
 ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
 	xpdfimport \
@@ -160,16 +173,6 @@ endif
 
 $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
-	gnome-open-url.bin \
-	$(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \
-	$(if $(filter $(GUIBASE)$(ENABLE_GTK),unxTRUE), \
-		xid-fullscreen-on-all-monitors \
-	) \
-	$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
-		tdefilepicker \
-	) \
-	uri-encode \
-	ui-previewer \
 	$(if $(filter LINUX MACOSX WNT,$(OS)), \
 		icontest) \
 	vcldemo \

scp2/AutoInstall.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
-$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))

scp2/source/gnome/module_gnome.scp

@@ -33,9 +33,7 @@ Module gid_Module_Optional_Gnome
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
       gid_File_Share_Registry_Gnome_Xcd,
 #endif
-      gid_File_Bin_Gnome_Open_Url,
-      gid_File_Bin_Gnome_Open_Url_Bin,
-      gid_File_Bin_XidFullscreen
+      gid_File_Bin_Gnome_Open_Url
     );
 End
 

scp2/source/ooo/file_library_ooo.scp

@@ -71,27 +71,6 @@ End
 
 #endif
 
-#if defined UNX && ! defined MACOSX
-#ifdef ENABLE_TDE
-File gid_File_Bin_TdeFilePicker
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "tdefilepicker";
-End
-#endif
-
-#ifdef ENABLE_GTK
-File gid_File_Bin_XidFullscreen
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "xid-fullscreen-on-all-monitors";
-End
-#endif
-
-#endif
-
 #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80

scp2/source/ooo/file_ooo.scp

@@ -122,17 +122,6 @@ File gid_File_Basic_Tutorials
     Name = "wizards_basicsrvtutorials.filelist";
 End
 
-File gid_File_Bin_UIPreviewer
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = "ui-previewer";
-  #else
-    Name = "ui-previewer.exe";
-  #endif
-End
-
 #if defined UNX && !defined MACOSX
 
 File gid_File_Script_Gengal
@@ -144,17 +133,6 @@ End
 
 #endif
 
-#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined MACOSX
-
-File gid_File_Bin_Pluginapp
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pluginapp.bin";
-    Styles = (PACKED);
-End
-
-#endif
-
 #if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_Gnome_Open_Url
@@ -164,13 +142,6 @@ File gid_File_Bin_Gnome_Open_Url
     Styles = (FILELIST, PACKED);
 End
 
-File gid_File_Bin_Gnome_Open_Url_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "gnome-open-url.bin";
-    Styles = (PACKED);
-End
-
 File gid_File_shell_scripts
     BIN_FILE_BODY;
     Dir = FILELIST_DIR;
@@ -187,17 +158,6 @@ End
 
 #endif
 
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Bin_Uri_Encode
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "uri-encode";
-    Styles = (PACKED);
-End
-
-#endif
-
 #if defined UNX && ! defined MACOSX
 File gid_File_Bin_Senddoc
     BIN_FILE_BODY;

scp2/source/ooo/module_ooo.scp

@@ -24,11 +24,8 @@ Module gid_Module_Root
     InstallOrder = "20";
     MOD_NAME_DESC(MODULE_ROOT_OSL);
     Files = (gid_File_shell_scripts,
-             gid_File_Bin_Pluginapp,
              gid_File_Bin_Senddoc,
              gid_File_Script_Gengal,
-             gid_File_Bin_Uri_Encode,
-             gid_File_Bin_UIPreviewer,
              gid_File_Txt_Pagein_Common,
              gid_File_Txt_Pagein_Calc,
              gid_File_Txt_Pagein_Draw,

shell/Module_shell.mk

@@ -115,6 +115,7 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),)
 
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_gnome_open_url \
+	Executable_uri_encode \
 	Library_recentfile \
 	Package_scripts \
 	Package_scripts_gnome \
@@ -126,7 +127,6 @@ endif
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
-	Executable_uri_encode \
 	Library_cmdmail \
 	Package_senddoc \
 ))