Commits

Anonymous committed 44d472b Merge

sb140: merged in cws/sb143

Comments (0)

Files changed (30)

 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
+    binaryurp \
 	comphelper \
+    configmgr \
         editeng \
 	framework \
 	padmin \
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	xml2 \
+	xmlreader \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	stl \
 ))
 
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
+    binaryurp \
+))
+
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+    configmgr \
 	fsstorage \
 	hatchwindowfactory \
 	passwordcontainer \

binaryurp/CppunitTest_binaryurp_cache.mk

+#*************************************************************************
+#
+# 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,binaryurp_cache))
+$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_cache, \
+    binaryurp/qa/test-cache))
+$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_cache, \
+    sal stl $(gb_STDLIBS)))
+$(eval $(call gb_CppunitTest_set_include,binaryurp_cache, \
+    $$(INCLUDE) -I$(OUTDIR)/inc))

binaryurp/CppunitTest_binaryurp_unmarshal.mk

+#*************************************************************************
+#
+# 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,binaryurp_unmarshal))
+$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_unmarshal, \
+    binaryurp/qa/test-unmarshal))
+$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_unmarshal, \
+    cppu cppuhelper sal salhelper stl $(gb_STDLIBS)))
+$(eval $(call \
+    gb_CppunitTest_add_other_cxxobjects,binaryurp_unmarshal,binaryurp, \
+    binaryurp/source/binaryany \
+    binaryurp/source/bridge \
+    binaryurp/source/bridgefactory \
+    binaryurp/source/currentcontext \
+    binaryurp/source/incomingrequest \
+    binaryurp/source/lessoperators \
+    binaryurp/source/marshal \
+    binaryurp/source/outgoingrequests \
+    binaryurp/source/proxy \
+    binaryurp/source/reader \
+    binaryurp/source/unmarshal \
+    binaryurp/source/writer))
+$(eval $(call gb_CppunitTest_set_include,binaryurp_unmarshal, \
+    $$(INCLUDE) -I$(OUTDIR)/inc/offuh -I$(OUTDIR)/inc))

binaryurp/Library_binaryurp.mk

+#*************************************************************************
+#
+# 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,binaryurp))
+$(eval $(call gb_Library_add_exception_objects,binaryurp, \
+    binaryurp/source/binaryany \
+    binaryurp/source/bridge \
+    binaryurp/source/bridgefactory \
+    binaryurp/source/currentcontext \
+    binaryurp/source/incomingrequest \
+    binaryurp/source/lessoperators \
+    binaryurp/source/marshal \
+    binaryurp/source/outgoingrequests \
+    binaryurp/source/proxy \
+    binaryurp/source/reader \
+    binaryurp/source/unmarshal \
+    binaryurp/source/writer))
+$(eval $(call gb_Library_add_linked_libs,binaryurp, \
+    cppu cppuhelper sal salhelper stl $(gb_STDLIBS)))
+$(eval $(call \
+    gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
+$(eval $(call gb_Library_set_include,binaryurp, \
+    $$(INCLUDE) -I$(OUTDIR)/inc/offuh -I$(OUTDIR)/inc))

binaryurp/Makefile

+#*************************************************************************
+#
+# 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)))

binaryurp/Module_binaryurp.mk

+#*************************************************************************
+#
+# 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,binaryurp))
+$(eval $(call gb_Module_add_check_targets,binaryurp, \
+    CppunitTest_binaryurp_cache CppunitTest_binaryurp_unmarshal))
+$(eval $(call gb_Module_add_targets,binaryurp,Library_binaryurp))

binaryurp/prj/build.lst

-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper stlport NULL
-bu binaryurp\source nmake - all bu_source NULL
-bu binaryurp\qa nmake - all bu_qa bu_source NULL
+bu binaryurp : BOOST:boost CPPUNIT:cppunit LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper stlport NULL
+bu binaryurp\prj nmake - all prj NULL

binaryurp/prj/d.lst

-..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin%_EXT%\binaryurp.uno.dll
-..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib%_EXT%\binaryurp.uno.dylib
-..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib%_EXT%\binaryurp.uno.so
-..\%__SRC%\misc\binaryurp.component %_DEST%\xml%_EXT%\binaryurp.component

binaryurp/prj/makefile.mk

+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+PRJ = ..
+TARGET = prj
+
+.INCLUDE: settings.mk
+
+.IF "$(VERBOSE)" == ""
+my_verbose = -s
+.ELSE
+my_verbose =
+.END
+
+do .PHONY :
+    cd $(PRJ) && $(GNUMAKE) $(my_verbose) -r -j$(MAXPROCESS) $(gb_MAKETARGET)

binaryurp/qa/makefile.mk

-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = binaryurp
-TARGET = qa
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-DLLPRE =
-
-SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-cache.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-SHL1TARGET = test-cache
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SHL2IMPLIB = i$(SHL2TARGET)
-SHL2OBJS = \
-    $(SLO)/test-unmarshal.obj \
-    $(SLO)/binaryany.obj \
-    $(SLO)/bridge.obj \
-    $(SLO)/bridgefactory.obj \
-    $(SLO)/currentcontext.obj \
-    $(SLO)/incomingrequest.obj \
-    $(SLO)/lessoperators.obj \
-    $(SLO)/marshal.obj \
-    $(SLO)/outgoingrequests.obj \
-    $(SLO)/proxy.obj \
-    $(SLO)/reader.obj \
-    $(SLO)/unmarshal.obj \
-    $(SLO)/writer.obj
-SHL2RPATH = NONE
-SHL2STDLIBS = \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB)
-SHL2TARGET = test-unmarshal
-SHL2VERSIONMAP = version.map
-DEF2NAME = $(SHL2TARGET)
-
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk

binaryurp/qa/test-cache.cxx

 
 #include "sal/config.h"
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "sal/cppunit.h"
 
 #include "../source/cache.hxx"
 

binaryurp/qa/test-unmarshal.cxx

 #include "com/sun/star/io/IOException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "cppu/unotype.hxx"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
+#include "sal/cppunit.h"
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 

binaryurp/qa/version.map

-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};

