summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-02-22 12:26:11 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-02-22 14:31:46 +0100
commite5202379e3ffa65e916e1d3dc14959d53d65acd7 (patch)
tree69d084941de78317dd22ad4b1285cc2f79f7818d
parentMissing dispose of dialog (diff)
downloadcore-e5202379e3ffa65e916e1d3dc14959d53d65acd7.tar.gz
core-e5202379e3ffa65e916e1d3dc14959d53d65acd7.zip
sfx2 classification: include example XML in the instset
Change-Id: I23c0227ee304a6b756ff3d474866609d95e6a071
-rw-r--r--scp2/InstallModule_ooo.mk1
-rw-r--r--scp2/source/ooo/module_classification.scp35
-rw-r--r--setup_native/source/packinfo/packinfo_office.txt15
-rw-r--r--sfx2/Module_sfx2.mk1
-rw-r--r--sfx2/Package_classification.mk16
5 files changed, 68 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d54ca2e6d0c7..33ca0b05c0e0 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/mingw_dlls \
) \
scp2/source/ooo/module_filter \
+ scp2/source/ooo/module_classification \
$(if $(filter-out MACOSX WNT,$(OS)), \
scp2/source/ooo/module_libreofficekit \
) \
diff --git a/scp2/source/ooo/module_classification.scp b/scp2/source/ooo/module_classification.scp
new file mode 100644
index 000000000000..4f04d2667051
--- /dev/null
+++ b/scp2/source/ooo/module_classification.scp
@@ -0,0 +1,35 @@
+/* -*- 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_Classification
+ Name = "Classification Data";
+ Description = "Classification Data";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root_Brand;
+ Styles = (HIDDEN_ROOT);
+ Dirs = (gid_Dir_Share_Classification);
+ Files = (
+ gid_File_Dat_Sfx2ClassificationExample);
+End
+
+Directory gid_Dir_Share_Classification
+ ParentID = gid_Brand_Dir_Share;
+ DosName = "classification";
+End
+
+File gid_File_Dat_Sfx2ClassificationExample
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Share_Classification;
+ Name = "example.xml";
+ Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index a097481374c8..870d5a805e49 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1163,6 +1163,21 @@ packageversion = "%PACKAGEVERSION"
End
Start
+module = "gid_Module_Classification"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-classification-data"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-classification-data"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Classification data for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
module = "gid_Module_Reportbuilder"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 96adc7a15c38..30846a259ff7 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_Module,sfx2))
$(eval $(call gb_Module_add_targets,sfx2,\
CustomTarget_classification \
Library_sfx \
+ Package_classification \
))
$(eval $(call gb_Module_add_l10n_targets,sfx2,\
diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
new file mode 100644
index 000000000000..a2dbb3e91e93
--- /dev/null
+++ b/sfx2/Package_classification.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
+
+$(eval $(call gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
+ classification/example.xml \
+))
+
+# vim: set noet sw=4 ts=4: