From 74f5df9bacf50464affdf48c0ea0fbfa01f28728 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Mon, 10 Jun 2013 00:48:31 +0200 Subject: gbuild: rework AutoInstallLibs and autoinstall ure executables Change-Id: I7312d94f90758d450a69410819c5e8c142756a47 --- scp2/source/base/module_base.scp | 2 +- scp2/source/gnome/module_gnome.scp | 2 +- scp2/source/graphicfilter/module_graphicfilter.scp | 2 +- scp2/source/impress/module_impress.scp | 2 +- scp2/source/kde/module_kde.scp | 2 +- scp2/source/math/module_math.scp | 2 +- scp2/source/onlineupdate/module_onlineupdate.scp | 2 +- scp2/source/ooo/module_hidden_ooo.scp | 2 +- scp2/source/ooo/ure.scp | 33 ++-------------------- scp2/source/tde/module_tde.scp | 2 +- scp2/source/writer/module_writer.scp | 2 +- 11 files changed, 12 insertions(+), 41 deletions(-) (limited to 'scp2/source') diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 615cbddedf5f..9a1f22d1969a 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Base_Bin Minimal = NO; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Base_Lib_ALL + Files = (auto_base_ALL gid_File_Share_Registry_Base_Xcd ); End diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index f66178ddea76..262799d9a4b4 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome #ifdef ENABLE_GNOMEVFS XpdCheckSolaris = "SUNWgnome-vfs"; #endif - Files = (auto_Gnome_Lib_ALL + Files = (auto_gnome_ALL #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 556161e0ceed..6c8b2e8e8581 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = (auto_Graphicfilter_Lib_ALL + Files = (auto_graphicfilter_ALL gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 1dac3a09c5e8..8201e9a3f8c5 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Impress_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Impress_Lib_ALL + Files = (auto_impress_ALL gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress, gid_File_Share_Registry_Impress_Xcd, gid_File_sd_xml, diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 8e8012f9e56a..23b921e5e8e7 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Kde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); - Files = (auto_Kde_Lib_ALL + Files = (auto_kde_ALL ); End diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index aec363a63bc3..b8427c9a73b9 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -35,7 +35,7 @@ Module gid_Module_Prg_Math_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (auto_Math_Lib_ALL + Files = (auto_math_ALL gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, gid_File_Share_Registry_Math_Xcd, gid_File_Tmp_Userinstall_Math_Inf); diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 6c86444644ce..4fdb0b3304f3 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -27,7 +27,7 @@ Module gid_Module_Optional_Onlineupdate ParentID = gid_Module_Optional; Default = YES; Styles = (); - Files = (auto_Onlineupdate_Lib_ALL + Files = (auto_onlineupdate_ALL gid_File_Bin_UnpackUpdate, gid_File_Share_Registry_Onlineupdate_Xcd); End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index cf10632e136d..b5452d33dd8d 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, - auto_File_Lib_ALL + auto_ooo_ALL gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index d127ab6cb4f4..63c8e26c54e3 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -84,32 +84,6 @@ Shortcut gid_Shortcut_Exe_Uno End #endif -File gid_File_Exe_Regmerge - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(regmerge); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B"; -End - -File gid_File_Exe_Regview - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(regview); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2"; -End - -#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA -File gid_File_Exe_Javaldx - BIN_FILE_BODY; - Dir = gid_Dir_Ure_Bin; - Name = EXENAME(javaldx); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1"; -End -#endif - // Private Executables: #if !defined WNT @@ -643,13 +617,11 @@ Module gid_Module_Root_Ure_Hidden gid_Dir_Ure_Share, gid_Dir_Ure_Java, gid_Dir_Ure_Misc); - Files = (gid_File_ThirdpartylicensereadmeHtml_Ure, + Files = (auto_ure_ALL + gid_File_ThirdpartylicensereadmeHtml_Ure, gid_File_Readme_Ure, gid_File_License_Ure, gid_File_Exe_Uno, - gid_File_Exe_Regmerge, - gid_File_Exe_Regview, - gid_File_Exe_Javaldx, gid_File_Exe_StartupSh, gid_File_Exe_UnoBin, gid_File_Dl_Cli_Uno, @@ -684,7 +656,6 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Store, gid_Unixlink_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmfwk, - auto_Ure_Private_Lib_ALL gid_File_Dl_JrepropertiesClass, gid_File_Dl_Profile_Jvmfwk3rc, gid_File_Dl_Jpipe, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 89f2462a61dd..2f4523d87739 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,7 +19,7 @@ Module gid_Module_Optional_Tde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); - Files = (auto_Tde_Lib_ALL + Files = (auto_tde_ALL ); End diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 6628e860f97b..b0a2bc982002 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -37,7 +37,7 @@ Module gid_Module_Prg_Wrt_Bin Styles = (HIDDEN_ROOT); Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel, gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard, - auto_Writer_Lib_ALL + auto_writer_ALL gid_File_Lib_Vbaswobj, gid_File_Jar_Email, gid_File_Jar_Mail, -- cgit v1.2.3