binaryurp/source/makefile.mk

-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = binaryurp
-TARGET = binaryurp
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-DLLPRE =
-
-SLOFILES = \
-    $(SLO)/binaryany.obj \
-    $(SLO)/bridge.obj \
-    $(SLO)/bridgefactory.obj \
-    $(SLO)/currentcontext.obj \
-    $(SLO)/incomingrequest.obj \
-    $(SLO)/lessoperators.obj \
-    $(SLO)/marshal.obj \
-    $(SLO)/outgoingrequests.obj \
-    $(SLO)/proxy.obj \
-    $(SLO)/reader.obj \
-    $(SLO)/unmarshal.obj \
-    $(SLO)/writer.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = URELIB
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
-SHL1TARGET = binaryurp.uno
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/binaryurp.component
-
-$(MISC)/binaryurp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        binaryurp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt binaryurp.component

configmgr/JunitTest_configmgr_unoapi.mk

+#*************************************************************************
+#
+# 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_JunitTest_JunitTest,configmgr_unoapi))
+$(eval $(call gb_JunitTest_add_classes,configmgr_unoapi, \
+    org.openoffice.configmgr.qa.unoapi.Test))
+$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi, \
+    $(OUTDIR)/bin/OOoRunner.jar $(OUTDIR)/bin/ridl.jar $(OUTDIR)/bin/test.jar))
+$(eval $(call gb_JunitTest_add_sourcefiles,configmgr_unoapi, \
+    configmgr/qa/unoapi/Test))
+$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,$$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce))

configmgr/Library_configmgr.mk

+#*************************************************************************
+#
+# 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,configmgr))
+$(eval $(call gb_Library_add_exception_objects,configmgr, \
+    configmgr/source/access \
+    configmgr/source/broadcaster \
+    configmgr/source/childaccess \
+    configmgr/source/components \
+    configmgr/source/configurationprovider \
+    configmgr/source/configurationregistry \
+    configmgr/source/data \
+    configmgr/source/defaultprovider \
+    configmgr/source/groupnode \
+    configmgr/source/localizedpropertynode \
+    configmgr/source/localizedvaluenode \
+    configmgr/source/lock \
+    configmgr/source/modifications \
+    configmgr/source/node \
+    configmgr/source/nodemap \
+    configmgr/source/parsemanager \
+    configmgr/source/partial \
+    configmgr/source/propertynode \
+    configmgr/source/rootaccess \
+    configmgr/source/services \
+    configmgr/source/setnode \
+    configmgr/source/type \
+    configmgr/source/update \
+    configmgr/source/valueparser \
+    configmgr/source/writemodfile \
+    configmgr/source/xcdparser \
+    configmgr/source/xcsparser \
+    configmgr/source/xcuparser \
+    configmgr/source/xmldata))
+$(eval $(call gb_Library_add_linked_libs,configmgr, \
+    comphelper cppu cppuhelper sal salhelper stl xmlreader $(gb_STDLIBS)))
+$(eval $(call \
+    gb_Library_add_precompiled_header,configmgr,$(SRCDIR)/configmgr/inc/pch/precompiled_configmgr))
+$(eval $(call \
+    gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
+$(eval $(call gb_Library_set_include,configmgr, \
+    -I$(SRCDIR)/configmgr/inc/pch $$(INCLUDE) -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc))

configmgr/Makefile

+#*************************************************************************
+#
+# 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)))

configmgr/Module_configmgr.mk

+#*************************************************************************
+#
+# 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,configmgr))
+$(eval $(call gb_Module_add_subsequentcheck_targets,configmgr, \
+    JunitTest_configmgr_unoapi))
+$(eval $(call gb_Module_add_targets,configmgr,Library_configmgr))

configmgr/inc/makefile.mk

-#*************************************************************************
-# 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 = ..
-PRJNAME = configmgr
-TARGET = inc
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
-.ENDIF

configmgr/prj/build.lst

 cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL
-cg configmgr\inc nmake - all cg_inc NULL
-cg configmgr\source nmake - all cg_source cg_inc NULL
-cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
+cg configmgr\prj nmake - all prj NULL

configmgr/prj/d.lst

-..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll
-..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib
-..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so
-..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component

configmgr/prj/makefile.mk

+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+PRJ = ..
+TARGET = prj
+
+.INCLUDE: settings.mk
+
+.IF "$(VERBOSE)" == ""
+my_verbose = -s
+.ELSE
+my_verbose =
+.END
+
+do .PHONY :
+    cd $(PRJ) && $(GNUMAKE) $(my_verbose) -r -j$(MAXPROCESS) $(gb_MAKETARGET)

configmgr/qa/unoapi/Test.java

 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "module.sce", "-cs", connection.getDescription()));
