strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#70393: move redland to a subdir of external

Browse source 
Change-Id: Ia857f943b8f2915c857ec4c9fa363760699e5206
Reviewed-on: https://gerrit.libreoffice.org/6551
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny 2013-11-03 20:33:32 +02:00 committed by David Tardon
parent 9dc3f0f5af
commit fa560217db
43 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RepositoryModule_host.mk
View file

@ -90,7 +90,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
$(call gb_Helper_optional,REDLAND,redland) \
registry \
remotebridges \
reportbuilder \

1
external/Module_external.mk vendored
View file

@ -71,6 +71,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,POPPLER,poppler) \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \

0
redland/ExternalPackage_raptor.mk → external/redland/ExternalPackage_raptor.mk vendored
View file

0
redland/ExternalPackage_rasqal.mk → external/redland/ExternalPackage_rasqal.mk vendored
View file

0
redland/ExternalPackage_redland.mk → external/redland/ExternalPackage_redland.mk vendored
View file

0
redland/ExternalProject_raptor.mk → external/redland/ExternalProject_raptor.mk vendored
View file

0
redland/ExternalProject_rasqal.mk → external/redland/ExternalProject_rasqal.mk vendored
View file

0
redland/ExternalProject_redland.mk → external/redland/ExternalProject_redland.mk vendored
View file

0
redland/Library_raptor.mk → external/redland/Library_raptor.mk vendored
View file

0
redland/Library_rasqal.mk → external/redland/Library_rasqal.mk vendored
View file

0
redland/Library_rdf.mk → external/redland/Library_rdf.mk vendored
View file

2
redland/Makefile → external/redland/Makefile vendored
View file

@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:

0
redland/Module_redland.mk → external/redland/Module_redland.mk vendored
View file

0
redland/README → external/redland/README vendored
View file

12
redland/UnpackedTarball_raptor.mk → external/redland/UnpackedTarball_raptor.mk vendored
View file

@ -12,14 +12,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))
$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,redland/raptor/raptor2.h))
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,redland/raptor/raptor_config.h))
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h))
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h))
$(eval $(call gb_UnpackedTarball_add_patches,raptor,\
redland/raptor/raptor-freebsd.patch.1 \
$(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-mingw.patch.1) \
$(if $(filter-out WNT,$(OS)),redland/raptor/raptor-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),redland/raptor/raptor-android.patch.1) \
external/redland/raptor/raptor-freebsd.patch.1 \
$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \
$(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
))
# vim: set noet sw=4 ts=4:

28
external/redland/UnpackedTarball_rasqal.mk vendored Normal file
View file

@ -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,rasqal))
$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland))
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h))
$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
external/redland/rasqal/rasqal-pkgconfig.patch.1 \
external/redland/rasqal/rasqal-freebsd.patch.1 \
external/redland/rasqal/rasqal-msvc.patch.1 \
external/redland/rasqal/rasqal-aix.patch.1 \
$(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),external/redland/rasqal/rasqal-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4:

28
external/redland/UnpackedTarball_redland.mk vendored Normal file
View file

@ -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,redland))
$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland))
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h))
$(eval $(call gb_UnpackedTarball_add_patches,redland,\
external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
external/redland/redland/redland-pkgconfig.patch.1 \
external/redland/redland/redland-freebsd.patch.1 \
external/redland/redland/redland-msvc.patch.1 \
$(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),external/redland/redland/redland-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4:

0
redland/raptor/raptor-android.patch.1 → external/redland/raptor/raptor-android.patch.1 vendored
View file

0
redland/raptor/raptor-bundled-soname.patch.1 → external/redland/raptor/raptor-bundled-soname.patch.1 vendored
View file

0
redland/raptor/raptor-freebsd.patch.1 → external/redland/raptor/raptor-freebsd.patch.1 vendored
View file

0
redland/raptor/raptor-mingw.patch.1 → external/redland/raptor/raptor-mingw.patch.1 vendored
View file

0
redland/raptor/raptor2.h → external/redland/raptor/raptor2.h vendored
View file

0
redland/raptor/raptor_config.h → external/redland/raptor/raptor_config.h vendored
View file

0
redland/rasqal/rasqal-aix.patch.1 → external/redland/rasqal/rasqal-aix.patch.1 vendored
View file

0
redland/rasqal/rasqal-android.patch.1 → external/redland/rasqal/rasqal-android.patch.1 vendored
View file

0
redland/rasqal/rasqal-bundled-soname.patch.1 → external/redland/rasqal/rasqal-bundled-soname.patch.1 vendored
View file

0
redland/rasqal/rasqal-freebsd.patch.1 → external/redland/rasqal/rasqal-freebsd.patch.1 vendored
View file

0
redland/rasqal/rasqal-mingw.patch.1 → external/redland/rasqal/rasqal-mingw.patch.1 vendored
View file

0
redland/rasqal/rasqal-msvc.patch.1 → external/redland/rasqal/rasqal-msvc.patch.1 vendored
View file

0
redland/rasqal/rasqal-pkgconfig.patch.1 → external/redland/rasqal/rasqal-pkgconfig.patch.1 vendored
View file

0
redland/rasqal/rasqal-xcompile.patch.1 → external/redland/rasqal/rasqal-xcompile.patch.1 vendored
View file

0
redland/rasqal/rasqal.h → external/redland/rasqal/rasqal.h vendored
View file

0
redland/redland/librdf.h → external/redland/redland/librdf.h vendored
View file

0
redland/redland/redland-android.patch.1 → external/redland/redland/redland-android.patch.1 vendored
View file

0
redland/redland/redland-bundled-soname.patch.1 → external/redland/redland/redland-bundled-soname.patch.1 vendored
View file

0
redland/redland/redland-freebsd.patch.1 → external/redland/redland/redland-freebsd.patch.1 vendored
View file

0
redland/redland/redland-mingw.patch.1 → external/redland/redland/redland-mingw.patch.1 vendored
View file

0
redland/redland/redland-msvc.patch.1 → external/redland/redland/redland-msvc.patch.1 vendored
View file

0
redland/redland/redland-pkgconfig.patch.1 → external/redland/redland/redland-pkgconfig.patch.1 vendored
View file

0
redland/redland/redland-query-rasqal-avoid-assert.patch.1 → external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 vendored
View file

0
redland/redland/redland-xcompile.patch.1 → external/redland/redland/redland-xcompile.patch.1 vendored
View file

28
redland/UnpackedTarball_rasqal.mk
View file

@ -1,28 +0,0 @@
# -*- 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,rasqal))
$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland))
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,redland/rasqal/rasqal.h))
$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
redland/rasqal/rasqal-pkgconfig.patch.1 \
redland/rasqal/rasqal-freebsd.patch.1 \
redland/rasqal/rasqal-msvc.patch.1 \
redland/rasqal/rasqal-aix.patch.1 \
$(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),redland/rasqal/rasqal-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4:

28
redland/UnpackedTarball_redland.mk
View file

@ -1,28 +0,0 @@
# -*- 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,redland))
$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland))
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,redland/redland/librdf.h))
$(eval $(call gb_UnpackedTarball_add_patches,redland,\
redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
redland/redland/redland-pkgconfig.patch.1 \
redland/redland/redland-freebsd.patch.1 \
redland/redland/redland-msvc.patch.1 \
$(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),redland/redland/redland-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4: