From fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Mar 2011 13:22:42 +0100 Subject: CWS gnumake4: convert sax to new build system [hg:389d236eb6b2] --- sax/CppunitTest_sax.mk | 46 ++++++++++++++++++ sax/Library_expwrap.mk | 76 ++++++++++++++++++++++++++++++ sax/Library_fastsax.mk | 79 +++++++++++++++++++++++++++++++ sax/Library_sax.mk | 56 ++++++++++++++++++++++ sax/Makefile | 38 +++++++++++++++ sax/Module_sax.mk | 41 +++++++++++++++++ sax/Package_inc.mk | 34 ++++++++++++++ sax/prj/build.lst | 7 +-- sax/prj/d.lst | 16 ------- sax/prj/makefile.mk | 40 ++++++++++++++++ sax/qa/cppunit/test_converter.cxx | 1 + sax/source/expatwrap/attrlistimpl.hxx | 3 -- sax/source/expatwrap/makefile.mk | 87 ----------------------------------- sax/source/expatwrap/sax_expat.cxx | 4 +- sax/source/fastparser/makefile.mk | 79 ------------------------------- sax/source/tools/makefile.mk | 67 --------------------------- sax/util/makefile.mk | 68 --------------------------- sax/util/makefile.pmk | 30 ------------ 18 files changed, 415 insertions(+), 357 deletions(-) create mode 100644 sax/CppunitTest_sax.mk create mode 100644 sax/Library_expwrap.mk create mode 100644 sax/Library_fastsax.mk create mode 100644 sax/Library_sax.mk create mode 100644 sax/Makefile create mode 100644 sax/Module_sax.mk create mode 100644 sax/Package_inc.mk create mode 100644 sax/prj/makefile.mk delete mode 100644 sax/source/expatwrap/makefile.mk delete mode 100644 sax/source/fastparser/makefile.mk delete mode 100644 sax/source/tools/makefile.mk delete mode 100644 sax/util/makefile.mk delete mode 100644 sax/util/makefile.pmk diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk new file mode 100644 index 000000000000..d29632de5fae --- /dev/null +++ b/sax/CppunitTest_sax.mk @@ -0,0 +1,46 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sax_cppunit)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sax_cppunit, \ + sax/qa/cppunit/test_converter \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \ + cppunit \ + sax \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,sax_cppunit,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +# 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..58afe9ded9f4 --- /dev/null +++ b/sax/Library_expwrap.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,expwrap)) + +$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)) + +$(eval $(call gb_Library_set_include,expwrap,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(SRCDIR)/sax/inc \ +)) + +$(eval $(call gb_Library_set_defs,expwrap,\ + $$(DEFS) \ +)) + +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_defs,expwrap,\ + $$(DEFS) \ + -DSYSTEM_ZLIB \ +)) +endif + +ifeq ($(SYSTEM_EXPAT),YES) +$(eval $(call gb_Library_set_defs,expwrap,\ + $$(DEFS) \ + -DSYSTEM_EXPAT \ +)) +else +$(eval $(call gb_Library_set_defs,expwrap,\ + $$(DEFS) \ + -DXML_UNICODE \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,expwrap,\ + sal \ + cppu \ + cppuhelper \ + expat \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,expwrap,\ + sax/source/expatwrap/attrlistimpl \ + sax/source/expatwrap/sax_expat \ + sax/source/expatwrap/saxwriter \ + sax/source/expatwrap/xml2utf \ +)) + +# 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..06ef80b4ada0 --- /dev/null +++ b/sax/Library_fastsax.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fastsax)) + +$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax)) + +$(eval $(call gb_Library_set_include,fastsax,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(SRCDIR)/sax/inc \ +)) + +$(eval $(call gb_Library_set_defs,fastsax,\ + $$(DEFS) \ +)) + +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_defs,fastsax,\ + $$(DEFS) \ + -DSYSTEM_ZLIB \ +)) +endif + +ifeq ($(SYSTEM_EXPAT),YES) +$(eval $(call gb_Library_set_defs,fastsax,\ + $$(DEFS) \ + -DSYSTEM_EXPAT \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + sal \ + cppu \ + cppuhelper \ + expat \ + sax \ + $(gb_STDLIBS) \ +)) + +# re-uses xml2utf object from sax.uno lib (see below) +$(eval $(call gb_Library_add_exception_objects,fastsax,\ + sax/source/fastparser/facreg \ + sax/source/fastparser/fastparser \ + sax/source/expatwrap/xml2utf \ +)) + +# mba: currently it's unclear whether xml2utf needs to be compiled with the +# same compiler settings as in the sax.uno lib; in case not, we have to use +# a custom target +#$(eval $(call gb_Library_add_generated_exception_objects,fastsax,\ +# sax/source/expatwrap/xml2utf \ +#)) + +# 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..0d3999c61e23 --- /dev/null +++ b/sax/Library_sax.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sax)) + +$(eval $(call gb_Library_set_include,sax,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(SRCDIR)/sax/inc \ +)) + +$(eval $(call gb_Library_set_defs,sax,\ + $$(DEFS) \ + -DSAX_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,sax,\ + sal \ + cppu \ + cppuhelper \ + comphelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sax,\ + 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/Makefile b/sax/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/sax/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# 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..45895302b303 --- /dev/null +++ b/sax/Module_sax.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sax)) + +$(eval $(call gb_Module_add_targets,sax,\ + Library_sax \ + Library_expwrap \ + Library_fastsax \ + 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..ebee272d7abf --- /dev/null +++ b/sax/Package_inc.mk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sax_inc,$(SRCDIR)/sax/inc)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/dllapi.h,sax/dllapi.h)) +$(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/fastattribs.hxx,sax/fastattribs.hxx)) +$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/prj/build.lst b/sax/prj/build.lst index 849700087ae7..0a8a3789e1d8 100644 --- a/sax/prj/build.lst +++ b/sax/prj/build.lst @@ -1,6 +1,3 @@ ax sax : offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL -ax sax usr1 - all ax_mkout NULL -ax sax\source\expatwrap nmake - all ax_expatwrap NULL -ax sax\source\tools nmake - all ax_tools NULL -ax sax\source\fastparser nmake - all ax_fastparser ax_expatwrap ax_tools NULL -ax sax\qa\cppunit nmake - all ax_qa_cppunit ax_tools NULL +ax sax\prj nmake - all ax_prj NULL + diff --git a/sax/prj/d.lst b/sax/prj/d.lst index 76177f554909..e69de29bb2d1 100644 --- a/sax/prj/d.lst +++ b/sax/prj/d.lst @@ -1,16 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\misc\fastsax.component %_DEST%\xml%_EXT%\fastsax.component -..\%__SRC%\misc\sax.component %_DEST%\xml%_EXT%\sax.component -..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml%_EXT%\sax.inbuild.component - -mkdir: %_DEST%\inc%_EXT%\sax -mkdir: %_DEST%\inc%_EXT%\sax\tools -..\inc\sax\dllapi.h %_DEST%\inc%_EXT%\sax\dllapi.h -..\inc\sax\fshelper.hxx %_DEST%\inc%_EXT%\sax\fshelper.hxx -..\inc\sax\fastattribs.hxx %_DEST%\inc%_EXT%\sax\fastattribs.hxx -..\inc\sax\tools\converter.hxx %_DEST%\inc%_EXT%\sax\tools\converter.hxx - -dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" diff --git a/sax/prj/makefile.mk b/sax/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/sax/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index b1881f248c0c..3bc4cecfd799 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "preextstl.h" +#include #include #include #include diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index aaf6cf84b359..3676469a67c7 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -29,10 +29,7 @@ #define _SAX_ATTRLISTIMPL_HXX #include "sal/config.h" -//#include "sax/saxdllapi.h" - #include - #include #include #include diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk deleted file mode 100644 index 6e1348c0d403..000000000000 --- a/sax/source/expatwrap/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ELSE -CFLAGS += -DXML_UNICODE -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/xml2utf.obj\ - $(SLO)$/attrlistimpl.obj\ - $(SLO)$/sax_expat.obj \ - $(SLO)$/saxwriter.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPAT3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/sax.component $(MISC)/sax.inbuild.component - -$(MISC)/sax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - -$(MISC)/sax.inbuild.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_INBUILD_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index aaaac6bd564e..27ede854b974 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -1028,13 +1028,13 @@ using namespace sax_expatwrap; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk deleted file mode 100644 index d8f9378c19b9..000000000000 --- a/sax/source/fastparser/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=fastsax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/facreg.obj\ - $(SLO)$/fastparser.obj\ - $(SLO)$/xml2utf.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(SAXLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPATASCII3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/fastsax.component - -$(MISC)/fastsax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fastsax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fastsax.component diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk deleted file mode 100644 index 5923fc5a7785..000000000000 --- a/sax/source/tools/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/converter.obj \ - $(SLO)$/fastattribs.obj \ - $(SLO)$/fastserializer.obj \ - $(SLO)$/fshelper.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB)\ - $(RTLLIB) \ - $(SALLIB) \ - $(ONELIB) - -SHL1DEPN= -SHL1OBJS= $(SLOFILES) -SHL1USE_EXPORTS=name -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(TARGET) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sax/util/makefile.mk b/sax/util/makefile.mk deleted file mode 100644 index 5e2f378603e9..000000000000 --- a/sax/util/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=sax -TARGET=sax - -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/saxtools.lib - -# sax - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) -SHL1USE_EXPORTS=name - -SHL1LIBS= $(LIB1TARGET) -SHL1STDLIBS= \ - $(VOSLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB)\ - $(RTLLIB) \ - $(SALLIB) \ - $(ONELIB) \ - $(SALHELPERLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME=$(TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/sax/util/makefile.pmk b/sax/util/makefile.pmk deleted file mode 100644 index 1c044bb10ff0..000000000000 --- a/sax/util/makefile.pmk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# Reduction of exported symbols: -CDEFS += -DSAX_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE -- cgit