From 94b06fc32d62e644ebda4c2148c76d65759702e6 Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Fri, 6 Dec 2013 15:34:22 +0100 Subject: [PATCH] Renamed shxml/* to xml/*. --- Makefile | 8 ++--- debug/default.cfg | 2 +- default.cfg | 2 +- shxml/Makefile | 62 ------------------------------------ xml/Makefile | 62 ++++++++++++++++++++++++++++++++++++ {shxml => xml}/TODO | 0 {shxml => xml}/common.c | 6 ++-- {shxml => xml}/dtd.c | 6 ++-- {shxml => xml}/dtd.h | 2 +- {shxml => xml}/internals.h | 6 ++-- {shxml => xml}/libucw-xml.pc | 0 {shxml => xml}/parse.c | 6 ++-- {shxml => xml}/source.c | 8 ++--- {shxml => xml}/unicat.pl | 0 {shxml => xml}/xml-test.c | 4 +-- {shxml => xml}/xml-test.t | 6 ++-- {shxml => xml}/xml.h | 0 17 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 shxml/Makefile create mode 100644 xml/Makefile rename {shxml => xml}/TODO (100%) rename {shxml => xml}/common.c (97%) rename {shxml => xml}/dtd.c (99%) rename {shxml => xml}/dtd.h (99%) rename {shxml => xml}/internals.h (98%) rename {shxml => xml}/libucw-xml.pc (100%) rename {shxml => xml}/parse.c (99%) rename {shxml => xml}/source.c (99%) rename {shxml => xml}/unicat.pl (100%) rename {shxml => xml}/xml-test.c (99%) rename {shxml => xml}/xml-test.t (93%) rename {shxml => xml}/xml.h (100%) diff --git a/Makefile b/Makefile index 53fdd562..68ea310d 100644 --- a/Makefile +++ b/Makefile @@ -50,9 +50,9 @@ LIBIMAGES=$(o)/images/libucw-images.pc include $(s)/images/Makefile endif -ifdef CONFIG_SHXML -LIBSHXML=$(o)/shxml/libucw-xml.pc -include $(s)/shxml/Makefile +ifdef CONFIG_XML +LIBXML=$(o)/xml/libucw-xml.pc +include $(s)/xml/Makefile endif # Build documentation by default? @@ -60,7 +60,7 @@ ifdef CONFIG_DOC all: docs endif -libs: $(LIBUCW) $(LIBSHXML) $(LIBIMAGES) $(LIBCHARSET) +libs: $(LIBUCW) $(LIBXML) $(LIBIMAGES) $(LIBCHARSET) # And finally the default rules of the build system include $(BUILDSYS)/Makebottom diff --git a/debug/default.cfg b/debug/default.cfg index 114ad3a4..cbd208ae 100644 --- a/debug/default.cfg +++ b/debug/default.cfg @@ -14,4 +14,4 @@ Set("CONFIG_IMAGES_DUP"); Set("CONFIG_IMAGES_SIM"); Set("CONFIG_CHARSET"); -Set("CONFIG_SHXML"); +Set("CONFIG_XML"); diff --git a/default.cfg b/default.cfg index 3ec89117..53f7a90d 100644 --- a/default.cfg +++ b/default.cfg @@ -36,7 +36,7 @@ UnSet("CONFIG_CHARSET"); Set("CONFIG_CHARSET_UTILS"); # Libucw-xml -UnSet("CONFIG_UCW_XML"); +UnSet("CONFIG_XML"); # Return success 1; diff --git a/shxml/Makefile b/shxml/Makefile deleted file mode 100644 index 598a1c66..00000000 --- a/shxml/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# Makefile for the XML parser -# (c) 2007 Pavel Charvat - -DIRS+=shxml -PROGS+=$(o)/shxml/xml-test - -LIBSHXML_MODS=common source parse dtd -LIBSHXML_INCLUDES=xml.h dtd.h - -LIBSHXML_MOD_PATHS=$(addprefix $(o)/shxml/,$(LIBSHXML_MODS)) - -$(o)/shxml/libucw-xml.a: $(addsuffix .o,$(LIBSHXML_MOD_PATHS)) -$(o)/shxml/libucw-xml-pic.a: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS)) -$(o)/shxml/libucw-xml.so: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS)) -$(o)/shxml/libucw-xml.so: SONAME_SUFFIX=.$(UCW_ABI_VERSION) -$(o)/shxml/libucw-xml.pc: $(LIBCHARSET) - -ifdef CONFIG_STATIC_PIC -$(o)/shxml/libucw-xml.pc: $(o)/shxml/libucw-xml-pic.a -endif -ifdef CONFIG_INSTALL_API -$(o)/shxml/libucw-xml.pc: $(o)/shxml/libucw-xml.a $(o)/shxml/libucw-xml-pic.a $(o)/shxml/libucw-xml.so -endif - -$(o)/shxml/common.o: $(o)/shxml/unicat.h -$(o)/shxml/common.oo: $(o)/shxml/unicat.h -$(o)/shxml/source.o: $(o)/shxml/unicat.h -$(o)/shxml/source.oo: $(o)/shxml/unicat.h -$(o)/shxml/dtd.o: $(o)/shxml/unicat.h -$(o)/shxml/dtd.oo: $(o)/shxml/unicat.h -$(o)/shxml/parse.o: $(o)/shxml/unicat.h -$(o)/shxml/parse.oo: $(o)/shxml/unicat.h -$(o)/shxml/unicat.h: $(s)/shxml/unicat.pl - $(M)GEN $(addprefix $(o)/shxml/unicat,.h .c) - $(Q)$< $(addprefix $(o)/shxml/unicat,.h .c) - $(Q)touch $@ - -TESTS+=$(o)/shxml/xml-test.test -$(o)/shxml/xml-test: $(o)/shxml/xml-test.o $(LIBSHXML) -$(o)/shxml/xml-test.test: $(o)/shxml/xml-test - -API_LIBS+=libucw-xml -API_INCLUDES+=$(o)/shxml/.include-stamp -$(o)/shxml/.include-stamp: $(addprefix $(s)/shxml/,$(LIBSHXML_INCLUDES)) -$(o)/shxml/.include-stamp: IDST=shxml -run/lib/pkgconfig/libucw-xml.pc: $(o)/shxml/libucw-xml.pc - -INSTALL_TARGETS+=install-libucw-xml install-libucw-xml-api - -install-libucw-xml: - install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-xml.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR) - -install-libucw-xml-api: - install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/shxml $(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/shxml/,$(LIBSHXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/shxml - ln -sf libucw-xml.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml.so - install -m 644 run/lib/libucw-xml.a $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-xml-pic.a $(DESTDIR)$(INSTALL_LIB_DIR) - -.PHONY: install-libucw-xml install-libucw-xml-api diff --git a/xml/Makefile b/xml/Makefile new file mode 100644 index 00000000..4a1b2e6b --- /dev/null +++ b/xml/Makefile @@ -0,0 +1,62 @@ +# Makefile for the XML parser +# (c) 2007 Pavel Charvat + +DIRS+=xml +PROGS+=$(o)/xml/xml-test + +LIBXML_MODS=common source parse dtd +LIBXML_INCLUDES=xml.h dtd.h + +LIBXML_MOD_PATHS=$(addprefix $(o)/xml/,$(LIBXML_MODS)) + +$(o)/xml/libucw-xml.a: $(addsuffix .o,$(LIBXML_MOD_PATHS)) +$(o)/xml/libucw-xml-pic.a: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) +$(o)/xml/libucw-xml.so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) +$(o)/xml/libucw-xml.so: SONAME_SUFFIX=.$(UCW_ABI_VERSION) +$(o)/xml/libucw-xml.pc: $(LIBCHARSET) + +ifdef CONFIG_STATIC_PIC +$(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml-pic.a +endif +ifdef CONFIG_INSTALL_API +$(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml.a $(o)/xml/libucw-xml-pic.a $(o)/xml/libucw-xml.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) +$(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 install-libucw-xml-api + +install-libucw-xml: + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) + install -m 644 run/lib/libucw-xml.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR) + +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.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml.so + install -m 644 run/lib/libucw-xml.a $(DESTDIR)$(INSTALL_LIB_DIR) + install -m 644 run/lib/libucw-xml-pic.a $(DESTDIR)$(INSTALL_LIB_DIR) + +.PHONY: install-libucw-xml install-libucw-xml-api diff --git a/shxml/TODO b/xml/TODO similarity index 100% rename from shxml/TODO rename to xml/TODO diff --git a/shxml/common.c b/xml/common.c similarity index 97% rename from shxml/common.c rename to xml/common.c index cfccbf97..bd95b7ea 100644 --- a/shxml/common.c +++ b/xml/common.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/shxml/dtd.c b/xml/dtd.c similarity index 99% rename from shxml/dtd.c rename to xml/dtd.c index 9c3402d2..27bc9c8e 100644 --- a/shxml/dtd.c +++ b/xml/dtd.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/shxml/dtd.h b/xml/dtd.h similarity index 99% rename from shxml/dtd.h rename to xml/dtd.h index 493a5f66..4546e097 100644 --- a/shxml/dtd.h +++ b/xml/dtd.h @@ -10,7 +10,7 @@ #ifndef _SHERLOCK_XML_DTD_H #define _SHERLOCK_XML_DTD_H -#include +#include struct xml_dtd { struct mempool *pool; /* Memory pool where to allocate DTD */ diff --git a/shxml/internals.h b/xml/internals.h similarity index 98% rename from shxml/internals.h rename to xml/internals.h index ad2c3a8a..a3ca04c6 100644 --- a/shxml/internals.h +++ b/xml/internals.h @@ -10,8 +10,8 @@ #ifndef _SHERLOCK_XML_INTERNALS_H #define _SHERLOCK_XML_INTERNALS_H -#include -#include +#include +#include /*** Debugging ***/ @@ -143,7 +143,7 @@ xml_dec(struct xml_context *ctx) xml_fatal_nested(ctx); } -#include "obj/shxml/unicat.h" +#include "obj/xml/unicat.h" static inline uns xml_char_cat(uns c) diff --git a/shxml/libucw-xml.pc b/xml/libucw-xml.pc similarity index 100% rename from shxml/libucw-xml.pc rename to xml/libucw-xml.pc diff --git a/shxml/parse.c b/xml/parse.c similarity index 99% rename from shxml/parse.c rename to xml/parse.c index 0865dca9..1d7fe6fb 100644 --- a/shxml/parse.c +++ b/xml/parse.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/shxml/source.c b/xml/source.c similarity index 99% rename from shxml/source.c rename to xml/source.c index d6d1f3b3..f0d0cdb0 100644 --- a/shxml/source.c +++ b/xml/source.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ /*** Charecter categorization ***/ -#include "obj/shxml/unicat.c" +#include "obj/xml/unicat.c" static void xml_init_cats(struct xml_context *ctx) diff --git a/shxml/unicat.pl b/xml/unicat.pl similarity index 100% rename from shxml/unicat.pl rename to xml/unicat.pl diff --git a/shxml/xml-test.c b/xml/xml-test.c similarity index 99% rename from shxml/xml-test.c rename to xml/xml-test.c index f86547a0..d35aaece 100644 --- a/shxml/xml-test.c +++ b/xml/xml-test.c @@ -8,8 +8,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/shxml/xml-test.t b/xml/xml-test.t similarity index 93% rename from shxml/xml-test.t rename to xml/xml-test.t index 7a04fb1b..8d0f9bb1 100644 --- a/shxml/xml-test.t +++ b/xml/xml-test.t @@ -1,13 +1,13 @@ # Tests for the XML parser # (c) 2008 Pavel Charvat -Run: ../obj/shxml/xml-test +Run: ../obj/xml/xml-test In: Out: PULL: start PULL: eof -Run: ../obj/shxml/xml-test -s +Run: ../obj/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/shxml/xml-test -sptd +Run: ../obj/xml/xml-test -sptd In: diff --git a/shxml/xml.h b/xml/xml.h similarity index 100% rename from shxml/xml.h rename to xml/xml.h -- 2.39.5