diff options
author | Peter Foley <pefoley2@verizon.net> | 2012-10-28 09:39:23 -0400 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2012-10-28 09:57:01 -0400 |
commit | 7e2c27cfb08d3444fbf896d6ab9138a0fbc09ece (patch) | |
tree | 8deb38ef6d11068fd211c81bfb1d26861c7b9d31 /mythes | |
parent | 3fd0889013f0ae6b91a363a979bd64dd2eefe317 (diff) |
convert mythes to gbuild
Change-Id: I9c6b670a2df8b1d3a868d91737fcf93e7d40bcb4
Diffstat (limited to 'mythes')
-rw-r--r-- | mythes/ExternalPackage_mythes.mk | 29 | ||||
-rw-r--r-- | mythes/ExternalProject_mythes.mk | 27 | ||||
-rw-r--r-- | mythes/Makefile | 7 | ||||
-rw-r--r-- | mythes/Module_mythes.mk | 29 | ||||
-rw-r--r-- | mythes/StaticLibrary_mythes.mk | 21 | ||||
-rw-r--r-- | mythes/UnpackedTarball_mythes.mk | 20 | ||||
-rw-r--r-- | mythes/makefile.mk | 122 | ||||
-rw-r--r-- | mythes/mythes-1.2.0-makefile-mk.diff | 88 | ||||
-rw-r--r-- | mythes/prj/d.lst | 7 | ||||
-rw-r--r-- | mythes/prj/dmake | 0 |
10 files changed, 133 insertions, 217 deletions
diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk new file mode 100644 index 000000000000..2c56ba02bd3e --- /dev/null +++ b/mythes/ExternalPackage_mythes.mk @@ -0,0 +1,29 @@ +# -*- 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: diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk new file mode 100644 index 000000000000..87c5439703b9 --- /dev/null +++ b/mythes/ExternalProject_mythes.mk @@ -0,0 +1,27 @@ +# -*- 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: diff --git a/mythes/Makefile b/mythes/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/mythes/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/mythes/Module_mythes.mk b/mythes/Module_mythes.mk new file mode 100644 index 000000000000..b8dbc9b7660e --- /dev/null +++ b/mythes/Module_mythes.mk @@ -0,0 +1,29 @@ +# -*- 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: diff --git a/mythes/StaticLibrary_mythes.mk b/mythes/StaticLibrary_mythes.mk new file mode 100644 index 000000000000..d955b6a025e7 --- /dev/null +++ b/mythes/StaticLibrary_mythes.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_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: diff --git a/mythes/UnpackedTarball_mythes.mk b/mythes/UnpackedTarball_mythes.mk new file mode 100644 index 000000000000..a4928af84124 --- /dev/null +++ b/mythes/UnpackedTarball_mythes.mk @@ -0,0 +1,20 @@ +# -*- 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: diff --git a/mythes/makefile.mk b/mythes/makefile.mk deleted file mode 100644 index a8b7439fa57c..000000000000 --- a/mythes/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# 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 - diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff deleted file mode 100644 index de247f662dc6..000000000000 --- a/mythes/mythes-1.2.0-makefile-mk.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- 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 -+ diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst index f6042701a457..e69de29bb2d1 100644 --- a/mythes/prj/d.lst +++ b/mythes/prj/d.lst @@ -1,7 +0,0 @@ -..\%__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 - diff --git a/mythes/prj/dmake b/mythes/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/mythes/prj/dmake +++ /dev/null |