You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:59:29 UTC
svn commit: r1409519 - in /incubator/ooo/branches/gbuild/main: ./ sax/
sax/source/fastparser/ solenv/gbuild/platform/ xmlscript/
Author: arist
Date: Wed Nov 14 22:59:28 2012
New Revision: 1409519
URL: http://svn.apache.org/viewvc?rev=1409519&view=rev
Log:
gnumake4_028_9eb9b5d5181e.patch
# HG changeset patch
# User mba
# Date 1299073131 -3600
# Node ID 9eb9b5d5181e24513ad6a6ef1c7eb3192d45fdc0
# Parent 389d236eb6b2691c70310021961f3bf467c3e583
CWS gnumake4: some fixes for Windows
Modified:
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk
incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk
incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk
incubator/ooo/branches/gbuild/main/sax/Library_sax.mk
incubator/ooo/branches/gbuild/main/sax/source/fastparser/facreg.cxx
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 22:59:28 2012
@@ -141,6 +141,9 @@ gb_Library_NOILIBFILENAMES:=\
d3d9 \
d3dx \
ddraw \
+ expat \
+ expat_xmltok\
+ expat_xmlparse \
gdi32 \
gdiplus \
gnu_getopt \
@@ -289,9 +292,4 @@ gb_Library_TARGETS := $(filter-out cairo
gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
endif
-ifeq ($(SYSTEM_EXPAT),YES)
-gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS))
-endif
-
-
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk Wed Nov 14 22:59:28 2012
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_
cppunit \
sax \
sal \
+ stl \
$(gb_STDLIBS) \
))
Modified: incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk Wed Nov 14 22:59:28 2012
@@ -50,25 +50,32 @@ $(eval $(call gb_Library_set_defs,expwra
))
endif
+$(eval $(call gb_Library_add_linked_libs,expwrap,\
+ sal \
+ cppu \
+ cppuhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
ifeq ($(SYSTEM_EXPAT),YES)
$(eval $(call gb_Library_set_defs,expwrap,\
$$(DEFS) \
-DSYSTEM_EXPAT \
))
+$(eval $(call gb_Library_add_linked_libs,expwrap,\
+ 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) \
+ expat_xmlparse \
+ expat_xmltok \
))
+endif
$(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \
Modified: incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk Wed Nov 14 22:59:28 2012
@@ -43,6 +43,15 @@ $(eval $(call gb_Library_set_defs,fastsa
$$(DEFS) \
))
+$(eval $(call gb_Library_add_linked_libs,fastsax,\
+ sal \
+ cppu \
+ cppuhelper \
+ sax \
+ stl \
+ $(gb_STDLIBS) \
+))
+
ifeq ($(SYSTEM_ZLIB),YES)
$(eval $(call gb_Library_set_defs,fastsax,\
$$(DEFS) \
@@ -55,16 +64,15 @@ $(eval $(call gb_Library_set_defs,fastsa
$$(DEFS) \
-DSYSTEM_EXPAT \
))
-endif
-
$(eval $(call gb_Library_add_linked_libs,fastsax,\
- sal \
- cppu \
- cppuhelper \
expat \
- sax \
- $(gb_STDLIBS) \
))
+else
+$(eval $(call gb_Library_add_linked_libs,fastsax,\
+ expat_xmlparse \
+ expat_xmltok \
+))
+endif
# re-uses xml2utf object from sax.uno lib (see below)
$(eval $(call gb_Library_add_exception_objects,fastsax,\
Modified: incubator/ooo/branches/gbuild/main/sax/Library_sax.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Library_sax.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_sax.mk (original)
+++ incubator/ooo/branches/gbuild/main/sax/Library_sax.mk Wed Nov 14 22:59:28 2012
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
cppuhelper \
comphelper \
+ stl \
$(gb_STDLIBS) \
))
Modified: incubator/ooo/branches/gbuild/main/sax/source/fastparser/facreg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/source/fastparser/facreg.cxx?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/source/fastparser/facreg.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sax/source/fastparser/facreg.cxx Wed Nov 14 22:59:28 2012
@@ -55,13 +55,13 @@ Reference< XInterface > SAL_CALL FastSax
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( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 22:59:28 2012
@@ -281,6 +281,8 @@ endif
gb_Library_PLAINLIBS_NONE += \
cairo \
expat \
+ expat_xmltok \
+ expat_xmlparse \
fontconfig \
Xrender \
pixman-1 \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 22:59:28 2012
@@ -461,6 +461,8 @@ gb_Library_PLAINLIBS_NONE += \
d3dx \
ddraw \
expat \
+ expat_xmltok \
+ expat_xmlparse \
gdi32 \
gdiplus \
gnu_getopt \
Modified: incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk?rev=1409519&r1=1409518&r2=1409519&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk (original)
+++ incubator/ooo/branches/gbuild/main/xmlscript/Library_xcr.mk Wed Nov 14 22:59:28 2012
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_linked_libs
sal \
cppu \
cppuhelper \
+ stl \
$(gb_STDLIBS) \
))