convert mythes to gbuild

Change-Id: I9c6b670a2df8b1d3a868d91737fcf93e7d40bcb4

Makefile.top

@@ -116,6 +116,7 @@ linguistic\
 lotuswordpro\
 mdds\
 more_fonts\
+mythes\
 neon\
 nlpsolver\
 np_sdk\
@@ -235,7 +236,6 @@ migrationanalysis\
 moz\
 mysqlc\
 mysqlcppconn\
-mythes\
 nss\
 odk\
 openldap\

Module_tail_build.mk

@@ -107,6 +107,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	mdds \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \

Repository.mk

@@ -654,6 +654,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	findsofficepath \
     headless \
     libeay32 \
+	mythes \
     npsoenv \
     nputils \
     pdfimport_s \

RepositoryModule_ooo.mk

@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	mdds \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \

config_host.mk.in

@@ -431,6 +431,7 @@ export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
 export MYTHES_CFLAGS=@MYTHES_CFLAGS@
 export MYTHES_LIBS=@MYTHES_LIBS@
+export MYTHES_TARBALL=@MYTHES_TARBALL@
 export NEON_CFLAGS=@NEON_CFLAGS@
 export NEON_LIBS=@NEON_LIBS@
 export NEON_TARBALL=@NEON_TARBALL@

configure.ac

@@ -8908,10 +8908,12 @@ if test "$with_system_mythes" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_MYTHES=NO
+    MYTHES_TARBALL="46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz"
     BUILD_TYPE="$BUILD_TYPE MYTHES"
 fi
 AC_SUBST(SYSTEM_MYTHES)
 AC_SUBST(MYTHES_CFLAGS)
+AC_SUBST(MYTHES_TARBALL)
 AC_SUBST(MYTHES_LIBS)
 AC_SUBST([MINGW_MYTHES_DLL])
 

mythes/ExternalPackage_mythes.mk

+# -*- 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,mythes,mythes))
+
+ifneq ($(COM),MSC)
+
+$(eval $(call gb_ExternalPackage_use_external_project,mythes,mythes))
+
+$(eval $(call gb_ExternalPackage_add_files,mythes,lib,\
+    .libs/libmythes-1.2.a \
+))
+
+endif
+
+$(eval $(call gb_ExternalPackage_add_files,mythes,bin,\
+	th_gen_idx.pl \
+))
+$(eval $(call gb_ExternalPackage_add_unpacked_files,mythes,inc,\
+    mythes.hxx \
+))
+
+# vim: set noet sw=4 ts=4:

mythes/ExternalProject_mythes.mk

+# -*- 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_ExternalProject_ExternalProject,mythes))
+
+$(eval $(call gb_ExternalProject_use_unpacked,mythes,mythes))
+
+$(eval $(call gb_ExternalProject_register_targets,mythes,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,mythes,build):
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure --disable-shared --with-pic \
+	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
+	$(if $(filter NO,$(SYSTEM_HUNSPELL)),HUNSPELL_CFLAGS="-I$(OUTDIR)/inc/hunspell" HUNSPELL_LIBS="-L$(OUTDIR)/lib -lhunspell-1.3") \
+	$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
+	&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
+	&& touch $@
+
+# vim: set noet sw=4 ts=4:

mythes/Makefile

+# -*- 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:

mythes/Module_mythes.mk

+# -*- 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,mythes))
+
+ifeq ($(SYSTEM_MYTHES),NO)
+$(eval $(call gb_Module_add_targets,mythes,\
+	UnpackedTarball_mythes \
+))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,mythes,\
+	ExternalPackage_mythes \
+	StaticLibrary_mythes \
+))
+else
+$(eval $(call gb_Module_add_targets,librsvg,\
+	ExternalPackage_mythes \
+	ExternalProject_mythes \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:

mythes/StaticLibrary_mythes.mk

+# -*- 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_StaticLibrary_StaticLibrary,mythes))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes))
+
+$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,mythes,\
+	UnpackedTarball/mythes/mythes \
+))
+
+
+# vim: set noet sw=4 ts=4:

mythes/UnpackedTarball_mythes.mk

+# -*- 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,mythes))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mythes,\
+	mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
+	mythes/mythes-1.2.0-android.patch \
+	mythes/mythes-ssizet.patch \
+))
+
+# vim: set noet sw=4 ts=4:

mythes/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=mythes
-TARGET=mythes
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=mythes-1.2.3
-TARFILE_MD5=46e92b68e31e858512b680b3b61dc4c1
-
-ADDITIONAL_FILES += makefile.mk
-
-PATCH_FILES=\
-    mythes-1.2.0-vanilla-th-gen-idx.patch \
-    mythes-1.2.0-makefile-mk.diff \
-    mythes-1.2.0-android.patch \
-    mythes-ssizet.patch
-
-.IF "$(COM)"=="GCC"
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
-HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-CONFIGURE_DIR=$(BUILD_DIR)
-
-#relative to CONFIGURE_DIR
-# still needed also in system-mythes case as it creates the makefile
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-LCL_CONFIGURE_CFLAGS+=-m64
-.ELIF "$(OS)"=="AIX"
-LCL_CONFIGURE_CFLAG+=-D_LINUX_SOURCE_COMPAT
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)"!=""
-LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
-CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
-CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
-.ENDIF
-
-.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no LIBS="$(STDLIBCUIMT)"
-CONFIGURE_FLAGS:=$(subst,CPPRUNTIME,$(STDLIBCPP) $(CONFIGURE_FLAGS))
-.ENDIF
-
-BUILD_ACTION=make
-OUT2INC += mythes.hxx
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic \
-    HUNSPELL_CFLAGS="$(HUNSPELL_CFLAGS)" \
-    HUNSPELL_LIBS="$(HUNSPELL_LIBS)"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
-.ENDIF
-
-BUILD_ACTION=make
-
-.ELSE
-BUILD_ACTION=dmake
-.ENDIF # "$(COM)"=="GCC"
-OUT2INC += mythes.hxx
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
-.ENDIF
-

mythes/mythes-1.2.0-makefile-mk.diff

---- misc/mythes-1.2.3/makefile.mk	2010-05-14 23:36:09.000000000 +0200
-+++ misc/build/mythes-1.2.3/makefile.mk	2010-05-14 23:35:14.000000000 +0200
-@@ -1 +1,84 @@
--dummy
-+#*************************************************************************
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (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.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ = ../../../..
-+
-+PRJNAME	= mythes
-+TARGET	= mythes
-+LIBTARGET=YES
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+#----- Settings ---------------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+all_target: ALLTAR
-+
-+
-+
-+SLOFILES=	\
-+		$(SLO)$/mythes.obj
-+
-+LIB1TARGET= $(SLB)$/lib$(TARGET).lib
-+LIB1ARCHIV= $(LB)/lib$(TARGET).a
-+LIB1OBJFILES= $(SLOFILES)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+

mythes/prj/d.lst

-..\%__SRC%\slb\libmythes.lib     %_DEST%\lib\libmythes.lib
-
-..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx
-..\%__SRC%\misc\build\mythes-1.2.3\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
-..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
-..\%__SRC%\misc\build\mythes-1.2.3\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl
-

ooo.lst.in

@@ -29,7 +29,7 @@ e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 @POSTGRESQL_TARBALL@
-46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
+@MYTHES_TARBALL@
 3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
 9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
 a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz

tail_build/prj/build.lst

-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL