ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

AutoInstall oox filter data packages to ooo module

Browse Source 
Change-Id: Ib7b0773ee2b347d81d3f8894ea3063c6d6f18d90
Reviewed-on: https://gerrit.libreoffice.org/34168
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Matúš Kukan
2017-02-13 11:40:24 +00:00
committed by Michael Stahl
parent e892bc3fef
commit dc2d33dd90
5 changed files with 2 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+2 -2
View File
@@ -799,8 +799,6 @@ $(eval $(call gb_Helper_register_packages, \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
odk_headers_generated \
oox_customshapes \
oox_generated \
postprocess_images \
postprocess_registry \
readlicense_oo_readmes \
@@ -896,6 +894,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizstyles \
framework_dtd \
$(if $(filter $(OS),MACOSX),infoplist) \
oox_customshapes \
oox_generated \
package_dtd \
sd_web \
sfx2_emojiconfig \
bin/distro-install-file-lists
-2
View File
@@ -78,7 +78,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
rm -f common_list.txt
for module in gid_Module_Root gid_Module_Root_Brand \
gid_Module_Root_Files_[0-9] \
gid_Module_Filter \
gid_Module_Root_Hack \
gid_Module_Oo_Linguistic \
gid_Module_Root_Extension_Dictionary_* \
@@ -394,7 +393,6 @@ else
create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common
create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
create_package_directory gid_Module_Filter pkg/libreoffice-common
create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
scp2/InstallModule_ooo.mk
-1
View File
@@ -70,7 +70,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/module_lang_template \
scp2/source/ooo/profileitem_ooo \
scp2/source/ooo/scpaction_ooo \
scp2/source/ooo/module_filter \
$(if $(filter-out MACOSX WNT,$(OS)), \
scp2/source/ooo/module_libreofficekit \
) \
scp2/source/ooo/module_filter.scp
-51
View File
@@ -1,51 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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/.
*/
#include "macros.inc"
Module gid_Module_Filter
Name = "Filter Data";
Description = "Filter Data";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Share_Filter);
Files = (
gid_File_Dat_OoxDrawingmlAdjNames,
gid_File_Dat_OoxDrawingmlCsPresets,
gid_File_Dat_VmlShapeTypes);
End
Directory gid_Dir_Share_Filter
ParentID = gid_Brand_Dir_Share;
DosName = "filter";
End
File gid_File_Dat_OoxDrawingmlAdjNames
TXT_FILE_BODY;
Dir = gid_Dir_Share_Filter;
Name = "oox-drawingml-adj-names";
Styles = (PACKED);
End
File gid_File_Dat_OoxDrawingmlCsPresets
TXT_FILE_BODY;
Dir = gid_Dir_Share_Filter;
Name = "oox-drawingml-cs-presets";
Styles = (PACKED);
End
File gid_File_Dat_OoxVmlShapeTypes
TXT_FILE_BODY;
Dir = gid_Dir_Share_Filter;
Name = "vml-shape-types";
Styles = (PACKED);
End
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
setup_native/source/packinfo/packinfo_office.txt
-15
View File
@@ -1162,21 +1162,6 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
Start
module = "gid_Module_Filter"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-filter-data"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-filter-data"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
linuxpatchrequires = ""
copyright = "2017 The Document Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation"
description = "Filter data for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
Start
module = "gid_Module_Reportbuilder"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"