diff options
| l--------- | .gitattributes | 1 | ||||
| -rw-r--r-- | oox/Library_oox.mk | 28 | ||||
| -rw-r--r-- | oox/prj/d.lst | 1 | ||||
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_doctok.mk | 3 | ||||
| -rw-r--r-- | writerfilter/JunitTest_writerfilter_complex.mk | 3 | ||||
| -rw-r--r-- | writerfilter/JunitTest_writerfilter_complex.mk.orig | 51 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 6 |
7 files changed, 61 insertions, 32 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 120000 index 000000000000..f18402b73cb9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 53bb404333e5..c545c34ca519 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -57,33 +57,7 @@ $(eval $(call gb_Library_add_linked_libs,oox,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_OPENSSL),YES) -$(eval $(call gb_Library_add_linked_libs,oox,\ - crypto \ - ssl \ -)) -else -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,oox,\ - crypto \ - ssl \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,oox,\ - crypto \ - ssl \ -)) -endif -endif - -# this is for openssl -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_linked_libs,oox,\ - nsl \ - socket \ -)) -endif -#probably not necessary: dl \ +$(call gb_Library_use_external,oox,openssl) # object files ---------------------------------------------------------------- diff --git a/oox/prj/d.lst b/oox/prj/d.lst index 8b137891791f..e69de29bb2d1 100644 --- a/oox/prj/d.lst +++ b/oox/prj/d.lst @@ -1 +0,0 @@ - diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index f55bc25883dd..5a5df3e56610 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -33,10 +33,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \ cppuhelper \ - cppunit \ cppu \ sal \ stl \ + ucbhelper \ + writerfilter \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index 860720041395..5262f0a0fc43 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -27,7 +27,8 @@ $(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR)) -$(eval $(call gb_JunitTest_add_defs,writerfilter_complex,\ +$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ + $$(DEFS) \ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) diff --git a/writerfilter/JunitTest_writerfilter_complex.mk.orig b/writerfilter/JunitTest_writerfilter_complex.mk.orig new file mode 100644 index 000000000000..129ba98e08a1 --- /dev/null +++ b/writerfilter/JunitTest_writerfilter_complex.mk.orig @@ -0,0 +1,51 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR)) + +$(eval $(call gb_JunitTest_add_defs,writerfilter_complex,\ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\ + writerfilter/qa/complex/ooxml/TestDocument \ + writerfilter/qa/complex/ooxml/LoadDocuments \ +)) + +$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\ + complex.ooxml.LoadDocuments \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 28980f438907..e764857a9bfb 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,writerfilter,\ -I$(SRCDIR)/writerfilter/source/ooxml \ )) -$(eval $(call gb_Library_set_defs,writerfilter,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,writerfilter,\ -DWRITERFILTER_DLLIMPLEMENTATION \ )) @@ -96,6 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/dmapper/TablePropertiesHandler \ writerfilter/source/dmapper/TblStylePrHandler \ writerfilter/source/dmapper/ThemeTable \ + writerfilter/source/dmapper/WrapPolygonHandler \ writerfilter/source/doctok/Dff \ writerfilter/source/doctok/DffImpl \ writerfilter/source/doctok/WW8Annotation \ @@ -132,6 +132,8 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/ooxml/OOXMLParserState \ writerfilter/source/ooxml/OOXMLPropertySetImpl \ writerfilter/source/ooxml/OOXMLStreamImpl \ + writerfilter/source/resourcemodel/Fraction \ + writerfilter/source/resourcemodel/LoggedResources \ writerfilter/source/resourcemodel/Protocol \ writerfilter/source/resourcemodel/ResourceModelHelper \ writerfilter/source/resourcemodel/TagLogger \ |