Author: damjan Date: Mon Dec 5 21:40:32 2016 New Revision: 1772808 URL: http://svn.apache.org/viewvc?rev=1772808&view=rev Log: Port main/configmgr to gbuild.
Patch by: me Added: openoffice/trunk/main/configmgr/JunitTest_configmgr_unoapi.mk openoffice/trunk/main/configmgr/Library_configmgr.mk openoffice/trunk/main/configmgr/Makefile (with props) openoffice/trunk/main/configmgr/Module_configmgr.mk openoffice/trunk/main/configmgr/prj/makefile.mk Modified: openoffice/trunk/main/Module_ooo.mk openoffice/trunk/main/Repository.mk openoffice/trunk/main/configmgr/prj/build.lst openoffice/trunk/main/configmgr/prj/d.lst openoffice/trunk/main/postprocess/packcomponents/makefile.mk Modified: openoffice/trunk/main/Module_ooo.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772808&r1=1772807&r2=1772808&view=diff ============================================================================== --- openoffice/trunk/main/Module_ooo.mk (original) +++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 21:40:32 2016 @@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,o binaryurp \ canvas \ comphelper \ + configmgr \ cppcanvas \ dbaccess \ drawinglayer \ Modified: openoffice/trunk/main/Repository.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772808&r1=1772807&r2=1772808&view=diff ============================================================================== --- openoffice/trunk/main/Repository.mk (original) +++ openoffice/trunk/main/Repository.mk Mon Dec 5 21:40:32 2016 @@ -153,6 +153,7 @@ $(eval $(call gb_Helper_register_librari binaryurp \ cairocanvas \ canvasfactory \ + configmgr \ connector \ directx5canvas \ directx9canvas \ Added: openoffice/trunk/main/configmgr/JunitTest_configmgr_unoapi.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/JunitTest_configmgr_unoapi.mk?rev=1772808&view=auto ============================================================================== --- openoffice/trunk/main/configmgr/JunitTest_configmgr_unoapi.mk (added) +++ openoffice/trunk/main/configmgr/JunitTest_configmgr_unoapi.mk Mon Dec 5 21:40:32 2016 @@ -0,0 +1,45 @@ +############################################################### +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +############################################################### + + + +$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi,SRCDIR)) + +$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce \ +)) + +$(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_add_classes,configmgr_unoapi,\ + org.openoffice.configmgr.qa.unoapi.Test \ +)) + +# vim: set noet sd=4 ts=4: Added: openoffice/trunk/main/configmgr/Library_configmgr.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/Library_configmgr.mk?rev=1772808&view=auto ============================================================================== --- openoffice/trunk/main/configmgr/Library_configmgr.mk (added) +++ openoffice/trunk/main/configmgr/Library_configmgr.mk Mon Dec 5 21:40:32 2016 @@ -0,0 +1,83 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,configmgr)) + +$(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,\ + $$(INCLUDE) \ + -I$(SRCDIR)/configmgr/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,configmgr,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,configmgr,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + salhelper \ + xmlreader \ + $(gb_STDLIBS) \ +)) + + +$(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 \ +)) + +# vim: set noet sw=4 ts=4: Added: openoffice/trunk/main/configmgr/Makefile URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/Makefile?rev=1772808&view=auto ============================================================================== --- openoffice/trunk/main/configmgr/Makefile (added) +++ openoffice/trunk/main/configmgr/Makefile Mon Dec 5 21:40:32 2016 @@ -0,0 +1,32 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the 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: Propchange: openoffice/trunk/main/configmgr/Makefile ------------------------------------------------------------------------------ svn:eol-style = native Added: openoffice/trunk/main/configmgr/Module_configmgr.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/Module_configmgr.mk?rev=1772808&view=auto ============================================================================== --- openoffice/trunk/main/configmgr/Module_configmgr.mk (added) +++ openoffice/trunk/main/configmgr/Module_configmgr.mk Mon Dec 5 21:40:32 2016 @@ -0,0 +1,38 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Module_Module,configmgr)) + +$(eval $(call gb_Module_add_targets,configmgr,\ + Library_configmgr \ +)) + + +ifneq ($(OOO_JUNIT_JAR),) +$(eval $(call gb_Module_add_subsequentcheck_targets,configmgr,\ + JunitTest_configmgr_unoapi \ +)) +endif + + +# vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/configmgr/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/prj/build.lst?rev=1772808&r1=1772807&r2=1772808&view=diff ============================================================================== --- openoffice/trunk/main/configmgr/prj/build.lst (original) +++ openoffice/trunk/main/configmgr/prj/build.lst Mon Dec 5 21:40:32 2016 @@ -1,4 +1,2 @@ cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi 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 cg_prj NULL Modified: openoffice/trunk/main/configmgr/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/prj/d.lst?rev=1772808&r1=1772807&r2=1772808&view=diff ============================================================================== --- openoffice/trunk/main/configmgr/prj/d.lst (original) +++ openoffice/trunk/main/configmgr/prj/d.lst Mon Dec 5 21:40:32 2016 @@ -1,4 +0,0 @@ -..\%__SRC%\bin\configmg*.dll %_DEST%\bin%_EXT%\configmg*.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 Added: openoffice/trunk/main/configmgr/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/prj/makefile.mk?rev=1772808&view=auto ============================================================================== --- openoffice/trunk/main/configmgr/prj/makefile.mk (added) +++ openoffice/trunk/main/configmgr/prj/makefile.mk Mon Dec 5 21:40:32 2016 @@ -0,0 +1,44 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772808&r1=1772807&r2=1772808&view=diff ============================================================================== --- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original) +++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Dec 5 21:40:32 2016 @@ -65,6 +65,7 @@ my_components = \ component/canvas/source/simplecanvas/simplecanvas \ component/canvas/source/vcl/vclcanvas \ component/comphelper/util/comphelp \ + component/configmgr/source/configmgr \ component/cui/util/cui \ component/drawinglayer/drawinglayer \ component/dbaccess/source/ext/adabas/adabasui \ @@ -120,7 +121,6 @@ my_components = \ component/xmloff/source/transform/xof \ component/xmloff/util/xo \ component/xmlscript/util/xcr \ - configmgr \ ctl \ date \ dbase \