From f84c2f6bec0c8be01c23550117470a8fe1794a5a Mon Sep 17 00:00:00 2001 From: Adrien Prokopowicz Date: Sun, 30 Jul 2017 13:14:48 +0200 Subject: [PATCH] Added XML component to CMake config. --- .gitignore | 4 ++ CMakeLists.txt | 1 + config/gambas.cmake | 2 +- gb.xml/AUTHORS | 0 gb.xml/{src => }/CDocument.cpp | 0 gb.xml/{src => }/CDocument.h | 0 gb.xml/{src => }/CElement.cpp | 0 gb.xml/{src => }/CElement.h | 0 gb.xml/{src => }/CExplorer.cpp | 0 gb.xml/{src => }/CExplorer.h | 0 gb.xml/CMakeLists.txt | 16 +++++++ gb.xml/{src => }/CNode.cpp | 0 gb.xml/{src => }/CNode.h | 0 gb.xml/COPYING | 1 - gb.xml/{src => }/CReader.cpp | 0 gb.xml/{src => }/CReader.h | 0 gb.xml/{src => }/CTextNode.cpp | 0 gb.xml/{src => }/CTextNode.h | 0 gb.xml/ChangeLog | 0 gb.xml/INSTALL | 1 - gb.xml/Makefile.am | 4 -- gb.xml/NEWS | 0 gb.xml/README | 7 --- gb.xml/TODO | 8 ---- gb.xml/acinclude.m4 | 1 - gb.xml/component.am | 1 - gb.xml/configure.ac | 37 --------------- gb.xml/{src => }/document.cpp | 0 gb.xml/{src => }/document.h | 0 gb.xml/{src => }/element.cpp | 0 gb.xml/{src => }/element.h | 0 gb.xml/{src => }/explorer.cpp | 0 gb.xml/{src => }/explorer.h | 0 gb.xml/gambas.h | 1 - gb.xml/{src => }/gb.xml.component | 0 gb.xml/{src => }/gb.xml.h | 0 gb.xml/{src/rpc => }/gb.xml.rpc/.component | 0 gb.xml/{src/rpc => }/gb.xml.rpc/.info | 0 gb.xml/{src/rpc => }/gb.xml.rpc/.list | 0 gb.xml/{src/rpc => }/gb.xml.rpc/.project | 0 .../rpc => }/gb.xml.rpc/.src/RpcArray.class | 0 .../rpc => }/gb.xml.rpc/.src/RpcAtom.class | 0 .../rpc => }/gb.xml.rpc/.src/RpcClient.class | 0 .../gb.xml.rpc/.src/RpcFunction.class | 0 .../rpc => }/gb.xml.rpc/.src/RpcServer.class | 0 .../rpc => }/gb.xml.rpc/.src/RpcStruct.class | 0 .../rpc => }/gb.xml.rpc/.src/RpcType.class | 0 .../gb.xml.rpc/.src/Test/CXMLRPC.class | 0 .../gb.xml.rpc/.src/Test/MMain.module | 0 .../gb.xml.rpc/.src/Test/MTest.module | 0 .../rpc => }/gb.xml.rpc/.src/Tools.module | 0 .../rpc => }/gb.xml.rpc/.src/XmlRpc.class | 0 .../{src/rpc => }/gb.xml.rpc/.src/hPost.class | 0 .../rpc => }/gb.xml.rpc/.src/miniServer.class | 0 gb.xml/{src => }/gb.xml/.component | 0 gb.xml/{src => }/gb.xml/.directory | 0 gb.xml/{src => }/gb.xml/.icon.png | Bin gb.xml/{src => }/gb.xml/.info | 0 gb.xml/{src => }/gb.xml/.list | 0 gb.xml/{src => }/gb.xml/.project | 0 gb.xml/{src => }/gb.xml/.src/MTest.module | 0 gb.xml/{src => }/gb.xml/.src/MTest2.module | 0 gb.xml/{src => }/gb.xml/.src/XmlReader.class | 0 gb.xml/{src => }/gb.xml/.src/XmlWriter.class | 0 .../{src => }/gb.xml/.src/_XmlWriterDTD.class | 0 gb.xml/{src => }/gb.xml/text.xml | 0 gb.xml/gb_common.h | 1 - gb.xml/{src => }/gbinterface.h | 0 gb.xml/{src => }/html/CHTMLDocument.cpp | 0 gb.xml/{src => }/html/CHTMLDocument.h | 0 gb.xml/{src => }/html/CHTMLElement.cpp | 0 gb.xml/{src => }/html/CHTMLElement.h | 0 gb.xml/html/CMakeLists.txt | 11 +++++ gb.xml/{src => }/html/cssfilter.cpp | 0 gb.xml/{src => }/html/cssfilter.h | 0 gb.xml/{src => }/html/gb.xml.html.component | 0 gb.xml/{src => }/html/gb.xml.html.h | 0 gb.xml/{src => }/html/htmldocument.cpp | 0 gb.xml/{src => }/html/htmldocument.h | 0 gb.xml/{src => }/html/htmlelement.cpp | 0 gb.xml/{src => }/html/htmlelement.h | 0 gb.xml/{src => }/html/htmlmain.cpp | 0 gb.xml/{src => }/html/htmlmain.h | 0 gb.xml/{src => }/html/htmlparser.cpp | 0 gb.xml/{src => }/html/htmlparser.h | 0 gb.xml/{src => }/html/htmlserializer.cpp | 0 gb.xml/{src => }/html/htmlserializer.h | 0 gb.xml/m4 | 1 - gb.xml/{src => }/main.cpp | 0 gb.xml/{src => }/main.h | 0 gb.xml/missing | 1 - gb.xml/{src => }/node.cpp | 0 gb.xml/{src => }/node.h | 0 gb.xml/{src => }/parser.cpp | 0 gb.xml/{src => }/parser.h | 0 gb.xml/{src => }/reader.cpp | 0 gb.xml/{src => }/reader.h | 0 gb.xml/reconf | 1 - gb.xml/{src => }/serializer.cpp | 0 gb.xml/{src => }/serializer.h | 0 gb.xml/src/.directory | 6 --- gb.xml/src/Makefile.am | 18 ------- gb.xml/src/html/Makefile.am | 19 -------- gb.xml/src/html/html.pro | 29 ------------ gb.xml/src/rpc/Makefile.am | 2 - gb.xml/src/rpc/gb.xml.rpc.component | 1 - gb.xml/src/src.pro | 44 ------------------ gb.xml/src/xslt/Makefile.am | 11 ----- gb.xml/src/xslt/xslt.pro | 14 ------ gb.xml/{src => }/textnode.cpp | 0 gb.xml/{src => }/textnode.h | 0 gb.xml/{src => }/utils.cpp | 0 gb.xml/{src => }/utils.h | 0 gb.xml/xslt/CMakeLists.txt | 5 ++ gb.xml/{src => }/xslt/CXSLT.cpp | 0 gb.xml/{src => }/xslt/CXSLT.h | 0 gb.xml/{src => }/xslt/gb.xml.xslt.component | 0 gb.xml/{src => }/xslt/main.cpp | 0 gb.xml/{src => }/xslt/main.h | 0 main/CMakeLists.txt | 2 +- main/share/Makefile.am | 1 - 121 files changed, 39 insertions(+), 212 deletions(-) delete mode 100755 gb.xml/AUTHORS rename gb.xml/{src => }/CDocument.cpp (100%) rename gb.xml/{src => }/CDocument.h (100%) rename gb.xml/{src => }/CElement.cpp (100%) rename gb.xml/{src => }/CElement.h (100%) rename gb.xml/{src => }/CExplorer.cpp (100%) rename gb.xml/{src => }/CExplorer.h (100%) create mode 100644 gb.xml/CMakeLists.txt rename gb.xml/{src => }/CNode.cpp (100%) rename gb.xml/{src => }/CNode.h (100%) delete mode 120000 gb.xml/COPYING rename gb.xml/{src => }/CReader.cpp (100%) rename gb.xml/{src => }/CReader.h (100%) rename gb.xml/{src => }/CTextNode.cpp (100%) rename gb.xml/{src => }/CTextNode.h (100%) delete mode 100755 gb.xml/ChangeLog delete mode 120000 gb.xml/INSTALL delete mode 100755 gb.xml/Makefile.am delete mode 100755 gb.xml/NEWS delete mode 100755 gb.xml/README delete mode 100644 gb.xml/TODO delete mode 120000 gb.xml/acinclude.m4 delete mode 120000 gb.xml/component.am delete mode 100755 gb.xml/configure.ac rename gb.xml/{src => }/document.cpp (100%) rename gb.xml/{src => }/document.h (100%) rename gb.xml/{src => }/element.cpp (100%) rename gb.xml/{src => }/element.h (100%) rename gb.xml/{src => }/explorer.cpp (100%) rename gb.xml/{src => }/explorer.h (100%) delete mode 120000 gb.xml/gambas.h rename gb.xml/{src => }/gb.xml.component (100%) rename gb.xml/{src => }/gb.xml.h (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.component (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.info (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.list (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.project (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcArray.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcAtom.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcClient.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcFunction.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcServer.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcStruct.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/RpcType.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/Test/CXMLRPC.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/Test/MMain.module (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/Test/MTest.module (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/Tools.module (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/XmlRpc.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/hPost.class (100%) rename gb.xml/{src/rpc => }/gb.xml.rpc/.src/miniServer.class (100%) rename gb.xml/{src => }/gb.xml/.component (100%) rename gb.xml/{src => }/gb.xml/.directory (100%) rename gb.xml/{src => }/gb.xml/.icon.png (100%) rename gb.xml/{src => }/gb.xml/.info (100%) rename gb.xml/{src => }/gb.xml/.list (100%) rename gb.xml/{src => }/gb.xml/.project (100%) rename gb.xml/{src => }/gb.xml/.src/MTest.module (100%) rename gb.xml/{src => }/gb.xml/.src/MTest2.module (100%) rename gb.xml/{src => }/gb.xml/.src/XmlReader.class (100%) rename gb.xml/{src => }/gb.xml/.src/XmlWriter.class (100%) rename gb.xml/{src => }/gb.xml/.src/_XmlWriterDTD.class (100%) rename gb.xml/{src => }/gb.xml/text.xml (100%) delete mode 120000 gb.xml/gb_common.h rename gb.xml/{src => }/gbinterface.h (100%) rename gb.xml/{src => }/html/CHTMLDocument.cpp (100%) rename gb.xml/{src => }/html/CHTMLDocument.h (100%) rename gb.xml/{src => }/html/CHTMLElement.cpp (100%) rename gb.xml/{src => }/html/CHTMLElement.h (100%) create mode 100644 gb.xml/html/CMakeLists.txt rename gb.xml/{src => }/html/cssfilter.cpp (100%) rename gb.xml/{src => }/html/cssfilter.h (100%) rename gb.xml/{src => }/html/gb.xml.html.component (100%) rename gb.xml/{src => }/html/gb.xml.html.h (100%) rename gb.xml/{src => }/html/htmldocument.cpp (100%) rename gb.xml/{src => }/html/htmldocument.h (100%) rename gb.xml/{src => }/html/htmlelement.cpp (100%) rename gb.xml/{src => }/html/htmlelement.h (100%) rename gb.xml/{src => }/html/htmlmain.cpp (100%) rename gb.xml/{src => }/html/htmlmain.h (100%) rename gb.xml/{src => }/html/htmlparser.cpp (100%) rename gb.xml/{src => }/html/htmlparser.h (100%) rename gb.xml/{src => }/html/htmlserializer.cpp (100%) rename gb.xml/{src => }/html/htmlserializer.h (100%) delete mode 120000 gb.xml/m4 rename gb.xml/{src => }/main.cpp (100%) rename gb.xml/{src => }/main.h (100%) delete mode 120000 gb.xml/missing rename gb.xml/{src => }/node.cpp (100%) rename gb.xml/{src => }/node.h (100%) rename gb.xml/{src => }/parser.cpp (100%) rename gb.xml/{src => }/parser.h (100%) rename gb.xml/{src => }/reader.cpp (100%) rename gb.xml/{src => }/reader.h (100%) delete mode 120000 gb.xml/reconf rename gb.xml/{src => }/serializer.cpp (100%) rename gb.xml/{src => }/serializer.h (100%) delete mode 100755 gb.xml/src/.directory delete mode 100644 gb.xml/src/Makefile.am delete mode 100644 gb.xml/src/html/Makefile.am delete mode 100644 gb.xml/src/html/html.pro delete mode 100644 gb.xml/src/rpc/Makefile.am delete mode 120000 gb.xml/src/rpc/gb.xml.rpc.component delete mode 100644 gb.xml/src/src.pro delete mode 100755 gb.xml/src/xslt/Makefile.am delete mode 100644 gb.xml/src/xslt/xslt.pro rename gb.xml/{src => }/textnode.cpp (100%) rename gb.xml/{src => }/textnode.h (100%) rename gb.xml/{src => }/utils.cpp (100%) rename gb.xml/{src => }/utils.h (100%) create mode 100644 gb.xml/xslt/CMakeLists.txt rename gb.xml/{src => }/xslt/CXSLT.cpp (100%) rename gb.xml/{src => }/xslt/CXSLT.h (100%) rename gb.xml/{src => }/xslt/gb.xml.xslt.component (100%) rename gb.xml/{src => }/xslt/main.cpp (100%) rename gb.xml/{src => }/xslt/main.h (100%) delete mode 100644 main/share/Makefile.am diff --git a/.gitignore b/.gitignore index 25d3c340a..a1f48d189 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ Makefile # Static libraries *.a + +# Gambas temporary files +.gambas/ +.startup diff --git a/CMakeLists.txt b/CMakeLists.txt index 867b77d4a..ec2ce09fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -ggdb -fvisibility=hidden") include(config/gambas.cmake) add_subdirectory(main) +add_subdirectory(gb.xml) # add_subdirectory(comp) # add_subdirectory(app) diff --git a/config/gambas.cmake b/config/gambas.cmake index 9eb3b3264..af1d9ae83 100644 --- a/config/gambas.cmake +++ b/config/gambas.cmake @@ -11,7 +11,7 @@ set(GAMBAS_VERSION_REVISON 90) # Gambas Source Configuration -set(GAMBAS_SOURCE_INCLUDE_DIR "${GAMBAS_SOURCE_ROOT}/include" "${GAMBAS_SOURCE_ROOT}/main/share") +set(GAMBAS_SOURCE_INCLUDE_DIR "${GAMBAS_SOURCE_ROOT}/main/share") set(GAMBAS_SOURCE_CONFIG_DIR "${GAMBAS_SOURCE_ROOT}/config") set(GAMBAS_SOURCE_CONFIG_FILE "${GAMBAS_SOURCE_CONFIG_DIR}/config.h") set(GAMBAS_SOURCE_OUTPUT_DIR "${GAMBAS_SOURCE_ROOT}/build") diff --git a/gb.xml/AUTHORS b/gb.xml/AUTHORS deleted file mode 100755 index e69de29bb..000000000 diff --git a/gb.xml/src/CDocument.cpp b/gb.xml/CDocument.cpp similarity index 100% rename from gb.xml/src/CDocument.cpp rename to gb.xml/CDocument.cpp diff --git a/gb.xml/src/CDocument.h b/gb.xml/CDocument.h similarity index 100% rename from gb.xml/src/CDocument.h rename to gb.xml/CDocument.h diff --git a/gb.xml/src/CElement.cpp b/gb.xml/CElement.cpp similarity index 100% rename from gb.xml/src/CElement.cpp rename to gb.xml/CElement.cpp diff --git a/gb.xml/src/CElement.h b/gb.xml/CElement.h similarity index 100% rename from gb.xml/src/CElement.h rename to gb.xml/CElement.h diff --git a/gb.xml/src/CExplorer.cpp b/gb.xml/CExplorer.cpp similarity index 100% rename from gb.xml/src/CExplorer.cpp rename to gb.xml/CExplorer.cpp diff --git a/gb.xml/src/CExplorer.h b/gb.xml/CExplorer.h similarity index 100% rename from gb.xml/src/CExplorer.h rename to gb.xml/CExplorer.h diff --git a/gb.xml/CMakeLists.txt b/gb.xml/CMakeLists.txt new file mode 100644 index 000000000..d1eeb67c0 --- /dev/null +++ b/gb.xml/CMakeLists.txt @@ -0,0 +1,16 @@ + +set(GB_XML_SRC_LIST + main.cpp main.h utils.cpp utils.h + serializer.h serializer.cpp parser.h parser.cpp + document.cpp document.h node.cpp node.h textnode.cpp textnode.h element.cpp element.h + CDocument.cpp CDocument.h CNode.cpp CNode.h CElement.h CElement.cpp CTextNode.h CTextNode.cpp + CReader.h CReader.cpp reader.cpp reader.h + CExplorer.h CExplorer.cpp explorer.cpp explorer.h + gb.xml.h gbinterface.h +) + +gb_add_component(gb.xml ${GB_XML_SRC_LIST}) +gb_add_subcomponent(gb.xml html) +gb_add_subcomponent(gb.xml xslt) +gb_add_subcomponent(gb.xml gb.xml) +gb_add_subcomponent(gb.xml gb.xml.rpc) \ No newline at end of file diff --git a/gb.xml/src/CNode.cpp b/gb.xml/CNode.cpp similarity index 100% rename from gb.xml/src/CNode.cpp rename to gb.xml/CNode.cpp diff --git a/gb.xml/src/CNode.h b/gb.xml/CNode.h similarity index 100% rename from gb.xml/src/CNode.h rename to gb.xml/CNode.h diff --git a/gb.xml/COPYING b/gb.xml/COPYING deleted file mode 120000 index 012065c85..000000000 --- a/gb.xml/COPYING +++ /dev/null @@ -1 +0,0 @@ -../COPYING \ No newline at end of file diff --git a/gb.xml/src/CReader.cpp b/gb.xml/CReader.cpp similarity index 100% rename from gb.xml/src/CReader.cpp rename to gb.xml/CReader.cpp diff --git a/gb.xml/src/CReader.h b/gb.xml/CReader.h similarity index 100% rename from gb.xml/src/CReader.h rename to gb.xml/CReader.h diff --git a/gb.xml/src/CTextNode.cpp b/gb.xml/CTextNode.cpp similarity index 100% rename from gb.xml/src/CTextNode.cpp rename to gb.xml/CTextNode.cpp diff --git a/gb.xml/src/CTextNode.h b/gb.xml/CTextNode.h similarity index 100% rename from gb.xml/src/CTextNode.h rename to gb.xml/CTextNode.h diff --git a/gb.xml/ChangeLog b/gb.xml/ChangeLog deleted file mode 100755 index e69de29bb..000000000 diff --git a/gb.xml/INSTALL b/gb.xml/INSTALL deleted file mode 120000 index 99d491b4f..000000000 --- a/gb.xml/INSTALL +++ /dev/null @@ -1 +0,0 @@ -../INSTALL \ No newline at end of file diff --git a/gb.xml/Makefile.am b/gb.xml/Makefile.am deleted file mode 100755 index 3765f66a9..000000000 --- a/gb.xml/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 --install -SUBDIRS = @XML_DIR@ -EXTRA_DIST = reconf gambas.h gb*.h - diff --git a/gb.xml/NEWS b/gb.xml/NEWS deleted file mode 100755 index e69de29bb..000000000 diff --git a/gb.xml/README b/gb.xml/README deleted file mode 100755 index 53f792ab3..000000000 --- a/gb.xml/README +++ /dev/null @@ -1,7 +0,0 @@ -TODO : -GLrasterisation : -glBitmap() -glPolygonStipple() -glGetPolygonStipple() - -Waiting for texture implementation under components (needed to test !) diff --git a/gb.xml/TODO b/gb.xml/TODO deleted file mode 100644 index 1e9c72e18..000000000 --- a/gb.xml/TODO +++ /dev/null @@ -1,8 +0,0 @@ - -- Support "linked-nodes" (not urgent) - -- Make MANY tests with valgrind/gdb/whatyouwant , running many different projects, so that there isn't ANY bug or memory leak. - -- Check for any possible performance improvement - -- Improve my English. :/ \ No newline at end of file diff --git a/gb.xml/acinclude.m4 b/gb.xml/acinclude.m4 deleted file mode 120000 index d84c32a31..000000000 --- a/gb.xml/acinclude.m4 +++ /dev/null @@ -1 +0,0 @@ -../acinclude.m4 \ No newline at end of file diff --git a/gb.xml/component.am b/gb.xml/component.am deleted file mode 120000 index 2f0eee34f..000000000 --- a/gb.xml/component.am +++ /dev/null @@ -1 +0,0 @@ -../component.am \ No newline at end of file diff --git a/gb.xml/configure.ac b/gb.xml/configure.ac deleted file mode 100755 index 66cf8fb68..000000000 --- a/gb.xml/configure.ac +++ /dev/null @@ -1,37 +0,0 @@ -dnl ---- configure.ac for gb.xml - -m4_include([../version.m4]) -AC_INIT(gambas3-gb-xml, GB_VERSION, GB_MAIL, [], GB_URL) -AC_CONFIG_MACRO_DIR([m4]) - -GB_INIT(gb.xml) -AC_PROG_LIBTOOL - -GB_COMPONENT( - xml, XML, gb.xml, [src], - [], - [], - [] -) - -GB_COMPONENT( - xmlhtml, XMLHTML, gb.xml.html, [html], - [], - [], - [] -) - -GB_COMPONENT_PKG_CONFIG( - xmlxslt, XMLXSLT, gb.xml.xslt, [xslt], - libxml-2.0 libxslt -) - -AC_OUTPUT( \ -Makefile \ -src/Makefile \ -src/html/Makefile \ -src/xslt/Makefile \ -src/rpc/Makefile \ -) - -GB_PRINT_MESSAGES \ No newline at end of file diff --git a/gb.xml/src/document.cpp b/gb.xml/document.cpp similarity index 100% rename from gb.xml/src/document.cpp rename to gb.xml/document.cpp diff --git a/gb.xml/src/document.h b/gb.xml/document.h similarity index 100% rename from gb.xml/src/document.h rename to gb.xml/document.h diff --git a/gb.xml/src/element.cpp b/gb.xml/element.cpp similarity index 100% rename from gb.xml/src/element.cpp rename to gb.xml/element.cpp diff --git a/gb.xml/src/element.h b/gb.xml/element.h similarity index 100% rename from gb.xml/src/element.h rename to gb.xml/element.h diff --git a/gb.xml/src/explorer.cpp b/gb.xml/explorer.cpp similarity index 100% rename from gb.xml/src/explorer.cpp rename to gb.xml/explorer.cpp diff --git a/gb.xml/src/explorer.h b/gb.xml/explorer.h similarity index 100% rename from gb.xml/src/explorer.h rename to gb.xml/explorer.h diff --git a/gb.xml/gambas.h b/gb.xml/gambas.h deleted file mode 120000 index 03677ecd0..000000000 --- a/gb.xml/gambas.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gambas.h \ No newline at end of file diff --git a/gb.xml/src/gb.xml.component b/gb.xml/gb.xml.component similarity index 100% rename from gb.xml/src/gb.xml.component rename to gb.xml/gb.xml.component diff --git a/gb.xml/src/gb.xml.h b/gb.xml/gb.xml.h similarity index 100% rename from gb.xml/src/gb.xml.h rename to gb.xml/gb.xml.h diff --git a/gb.xml/src/rpc/gb.xml.rpc/.component b/gb.xml/gb.xml.rpc/.component similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.component rename to gb.xml/gb.xml.rpc/.component diff --git a/gb.xml/src/rpc/gb.xml.rpc/.info b/gb.xml/gb.xml.rpc/.info similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.info rename to gb.xml/gb.xml.rpc/.info diff --git a/gb.xml/src/rpc/gb.xml.rpc/.list b/gb.xml/gb.xml.rpc/.list similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.list rename to gb.xml/gb.xml.rpc/.list diff --git a/gb.xml/src/rpc/gb.xml.rpc/.project b/gb.xml/gb.xml.rpc/.project similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.project rename to gb.xml/gb.xml.rpc/.project diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcArray.class b/gb.xml/gb.xml.rpc/.src/RpcArray.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcArray.class rename to gb.xml/gb.xml.rpc/.src/RpcArray.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcAtom.class b/gb.xml/gb.xml.rpc/.src/RpcAtom.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcAtom.class rename to gb.xml/gb.xml.rpc/.src/RpcAtom.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcClient.class b/gb.xml/gb.xml.rpc/.src/RpcClient.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcClient.class rename to gb.xml/gb.xml.rpc/.src/RpcClient.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcFunction.class b/gb.xml/gb.xml.rpc/.src/RpcFunction.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcFunction.class rename to gb.xml/gb.xml.rpc/.src/RpcFunction.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcServer.class b/gb.xml/gb.xml.rpc/.src/RpcServer.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcServer.class rename to gb.xml/gb.xml.rpc/.src/RpcServer.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcStruct.class b/gb.xml/gb.xml.rpc/.src/RpcStruct.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcStruct.class rename to gb.xml/gb.xml.rpc/.src/RpcStruct.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/RpcType.class b/gb.xml/gb.xml.rpc/.src/RpcType.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/RpcType.class rename to gb.xml/gb.xml.rpc/.src/RpcType.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/Test/CXMLRPC.class b/gb.xml/gb.xml.rpc/.src/Test/CXMLRPC.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/Test/CXMLRPC.class rename to gb.xml/gb.xml.rpc/.src/Test/CXMLRPC.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/Test/MMain.module b/gb.xml/gb.xml.rpc/.src/Test/MMain.module similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/Test/MMain.module rename to gb.xml/gb.xml.rpc/.src/Test/MMain.module diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/Test/MTest.module b/gb.xml/gb.xml.rpc/.src/Test/MTest.module similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/Test/MTest.module rename to gb.xml/gb.xml.rpc/.src/Test/MTest.module diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/Tools.module b/gb.xml/gb.xml.rpc/.src/Tools.module similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/Tools.module rename to gb.xml/gb.xml.rpc/.src/Tools.module diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/XmlRpc.class b/gb.xml/gb.xml.rpc/.src/XmlRpc.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/XmlRpc.class rename to gb.xml/gb.xml.rpc/.src/XmlRpc.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/hPost.class b/gb.xml/gb.xml.rpc/.src/hPost.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/hPost.class rename to gb.xml/gb.xml.rpc/.src/hPost.class diff --git a/gb.xml/src/rpc/gb.xml.rpc/.src/miniServer.class b/gb.xml/gb.xml.rpc/.src/miniServer.class similarity index 100% rename from gb.xml/src/rpc/gb.xml.rpc/.src/miniServer.class rename to gb.xml/gb.xml.rpc/.src/miniServer.class diff --git a/gb.xml/src/gb.xml/.component b/gb.xml/gb.xml/.component similarity index 100% rename from gb.xml/src/gb.xml/.component rename to gb.xml/gb.xml/.component diff --git a/gb.xml/src/gb.xml/.directory b/gb.xml/gb.xml/.directory similarity index 100% rename from gb.xml/src/gb.xml/.directory rename to gb.xml/gb.xml/.directory diff --git a/gb.xml/src/gb.xml/.icon.png b/gb.xml/gb.xml/.icon.png similarity index 100% rename from gb.xml/src/gb.xml/.icon.png rename to gb.xml/gb.xml/.icon.png diff --git a/gb.xml/src/gb.xml/.info b/gb.xml/gb.xml/.info similarity index 100% rename from gb.xml/src/gb.xml/.info rename to gb.xml/gb.xml/.info diff --git a/gb.xml/src/gb.xml/.list b/gb.xml/gb.xml/.list similarity index 100% rename from gb.xml/src/gb.xml/.list rename to gb.xml/gb.xml/.list diff --git a/gb.xml/src/gb.xml/.project b/gb.xml/gb.xml/.project similarity index 100% rename from gb.xml/src/gb.xml/.project rename to gb.xml/gb.xml/.project diff --git a/gb.xml/src/gb.xml/.src/MTest.module b/gb.xml/gb.xml/.src/MTest.module similarity index 100% rename from gb.xml/src/gb.xml/.src/MTest.module rename to gb.xml/gb.xml/.src/MTest.module diff --git a/gb.xml/src/gb.xml/.src/MTest2.module b/gb.xml/gb.xml/.src/MTest2.module similarity index 100% rename from gb.xml/src/gb.xml/.src/MTest2.module rename to gb.xml/gb.xml/.src/MTest2.module diff --git a/gb.xml/src/gb.xml/.src/XmlReader.class b/gb.xml/gb.xml/.src/XmlReader.class similarity index 100% rename from gb.xml/src/gb.xml/.src/XmlReader.class rename to gb.xml/gb.xml/.src/XmlReader.class diff --git a/gb.xml/src/gb.xml/.src/XmlWriter.class b/gb.xml/gb.xml/.src/XmlWriter.class similarity index 100% rename from gb.xml/src/gb.xml/.src/XmlWriter.class rename to gb.xml/gb.xml/.src/XmlWriter.class diff --git a/gb.xml/src/gb.xml/.src/_XmlWriterDTD.class b/gb.xml/gb.xml/.src/_XmlWriterDTD.class similarity index 100% rename from gb.xml/src/gb.xml/.src/_XmlWriterDTD.class rename to gb.xml/gb.xml/.src/_XmlWriterDTD.class diff --git a/gb.xml/src/gb.xml/text.xml b/gb.xml/gb.xml/text.xml similarity index 100% rename from gb.xml/src/gb.xml/text.xml rename to gb.xml/gb.xml/text.xml diff --git a/gb.xml/gb_common.h b/gb.xml/gb_common.h deleted file mode 120000 index 707d79da6..000000000 --- a/gb.xml/gb_common.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gb_common.h \ No newline at end of file diff --git a/gb.xml/src/gbinterface.h b/gb.xml/gbinterface.h similarity index 100% rename from gb.xml/src/gbinterface.h rename to gb.xml/gbinterface.h diff --git a/gb.xml/src/html/CHTMLDocument.cpp b/gb.xml/html/CHTMLDocument.cpp similarity index 100% rename from gb.xml/src/html/CHTMLDocument.cpp rename to gb.xml/html/CHTMLDocument.cpp diff --git a/gb.xml/src/html/CHTMLDocument.h b/gb.xml/html/CHTMLDocument.h similarity index 100% rename from gb.xml/src/html/CHTMLDocument.h rename to gb.xml/html/CHTMLDocument.h diff --git a/gb.xml/src/html/CHTMLElement.cpp b/gb.xml/html/CHTMLElement.cpp similarity index 100% rename from gb.xml/src/html/CHTMLElement.cpp rename to gb.xml/html/CHTMLElement.cpp diff --git a/gb.xml/src/html/CHTMLElement.h b/gb.xml/html/CHTMLElement.h similarity index 100% rename from gb.xml/src/html/CHTMLElement.h rename to gb.xml/html/CHTMLElement.h diff --git a/gb.xml/html/CMakeLists.txt b/gb.xml/html/CMakeLists.txt new file mode 100644 index 000000000..eeebe5e8a --- /dev/null +++ b/gb.xml/html/CMakeLists.txt @@ -0,0 +1,11 @@ + +set(GB_XML_HTML_SRC_LIST +htmlmain.cpp +htmldocument.cpp htmlelement.cpp +CHTMLDocument.cpp CHTMLElement.cpp +htmlserializer.cpp +cssfilter.cpp +htmlparser.cpp +gb.xml.html.h) + +gb_add_component(gb.xml.html ${GB_XML_HTML_SRC_LIST}) \ No newline at end of file diff --git a/gb.xml/src/html/cssfilter.cpp b/gb.xml/html/cssfilter.cpp similarity index 100% rename from gb.xml/src/html/cssfilter.cpp rename to gb.xml/html/cssfilter.cpp diff --git a/gb.xml/src/html/cssfilter.h b/gb.xml/html/cssfilter.h similarity index 100% rename from gb.xml/src/html/cssfilter.h rename to gb.xml/html/cssfilter.h diff --git a/gb.xml/src/html/gb.xml.html.component b/gb.xml/html/gb.xml.html.component similarity index 100% rename from gb.xml/src/html/gb.xml.html.component rename to gb.xml/html/gb.xml.html.component diff --git a/gb.xml/src/html/gb.xml.html.h b/gb.xml/html/gb.xml.html.h similarity index 100% rename from gb.xml/src/html/gb.xml.html.h rename to gb.xml/html/gb.xml.html.h diff --git a/gb.xml/src/html/htmldocument.cpp b/gb.xml/html/htmldocument.cpp similarity index 100% rename from gb.xml/src/html/htmldocument.cpp rename to gb.xml/html/htmldocument.cpp diff --git a/gb.xml/src/html/htmldocument.h b/gb.xml/html/htmldocument.h similarity index 100% rename from gb.xml/src/html/htmldocument.h rename to gb.xml/html/htmldocument.h diff --git a/gb.xml/src/html/htmlelement.cpp b/gb.xml/html/htmlelement.cpp similarity index 100% rename from gb.xml/src/html/htmlelement.cpp rename to gb.xml/html/htmlelement.cpp diff --git a/gb.xml/src/html/htmlelement.h b/gb.xml/html/htmlelement.h similarity index 100% rename from gb.xml/src/html/htmlelement.h rename to gb.xml/html/htmlelement.h diff --git a/gb.xml/src/html/htmlmain.cpp b/gb.xml/html/htmlmain.cpp similarity index 100% rename from gb.xml/src/html/htmlmain.cpp rename to gb.xml/html/htmlmain.cpp diff --git a/gb.xml/src/html/htmlmain.h b/gb.xml/html/htmlmain.h similarity index 100% rename from gb.xml/src/html/htmlmain.h rename to gb.xml/html/htmlmain.h diff --git a/gb.xml/src/html/htmlparser.cpp b/gb.xml/html/htmlparser.cpp similarity index 100% rename from gb.xml/src/html/htmlparser.cpp rename to gb.xml/html/htmlparser.cpp diff --git a/gb.xml/src/html/htmlparser.h b/gb.xml/html/htmlparser.h similarity index 100% rename from gb.xml/src/html/htmlparser.h rename to gb.xml/html/htmlparser.h diff --git a/gb.xml/src/html/htmlserializer.cpp b/gb.xml/html/htmlserializer.cpp similarity index 100% rename from gb.xml/src/html/htmlserializer.cpp rename to gb.xml/html/htmlserializer.cpp diff --git a/gb.xml/src/html/htmlserializer.h b/gb.xml/html/htmlserializer.h similarity index 100% rename from gb.xml/src/html/htmlserializer.h rename to gb.xml/html/htmlserializer.h diff --git a/gb.xml/m4 b/gb.xml/m4 deleted file mode 120000 index 7d49a2a4b..000000000 --- a/gb.xml/m4 +++ /dev/null @@ -1 +0,0 @@ -../m4 \ No newline at end of file diff --git a/gb.xml/src/main.cpp b/gb.xml/main.cpp similarity index 100% rename from gb.xml/src/main.cpp rename to gb.xml/main.cpp diff --git a/gb.xml/src/main.h b/gb.xml/main.h similarity index 100% rename from gb.xml/src/main.h rename to gb.xml/main.h diff --git a/gb.xml/missing b/gb.xml/missing deleted file mode 120000 index f3ade9ba1..000000000 --- a/gb.xml/missing +++ /dev/null @@ -1 +0,0 @@ -../missing \ No newline at end of file diff --git a/gb.xml/src/node.cpp b/gb.xml/node.cpp similarity index 100% rename from gb.xml/src/node.cpp rename to gb.xml/node.cpp diff --git a/gb.xml/src/node.h b/gb.xml/node.h similarity index 100% rename from gb.xml/src/node.h rename to gb.xml/node.h diff --git a/gb.xml/src/parser.cpp b/gb.xml/parser.cpp similarity index 100% rename from gb.xml/src/parser.cpp rename to gb.xml/parser.cpp diff --git a/gb.xml/src/parser.h b/gb.xml/parser.h similarity index 100% rename from gb.xml/src/parser.h rename to gb.xml/parser.h diff --git a/gb.xml/src/reader.cpp b/gb.xml/reader.cpp similarity index 100% rename from gb.xml/src/reader.cpp rename to gb.xml/reader.cpp diff --git a/gb.xml/src/reader.h b/gb.xml/reader.h similarity index 100% rename from gb.xml/src/reader.h rename to gb.xml/reader.h diff --git a/gb.xml/reconf b/gb.xml/reconf deleted file mode 120000 index 48a376da6..000000000 --- a/gb.xml/reconf +++ /dev/null @@ -1 +0,0 @@ -../reconf \ No newline at end of file diff --git a/gb.xml/src/serializer.cpp b/gb.xml/serializer.cpp similarity index 100% rename from gb.xml/src/serializer.cpp rename to gb.xml/serializer.cpp diff --git a/gb.xml/src/serializer.h b/gb.xml/serializer.h similarity index 100% rename from gb.xml/src/serializer.h rename to gb.xml/serializer.h diff --git a/gb.xml/src/.directory b/gb.xml/src/.directory deleted file mode 100755 index 22f35d7fa..000000000 --- a/gb.xml/src/.directory +++ /dev/null @@ -1,6 +0,0 @@ -[Dolphin] -Timestamp=2012,2,8,18,41,28 -Version=2 - -[Settings] -ShowDotFiles=true diff --git a/gb.xml/src/Makefile.am b/gb.xml/src/Makefile.am deleted file mode 100644 index 5ab447e79..000000000 --- a/gb.xml/src/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -COMPONENT = gb.xml -include $(top_srcdir)/component.am - -SUBDIRS = . @XMLXSLT_DIR@ rpc @XMLHTML_DIR@ -gblib_LTLIBRARIES = gb.xml.la - -gb_xml_la_LIBADD = @XML_LIB@ -gb_xml_la_LDFLAGS = -module @LD_FLAGS@ @XML_LDFLAGS@ -gb_xml_la_CPPFLAGS = @XML_INC@ -gb_xml_la_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions -fvisibility=default - -gb_xml_la_SOURCES = main.cpp main.h utils.cpp utils.h\ -serializer.h serializer.cpp parser.h parser.cpp\ -document.cpp document.h node.cpp node.h textnode.cpp textnode.h element.cpp element.h \ -CDocument.cpp CDocument.h CNode.cpp CNode.h CElement.h CElement.cpp CTextNode.h CTextNode.cpp \ -CReader.h CReader.cpp reader.cpp reader.h \ -CExplorer.h CExplorer.cpp explorer.cpp explorer.h \ -gb.xml.h gbinterface.h diff --git a/gb.xml/src/html/Makefile.am b/gb.xml/src/html/Makefile.am deleted file mode 100644 index f571657ca..000000000 --- a/gb.xml/src/html/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -COMPONENT = gb.xml.html -include $(top_srcdir)/component.am -gblib_LTLIBRARIES = gb.xml.html.la - -##gb_xml_html_la_LIBADD = @XMLHTML_LIB@ @XML_LIB@ -l:gb.xml.so -##gb_xml_html_la_LDFLAGS = -module @LD_FLAGS@ @XMLHTML_LDFLAGS@ -L$(srcdir)/../.libs -gb_xml_html_la_LIBADD = @XMLHTML_LIB@ @XML_LIB@ -gb_xml_html_la_LDFLAGS = -module @LD_FLAGS@ @XMLHTML_LDFLAGS@ -gb_xml_html_la_CPPFLAGS = @XMLHTML_INC@ -gb_xml_html_la_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions - -gb_xml_html_la_SOURCES = *.h \ -htmlmain.cpp \ -htmldocument.cpp htmlelement.cpp \ -CHTMLDocument.cpp CHTMLElement.cpp \ -htmlserializer.cpp \ -cssfilter.cpp \ -htmlparser.cpp \ -gb.xml.html.h diff --git a/gb.xml/src/html/html.pro b/gb.xml/src/html/html.pro deleted file mode 100644 index 730e1c923..000000000 --- a/gb.xml/src/html/html.pro +++ /dev/null @@ -1,29 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 4 21:47:56 2012 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . /usr/include/c++/4.6.1 - -# Input -HEADERS += \ - gb.xml.html.h \ - cssfilter.h \ - htmlserializer.h \ - CHTMLDocument.h \ - CHTMLElement.h \ - htmlmain.h \ - htmlparser.h \ - htmldocument.h \ - htmlelement.h -SOURCES += \ - cssfilter.cpp \ - CHTMLDocument.cpp \ - CHTMLElement.cpp \ - htmldocument.cpp \ - htmlelement.cpp \ - htmlserializer.cpp \ - htmlmain.cpp \ - htmlparser.cpp diff --git a/gb.xml/src/rpc/Makefile.am b/gb.xml/src/rpc/Makefile.am deleted file mode 100644 index 466d81014..000000000 --- a/gb.xml/src/rpc/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -COMPONENT = gb.xml.rpc -include $(top_srcdir)/component.am diff --git a/gb.xml/src/rpc/gb.xml.rpc.component b/gb.xml/src/rpc/gb.xml.rpc.component deleted file mode 120000 index 1331526cb..000000000 --- a/gb.xml/src/rpc/gb.xml.rpc.component +++ /dev/null @@ -1 +0,0 @@ -gb.xml.rpc/.component \ No newline at end of file diff --git a/gb.xml/src/src.pro b/gb.xml/src/src.pro deleted file mode 100644 index fb36133fb..000000000 --- a/gb.xml/src/src.pro +++ /dev/null @@ -1,44 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) lun. juil. 4 20:53:59 2011 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . testhtml -INCLUDEPATH += . /usr/include/c++/4.6.1 - -# Input -HEADERS += document.h \ - element.h \ - main.h \ - node.h \ - textnode.h \ - CDocument.h \ - CNode.h \ - CElement.h \ - CTextNode.h \ - CReader.h \ - reader.h \ - explorer.h \ - CExplorer.h \ - utils.h \ - parser.h \ - serializer.h \ - gb.xml.h \ - gbinterface.h -SOURCES += document.cpp \ - element.cpp \ - main.cpp \ - node.cpp \ - textnode.cpp \ - CDocument.cpp \ - CNode.cpp \ - CElement.cpp \ - CTextNode.cpp \ - CReader.cpp \ - reader.cpp \ - explorer.cpp \ - CExplorer.cpp \ - utils.cpp \ - parser.cpp \ - serializer.cpp diff --git a/gb.xml/src/xslt/Makefile.am b/gb.xml/src/xslt/Makefile.am deleted file mode 100755 index 98f0bedbb..000000000 --- a/gb.xml/src/xslt/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -COMPONENT = gb.xml.xslt -include $(top_srcdir)/component.am - -gblib_LTLIBRARIES = gb.xml.xslt.la - -gb_xml_xslt_la_LIBADD = @XMLXSLT_LIB@ @XML_LIB@ -gb_xml_xslt_la_LDFLAGS = -module @LD_FLAGS@ @XML_LDFLAGS@ @XMLXSLT_LDFLAGS@ -gb_xml_xslt_la_CPPFLAGS = @XMLXSLT_INC@ -gb_xml_xslt_la_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions - -gb_xml_xslt_la_SOURCES = main.cpp CXSLT.h CXSLT.cpp diff --git a/gb.xml/src/xslt/xslt.pro b/gb.xml/src/xslt/xslt.pro deleted file mode 100644 index 61584fa66..000000000 --- a/gb.xml/src/xslt/xslt.pro +++ /dev/null @@ -1,14 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fri Apr 13 23:39:19 2012 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += CXSLT.h -SOURCES += \ - main.cpp \ - CXSLT.cpp diff --git a/gb.xml/src/textnode.cpp b/gb.xml/textnode.cpp similarity index 100% rename from gb.xml/src/textnode.cpp rename to gb.xml/textnode.cpp diff --git a/gb.xml/src/textnode.h b/gb.xml/textnode.h similarity index 100% rename from gb.xml/src/textnode.h rename to gb.xml/textnode.h diff --git a/gb.xml/src/utils.cpp b/gb.xml/utils.cpp similarity index 100% rename from gb.xml/src/utils.cpp rename to gb.xml/utils.cpp diff --git a/gb.xml/src/utils.h b/gb.xml/utils.h similarity index 100% rename from gb.xml/src/utils.h rename to gb.xml/utils.h diff --git a/gb.xml/xslt/CMakeLists.txt b/gb.xml/xslt/CMakeLists.txt new file mode 100644 index 000000000..9408eadfb --- /dev/null +++ b/gb.xml/xslt/CMakeLists.txt @@ -0,0 +1,5 @@ + +gb_add_component(gb.xml.xslt CXSLT.cpp main.cpp) +gb_component_require_package(gb.xml.xslt LibXml2) +gb_component_require_package(gb.xml.xslt LibXslt) +target_include_directories(gb.xml.xslt PUBLIC "/usr/include/libxml2") \ No newline at end of file diff --git a/gb.xml/src/xslt/CXSLT.cpp b/gb.xml/xslt/CXSLT.cpp similarity index 100% rename from gb.xml/src/xslt/CXSLT.cpp rename to gb.xml/xslt/CXSLT.cpp diff --git a/gb.xml/src/xslt/CXSLT.h b/gb.xml/xslt/CXSLT.h similarity index 100% rename from gb.xml/src/xslt/CXSLT.h rename to gb.xml/xslt/CXSLT.h diff --git a/gb.xml/src/xslt/gb.xml.xslt.component b/gb.xml/xslt/gb.xml.xslt.component similarity index 100% rename from gb.xml/src/xslt/gb.xml.xslt.component rename to gb.xml/xslt/gb.xml.xslt.component diff --git a/gb.xml/src/xslt/main.cpp b/gb.xml/xslt/main.cpp similarity index 100% rename from gb.xml/src/xslt/main.cpp rename to gb.xml/xslt/main.cpp diff --git a/gb.xml/src/xslt/main.h b/gb.xml/xslt/main.h similarity index 100% rename from gb.xml/src/xslt/main.h rename to gb.xml/xslt/main.h diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 9effd845b..219e01062 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(gbc) add_subdirectory(gbx) -add_subdirectory(lib) \ No newline at end of file +add_subdirectory(lib) diff --git a/main/share/Makefile.am b/main/share/Makefile.am deleted file mode 100644 index 379c0ba79..000000000 --- a/main/share/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = *.h