Author: arist
Date: Wed Nov 14 22:56:43 2012
New Revision: 1409513
URL: http://svn.apache.org/viewvc?rev=1409513&view=rev
Log:
gnumake4_024_c943ed591aff.patch
# HG changeset patch
# User mba
# Date 1299010190 -3600
# Node ID c943ed591aff77251fe0f71f23dc536f90952349
# Parent 280f52b66154128dce219e3149a356fb7e1dff0a
CWS gnumake4: reimplement basegfx_s hack for new build system
Added:
incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk
(with props)
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk
incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/inc/pdfihelper.hxx
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/test/tests.cxx
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 22:56:43 2012
@@ -150,6 +150,7 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ basegfx_s \
jpeglib \
ooopathutils \
salcpprt \
Modified: incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk (original)
+++ incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk Wed Nov 14
22:56:43 2012
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,basegfx))
$(eval $(call gb_Module_add_targets,basegfx,\
Library_basegfx \
Package_inc \
+ StaticLibrary_basegfx_s \
))
ifeq ($(WITH_CPPUNIT),YES)
Added: incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk?rev=1409513&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk
(added)
+++ incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk Wed
Nov 14 22:56:43 2012
@@ -0,0 +1,127 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,basegfx_s))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc))
+
+$(eval $(call
gb_StaticLibrary_add_precompiled_header,basegfx_s,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx))
+
+$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
+ -I$(SRCDIR)/basegfx/inc \
+ -I$(SRCDIR)/basegfx/source/inc \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/basegfx/inc/pch \
+))
+
+# the whole library is a hack
+# we only build it to prevent the pdfimporter shared lib from linking to the
basegfx shared lib
+# this means that all code of this static library will end in a dll
+# thus the _DLL define must be set to avoid link problems with stlport symbols
+# the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC
macros to nothing
+$(eval $(call gb_StaticLibrary_set_defs,basegfx_s,\
+ $$(DEFS) \
+ -DBASEGFX_STATICLIBRARY \
+ -D_DLL \
+))
+
+# as we have to build all sources a second time, we must copy them to the
workdir and build from there
+$(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx
+ mkdir -p $(dir $@) && \
+ cp $< $@
+
+# copied sources are generated cxx sources
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
+ CustomTarget/basegfx/source/tools/liangbarsky \
+ CustomTarget/basegfx/source/tools/debugplotter \
+ CustomTarget/basegfx/source/tools/canvastools \
+ CustomTarget/basegfx/source/tools/gradienttools \
+ CustomTarget/basegfx/source/tools/keystoplerp \
+ CustomTarget/basegfx/source/tools/unopolypolygon \
+ CustomTarget/basegfx/source/tools/tools \
+ CustomTarget/basegfx/source/tools/b2dclipstate \
+ CustomTarget/basegfx/source/numeric/ftools \
+ CustomTarget/basegfx/source/tuple/b3ituple \
+ CustomTarget/basegfx/source/tuple/b3dtuple \
+ CustomTarget/basegfx/source/tuple/b2ituple \
+ CustomTarget/basegfx/source/tuple/b2dtuple \
+ CustomTarget/basegfx/source/tuple/b3i64tuple \
+ CustomTarget/basegfx/source/tuple/b2i64tuple \
+ CustomTarget/basegfx/source/range/b1drange \
+ CustomTarget/basegfx/source/range/b2dpolyrange \
+ CustomTarget/basegfx/source/range/b2xrange \
+ CustomTarget/basegfx/source/range/b3drange \
+ CustomTarget/basegfx/source/range/b2drangeclipper \
+ CustomTarget/basegfx/source/range/b2drange \
+ CustomTarget/basegfx/source/vector/b3ivector \
+ CustomTarget/basegfx/source/vector/b2ivector \
+ CustomTarget/basegfx/source/vector/b2dvector \
+ CustomTarget/basegfx/source/vector/b3dvector \
+ CustomTarget/basegfx/source/polygon/b3dpolygon \
+ CustomTarget/basegfx/source/polygon/b2dtrapezoid \
+ CustomTarget/basegfx/source/polygon/b3dpolygontools \
+ CustomTarget/basegfx/source/polygon/b2dlinegeometry \
+ CustomTarget/basegfx/source/polygon/b3dpolypolygontools \
+ CustomTarget/basegfx/source/polygon/b3dpolygonclipper \
+ CustomTarget/basegfx/source/polygon/b2dpolygonclipper \
+ CustomTarget/basegfx/source/polygon/b2dpolypolygoncutter \
+ CustomTarget/basegfx/source/polygon/b2dpolypolygonrasterconverter \
+ CustomTarget/basegfx/source/polygon/b2dpolygon \
+ CustomTarget/basegfx/source/polygon/b2dpolygontriangulator \
+ CustomTarget/basegfx/source/polygon/b2dpolypolygon \
+ CustomTarget/basegfx/source/polygon/b3dpolypolygon \
+ CustomTarget/basegfx/source/polygon/b2dsvgpolypolygon \
+ CustomTarget/basegfx/source/polygon/b2dpolygoncutandtouch \
+ CustomTarget/basegfx/source/polygon/b2dpolypolygontools \
+ CustomTarget/basegfx/source/polygon/b2dpolygontools \
+ CustomTarget/basegfx/source/pixel/bpixel \
+ CustomTarget/basegfx/source/matrix/b2dhommatrixtools \
+ CustomTarget/basegfx/source/matrix/b3dhommatrix \
+ CustomTarget/basegfx/source/matrix/b2dhommatrix \
+ CustomTarget/basegfx/source/point/b3ipoint \
+ CustomTarget/basegfx/source/point/b3dhompoint \
+ CustomTarget/basegfx/source/point/b2dpoint \
+ CustomTarget/basegfx/source/point/b3dpoint \
+ CustomTarget/basegfx/source/point/b2dhompoint \
+ CustomTarget/basegfx/source/point/b2ipoint \
+ CustomTarget/basegfx/source/curve/b2dbeziertools \
+ CustomTarget/basegfx/source/curve/b2dcubicbezier \
+ CustomTarget/basegfx/source/curve/b2dquadraticbezier \
+ CustomTarget/basegfx/source/color/bcolormodifier \
+ CustomTarget/basegfx/source/color/bcolor \
+ CustomTarget/basegfx/source/color/bcolortools \
+ CustomTarget/basegfx/source/raster/bpixelraster \
+ CustomTarget/basegfx/source/raster/bzpixelraster \
+ CustomTarget/basegfx/source/raster/rasterconvert3d \
+))
+
+# vim: set noet sw=4 ts=4:
Propchange:
incubator/ooo/branches/gbuild/main/basegfx/StaticLibrary_basegfx_s.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h
(original)
+++ incubator/ooo/branches/gbuild/main/basegfx/inc/basegfx/basegfxdllapi.h Wed
Nov 14 22:56:43 2012
@@ -27,6 +27,12 @@
#ifndef INCLUDED_BASEGFXDLLAPI_H
#define INCLUDED_BASEGFXDLLAPI_H
+#if defined BASEGFX_STATICLIBRARY
+#define BASEGFX_DLLPUBLIC
+#define BASEGFX_DLLPRIVATE
+
+#else
+
#if defined BASEGFX_DLLIMPLEMENTATION
#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
@@ -35,3 +41,5 @@
#define BASEGFX_DLLPRIVATE SAL_DLLPRIVATE
#endif
+
+#endif
\ No newline at end of file
Modified:
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/inc/pdfihelper.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/inc/pdfihelper.hxx?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/inc/pdfihelper.hxx
(original)
+++
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/inc/pdfihelper.hxx
Wed Nov 14 22:56:43 2012
@@ -24,6 +24,8 @@
#ifndef INCLUDED_PDFI_HELPER_HXX
#define INCLUDED_PDFI_HELPER_HXX
+#define BASEGFX_STATICLIBRARY
+
#include "contentsink.hxx"
#include <rtl/ustring.hxx>
Modified:
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/test/tests.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/test/tests.cxx?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/test/tests.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/test/tests.cxx
Wed Nov 14 22:56:43 2012
@@ -24,6 +24,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
+#define BASEGFX_STATICLIBRARY
+
#ifdef SYSTEM_ZLIB
#include "zlib.h"
#else
Modified:
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx?rev=1409513&r1=1409512&r2=1409513&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
(original)
+++
incubator/ooo/branches/gbuild/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
Wed Nov 14 22:56:43 2012
@@ -24,6 +24,8 @@
#ifndef INCLUDED_PDFI_PROCESSOR_HXX
#define INCLUDED_PDFI_PROCESSOR_HXX
+#include "pdfihelper.hxx"
+
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
@@ -46,7 +48,6 @@
#include <hash_map>
#include "imagecontainer.hxx"
-#include "pdfihelper.hxx"
#include "contentsink.hxx"
#include "treevisitorfactory.hxx"
#include "genericelements.hxx"