+                "-sce", Argument.get("sce"), "-cs"
+                , connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();

configmgr/qa/unoapi/makefile.mk

-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = configmgr
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/configmgr/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END

configmgr/source/makefile.mk

-#*************************************************************************
-#
-# 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 = ..
-PRJNAME = configmgr
-TARGET = configmgr
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-DLLPRE =
-
-SLOFILES = \
-    $(SLO)/access.obj \
-    $(SLO)/broadcaster.obj \
-    $(SLO)/childaccess.obj \
-    $(SLO)/components.obj \
-    $(SLO)/configurationprovider.obj \
-    $(SLO)/configurationregistry.obj \
-    $(SLO)/data.obj \
-    $(SLO)/defaultprovider.obj \
-    $(SLO)/groupnode.obj \
-    $(SLO)/localizedpropertynode.obj \
-    $(SLO)/localizedvaluenode.obj \
-    $(SLO)/lock.obj \
-    $(SLO)/modifications.obj \
-    $(SLO)/node.obj \
-    $(SLO)/nodemap.obj \
-    $(SLO)/parsemanager.obj \
-    $(SLO)/partial.obj \
-    $(SLO)/propertynode.obj \
-    $(SLO)/rootaccess.obj \
-    $(SLO)/services.obj \
-    $(SLO)/setnode.obj \
-    $(SLO)/type.obj \
-    $(SLO)/update.obj \
-    $(SLO)/valueparser.obj \
-    $(SLO)/writemodfile.obj \
-    $(SLO)/xcdparser.obj \
-    $(SLO)/xcsparser.obj \
-    $(SLO)/xcuparser.obj \
-    $(SLO)/xmldata.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1STDLIBS = \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB) \
-    $(XMLREADERLIB)
-SHL1TARGET = configmgr.uno
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/configmgr.component
-
-$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        configmgr.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt configmgr.component

postprocess/packcomponents/makefile.mk

     charttools \
     chartview \
     component/comphelper/util/comphelp \
+    component/configmgr/source/configmgr \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
     component/unoxml/source/service/unoxml \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
-    configmgr \
     ctl \
     date \
     dba \

solenv/gbuild/CppunitTest.mk

 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+$(call gb_LinkTarget_set_defs,$(2),$$(DEFS) $(gb_Library_DEFS))
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 	add_objcxxobjects \
 	add_exception_objects \
 	add_noexception_objects \
+    add_other_cxxobjects \
 	set_cflags \
 	set_cxxflags \
 	set_objcxxflags \

solenv/gbuild/LinkTarget.mk

 $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_exception_object,$(1),$(obj)))
 endef
 
+define gb_LinkTarget_add_other_cxxobject
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_other_cxxobjects
+# Specify an order between the additional link target $(1) and the original link
+# target $(2), so that the objects $(3) are not accidentally built inheriting
+# the target-specific variable values of the wrong link target:
+$(call gb_LinkTarget_get_target,$(1)) : | \
+    $(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(2)))
+
+$(foreach obj,$(3),$(call gb_LinkTarget_add_other_cxxobject,$(1),$(obj)))
+endef
+
 define gb_LinkTarget_set_targettype
 $(call gb_LinkTarget_get_target,$(1)) \
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2)

ure/source/makefile.mk

 
 my_components = \
     acceptor \
-    binaryurp \
     bootstrap \
+    component/binaryurp/source/binaryurp \
     connector \
     introspection \
     invocadapt \