diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-30 17:44:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-30 17:50:43 +0200 |
| commit | 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8 (patch) | |
| tree | 44cee4b100632398df260c567d5f713706b95d87 /scp2 | |
| parent | 148c7629fc844db690075b9df62677b5e902c9f0 (diff) | |
install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).
Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 23 |
2 files changed, 21 insertions, 3 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 0462379595c0..e37484d09d77 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -79,6 +79,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ )) $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ + $(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ ) \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c4fe20a12dcb..28c1dca8d4ad 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -60,6 +60,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Unopkg, gid_Brand_File_Bin_Libxml2, gid_Brand_File_Bmp_IntroAboutShell, + gid_Brand_File_Bmp_IntroAboutShell_custom, gid_Brand_File_Html_Thirdpartylicensereadme, gid_Brand_File_Lib_Dbghelp, gid_Brand_File_Lib_Mingw_GccS, @@ -613,9 +614,25 @@ End File gid_Brand_File_Bmp_IntroAboutShell TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "intro.zip"; - Styles = (ARCHIVE); + Dir = FILELIST_DIR; + Name = "desktop_branding.filelist"; + Styles = (FILELIST); +End + +#if defined CUSTOM_BRANDING +File gid_Brand_File_Bmp_IntroAboutShell_custom + TXT_FILE_BODY; + Dir = FILELIST_DIR; + Name = "desktop_branding_custom.filelist"; + Styles = (FILELIST); +End +#endif + +File gid_Brand_File_Images_Brand_Zip + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Config; + Name = "images_brand.zip"; + Styles = (PACKED); End File gid_Brand_File_Txt_Package |