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:58:54 UTC
svn commit: r1409518 - in /incubator/ooo/branches/gbuild/main: ./
postprocess/packcomponents/ sax/ sax/prj/ sax/qa/cppunit/
sax/source/expatwrap/ scp2/source/ooo/ solenv/gbuild/platform/
Author: arist
Date: Wed Nov 14 22:58:52 2012
New Revision: 1409518
URL: http://svn.apache.org/viewvc?rev=1409518&view=rev
Log:
gnumake4_027_389d236eb6b2.patch
# HG changeset patch
# User mba
# Date 1299068562 -3600
# Node ID 389d236eb6b2691c70310021961f3bf467c3e583
# Parent d4df54d61f2aed965539ad54975350752f462556
CWS gnumake4: convert sax to new build system
Added:
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/Makefile
incubator/ooo/branches/gbuild/main/sax/Module_sax.mk
incubator/ooo/branches/gbuild/main/sax/Package_inc.mk
incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk (with props)
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/sax/prj/build.lst
incubator/ooo/branches/gbuild/main/sax/prj/d.lst
incubator/ooo/branches/gbuild/main/sax/qa/cppunit/test_converter.cxx
incubator/ooo/branches/gbuild/main/sax/source/expatwrap/attrlistimpl.hxx
incubator/ooo/branches/gbuild/main/sax/source/expatwrap/sax_expat.cxx
incubator/ooo/branches/gbuild/main/scp2/source/ooo/file_library_ooo.scp
incubator/ooo/branches/gbuild/main/scp2/source/ooo/module_hidden_ooo.scp
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Wed Nov 14 22:58:52 2012
@@ -130,6 +130,8 @@ $(eval $(call gb_Helper_register_librari
canvasfactory \
directx5canvas \
directx9canvas \
+ expwrap \
+ fastsax \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 22:58:52 2012
@@ -289,4 +289,9 @@ 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/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk Wed Nov 14 22:58:52 2012
@@ -61,6 +61,8 @@ my_components = \
component/linguistic/source/lng \
component/oox/oox \
component/vbahelper/util/msforms \
+ component/sax/source/expatwrap/expwrap \
+ component/sax/source/fastparser/fastsax \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svgio/svgio \
@@ -102,7 +104,6 @@ my_components = \
dlgprov \
embobj \
evtatt \
- fastsax \
fileacc \
filterconfig1 \
flash \
Added: 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=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/CppunitTest_sax.mk Wed Nov 14 22:58:52 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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_add_api,sax_cppunit,\
+ udkapi \
+ offapi \
+))
+
+# vim: set noet sw=4 ts=4:
Added: 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=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk Wed Nov 14 22:58:52 2012
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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_add_api,expwrap,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,expwrap,\
+ $$(INCLUDE) \
+ -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:
Added: 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=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk Wed Nov 14 22:58:52 2012
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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_add_api,fastsax,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,fastsax,\
+ $$(INCLUDE) \
+ -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:
Added: 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=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_sax.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/Library_sax.mk Wed Nov 14 22:58:52 2012
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sax))
+
+$(eval $(call gb_Library_add_api,sax,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,sax,\
+ $$(INCLUDE) \
+ -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:
Added: incubator/ooo/branches/gbuild/main/sax/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Makefile?rev=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/sax/Makefile Wed Nov 14 22:58:52 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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:
Added: incubator/ooo/branches/gbuild/main/sax/Module_sax.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Module_sax.mk?rev=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Module_sax.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/Module_sax.mk Wed Nov 14 22:58:52 2012
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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 \
+))
+
+ifeq ($(WITH_CPPUNIT),YES)
+$(eval $(call gb_Module_add_check_targets,sax,\
+ CppunitTest_sax \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/branches/gbuild/main/sax/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/Package_inc.mk?rev=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/Package_inc.mk Wed Nov 14 22:58:52 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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:
Modified: incubator/ooo/branches/gbuild/main/sax/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/prj/build.lst?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/sax/prj/build.lst Wed Nov 14 22:58:52 2012
@@ -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
+
Modified: incubator/ooo/branches/gbuild/main/sax/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/prj/d.lst?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/sax/prj/d.lst Wed Nov 14 22:58:52 2012
@@ -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"
Added: incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk?rev=1409518&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk Wed Nov 14 22:58:52 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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
Propchange: incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/ooo/branches/gbuild/main/sax/qa/cppunit/test_converter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/qa/cppunit/test_converter.cxx?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/qa/cppunit/test_converter.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sax/qa/cppunit/test_converter.cxx Wed Nov 14 22:58:52 2012
@@ -22,6 +22,7 @@
#include "preextstl.h"
+#include <sal/cppunit.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
Modified: incubator/ooo/branches/gbuild/main/sax/source/expatwrap/attrlistimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/source/expatwrap/attrlistimpl.hxx?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/source/expatwrap/attrlistimpl.hxx (original)
+++ incubator/ooo/branches/gbuild/main/sax/source/expatwrap/attrlistimpl.hxx Wed Nov 14 22:58:52 2012
@@ -25,10 +25,7 @@
#define _SAX_ATTRLISTIMPL_HXX
#include "sal/config.h"
-//#include "sax/saxdllapi.h"
-
#include <cppuhelper/implbase2.hxx>
-
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
Modified: incubator/ooo/branches/gbuild/main/sax/source/expatwrap/sax_expat.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sax/source/expatwrap/sax_expat.cxx?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/source/expatwrap/sax_expat.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sax/source/expatwrap/sax_expat.cxx Wed Nov 14 22:58:52 2012
@@ -1024,13 +1024,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;
Modified: incubator/ooo/branches/gbuild/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/scp2/source/ooo/file_library_ooo.scp?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/branches/gbuild/main/scp2/source/ooo/file_library_ooo.scp Wed Nov 14 22:58:52 2012
@@ -1265,16 +1265,16 @@ File gid_File_Lib_Res
Dir = SCP2_OOO_BIN_DIR;
End
-File gid_File_Lib_Sax_Uno
+File gid_File_Lib_Expwrap_Uno
TXT_FILE_BODY;
Styles = (PACKED,DONT_OVERWRITE);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
+ Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
#elif defined(OS2)
- Name = "sax_uno.dll";
+ Name = "expwrap_uno.dll";
#else
- Name = "sax.uno.dll";
+ Name = "expwrap.uno.dll";
#endif
End
Modified: incubator/ooo/branches/gbuild/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1409518&r1=1409517&r2=1409518&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ incubator/ooo/branches/gbuild/main/scp2/source/ooo/module_hidden_ooo.scp Wed Nov 14 22:58:52 2012
@@ -335,7 +335,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Package2,
gid_File_Lib_Deployment,
gid_File_Lib_DeploymentGui,
- gid_File_Lib_Sax_Uno,
+ gid_File_Lib_Expwrap_Uno,
gid_File_Lib_Fastsax_Uno,
gid_File_Lib_Slideshow,
gid_File_Lib_Recentfile,
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=1409518&r1=1409517&r2=1409518&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:58:52 2012
@@ -280,6 +280,7 @@ endif
gb_Library_PLAINLIBS_NONE += \
cairo \
+ expat \
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=1409518&r1=1409517&r2=1409518&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:58:52 2012
@@ -460,6 +460,7 @@ gb_Library_PLAINLIBS_NONE += \
d3d9 \
d3dx \
ddraw \
+ expat \
gdi32 \
gdiplus \
gnu_getopt \