From 254d3b8291246adb2dbcae5c13bed3928f71c986 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 12 Feb 2015 19:44:04 +0100 Subject: [PATCH] XML: Directory renamed to ucw-xml Instead of , we now include , which is less likely to clash with other libraries. --- Makefile | 4 +-- maint/abi-map-symbols | 2 +- maint/libucw.abi | 6 ++-- ucw-xml/Makefile | 58 ++++++++++++++++++++++++++++++++++ {xml => ucw-xml}/TODO | 0 {xml => ucw-xml}/common.c | 6 ++-- {xml => ucw-xml}/dtd.c | 6 ++-- {xml => ucw-xml}/dtd.h | 2 +- {xml => ucw-xml}/internals.h | 6 ++-- {xml => ucw-xml}/libucw-xml.pc | 0 {xml => ucw-xml}/parse.c | 6 ++-- {xml => ucw-xml}/source.c | 8 ++--- {xml => ucw-xml}/unicat.pl | 0 {xml => ucw-xml}/xml-test.c | 4 +-- {xml => ucw-xml}/xml-test.t | 6 ++-- {xml => ucw-xml}/xml.h | 0 xml/Makefile | 58 ---------------------------------- 17 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 ucw-xml/Makefile rename {xml => ucw-xml}/TODO (100%) rename {xml => ucw-xml}/common.c (97%) rename {xml => ucw-xml}/dtd.c (99%) rename {xml => ucw-xml}/dtd.h (99%) rename {xml => ucw-xml}/internals.h (99%) rename {xml => ucw-xml}/libucw-xml.pc (100%) rename {xml => ucw-xml}/parse.c (99%) rename {xml => ucw-xml}/source.c (99%) rename {xml => ucw-xml}/unicat.pl (100%) rename {xml => ucw-xml}/xml-test.c (99%) rename {xml => ucw-xml}/xml-test.t (93%) rename {xml => ucw-xml}/xml.h (100%) delete mode 100644 xml/Makefile diff --git a/Makefile b/Makefile index 68ea310d..51ffa3ed 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,8 @@ include $(s)/images/Makefile endif ifdef CONFIG_XML -LIBXML=$(o)/xml/libucw-xml.pc -include $(s)/xml/Makefile +LIBXML=$(o)/ucw-xml/libucw-xml.pc +include $(s)/ucw-xml/Makefile endif # Build documentation by default? diff --git a/maint/abi-map-symbols b/maint/abi-map-symbols index 0a5e2f0f..298ad0f4 100755 --- a/maint/abi-map-symbols +++ b/maint/abi-map-symbols @@ -79,7 +79,7 @@ my %blacklist = map { $_ => 1 } qw( images/scale-gen.h ); -for my $f (, , , , ) { +for my $f (, , , , ) { next if $blacklist{$f}; parse($f); } diff --git a/maint/libucw.abi b/maint/libucw.abi index 90ab410e..1b6376e9 100644 --- a/maint/libucw.abi +++ b/maint/libucw.abi @@ -803,7 +803,7 @@ image_sig_segmentation image_sig_detect_textured image_signatures_dist image_signatures_dist_explain -# xml/dtd.h +# ucw-xml/dtd.h xml_dtd_find_notn xml_dtd_find_entity xml_dtd_find_elem @@ -811,7 +811,7 @@ xml_dtd_init xml_dtd_cleanup xml_dtd_finish xml_dtd_find_attr -# xml/internals.h +# ucw-xml/internals.h xml_throw xml_hash_new xml_spout_chars @@ -846,7 +846,7 @@ xml_skip_pi xml_attrs_table_init xml_attrs_table_cleanup xml_validate_attr -# xml/xml.h +# ucw-xml/xml.h xml_init xml_cleanup xml_reset diff --git a/ucw-xml/Makefile b/ucw-xml/Makefile new file mode 100644 index 00000000..28083ccd --- /dev/null +++ b/ucw-xml/Makefile @@ -0,0 +1,58 @@ +# Makefile for the XML parser +# (c) 2007 Pavel Charvat + +DIRS+=ucw-xml +PROGS+=$(o)/ucw-xml/xml-test + +LIBXML_MODS=common source parse dtd +LIBXML_MOD_PATHS=$(addprefix $(o)/ucw-xml/,$(LIBXML_MODS)) +LIBXML_INCLUDES=xml.h dtd.h +LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET) + +$(o)/ucw-xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS)) +$(o)/ucw-xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS) +$(o)/ucw-xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0 +$(o)/ucw-xml/libucw-xml.pc: $(LIBXML_DEPS) + +ifdef CONFIG_INSTALL_API +$(o)/ucw-xml/libucw-xml.pc: $(addprefix $(o)/ucw-xml/libucw-xml$(LV),.a .so) +endif + +$(o)/ucw-xml/common.o: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/common.oo: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/source.o: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/source.oo: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/dtd.o: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/dtd.oo: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/parse.o: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/parse.oo: $(o)/ucw-xml/unicat.h +$(o)/ucw-xml/unicat.h: $(s)/ucw-xml/unicat.pl + $(M)GEN $(addprefix $(o)/ucw-xml/unicat,.h .c) + $(Q)$< $(addprefix $(o)/ucw-xml/unicat,.h .c) + $(Q)touch $@ + +TESTS+=$(o)/ucw-xml/xml-test.test +$(o)/ucw-xml/xml-test: $(o)/ucw-xml/xml-test.o $(LIBXML) $(LIBCHARSET) $(LIBUCW) +$(o)/ucw-xml/xml-test.test: $(o)/ucw-xml/xml-test + +API_LIBS+=libucw-xml +API_INCLUDES+=$(o)/ucw-xml/.include-stamp +$(o)/ucw-xml/.include-stamp: $(addprefix $(s)/ucw-xml/,$(LIBXML_INCLUDES)) +$(o)/ucw-xml/.include-stamp: IDST=ucw-xml +run/lib/pkgconfig/libucw-xml.pc: $(o)/ucw-xml/libucw-xml.pc + +INSTALL_TARGETS+=install-libucw-xml-lib +install-libucw-xml-lib: + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) + install -m 644 run/lib/libucw-xml$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0.0 + ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0 +.PHONY: install-libucw-xml-lib + +INSTALL_TARGETS+=install-libucw-xml-api +install-libucw-xml-api: + install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) + install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) + install -m 644 $(addprefix run/include/ucw-xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml + ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so + install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) +.PHONY: install-libucw-xml-api diff --git a/xml/TODO b/ucw-xml/TODO similarity index 100% rename from xml/TODO rename to ucw-xml/TODO diff --git a/xml/common.c b/ucw-xml/common.c similarity index 97% rename from xml/common.c rename to ucw-xml/common.c index 7f120d85..8b37d597 100644 --- a/xml/common.c +++ b/ucw-xml/common.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/xml/dtd.c b/ucw-xml/dtd.c similarity index 99% rename from xml/dtd.c rename to ucw-xml/dtd.c index 407511f7..7c06af84 100644 --- a/xml/dtd.c +++ b/ucw-xml/dtd.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/xml/dtd.h b/ucw-xml/dtd.h similarity index 99% rename from xml/dtd.h rename to ucw-xml/dtd.h index d3524ad1..c3e07f69 100644 --- a/xml/dtd.h +++ b/ucw-xml/dtd.h @@ -10,7 +10,7 @@ #ifndef _UCW_XML_DTD_H #define _UCW_XML_DTD_H -#include +#include #ifdef CONFIG_UCW_CLEAN_ABI #define xml_dtd_cleanup ucw_xml_dtd_cleanup diff --git a/xml/internals.h b/ucw-xml/internals.h similarity index 99% rename from xml/internals.h rename to ucw-xml/internals.h index a605733b..a67cd8eb 100644 --- a/xml/internals.h +++ b/ucw-xml/internals.h @@ -10,8 +10,8 @@ #ifndef _UCW_XML_INTERNALS_H #define _UCW_XML_INTERNALS_H -#include -#include +#include +#include #ifdef CONFIG_UCW_CLEAN_ABI #define xml_attrs_table_cleanup ucw_xml_attrs_table_cleanup @@ -172,7 +172,7 @@ static inline void xml_dec(struct xml_context *ctx) xml_fatal_nested(ctx); } -#include "obj/xml/unicat.h" +#include "obj/ucw-xml/unicat.h" static inline uint xml_char_cat(uint c) { diff --git a/xml/libucw-xml.pc b/ucw-xml/libucw-xml.pc similarity index 100% rename from xml/libucw-xml.pc rename to ucw-xml/libucw-xml.pc diff --git a/xml/parse.c b/ucw-xml/parse.c similarity index 99% rename from xml/parse.c rename to ucw-xml/parse.c index 1187d8be..3402b732 100644 --- a/xml/parse.c +++ b/ucw-xml/parse.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/xml/source.c b/ucw-xml/source.c similarity index 99% rename from xml/source.c rename to ucw-xml/source.c index d369c319..5396c50d 100644 --- a/xml/source.c +++ b/ucw-xml/source.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ /*** Character categorization ***/ -#include "obj/xml/unicat.c" +#include "obj/ucw-xml/unicat.c" static void xml_init_cats(struct xml_context *ctx) diff --git a/xml/unicat.pl b/ucw-xml/unicat.pl similarity index 100% rename from xml/unicat.pl rename to ucw-xml/unicat.pl diff --git a/xml/xml-test.c b/ucw-xml/xml-test.c similarity index 99% rename from xml/xml-test.c rename to ucw-xml/xml-test.c index 6821c17f..758b0373 100644 --- a/xml/xml-test.c +++ b/ucw-xml/xml-test.c @@ -8,8 +8,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/xml/xml-test.t b/ucw-xml/xml-test.t similarity index 93% rename from xml/xml-test.t rename to ucw-xml/xml-test.t index 8d0f9bb1..d48fd409 100644 --- a/xml/xml-test.t +++ b/ucw-xml/xml-test.t @@ -1,13 +1,13 @@ # Tests for the XML parser # (c) 2008 Pavel Charvat -Run: ../obj/xml/xml-test +Run: ../obj/ucw-xml/xml-test In: Out: PULL: start PULL: eof -Run: ../obj/xml/xml-test -s +Run: ../obj/ucw-xml/xml-test -s In: text1&amp;<text2 Out: PULL: start @@ -22,7 +22,7 @@ Out: PULL: start SAX: document_end PULL: eof -Run: ../obj/xml/xml-test -sptd +Run: ../obj/ucw-xml/xml-test -sptd In: diff --git a/xml/xml.h b/ucw-xml/xml.h similarity index 100% rename from xml/xml.h rename to ucw-xml/xml.h diff --git a/xml/Makefile b/xml/Makefile deleted file mode 100644 index 4df8de25..00000000 --- a/xml/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Makefile for the XML parser -# (c) 2007 Pavel Charvat - -DIRS+=xml -PROGS+=$(o)/xml/xml-test - -LIBXML_MODS=common source parse dtd -LIBXML_MOD_PATHS=$(addprefix $(o)/xml/,$(LIBXML_MODS)) -LIBXML_INCLUDES=xml.h dtd.h -LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET) - -$(o)/xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS)) -$(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS) -$(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0 -$(o)/xml/libucw-xml.pc: $(LIBXML_DEPS) - -ifdef CONFIG_INSTALL_API -$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml$(LV),.a .so) -endif - -$(o)/xml/common.o: $(o)/xml/unicat.h -$(o)/xml/common.oo: $(o)/xml/unicat.h -$(o)/xml/source.o: $(o)/xml/unicat.h -$(o)/xml/source.oo: $(o)/xml/unicat.h -$(o)/xml/dtd.o: $(o)/xml/unicat.h -$(o)/xml/dtd.oo: $(o)/xml/unicat.h -$(o)/xml/parse.o: $(o)/xml/unicat.h -$(o)/xml/parse.oo: $(o)/xml/unicat.h -$(o)/xml/unicat.h: $(s)/xml/unicat.pl - $(M)GEN $(addprefix $(o)/xml/unicat,.h .c) - $(Q)$< $(addprefix $(o)/xml/unicat,.h .c) - $(Q)touch $@ - -TESTS+=$(o)/xml/xml-test.test -$(o)/xml/xml-test: $(o)/xml/xml-test.o $(LIBXML) $(LIBCHARSET) $(LIBUCW) -$(o)/xml/xml-test.test: $(o)/xml/xml-test - -API_LIBS+=libucw-xml -API_INCLUDES+=$(o)/xml/.include-stamp -$(o)/xml/.include-stamp: $(addprefix $(s)/xml/,$(LIBXML_INCLUDES)) -$(o)/xml/.include-stamp: IDST=xml -run/lib/pkgconfig/libucw-xml.pc: $(o)/xml/libucw-xml.pc - -INSTALL_TARGETS+=install-libucw-xml-lib -install-libucw-xml-lib: - install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-xml$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0.0 - ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0 -.PHONY: install-libucw-xml-lib - -INSTALL_TARGETS+=install-libucw-xml-api -install-libucw-xml-api: - install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) - install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) - install -m 644 $(addprefix run/include/xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml - ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so - install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) -.PHONY: install-libucw-xml-api -- 2.39.2