Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3649
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3649/1
fdo#63197: convert helpxsl
Change-Id: Icd436733b47d7883209fe73dc1d0099dc87db089
---
M scp2/source/ooo/file_ooo.scp
M xmlhelp/Module_xmlhelp.mk
R xmlhelp/Package_helpxsl.mk
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 90b04d4..00f1a94 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -350,9 +350,10 @@
STD_RES_FILE( gid_File_Res_Eps, eps )
File gid_File_Help_Help_Zip
- Dir = gid_Dir_Help;
- ARCHIVE_TXT_FILE_BODY;
- Name = "helpxsl.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "xmlhelp_helpxsl.filelist";
End
#if defined WITH_HELP
diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk
index 24390ea..5e5105d2 100644
--- a/xmlhelp/Module_xmlhelp.mk
+++ b/xmlhelp/Module_xmlhelp.mk
@@ -13,7 +13,7 @@
Library_tvhlp1 \
Library_ucpchelp1 \
Package_xsl \
- Zip_helpxsl \
+ Package_helpxsl \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/Zip_helpxsl.mk b/xmlhelp/Package_helpxsl.mk
similarity index 68%
rename from xmlhelp/Zip_helpxsl.mk
rename to xmlhelp/Package_helpxsl.mk
index 8e10a80..ca86276 100644
--- a/xmlhelp/Zip_helpxsl.mk
+++ b/xmlhelp/Package_helpxsl.mk
@@ -7,9 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Zip_Zip,helpxsl,$(SRCDIR)/xmlhelp/util))
+$(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util))
-$(eval $(call gb_Zip_add_files,helpxsl,\
+$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,help,\
idxcaption.xsl \
idxcontent.xsl \
main_transform.xsl \
--
To view, visit https://gerrit.libreoffice.org/3649
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd436733b47d7883209fe73dc1d0099dc87db089
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>
Context
- [PATCH] fdo#63197: convert helpxsl · Julien Nabet (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.