diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 09:07:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 16:44:48 +0200 |
| commit | 6514956d4239f77d3cba34fd06aab5f1001e05de (patch) | |
| tree | 87d6910a51e2e91c57e3c02461f723ffb0dd3e7b /scp2 | |
| parent | d7f00e2e8aa4f91c340f3f7c4856259abee13b16 (diff) | |
install scripts from shell using filelists
The FILELIST install method is really tailored to large sets of closely
related files. It is not such a great idea to apply it just to move some
unrelated files, delivered from a single module, out of $(OUTDIR), like
here, because it requires splitting one Package to several to allow the
files to be placed to different installation modules in scp2. The extra
makefile increases the overhead needed to place a file into an
installation set. We really need a better way to handle this...
Change-Id: I2f271562d8773152e69d284b4fe8ae356dea0945
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 52 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 5 |
2 files changed, 20 insertions, 37 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index feed1cea1502..fdeeb1fe765e 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -172,24 +172,13 @@ End #endif -#ifdef UNX - -File gid_File_Bin_Open_Url - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "open-url"; - Styles = (PACKED); -End - -#endif - #if defined UNX && ! defined MACOSX File gid_File_Bin_Gnome_Open_Url BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "gnome-open-url"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "shell_scripts_gnome.filelist"; + Styles = (FILELIST, PACKED); End File gid_File_Bin_Gnome_Open_Url_Bin @@ -199,25 +188,18 @@ File gid_File_Bin_Gnome_Open_Url_Bin Styles = (PACKED); End -File gid_File_Bin_Tde_Open_Url +File gid_File_shell_scripts BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "tde-open-url"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "shell_scripts.filelist"; + Styles = (FILELIST, PACKED); End File gid_File_Bin_Kde_Open_Url BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "kde-open-url"; - Styles = (PACKED); -End - -File gid_File_Bin_Cde_Open_Url - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "cde-open-url"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "shell_scripts_kde.filelist"; + Styles = (FILELIST, PACKED); End #endif @@ -233,17 +215,21 @@ End #endif +#ifdef UNX +File gid_File_Bin_Senddoc + BIN_FILE_BODY; + Dir = FILELIST_DIR; + Name = "shell_senddoc.filelist"; + Styles = (FILELIST, PACKED); +End +#else File gid_File_Bin_Senddoc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; - #ifdef UNX - Name = "senddoc"; - Styles = (PACKED); - #else Name = "senddoc.exe"; Styles = (PACKED); - #endif End +#endif #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index af3bc1b13ac2..6244a162de25 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -89,10 +89,7 @@ Module gid_Module_Root_Files_2 Sortkey = "1200"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Bin_Cde_Open_Url, - gid_File_Bin_Tde_Open_Url, - gid_File_Bin_Kde_Open_Url, - gid_File_Bin_Open_Url, + Files = (gid_File_shell_scripts, gid_File_Bin_Pluginapp, gid_File_Bin_Senddoc, gid_File_Bin_Gengal, |