scp2/source/ooo/file_ooo.scp | 7 ++++---
xmlhelp/Module_xmlhelp.mk | 2 +-
xmlhelp/Package_helpxsl.mk | 20 ++++++++++++++++++++
xmlhelp/Zip_helpxsl.mk | 18 ------------------
4 files changed, 25 insertions(+), 22 deletions(-)
New commits:
commit 2c04d86f692d4b0841adba508a21e63e1bcdc45f
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Apr 28 15:47:42 2013 +0200
fdo#63197: convert helpxsl
Change-Id: Icd436733b47d7883209fe73dc1d0099dc87db089
Reviewed-on: https://gerrit.libreoffice.org/3649
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
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 @@ End
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 @@ $(eval $(call gb_Module_add_targets,xmlhelp,\
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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
