Kaydet (Commit) 70527511 authored tarafından Michael Stahl's avatar Michael Stahl

expat: get rid of expat_xmltok static library:

Just compile those files twice.
Also rename the UTF8 library to plain "expat".
This allows python to simply use that library and build "pyexpat"
succesfully.

Change-Id: I7e37ec5b87b70c2cf8c86e06709f0e8d0a67f09d
üst e097ec36
...@@ -286,9 +286,8 @@ endef ...@@ -286,9 +286,8 @@ endef
else # !SYSTEM_EXPAT else # !SYSTEM_EXPAT
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
ascii_expat_xmlparse \ expat \
expat_xmlparse \ expat_utf16 \
expat_xmltok \
expat_x64 \ expat_x64 \
)) ))
...@@ -300,7 +299,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ...@@ -300,7 +299,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(if $(filter-out ascii_expat_xmlparse expat_xmltok,$(2)),\ $(if $(filter expat_utf16,$(2)),\
$(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_add_defs,$(1),\
-DXML_UNICODE \ -DXML_UNICODE \
)) ))
...@@ -315,12 +314,12 @@ endif # SYSTEM_EXPAT ...@@ -315,12 +314,12 @@ endif # SYSTEM_EXPAT
# now define 2 wrappers that select which internal static library to use... # now define 2 wrappers that select which internal static library to use...
define gb_LinkTarget__use_expat_utf8 define gb_LinkTarget__use_expat_utf8
$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse expat_xmltok) $(call gb_LinkTarget__use_expat,$(1),expat)
endef endef
define gb_LinkTarget__use_expat_utf16 define gb_LinkTarget__use_expat_utf16
$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse expat_xmltok) $(call gb_LinkTarget__use_expat,$(1),expat_utf16)
endef endef
......
...@@ -14,9 +14,8 @@ ifeq ($(SYSTEM_EXPAT),NO) ...@@ -14,9 +14,8 @@ ifeq ($(SYSTEM_EXPAT),NO)
$(eval $(call gb_Module_add_targets,expat,\ $(eval $(call gb_Module_add_targets,expat,\
ExternalPackage_expat \ ExternalPackage_expat \
UnpackedTarball_expat \ UnpackedTarball_expat \
StaticLibrary_ascii_expat_xmlparse \ StaticLibrary_expat \
StaticLibrary_expat_xmlparse \ StaticLibrary_expat_utf16 \
StaticLibrary_expat_xmltok \
)) ))
# Actually it wasn't that clear if we should # Actually it wasn't that clear if we should
......
# -*- 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,ascii_expat_xmlparse))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,ascii_expat_xmlparse))
$(eval $(call gb_StaticLibrary_use_unpacked,ascii_expat_xmlparse,expat))
# no configure step on windows, no dependency
ifneq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_StaticLibrary_use_external_project,ascii_expat_xmlparse,expat))
endif
$(eval $(call gb_StaticLibrary_set_include,ascii_expat_xmlparse,\
-I$(call gb_UnpackedTarball_get_dir,expat) \
$$(INCLUDE) \
))
ifeq ($(OS),MACOSX)
ifneq ($(strip $(SYSBASE)),)
$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
-DHAVE_MEMMOVE \
-DHAVE_BCOPY \
))
endif
endif
ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
-DCOMPILED_FROM_DSP \
))
else
$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
-DHAVE_EXPAT_CONFIG_H \
))
endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,ascii_expat_xmlparse,\
UnpackedTarball/expat/lib/xmlparse \
))
# vim: set noet sw=4 ts=4:
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmltok)) $(eval $(call gb_StaticLibrary_StaticLibrary,expat))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmltok)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat))
$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmltok,expat)) $(eval $(call gb_StaticLibrary_use_unpacked,expat,expat))
# no configure step on windows, no dependency # no configure step on windows, no dependency
ifneq ($(OS)$(COM),WNTMSC) ifneq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_StaticLibrary_use_external_project,expat_xmltok,expat)) $(eval $(call gb_StaticLibrary_use_external_project,expat,expat))
endif endif
$(eval $(call gb_StaticLibrary_set_include,expat_xmltok,\ $(eval $(call gb_StaticLibrary_set_include,expat,\
-I$(call gb_UnpackedTarball_get_dir,expat) \ -I$(call gb_UnpackedTarball_get_dir,expat) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
ifneq ($(strip $(SYSBASE)),) ifneq ($(strip $(SYSBASE)),)
$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ $(eval $(call gb_StaticLibrary_add_defs,expat,\
-DHAVE_MEMMOVE \ -DHAVE_MEMMOVE \
-DHAVE_BCOPY \ -DHAVE_BCOPY \
)) ))
...@@ -33,18 +33,19 @@ endif ...@@ -33,18 +33,19 @@ endif
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ $(eval $(call gb_StaticLibrary_add_defs,expat,\
-DCOMPILED_FROM_DSP \ -DCOMPILED_FROM_DSP \
)) ))
else else
$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ $(eval $(call gb_StaticLibrary_add_defs,expat,\
-DHAVE_EXPAT_CONFIG_H \ -DHAVE_EXPAT_CONFIG_H \
)) ))
endif endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmltok,\ $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
UnpackedTarball/expat/lib/xmltok \ UnpackedTarball/expat/lib/xmlparse \
UnpackedTarball/expat/lib/xmlrole \ UnpackedTarball/expat/lib/xmlrole \
UnpackedTarball/expat/lib/xmltok \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,29 +7,29 @@ ...@@ -7,29 +7,29 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmlparse)) $(eval $(call gb_StaticLibrary_StaticLibrary,expat_utf16))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmlparse)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_utf16))
$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmlparse,expat)) $(eval $(call gb_StaticLibrary_use_unpacked,expat_utf16,expat))
# no configure step on windows, no dependency # no configure step on windows, no dependency
ifneq ($(OS)$(COM),WNTMSC) ifneq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_StaticLibrary_use_external_project,expat_xmlparse,expat)) $(eval $(call gb_StaticLibrary_use_external_project,expat_utf16,expat))
endif endif
$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DXML_UNICODE \ -DXML_UNICODE \
)) ))
$(eval $(call gb_StaticLibrary_set_include,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_set_include,expat_utf16,\
-I$(call gb_UnpackedTarball_get_dir,expat) \ -I$(call gb_UnpackedTarball_get_dir,expat) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
ifneq ($(strip $(SYSBASE)),) ifneq ($(strip $(SYSBASE)),)
$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DHAVE_MEMMOVE \ -DHAVE_MEMMOVE \
-DHAVE_BCOPY \ -DHAVE_BCOPY \
)) ))
...@@ -37,17 +37,19 @@ endif ...@@ -37,17 +37,19 @@ endif
endif endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DCOMPILED_FROM_DSP \ -DCOMPILED_FROM_DSP \
)) ))
else else
$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DHAVE_EXPAT_CONFIG_H \ -DHAVE_EXPAT_CONFIG_H \
)) ))
endif endif
$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmlparse,\ $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_utf16,\
UnpackedTarball/expat/lib/unicode_xmlparse \ UnpackedTarball/expat/lib/unicode_xmlparse \
UnpackedTarball/expat/lib/unicode_xmlrole \
UnpackedTarball/expat/lib/unicode_xmltok \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ ...@@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\
# on windows 64 bit platform we need to link it twice: # on windows 64 bit platform we need to link it twice:
# with $(LINK_X64_BINARY) and with $(gb_LINK). # with $(LINK_X64_BINARY) and with $(gb_LINK).
$(eval $(call gb_UnpackedTarball_set_post_action,expat,\ $(eval $(call gb_UnpackedTarball_set_post_action,expat,\
cp lib/xmltok.c lib/unicode_xmltok.c && \
cp lib/xmlrole.c lib/unicode_xmlrole.c && \
cp lib/xmlparse.c lib/unicode_xmlparse.c \ cp lib/xmlparse.c lib/unicode_xmlparse.c \
$(if $(filter $(BUILD_X64),TRUE), && \ $(if $(filter $(BUILD_X64),TRUE), && \
cp lib/xmlparse.c lib/xmlparse_x64.c && \ cp lib/xmlparse.c lib/xmlparse_x64.c && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment