diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-24 13:49:02 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-26 11:46:56 +0200 |
commit | c640a42f29bd0bb47ac783b6324bd5c73fec7312 (patch) | |
tree | bb2167a8947e3f54e55f291209175601c8728837 | |
parent | this belongs to RepositoryFixes (diff) | |
download | core-c640a42f29bd0bb47ac783b6324bd5c73fec7312.tar.gz core-c640a42f29bd0bb47ac783b6324bd5c73fec7312.zip |
xsltml: convert to gbuild
Change-Id: I7074c377b6a8f8250adcae73178882fc9e68c696
-rw-r--r-- | Makefile.top | 2 | ||||
-rw-r--r-- | Module_tail_build.mk | 1 | ||||
-rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
-rw-r--r-- | config_host.mk.in | 3 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | ooo.lst.in | 2 | ||||
-rw-r--r-- | xsltml/ExternalPackage_xsltml.mk | 22 | ||||
-rw-r--r-- | xsltml/Makefile | 7 | ||||
-rw-r--r-- | xsltml/Module_xsltml.mk | 21 | ||||
-rw-r--r-- | xsltml/UnpackedTarball_xsltml.mk | 28 | ||||
-rw-r--r-- | xsltml/makefile.mk | 57 | ||||
-rw-r--r-- | xsltml/prj/d.lst | 6 | ||||
-rw-r--r-- | xsltml/prj/dmake | 0 | ||||
-rw-r--r-- | xsltml/xsltml_2.1.2.patch | 36 |
14 files changed, 87 insertions, 102 deletions
diff --git a/Makefile.top b/Makefile.top index 8b914a6dae5e..da83b1b12199 100644 --- a/Makefile.top +++ b/Makefile.top @@ -189,6 +189,7 @@ xmloff\ xmlreader\ xmlscript\ xmlsecurity\ +xsltml\ dmake_modules:=\ apache-commons\ @@ -250,7 +251,6 @@ stlport\ sysui\ tomcat\ xpdf\ -xsltml\ zlib\ export gb_TAILBUILDTARGET=all slowcheck diff --git a/Module_tail_build.mk b/Module_tail_build.mk index bbde5cba0785..8e5c1c1ce544 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -216,6 +216,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ xmlreader \ xmlscript \ xmlsecurity \ + xsltml \ )) ifeq ($(MERGELIBS),TRUE) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index a0b7be200b89..0e3dcae5ae43 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -183,6 +183,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ xmlreader \ xmlscript \ xmlsecurity \ + xsltml \ )) # vim: set noet ts=4 sw=4: diff --git a/config_host.mk.in b/config_host.mk.in index ff4b83ea3c6c..2d9577ff09d4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -645,8 +645,9 @@ export WPS_LIBS=@WPS_LIBS@ export WPS_TARBALL=@WPS_TARBALL@ export XCLASSPATH=@XCLASSPATH@ export XINERAMA_LINK=@XINERAMA_LINK@ +export XMLLINT=@XMLLINT@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@ export XRANDR_DLOPEN=@XRANDR_DLOPEN@ export XRANDR_LIBS=@XRANDR_LIBS@ +export XSLTML_TARBALL=@XSLTML_TARBALL@ export XSLTPROC=@XSLTPROC@ -export XMLLINT=@XMLLINT@ diff --git a/configure.in b/configure.in index 6abfc266df35..3434f7483a18 100644 --- a/configure.in +++ b/configure.in @@ -9681,7 +9681,7 @@ AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) ENABLE_MEDIAWIKI=YES - BUILD_TYPE="$BUILD_TYPE SWEXT" + XSLTML_TARBALL=a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip if test "x$with_java" = "xno"; then AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.]) fi @@ -9691,6 +9691,7 @@ else SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI" fi AC_SUBST(ENABLE_MEDIAWIKI) +AC_SUBST(XSLTML_TARBALL) if test "$ENABLE_MEDIAWIKI" = "YES"; then AC_MSG_CHECKING([which Servlet API Jar to use]) diff --git a/ooo.lst.in b/ooo.lst.in index 2509aae4bc26..95a4b861cfd8 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -36,7 +36,7 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz @MOZ_TARBALL@ a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html -a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +@XSLTML_TARBALL@ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 diff --git a/xsltml/ExternalPackage_xsltml.mk b/xsltml/ExternalPackage_xsltml.mk new file mode 100644 index 000000000000..bac40f1bb774 --- /dev/null +++ b/xsltml/ExternalPackage_xsltml.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,xsltml_xsl,xsltml)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,xsltml_xsl,bin/xslt/export/xsltml,\ + entities.xsl \ + glayout.xsl \ + mmltex.xsl \ + cmarkup.xsl \ + scripts.xsl \ + tables.xsl \ + tokens.xsl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xsltml/Makefile b/xsltml/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/xsltml/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk new file mode 100644 index 000000000000..68de9f2d7177 --- /dev/null +++ b/xsltml/Module_xsltml.mk @@ -0,0 +1,21 @@ +# -*- 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_Module_Module,xsltml)) + +ifeq ($(ENABLE_MEDIAWIKI),YES) + +$(eval $(call gb_Module_add_targets,xsltml,\ + ExternalPackage_xsltml \ + UnpackedTarball_xsltml \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/xsltml/UnpackedTarball_xsltml.mk b/xsltml/UnpackedTarball_xsltml.mk new file mode 100644 index 000000000000..4151d26f3bef --- /dev/null +++ b/xsltml/UnpackedTarball_xsltml.mk @@ -0,0 +1,28 @@ +# -*- 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_UnpackedTarball_UnpackedTarball,xsltml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,xsltml,$(XSLTML_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\ + cmarkup.xsl \ + entities.xsl \ + glayout.xsl \ + mmltex.xsl \ + scripts.xsl \ + tables.xsl \ + tokens.xsl \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,xsltml,\ + xsltml/xsltml_2.1.2.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk deleted file mode 100644 index af0498a74e32..000000000000 --- a/xsltml/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=. - -PRJNAME=xsltml -TARGET=xsltml - -.IF "$(ENABLE_MEDIAWIKI)" == "YES" - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=xsltml_2.1.2 -TARFILE_MD5=a7983f859eafb2677d7ff386a023bc40 -PATCH_FILES=$(TARFILE_NAME).patch -TARFILE_IS_FLAT:=TRUE - -CONVERTFILES=\ - README \ - entities.xsl \ - glayout.xsl \ - mmltex.xsl \ - cmarkup.xsl \ - scripts.xsl \ - tables.xsl \ - tokens.xsl \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -.ELSE -@all: - @echo "MediaWiki Publisher extension disabled." -.ENDIF - diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst index ee5b0e21e9ae..e69de29bb2d1 100644 --- a/xsltml/prj/d.lst +++ b/xsltml/prj/d.lst @@ -1,6 +0,0 @@ -mkdir: %_DEST%\bin\xslt -mkdir: %_DEST%\bin\xslt\export -mkdir: %_DEST%\bin\xslt\export\xsltml - -..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl - diff --git a/xsltml/prj/dmake b/xsltml/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/xsltml/prj/dmake +++ /dev/null diff --git a/xsltml/xsltml_2.1.2.patch b/xsltml/xsltml_2.1.2.patch index 04de2ea2d3c7..292338b210d4 100644 --- a/xsltml/xsltml_2.1.2.patch +++ b/xsltml/xsltml_2.1.2.patch @@ -95,13 +95,6 @@ </xsl:template> <!-- 4.4.10.4 determinant --> -@@ -1103,4 +1110,4 @@ - <xsl:if test="$this-p < $p"><xsl:text>)</xsl:text></xsl:if> - </xsl:template> - --</xsl:stylesheet> -+</xsl:stylesheet> -\ No newline at end of file --- misc/xsltml_2.1.2/entities.xsl 2009-03-27 08:11:02.000000000 +0100 +++ misc/build/xsltml_2.1.2/entities.xsl 2008-03-07 21:36:34.000000000 +0100 @@ -4,17 +4,56 @@ @@ -1161,13 +1154,6 @@ <xsl:text>}</xsl:text> </xsl:if> <xsl:if test="@background"> -@@ -219,4 +229,4 @@ - <xsl:apply-templates/> - </xsl:template> - --</xsl:stylesheet> -+</xsl:stylesheet> -\ No newline at end of file --- misc/xsltml_2.1.2/mmltex.xsl 2009-03-27 08:11:02.000000000 +0100 +++ misc/build/xsltml_2.1.2/mmltex.xsl 2008-03-07 21:36:34.000000000 +0100 @@ -6,9 +6,9 @@ @@ -1182,13 +1168,6 @@ copyright and other information --> <!-- ====================================================================== --> -@@ -33,4 +33,4 @@ - <xsl:text>
\]</xsl:text> - </xsl:template> - --</xsl:stylesheet> -+</xsl:stylesheet> -\ No newline at end of file --- misc/xsltml_2.1.2/scripts.xsl 2009-03-27 08:11:02.000000000 +0100 +++ misc/build/xsltml_2.1.2/scripts.xsl 2008-03-07 21:36:34.000000000 +0100 @@ -1,12 +1,13 @@ @@ -1294,13 +1273,6 @@ <xsl:text>\underbrace{</xsl:text> <xsl:apply-templates select="./*[1]"/> <xsl:text>}</xsl:text> -@@ -372,4 +409,4 @@ - </xsl:choose> - </xsl:template> - --</xsl:stylesheet> -+</xsl:stylesheet> -\ No newline at end of file --- misc/xsltml_2.1.2/tables.xsl 2009-03-27 08:11:02.000000000 +0100 +++ misc/build/xsltml_2.1.2/tables.xsl 2008-03-07 21:36:34.000000000 +0100 @@ -1,130 +1,218 @@ @@ -1434,6 +1406,7 @@ -</xsl:template> - -</xsl:stylesheet> +\ No newline at end of file +<?xml version='1.0' encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:m="http://www.w3.org/1998/Math/MathML" @@ -1738,10 +1711,3 @@ </xsl:call-template> <xsl:text>}{</xsl:text> </xsl:if> -@@ -325,4 +343,4 @@ - </xsl:call-template> - </xsl:template> - --</xsl:stylesheet> -+</xsl:stylesheet> -\ No newline at end of file |