From f80d618cedafef73eb27fd994a1b5356ea693585 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 2 Dec 2016 16:16:53 +0100 Subject: scp2: Bin not defined gids and not used defines And a little cleanup. Change-Id: Id066b4d37e217b8ab21ea162c23a999566a9e190 --- scp2/source/ooo/common_brand.scp | 24 +++++++++++++----------- scp2/source/ooo/common_brand_readme.scp | 33 --------------------------------- scp2/source/ooo/ure.scp | 16 ---------------- 3 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 scp2/source/ooo/common_brand_readme.scp (limited to 'scp2/source') diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 2bb68015a159..1f88ada84564 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -58,19 +58,10 @@ Module gid_Module_Root_Brand gid_Brand_File_Gdb_Trace, gid_Brand_File_Bin_Unoinfo, gid_Brand_File_Desktophelper_Txt, - gid_Brand_File_Lib_Dbghelp, - gid_Brand_File_Lib_Mingw_GccS, - gid_Brand_File_Lib_Mingw_Stdcpp, - gid_Brand_File_Lib_Msvcr80, - gid_Brand_File_Lib_Msvcp80, - gid_Brand_File_Lib_Msvcm80, - gid_Brand_File_Msvcm80crt_Manifest, - gid_Brand_File_Share_Registry_O5oo_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, gid_Brand_File_Share_Xdg_Draw, - gid_Brand_File_Share_Xdg_Extension, gid_Brand_File_Share_Xdg_Impress, gid_Brand_File_Share_Xdg_Math, gid_Brand_File_Share_Xdg_QStart, @@ -90,8 +81,7 @@ Module gid_Module_Langpack_Brand_Template Dirs = (gid_Brand_Dir_Program_Shell, gid_Brand_Dir_Readme); Files = (gid_Brand_File_Readme_Readme, - gid_Brand_File_Share_Registry_Cjk_Xcd, - gid_Brand_File_Txt_Readme); + gid_Brand_File_Share_Registry_Cjk_Xcd); End // Directories @@ -503,6 +493,18 @@ File gid_Brand_File_Script_Unopkg End #endif +File gid_Brand_File_Readme_Readme + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Readme; + #ifdef UNX + README_ALL_LANG(Name, README); + #endif + #ifdef WNT + README_TXT_ALL_LANG(Name, readme, txt); + #endif + Styles = (PACKED, SCPZIP_REPLACE); +End + File gid_Brand_File_Share_Registry_Cjk_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp deleted file mode 100644 index be3469d13da5..000000000000 --- a/scp2/source/ooo/common_brand_readme.scp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -// Files - -File gid_Brand_File_Readme_Readme - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Readme; - #ifdef UNX - README_ALL_LANG(Name, README); - #endif - #ifdef WNT - README_TXT_ALL_LANG(Name, readme, txt); - #endif - Styles = (PACKED, SCPZIP_REPLACE); -End diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 61af96a79ead..ec1cafef03e6 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -293,9 +293,6 @@ Module gid_Module_Root_Ure_Hidden Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Ure_Share_Misc); Files = (auto_ure_ALL, - gid_File_ThirdpartylicensereadmeHtml_Ure, - gid_File_Readme_Ure, - gid_File_License_Ure, gid_File_Dl_Cli_Ure_Assembly, gid_File_Dl_Policy_Cli_Ure_Assembly, gid_File_Dl_Policy_Cli_Ure_Config, @@ -311,25 +308,13 @@ Module gid_Module_Root_Ure_Hidden gid_File_Lib_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Config, - gid_File_Dl_Cppu, gid_Unixlink_File_Dl_Cppu, - gid_File_Dl_Cppuhelper, gid_Unixlink_File_Dl_Cppuhelper, - gid_File_Dl_PurpEnvHelper, gid_Unixlink_File_Dl_PurpEnvHelper, - gid_File_Dl_Sal, gid_Unixlink_File_Dl_Sal, - gid_File_Dl_Salhelper, gid_Unixlink_File_Dl_Salhelper, - gid_File_Dl_Profile_Uno, - gid_Unixlink_File_Dl_Rmcxt, gid_File_Lib_Mingw_GccS_Ure, gid_File_Lib_Mingw_Stdcpp_Ure, - gid_File_Dl_Uwinapi, - gid_File_Lib_Msvcr80_Ure, - gid_File_Lib_Msvcp80_Ure, - gid_File_Lib_Msvcm80_Ure, - gid_File_Msvcm80crt_Manifest_Ure, gid_File_Misc_TypesRdb, gid_File_Misc_ServicesRdb); Unixlinks = (gid_Unixlink_File_Dl_Sal, @@ -337,7 +322,6 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Cppu, gid_Unixlink_File_Dl_Cppuhelper, gid_Unixlink_File_Dl_PurpEnvHelper, - gid_Unixlink_File_Dl_Rmcxt, gid_Unixlink_File_Dl_Libxml2); End -- cgit