diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-16 06:58:09 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-16 06:58:09 -0500 |
commit | 3be786451b6a9accc46a08f0aed4f8d5a8794ffe (patch) | |
tree | 64368032bd85bcb8d552a678174effdbd66e04b0 /sax | |
parent | revert gmk4 (diff) | |
download | core-3be786451b6a9accc46a08f0aed4f8d5a8794ffe.tar.gz core-3be786451b6a9accc46a08f0aed4f8d5a8794ffe.zip |
gbuildification of sax
Change-Id: I6e8220e88566e04b20687d54181205d31ec68e13
Diffstat (limited to 'sax')
-rw-r--r-- | sax/CppunitTest_sax.mk | 28 | ||||
-rw-r--r-- | sax/Library_expwrap.mk | 44 | ||||
-rw-r--r-- | sax/Library_fastsax.mk | 42 | ||||
-rw-r--r-- | sax/Library_sax.mk | 46 | ||||
-rw-r--r-- | sax/Module_sax.mk | 23 | ||||
-rw-r--r-- | sax/Package_inc.mk | 18 | ||||
-rw-r--r-- | sax/inc/sax/fastattribs.hxx | 2 | ||||
-rw-r--r-- | sax/inc/sax/fshelper.hxx | 1 | ||||
-rw-r--r-- | sax/inc/sax/parser/saxparser.hxx | 1 | ||||
-rw-r--r-- | sax/inc/sax/saxdllapi.h (renamed from sax/inc/sax/dllapi.h) | 2 | ||||
-rw-r--r-- | sax/inc/sax/tools/attributemap.hxx | 2 | ||||
-rw-r--r-- | sax/inc/sax/tools/saxobject.hxx | 2 | ||||
-rw-r--r-- | sax/inc/sax/tools/tokenmap.hxx | 1 | ||||
-rw-r--r-- | sax/source/tools/fastserializer.hxx | 1 |
14 files changed, 204 insertions, 9 deletions
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk new file mode 100644 index 000000000000..493cb7679645 --- /dev/null +++ b/sax/CppunitTest_sax.mk @@ -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_CppunitTest_CppunitTest,sax_cpputest)) + +$(eval $(call gb_CppunitTest_use_api,sax_cpputest,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ + sax \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ + sax/qa/cppunit/test_converter \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk new file mode 100644 index 000000000000..dca2b33d461c --- /dev/null +++ b/sax/Library_expwrap.mk @@ -0,0 +1,44 @@ +# -*- 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_Library_Library,expwrap)) + +$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)) + + +$(eval $(call gb_Library_use_api,expwrap,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,expwrap,\ + expat_utf16 \ +)) + +$(eval $(call gb_Library_use_libraries,expwrap,\ + cppu \ + cppuhelper \ + sal \ + sax \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_set_include,expwrap,\ + -I$(SRCDIR)/sax/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_exception_objects,expwrap,\ + sax/source/expatwrap/attrlistimpl \ + sax/source/expatwrap/sax_expat \ + sax/source/expatwrap/saxwriter \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk new file mode 100644 index 000000000000..e866cb89bdd5 --- /dev/null +++ b/sax/Library_fastsax.mk @@ -0,0 +1,42 @@ +# -*- 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_Library_Library,fastsax)) + +$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax)) + +$(eval $(call gb_Library_use_api,fastsax,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,fastsax,\ + expat_utf8 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,fastsax,\ + cppu \ + cppuhelper \ + sal \ + sax \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_include,fastsax,\ + -I$(SRCDIR)/sax/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_exception_objects,fastsax,\ + sax/source/fastparser/facreg \ + sax/source/fastparser/fastparser \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk new file mode 100644 index 000000000000..9b6b8600188a --- /dev/null +++ b/sax/Library_sax.mk @@ -0,0 +1,46 @@ +# -*- 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_Library_Library,sax)) + +$(eval $(call gb_Library_use_package,sax,\ + sax_inc \ +)) + +$(eval $(call gb_Library_use_api,sax,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_libraries,sax,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_include,sax,\ + -I$(SRCDIR)/sax/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,sax,\ + -DSAX_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_exception_objects,sax,\ + sax/source/expatwrap/xml2utf \ + sax/source/tools/converter \ + sax/source/tools/fastattribs \ + sax/source/tools/fastserializer \ + sax/source/tools/fshelper \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk new file mode 100644 index 000000000000..2ad7bf175338 --- /dev/null +++ b/sax/Module_sax.mk @@ -0,0 +1,23 @@ +# -*- 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_Module_Module,sax)) + +$(eval $(call gb_Module_add_targets,sax,\ + Library_expwrap \ + Library_fastsax \ + Library_sax \ + Package_inc \ +)) + +$(eval $(call gb_Module_add_check_targets,sax,\ + CppunitTest_sax \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk new file mode 100644 index 000000000000..8cf8114d371a --- /dev/null +++ b/sax/Package_inc.mk @@ -0,0 +1,18 @@ +# -*- 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_Package_Package,sax_inc,$(SRCDIR)/sax/inc)) + +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/saxdllapi.h,sax/saxdllapi.h)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/documenthandleradapter.hxx,sax/tools/documenthandleradapter.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx index 6759b58c1c74..1db74e12cc0d 100644 --- a/sax/inc/sax/fastattribs.hxx +++ b/sax/inc/sax/fastattribs.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/xml/FastAttribute.hpp> #include <cppuhelper/implbase1.hxx> -#include "sax/dllapi.h" +#include "sax/saxdllapi.h" #include <map> #include <vector> diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx index 73d04eb9560c..9278081ebe4f 100644 --- a/sax/inc/sax/fshelper.hxx +++ b/sax/inc/sax/fshelper.hxx @@ -35,7 +35,6 @@ #include <stdarg.h> #include <boost/shared_ptr.hpp> #include <sax/fastattribs.hxx> -#include "sax/dllapi.h" #define FSNS(namespc, element) ((namespc << 16) | element) const sal_Int32 FSEND = -1; // same as XML_TOKEN_INVALID diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx index 16bd1a3446e3..d8235dfebd40 100644 --- a/sax/inc/sax/parser/saxparser.hxx +++ b/sax/inc/sax/parser/saxparser.hxx @@ -29,7 +29,6 @@ #ifndef _SAX_SAXPARSER_HXX_ #define _SAX_SAXPARSER_HXX_ -#include "sax/dllapi.h" #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <rtl/ref.hxx> diff --git a/sax/inc/sax/dllapi.h b/sax/inc/sax/saxdllapi.h index 1e4904718776..7602424c1fdf 100644 --- a/sax/inc/sax/dllapi.h +++ b/sax/inc/sax/saxdllapi.h @@ -29,7 +29,7 @@ #ifndef INCLUDED_SAX_DLLAPI_H #define INCLUDED_SAX_DLLAPI_H -#include "sal/types.h" +#include <sal/types.h> #if defined SAX_DLLIMPLEMENTATION #define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx index 7a867c932a9d..579356ea8c5a 100644 --- a/sax/inc/sax/tools/attributemap.hxx +++ b/sax/inc/sax/tools/attributemap.hxx @@ -29,8 +29,6 @@ #ifndef _SAX_ATTRIBUTEMAP_HXX_ #define _SAX_ATTRIBUTEMAP_HXX_ -#include "sax/dllapi.h" - #include <map> #include "sax/tools/tokenmap.hxx" diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx index ee72ceeac983..4a1fba477bc9 100644 --- a/sax/inc/sax/tools/saxobject.hxx +++ b/sax/inc/sax/tools/saxobject.hxx @@ -30,7 +30,7 @@ #define _SAX_OBJECT_HXX_ #include <sal/types.h> -#include "sax/dllapi.h" +#include "sax/saxdllapi.h" namespace sax { diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx index 8749a6587b1c..71704f092a09 100644 --- a/sax/inc/sax/tools/tokenmap.hxx +++ b/sax/inc/sax/tools/tokenmap.hxx @@ -31,7 +31,6 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -#include "sax/dllapi.h" #include "sax/tools/saxobject.hxx" namespace sax diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index 0b0730d895ed..5574ec65b184 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -41,7 +41,6 @@ #include <boost/shared_ptr.hpp> -#include "sax/dllapi.h" #include "sax/fshelper.hxx" #define SERIALIZER_IMPLEMENTATION_NAME "com.sun.star.comp.extensions.xml.sax.FastSerializer" |