dev/null |binary
extras/CustomTarget_autotextuser.mk | 74 +++++++++++++++++++
extras/Module_extras.mk | 1
extras/Package_autotextuser.mk | 2
extras/source/autotext/mytexts/BlockList.xml | 3
extras/source/autotext/mytexts/META-INF/manifest.xml | 6 +
6 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit 56e071690febd8ee0e4c71684c9ed592fc5a628a
Author: Laurent Balland-Poirier <laurent.balland-poir...@laposte.net>
Date: Wed Jun 4 08:26:07 2014 +0200
Build default user AutoText file MyTexts.bau
Unzip Mytexts.bau and add files to project
Add empty mimetype file
Change-Id: Icc8099bcc4fe51e12b5314a4f25fcaf5f2e0938b
Reviewed-on: https://gerrit.libreoffice.org/9639
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/CustomTarget_autotextuser.mk
b/extras/CustomTarget_autotextuser.mk
new file mode 100644
index 0000000..ce47434
--- /dev/null
+++ b/extras/CustomTarget_autotextuser.mk
@@ -0,0 +1,74 @@
+# -*- 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_CustomTarget_CustomTarget,extras/source/autotext))
+
+extras_AUTOTEXTUSER_AUTOTEXTS := \
+ mytexts \
+
+
+extras_AUTOTEXTUSER_XMLFILES := \
+ mytexts/BlockList.xml \
+ mytexts/META-INF/manifest.xml \
+
+
+extras_AUTOTEXTUSER_MIMETYPEFILES := \
+ mytexts/mimetype \
+
+
+ifneq ($(sort $(foreach file,$(extras_AUTOTEXTUSER_XMLFILES),$(firstword
$(subst /, ,$(file))))),$(sort $(extras_AUTOTEXTUSER_AUTOTEXTS)))
+$(call gb_Output_error,defined user autotext do not match existing directories)
+endif
+
+$(call gb_CustomTarget_get_target,extras/source/autotext) : \
+ $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),$(call
gb_CustomTarget_get_workdir,extras/source/autotext)/$(atexts).bau)
+
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype :
$(SRCDIR)/extras/source/autotext/%/mimetype
+ $(call gb_Output_announce,$*/mimetype,$(true),CPY,1)
+ cp $< $@
+
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml :
$(SRCDIR)/extras/source/autotext/%.xml \
+ | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
+ $(call gb_Output_announce,$*.xml,$(true),XSL,1)
+ $(call gb_ExternalExecutable_get_command,xsltproc) -o $@
$(SRCDIR)/extras/util/compact.xsl $<
+
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau :
+ $(call gb_Output_announce,$*.bau,$(true),ZIP,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ cd $(EXTRAS_AUTOTEXTUSER_DIR) && \
+ zip -qrX --filesync --must-match $@
$(EXTRAS_AUTOTEXTUSER_FILES) \
+ )
+
+define extras_Autotextuser_make_file_deps
+$(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \
+ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir
+
+endef
+
+define extras_Autotextuser_make_zip_deps
+$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \
+ $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter
$(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES))) \
+ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir
+
+$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \
+ EXTRAS_AUTOTEXTUSER_FILES := $(foreach file,$(filter
$(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES)
$(extras_AUTOTEXTUSER_XMLFILES)),$(subst $(3)/,,$(file)))
+$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \
+ EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3)
+
+endef
+
+$(eval $(foreach file,$(extras_AUTOTEXTUSER_MIMETYPEFILES)
$(extras_AUTOTEXTUSER_XMLFILES),\
+ $(call
extras_Autotextuser_make_file_deps,extras/source/autotext,$(file)) \
+))
+
+$(eval $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),\
+ $(call
extras_Autotextuser_make_zip_deps,extras/source/autotext,$(atexts).bau,$(atexts))
\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 5b5678a..1602ec1 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,extras))
$(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autocorr \
+ CustomTarget_autotextuser \
CustomTarget_glade \
Package_autocorr \
Package_autotextuser \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index 054295d..57ddb7f 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext))
+$(eval $(call gb_Package_Package,extras_autotextuser,$(call
gb_CustomTarget_get_workdir,extras/source/autotext)))
$(eval $(call
gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
mytexts.bau \
diff --git a/extras/source/autotext/mytexts.bau
b/extras/source/autotext/mytexts.bau
deleted file mode 100644
index 6df413a..0000000
Binary files a/extras/source/autotext/mytexts.bau and /dev/null differ
diff --git a/extras/source/autotext/mytexts/BlockList.xml
b/extras/source/autotext/mytexts/BlockList.xml
new file mode 100644
index 0000000..d54a37c
--- /dev/null
+++ b/extras/source/autotext/mytexts/BlockList.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<block-list:block-list
xmlns:block-list="http://openoffice.org/2001/block-list";
block-list:list-name="My AutoText"/>
\ No newline at end of file
diff --git a/extras/source/autotext/mytexts/META-INF/manifest.xml
b/extras/source/autotext/mytexts/META-INF/manifest.xml
new file mode 100644
index 0000000..798e1d2
--- /dev/null
+++ b/extras/source/autotext/mytexts/META-INF/manifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";>
+ <manifest:file-entry manifest:media-type="" manifest:full-path="/"/>
+ <manifest:file-entry manifest:media-type="" manifest:full-path="META-INF/"/>
+ <manifest:file-entry manifest:media-type="text/xml"
manifest:full-path="BlockList.xml"/>
+</manifest:manifest>
\ No newline at end of file
diff --git a/extras/source/autotext/mytexts/mimetype
b/extras/source/autotext/mytexts/mimetype
new file mode 100644
index 0000000..e69de29
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
