convert libexttextcat to gbuild

Change-Id: I633892a6d611e6481e49f9bd2739d3886563a24a

Makefile.top

@@ -108,6 +108,7 @@ languagetool\
 lcms2\
 libcdr\
 libcmis\
+libexttextcat\
 libmspub\
 liborcus\
 libpng\
@@ -224,7 +225,6 @@ external\
 helpcontent2 \
 icu\
 instsetoo_native\
-libexttextcat\
 liblangtag\
 libxml2\
 libxmlsec\

Module_tail_build.mk

@@ -95,6 +95,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	libcdr \
 	libcmis \
+	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	libmspub \
 	liborcus \
 	librelogo \

RepositoryExternal.mk

@@ -487,32 +487,28 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 	$(LIBEXTTEXTCAT_CFLAGS) \
 )
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_LIBEXTTEXTCAT \
+)
 $(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS))
 
 endef
 
 else # !SYSTEM_LIBEXTTEXTCAT
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	libexttextcat \
-))
-else
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
-	exttextcat-1.0 \
+	exttextcat \
 ))
-endif
 
 define gb_LinkTarget__use_libexttextcat
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_use_libraries,$(1),\
-	libexttextcat \
-)
-else
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-	exttextcat-1.0 \
+	exttextcat \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \
+	$$(INCLUDE) \
 )
-endif
 
 endef
 

RepositoryModule_ooo.mk

@@ -105,6 +105,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	libcdr \
 	libcmis \
+	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	libmspub \
 	liborcus \
 	libpng \

libexttextcat/ExternalPackage_libexttextcat.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,libexttextcat,libexttextcat))
+
+ifneq ($(COM),MSC)
+
+$(eval $(call gb_ExternalPackage_use_external_project,libexttextcat,libexttextcat))
+
+$(eval $(call gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
+
+endif
+# vim: set noet sw=4 ts=4:

libexttextcat/ExternalProject_libexttextcat.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,libexttextcat))
+
+$(eval $(call gb_ExternalProject_use_unpacked,libexttextcat,libexttextcat))
+
+$(eval $(call gb_ExternalProject_register_targets,libexttextcat,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,libexttextcat,build):
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure --disable-shared --with-pic \
+	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+	CFLAGS="$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),-fvisibility=hidden) \
+	$(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
+	&& $(MAKE) \
+	&& touch $@
+
+# vim: set noet sw=4 ts=4:

libexttextcat/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:

libexttextcat/Module_libexttextcat.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,libexttextcat))
+
+ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
+$(eval $(call gb_Module_add_targets,libexttextcat,\
+	UnpackedTarball_libexttextcat \
+	ExternalPackage_libexttextcat \
+	Zip_fingerprint \
+))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,libexttextcat,\
+	StaticLibrary_exttextcat \
+))
+else
+$(eval $(call gb_Module_add_targets,libexttextcat,\
+	ExternalProject_libexttextcat \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:

libexttextcat/StaticLibrary_exttextcat.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,exttextcat))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,exttextcat,libexttextcat))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,exttextcat))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\
+	UnpackedTarball/libexttextcat/src/common \
+	UnpackedTarball/libexttextcat/src/fingerprint \
+	UnpackedTarball/libexttextcat/src/textcat \
+	UnpackedTarball/libexttextcat/src/wg_mempool \
+	UnpackedTarball/libexttextcat/src/utf8misc \
+))
+
+
+# vim: set noet sw=4 ts=4:

libexttextcat/UnpackedTarball_libexttextcat.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,libexttextcat))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
+	libexttextcat/android.patch \
+))
+
+# vim: set noet sw=4 ts=4:

libexttextcat/Zip_fingerprint.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,fingerprint,$(call gb_UnpackedTarball_get_dir,libexttextcat)/langclass))
+
+$(eval $(call gb_Zip_use_unpacked,fingerprint,libexttextcat))
+
+$(eval $(call gb_Zip_add_files,fingerprint,\
+	langclass/fpdb.conf \
+	LM/*.lm \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:

libexttextcat/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=libexttextcat
-TARGET=libexttextcat
-
-.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
-all:
-        @echo "An already available installation of libexttextcat should exist on your system."
-        @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
-# sources, far better to commit your changes in there
-TARFILE_NAME=libexttextcat-3.3.1
-TARFILE_MD5=6097739c841f671cb21332b9cc593ae7
-TARFILE_ROOTDIR=libexttextcat-3.3.1
-PATCH_FILES=android.patch
-
-.IF "$(GUI)"=="UNX"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-EXTRA_CFLAGS+=-fvisibility=hidden
-.ENDIF
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-.IF "$(OS)"=="AIX"
-CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
-.ELIF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
-    --prefix=/@.__________________________________________________$(EXTRPATH)
-.END
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=make $(eq,$(VERBOSE),TRUE V=1)
-
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat-1.0.a
-
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-BUILD_ACTION=cd src && dmake $(MAKEMACROS)
-.ENDIF # "$(GUI)"=="WNT"
-
-ALLTAR: $(BIN)/fingerprint.zip
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : tg_ext.mk
-.INCLUDE : target.mk
-
-$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-	@-rm -f $@
-	@echo creating ../../../../../$@
-	$(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
-	$(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
-		-name "*.lm" -print0 | \
-                xargs -0 zip -j $(ZIP_VERBOSITY) $@

libexttextcat/prj/d.lst

-
-..\%__SRC%\lib\lib*.*        %_DEST%\lib\lib*.*
-..\%__SRC%\lib\ilib*.*        %_DEST%\lib\ilib*.*
-..\%__SRC%\bin\l*.dll         %_DEST%\bin\*.dll
-
-mkdir: %_DEST%\inc\external\libexttextcat
-..\%__SRC%\misc\build\libexttextcat-3.3.1\src\*.h %_DEST%\inc\external\libexttextcat\*.h
-
-# data for language guessing
-..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip

lingucomponent/source/languageguessing/guess.cxx

@@ -21,7 +21,11 @@
 #include <iostream>
 #include <string.h>
 
+#ifdef SYSTEM_LIBEXTEXTCAT
 #include <libexttextcat/textcat.h>
+#else
+#include <textcat.h>
+#endif
 #include <altstrfunc.hxx>
 #include <guess.hxx>
 

lingucomponent/source/languageguessing/guesslang.cxx

@@ -40,7 +40,11 @@
 
 #include <sal/macros.h>
 
+#ifdef SYSTEM_LIBEXTEXTCAT
 #include <libexttextcat/textcat.h>
+#else
+#include <textcat.h>
+#endif
 
 using namespace ::rtl;
 using namespace ::osl;

lingucomponent/source/languageguessing/simpleguesser.cxx

@@ -32,11 +32,19 @@
 #include <sstream>
 #include <iostream>
 
+#ifdef SYSTEM_LIBEXTEXTCAT
 #include <libexttextcat/textcat.h>
 #include <libexttextcat/common.h>
 #include <libexttextcat/constants.h>
 #include <libexttextcat/fingerprint.h>
 #include <libexttextcat/utf8misc.h>
+#else
+#include <textcat.h>
+#include <common.h>
+#include <constants.h>
+#include <fingerprint.h>
+#include <utf8misc.h>
+#endif
 
 #include <sal/types.h>
 

tail_build/prj/build.lst

-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss 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 EXPAT:expat ICU:icu JPEG:jpeg LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL