summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Module_ooo.mk1
-rw-r--r--Repository.mk1
-rw-r--r--configmgr/JunitTest_configmgr_unoapi.mk45
-rw-r--r--configmgr/Library_configmgr.mk83
-rw-r--r--configmgr/Makefile32
-rw-r--r--configmgr/Module_configmgr.mk38
-rw-r--r--configmgr/prj/build.lst4
-rw-r--r--configmgr/prj/d.lst4
-rw-r--r--configmgr/prj/makefile.mk44
-rw-r--r--postprocess/packcomponents/makefile.mk2
10 files changed, 246 insertions, 8 deletions
diff --git a/Module_ooo.mk b/Module_ooo.mk
index f043b9867739..55655675874a 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
binaryurp \
canvas \
comphelper \
+ configmgr \
cppcanvas \
dbaccess \
drawinglayer \
diff --git a/Repository.mk b/Repository.mk
index 0272dcc47754..501dbcea3b41 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -153,6 +153,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
binaryurp \
cairocanvas \
canvasfactory \
+ configmgr \
connector \
directx5canvas \
directx9canvas \
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
new file mode 100644
index 000000000000..e519f41a3708
--- /dev/null
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -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:
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
new file mode 100644
index 000000000000..1940d76dea53
--- /dev/null
+++ b/configmgr/Library_configmgr.mk
@@ -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:
diff --git a/configmgr/Makefile b/configmgr/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/configmgr/Makefile
@@ -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:
diff --git a/configmgr/Module_configmgr.mk b/configmgr/Module_configmgr.mk
new file mode 100644
index 000000000000..f326b77410e7
--- /dev/null
+++ b/configmgr/Module_configmgr.mk
@@ -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:
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 3a926320e678..f88cd2cd9ee2 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -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
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index add66947d886..e69de29bb2d1 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -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
diff --git a/configmgr/prj/makefile.mk b/configmgr/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/configmgr/prj/makefile.mk
@@ -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
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f289b68f7adb..3b6f1aad15f9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -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 \
generated by cgit (git 2.34.1) at 2025-02-09 11:35:03 +0000