diff options
author | Andras Timar <atimar@suse.com> | 2011-09-27 21:33:07 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-09-28 13:48:10 +0200 |
commit | 05293cb04c707b12047ce2378894cf6b7bb67bbc (patch) | |
tree | 546bad7e2bc6f23dc3ca6ed191395b7703ba04aa /scp2 | |
parent | Look at GCC version, not whether MacOSX or not (diff) | |
download | core-05293cb04c707b12047ce2378894cf6b7bb67bbc.tar.gz core-05293cb04c707b12047ce2378894cf6b7bb67bbc.zip |
remove checks for unused BUILD_SPECIAL environment variable
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_improvement.scp | 41 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 10 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 6 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 12 | ||||
-rw-r--r-- | scp2/source/ooo/module_improvement.scp | 42 | ||||
-rw-r--r-- | scp2/source/ooo/ooo_brand.scp | 4 | ||||
-rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 4 | ||||
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 4 |
9 files changed, 0 insertions, 131 deletions
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp deleted file mode 100644 index cd6cfe715d64..000000000000 --- a/scp2/source/ooo/file_improvement.scp +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************* -* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#include "macros.inc" - -#if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Oooimprovement_Xcd - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry; - Name = "oooimprovement.xcd"; -End -#endif - -#if defined(BUILD_SPECIAL) -STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) -#endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f5b30d9b4dae..6c7bcb78cb92 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2156,13 +2156,3 @@ File gid_File_Extension_Dictionary_Zu UnixRights = 444; End #endif - -// #ifdef BUILD_SPECIAL -// File gid_File_Extension_Oxt_Oooimprovement -// Name = "OOoImprovement.oxt"; -// Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement; -// Styles = (PACKED, ARCHIVE); -// UnixRights = 444; -// End -// #endif - diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 76fbc52cd915..391348a51124 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -41,10 +41,6 @@ TARGETTYPE=CUI SCPDEFS+=-D_MSC .ENDIF -.IF "$(BUILD_SPECIAL)"!="" -SCPDEFS+=-DBUILD_SPECIAL -.ENDIF - .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCPDEFS+=-DENABLE_ONLINE_UPDATE .ENDIF @@ -308,7 +304,6 @@ PARFILES= \ file_font_ooo.par \ file_library_ooo.par \ file_resource_ooo.par \ - file_improvement.par \ shortcut_ooo.par \ module_ooo.par \ module_hidden_ooo.par \ @@ -318,7 +313,6 @@ PARFILES= \ module_help_template.par \ module_java.par \ module_systemint.par \ - module_improvement.par \ profile_ooo.par \ profileitem_ooo.par \ ure.par \ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index cb1e89a385c0..c290f2bc2d11 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -868,15 +868,3 @@ Module gid_Module_Root_Userland PackageName = "${USERLANDPACKAGENAME}"; End #endif - -// #ifdef BUILD_SPECIAL -// Module gid_Module_Root_Extension_Oooimprovement -// Name = "gid_Module_Root_Extension_Oooimprovement"; -// Description = "gid_Module_Root_Extension_Oooimprovement"; -// Files = (gid_File_Extension_Oxt_Oooimprovement); -// InstallOrder = "1990"; -// PackageInfo = "packinfo_office.txt"; -// ParentID = gid_Module_Root; -// Styles = (HIDDEN_ROOT); -// End -// #endif diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp deleted file mode 100644 index 1380202f34e7..000000000000 --- a/scp2/source/ooo/module_improvement.scp +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -// OOo improvement module - -#if defined(BUILD_SPECIAL) -Module gid_Module_Oooimprovement - PackageInfo = "packinfo_office.txt"; - Name = "gid_Module_Oooimprovement"; - Description = "gid_Module_Oooimprovement"; - ParentID = gid_Module_Root; - Default = YES; - Styles = (HIDDEN_ROOT); - Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement); -End -#endif diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index dcdf99b1718d..649c6b6f69e8 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -52,10 +52,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server Section = "ErrorReport"; Order = 8; Key = "ErrorReportServer"; - #if defined(BUILD_SPECIAL) Value = "report.libreoffice.org"; - #else - Value = ""; - #endif End diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 13a1316a352b..dba0ce7a8d59 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -282,11 +282,7 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image - #if defined(BUILD_SPECIAL) Copy = "osxdndinstall.png"; - #else - Copy = "osxdndinstall_nologo.png"; - #endif Name = "background.png"; UnixRights = 444; Styles = (); diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 0b71511c7f0e..5c5c557b4611 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -30,21 +30,13 @@ #if defined(WITH_VC_REDIST) ScpAction scp_Copy_vcredist_x86 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x86_9.0.30729.4148.exe"; - #else Copy = "vcredist_x86.exe"; - #endif Name = "vcredist_x86.exe"; Subdir = "redist"; End ScpAction scp_Copy_vcredist_x64 - #if defined(BUILD_SPECIAL) - Copy = "vcredist_x64_9.0.30729.4148.exe"; - #else Copy = "vcredist_x64.exe"; - #endif Name = "vcredist_x64.exe"; Subdir = "redist"; End diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index adc03b783da8..5b611c35803c 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -111,8 +111,6 @@ SCP1FILES += \ SCP1FILES += \ ure_into_ooo.par \ ure.par \ - module_improvement.par \ - file_improvement.par \ common_brand.par \ common_brand_readme.par \ ooo_brand.par @@ -305,8 +303,6 @@ SCP2FILES += \ SCP2FILES += \ ure_into_ooo.par \ ure.par \ - module_improvement.par \ - file_improvement.par \ common_brand.par \ common_brand_readme.par \ ooo_brand.par |