This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 34ced87459875146d765da31c6c4d824581ccc7f
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sun Jan 12 12:32:13 2025 +0200
Convert officecfg module to gbuild.
The patch is mostly by Michael Stahl; hunks that
failed to apply were patched by me.
Partially fixes: https://bz.apache.org/ooo/show_bug.cgi?id=118386
Patch by: Michael Stahl <mst@...>
Reviewed by: me
---
main/Module_ooo.mk | 1 +
main/officecfg/Configuration_officecfg.mk | 262 +++++++++++++++++++++
main/officecfg/Makefile | 30 +++
main/officecfg/Module_officecfg.mk | 28 +++
main/officecfg/Package_misc.mk | 29 +++
main/officecfg/Package_tools.mk | 36 +++
main/officecfg/prj/build.lst | 17 +-
main/officecfg/prj/d.lst | 69 ------
main/officecfg/prj/makefile.mk | 32 +++
.../data/org/openoffice/Office/UI/makefile.mk | 77 ------
.../data/org/openoffice/Office/makefile.mk | 118 ----------
.../data/org/openoffice/TypeDetection/makefile.mk | 47 ----
.../registry/data/org/openoffice/makefile.mk | 67 ------
.../registry/data/org/openoffice/ucb/makefile.mk | 41 ----
main/officecfg/registry/makefile.mk | 40 ----
main/officecfg/registry/schema/makefile.mk | 42 ----
.../org/openoffice/Office/DataAccess/makefile.mk | 38 ---
.../openoffice/Office/OOoImprovement/makefile.mk | 38 ---
.../schema/org/openoffice/Office/UI/makefile.mk | 77 ------
.../schema/org/openoffice/Office/makefile.mk | 80 -------
.../org/openoffice/TypeDetection/makefile.mk | 42 ----
.../registry/schema/org/openoffice/makefile.mk | 45 ----
.../registry/schema/org/openoffice/ucb/makefile.mk | 41 ----
main/officecfg/util/makefile.mk | 44 ----
main/officecfg/util/makefile.pmk | 30 ---
25 files changed, 419 insertions(+), 952 deletions(-)
diff --git a/main/Module_ooo.mk b/main/Module_ooo.mk
index 4f27bf82db..7a346b2d63 100644
--- a/main/Module_ooo.mk
+++ b/main/Module_ooo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
linguistic \
o3tl \
offapi \
+ officecfg \
oovbaapi \
oox \
package \
diff --git a/main/officecfg/Configuration_officecfg.mk
b/main/officecfg/Configuration_officecfg.mk
new file mode 100644
index 0000000000..51f61d9aa1
--- /dev/null
+++ b/main/officecfg/Configuration_officecfg.mk
@@ -0,0 +1,262 @@
+#***************************************************************
+# 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_Configuration_Configuration,registry,SRCDIR))
+
+$(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+ org/openoffice/LDAP.xcs \
+ org/openoffice/Inet.xcs \
+ org/openoffice/Setup.xcs \
+ org/openoffice/System.xcs \
+ org/openoffice/UserProfile.xcs \
+ org/openoffice/VCL.xcs \
+ org/openoffice/FirstStartWizard.xcs \
+ org/openoffice/Interaction.xcs \
+ org/openoffice/Office/Accelerators.xcs \
+ org/openoffice/Office/Addons.xcs \
+ org/openoffice/Office/Calc.xcs \
+ org/openoffice/Office/CalcAddIns.xcs \
+ org/openoffice/Office/Canvas.xcs \
+ org/openoffice/Office/Chart.xcs \
+ org/openoffice/Office/Commands.xcs \
+ org/openoffice/Office/Common.xcs \
+ org/openoffice/Office/Compatibility.xcs \
+ org/openoffice/Office/DataAccess.xcs \
+ org/openoffice/Office/Draw.xcs \
+ org/openoffice/Office/Events.xcs \
+ org/openoffice/Office/Embedding.xcs \
+ org/openoffice/Office/ExtensionManager.xcs \
+ org/openoffice/Office/Impress.xcs \
+ org/openoffice/Office/Java.xcs \
+ org/openoffice/Office/Jobs.xcs \
+ org/openoffice/Office/Labels.xcs \
+ org/openoffice/Office/Linguistic.xcs \
+ org/openoffice/Office/Logging.xcs \
+ org/openoffice/Office/Math.xcs \
+ org/openoffice/Office/OptionsDialog.xcs \
+ org/openoffice/Office/ProtocolHandler.xcs \
+ org/openoffice/Office/SFX.xcs \
+ org/openoffice/Office/Substitution.xcs \
+ org/openoffice/Office/TableWizard.xcs \
+ org/openoffice/Office/UI.xcs \
+ org/openoffice/Office/Views.xcs \
+ org/openoffice/Office/Writer.xcs \
+ org/openoffice/Office/WriterWeb.xcs \
+ org/openoffice/Office/Scripting.xcs \
+ org/openoffice/Office/Security.xcs \
+ org/openoffice/Office/WebWizard.xcs \
+ org/openoffice/Office/Recovery.xcs \
+ org/openoffice/Office/FormWizard.xcs \
+ org/openoffice/Office/ExtendedColorScheme.xcs \
+ org/openoffice/Office/TypeDetection.xcs \
+ org/openoffice/Office/TabBrowse.xcs \
+ org/openoffice/Office/Paths.xcs \
+ org/openoffice/Office/Histories.xcs \
+ org/openoffice/Office/UI/Controller.xcs \
+ org/openoffice/Office/UI/Factories.xcs \
+ org/openoffice/Office/UI/Commands.xcs \
+ org/openoffice/Office/UI/BasicIDECommands.xcs \
+ org/openoffice/Office/UI/BibliographyCommands.xcs \
+ org/openoffice/Office/UI/CalcCommands.xcs \
+ org/openoffice/Office/UI/ChartCommands.xcs \
+ org/openoffice/Office/UI/DbuCommands.xcs \
+ org/openoffice/Office/UI/BaseWindowState.xcs \
+ org/openoffice/Office/UI/WriterFormWindowState.xcs \
+ org/openoffice/Office/UI/WriterReportWindowState.xcs \
+ org/openoffice/Office/UI/DbBrowserWindowState.xcs \
+ org/openoffice/Office/UI/DbTableDataWindowState.xcs \
+ org/openoffice/Office/UI/DrawImpressCommands.xcs \
+ org/openoffice/Office/UI/GenericCommands.xcs \
+ org/openoffice/Office/UI/MathCommands.xcs \
+ org/openoffice/Office/UI/StartModuleCommands.xcs \
+ org/openoffice/Office/UI/WriterCommands.xcs \
+ org/openoffice/Office/UI/WindowState.xcs \
+ org/openoffice/Office/UI/BasicIDEWindowState.xcs \
+ org/openoffice/Office/UI/BibliographyWindowState.xcs \
+ org/openoffice/Office/UI/CalcWindowState.xcs \
+ org/openoffice/Office/UI/ChartWindowState.xcs \
+ org/openoffice/Office/UI/DbQueryWindowState.xcs \
+ org/openoffice/Office/UI/DbRelationWindowState.xcs \
+ org/openoffice/Office/UI/DbTableWindowState.xcs \
+ org/openoffice/Office/UI/DrawWindowState.xcs \
+ org/openoffice/Office/UI/ImpressWindowState.xcs \
+ org/openoffice/Office/UI/MathWindowState.xcs \
+ org/openoffice/Office/UI/StartModuleWindowState.xcs \
+ org/openoffice/Office/UI/WriterWindowState.xcs \
+ org/openoffice/Office/UI/XFormsWindowState.xcs \
+ org/openoffice/Office/UI/WriterGlobalWindowState.xcs \
+ org/openoffice/Office/UI/WriterWebWindowState.xcs \
+ org/openoffice/Office/UI/Effects.xcs \
+ org/openoffice/Office/UI/Category.xcs \
+ org/openoffice/Office/UI/GenericCategories.xcs \
+ org/openoffice/Office/UI/GlobalSettings.xcs \
+ org/openoffice/Office/UI/WindowContentFactories.xcs \
+ org/openoffice/Office/DataAccess/Drivers.xcs \
+ org/openoffice/Office/OOoImprovement/Settings.xcs \
+ org/openoffice/TypeDetection/Types.xcs \
+ org/openoffice/TypeDetection/Filter.xcs \
+ org/openoffice/TypeDetection/GraphicFilter.xcs \
+ org/openoffice/TypeDetection/Misc.xcs \
+ org/openoffice/TypeDetection/UISort.xcs \
+ org/openoffice/ucb/Configuration.xcs \
+ org/openoffice/ucb/Hierarchy.xcs \
+ org/openoffice/ucb/InteractionHandler.xcs \
+ org/openoffice/ucb/Store.xcs \
+)
+
+$(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+ org/openoffice/Inet.xcu \
+ org/openoffice/System.xcu \
+ org/openoffice/UserProfile.xcu \
+ org/openoffice/VCL.xcu \
+ org/openoffice/FirstStartWizard.xcu \
+ org/openoffice/Interaction.xcu \
+ org/openoffice/Office/Calc.xcu \
+ org/openoffice/Office/Canvas.xcu \
+ org/openoffice/Office/Compatibility.xcu \
+ org/openoffice/Office/ExtensionManager.xcu \
+ org/openoffice/Office/Impress.xcu \
+ org/openoffice/Office/Jobs.xcu \
+ org/openoffice/Office/Labels.xcu \
+ org/openoffice/Office/Linguistic.xcu \
+ org/openoffice/Office/Logging.xcu \
+ org/openoffice/Office/Math.xcu \
+ org/openoffice/Office/ProtocolHandler.xcu \
+ org/openoffice/Office/Security.xcu \
+ org/openoffice/Office/Scripting.xcu \
+ org/openoffice/Office/SFX.xcu \
+ org/openoffice/Office/Views.xcu \
+ org/openoffice/Office/Paths.xcu \
+ org/openoffice/Office/Histories.xcu \
+ org/openoffice/Office/UI/Controller.xcu \
+ org/openoffice/Office/UI/Factories.xcu \
+ org/openoffice/TypeDetection/UISort.xcu \
+ org/openoffice/ucb/Configuration.xcu \
+)
+
+$(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+ org/openoffice/Inet-macosx.xcu \
+ org/openoffice/Inet-unixdesktop.xcu \
+ org/openoffice/Inet-wnt.xcu \
+ org/openoffice/Setup-brand.xcu \
+ org/openoffice/Setup-writer.xcu \
+ org/openoffice/Setup-calc.xcu \
+ org/openoffice/Setup-draw.xcu \
+ org/openoffice/Setup-impress.xcu \
+ org/openoffice/Setup-base.xcu \
+ org/openoffice/Setup-math.xcu \
+ org/openoffice/Setup-report.xcu \
+ org/openoffice/Setup-start.xcu \
+ org/openoffice/UserProfile-gconflockdown.xcu \
+ org/openoffice/VCL-gconflockdown.xcu \
+ org/openoffice/VCL-unixdesktop.xcu \
+ org/openoffice/Office/Accelerators-macosx.xcu \
+ org/openoffice/Office/Accelerators-unxwnt.xcu \
+ org/openoffice/Office/Common-brand.xcu \
+ org/openoffice/Office/Common-writer.xcu \
+ org/openoffice/Office/Common-calc.xcu \
+ org/openoffice/Office/Common-draw.xcu \
+ org/openoffice/Office/Common-impress.xcu \
+ org/openoffice/Office/Common-base.xcu \
+ org/openoffice/Office/Common-math.xcu \
+ org/openoffice/Office/Common-unx.xcu \
+ org/openoffice/Office/Common-unixdesktop.xcu \
+ org/openoffice/Office/Common-gconflockdown.xcu \
+ org/openoffice/Office/Common-macosx.xcu \
+ org/openoffice/Office/Common-wnt.xcu \
+ org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
+ org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
+ org/openoffice/Office/Scripting-python.xcu \
+ org/openoffice/Office/Common-cjk.xcu \
+ org/openoffice/Office/Common-ctl.xcu \
+ org/openoffice/Office/Common-korea.xcu \
+ org/openoffice/Office/Paths-macosx.xcu \
+ org/openoffice/Office/Paths-unxwnt.xcu \
+ org/openoffice/Office/Paths-unixdesktop.xcu \
+ org/openoffice/Office/Paths-internallibtextcatdata.xcu \
+ org/openoffice/Office/Paths-externallibtextcatdata.xcu \
+ org/openoffice/Office/Writer-cjk.xcu \
+ org/openoffice/Office/Impress-ogltrans.xcu \
+ org/openoffice/Office/Embedding-calc.xcu \
+ org/openoffice/Office/Embedding-chart.xcu \
+ org/openoffice/Office/Embedding-draw.xcu \
+ org/openoffice/Office/Embedding-impress.xcu \
+ org/openoffice/Office/Embedding-math.xcu \
+ org/openoffice/Office/Embedding-base.xcu \
+ org/openoffice/Office/Embedding-writer.xcu \
+ org/openoffice/Office/UI-brand.xcu \
+ org/openoffice/Office/Recovery-gconflockdown.xcu \
+ org/openoffice/TypeDetection/UISort-writer.xcu \
+ org/openoffice/TypeDetection/UISort-calc.xcu \
+ org/openoffice/TypeDetection/UISort-draw.xcu \
+ org/openoffice/TypeDetection/UISort-impress.xcu \
+ org/openoffice/TypeDetection/UISort-math.xcu \
+ org/openoffice/ucb/Configuration-gio.xcu \
+)
+
+# perhaps this file should be moved 2 levels up?
+$(call
gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+ Langpack.xcu \
+)
+
+$(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+ org/openoffice/Setup.xcu \
+ org/openoffice/Office/Accelerators.xcu \
+ org/openoffice/Office/Common.xcu \
+ org/openoffice/Office/SFX.xcu \
+ org/openoffice/Office/DataAccess.xcu \
+ org/openoffice/Office/TableWizard.xcu \
+ org/openoffice/Office/UI.xcu \
+ org/openoffice/Office/Embedding.xcu \
+ org/openoffice/Office/WebWizard.xcu \
+ org/openoffice/Office/FormWizard.xcu \
+ org/openoffice/Office/Writer.xcu \
+ org/openoffice/Office/UI/BasicIDECommands.xcu \
+ org/openoffice/Office/UI/BibliographyCommands.xcu \
+ org/openoffice/Office/UI/CalcCommands.xcu \
+ org/openoffice/Office/UI/ChartCommands.xcu \
+ org/openoffice/Office/UI/ChartWindowState.xcu \
+ org/openoffice/Office/UI/DbuCommands.xcu \
+ org/openoffice/Office/UI/BaseWindowState.xcu \
+ org/openoffice/Office/UI/WriterFormWindowState.xcu \
+ org/openoffice/Office/UI/WriterReportWindowState.xcu \
+ org/openoffice/Office/UI/DbQueryWindowState.xcu \
+ org/openoffice/Office/UI/DbTableWindowState.xcu \
+ org/openoffice/Office/UI/DbRelationWindowState.xcu \
+ org/openoffice/Office/UI/DbBrowserWindowState.xcu \
+ org/openoffice/Office/UI/DbTableDataWindowState.xcu \
+ org/openoffice/Office/UI/DrawImpressCommands.xcu \
+ org/openoffice/Office/UI/Effects.xcu \
+ org/openoffice/Office/UI/GenericCommands.xcu \
+ org/openoffice/Office/UI/MathCommands.xcu \
+ org/openoffice/Office/UI/StartModuleCommands.xcu \
+ org/openoffice/Office/UI/BasicIDEWindowState.xcu \
+ org/openoffice/Office/UI/CalcWindowState.xcu \
+ org/openoffice/Office/UI/DrawWindowState.xcu \
+ org/openoffice/Office/UI/ImpressWindowState.xcu \
+ org/openoffice/Office/UI/MathWindowState.xcu \
+ org/openoffice/Office/UI/StartModuleWindowState.xcu \
+ org/openoffice/Office/UI/WriterWindowState.xcu \
+ org/openoffice/Office/UI/XFormsWindowState.xcu \
+ org/openoffice/Office/UI/WriterGlobalWindowState.xcu \
+ org/openoffice/Office/UI/WriterWebWindowState.xcu \
+ org/openoffice/Office/UI/WriterCommands.xcu \
+ org/openoffice/Office/UI/GenericCategories.xcu \
+)
+
diff --git a/main/officecfg/Makefile b/main/officecfg/Makefile
new file mode 100644
index 0000000000..3ac357a971
--- /dev/null
+++ b/main/officecfg/Makefile
@@ -0,0 +1,30 @@
+#***************************************************************
+# 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/main/officecfg/Module_officecfg.mk
b/main/officecfg/Module_officecfg.mk
new file mode 100644
index 0000000000..22d91c9692
--- /dev/null
+++ b/main/officecfg/Module_officecfg.mk
@@ -0,0 +1,28 @@
+#***************************************************************
+# 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,officecfg))
+
+$(eval $(call gb_Module_add_targets,officecfg,\
+ Package_misc \
+ Package_tools \
+ Configuration_officecfg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/Package_misc.mk b/main/officecfg/Package_misc.mk
new file mode 100644
index 0000000000..c4240696ae
--- /dev/null
+++ b/main/officecfg/Package_misc.mk
@@ -0,0 +1,29 @@
+#***************************************************************
+# 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_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
+
+$(eval $(call
gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
+$(eval $(call
gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
+$(eval $(call
gb_Package_add_file,officecfg_misc,pck/oo-ldap-attr-map.properties,registry/schema/oo-ldap-attr-map.properties))
+$(eval $(call
gb_Package_add_file,officecfg_misc,pck/oo-org-map.properties,registry/schema/oo-org-map.properties))
+$(eval $(call
gb_Package_add_file,officecfg_misc,pck/oo-common.ldif,registry/schema/oo-common.ldif))
+$(eval $(call
gb_Package_add_file,officecfg_misc,pck/oo-common-ad.ldf,registry/schema/oo-common-ad.ldf))
+$(eval $(call
gb_Package_add_file,officecfg_misc,pck/oo-common.conf,registry/schema/oo-common.conf))
+
diff --git a/main/officecfg/Package_tools.mk b/main/officecfg/Package_tools.mk
new file mode 100644
index 0000000000..7d7e2a42b7
--- /dev/null
+++ b/main/officecfg/Package_tools.mk
@@ -0,0 +1,36 @@
+#***************************************************************
+# 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.
+#***************************************************************
+
+# this package contains stuff that is used during the build
+
+$(eval $(call gb_Package_Package,officecfg_tools,$(SRCDIR)/officecfg))
+
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/alllang.xsl,util/alllang.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/schema_val.xsl,util/schema_val.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/schema_trim.xsl,util/schema_trim.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/resource.xsl,util/resource.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/sanity.xsl,util/sanity.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/data_val.xsl,util/data_val.xsl))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/processing/delcomment.sed,util/delcomment.sed))
+
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/registry/data.dtd,registry/data.dtd))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/registry/component-update.dtd,registry/component-update.dtd))
+$(eval $(call
gb_Package_add_file,officecfg_tools,xml/registry/component-schema.dtd,registry/component-schema.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/prj/build.lst b/main/officecfg/prj/build.lst
index b07a34aee9..a0704e5983 100644
--- a/main/officecfg/prj/build.lst
+++ b/main/officecfg/prj/build.lst
@@ -1,17 +1,2 @@
oc officecfg : L10N:l10n soltools solenv LIBXSLT:libxslt NULL
-oc officecfg usr1 -
all oc_mkout NULL
-oc officecfg\registry\schema nmake -
all oc_reg_schema NULL
-oc officecfg\registry nmake -
all oc_reg NULL
-oc officecfg\registry\schema\org\openoffice nmake -
all oc_reg_schema_ooo NULL
-oc officecfg\registry\schema\org\openoffice\Office nmake -
all oc_reg_schema_ooo_office NULL
-oc officecfg\registry\schema\org\openoffice\Office\UI nmake -
all oc_reg_schema_ooo_office_ui NULL
-oc officecfg\registry\schema\org\openoffice\Office\DataAccess nmake -
all oc_reg_schema_ooo_office_dataaccess NULL
-oc officecfg\registry\schema\org\openoffice\Office\OOoImprovement nmake -
all oc_reg_schema_ooo_office_oooimprovement NULL
-oc officecfg\registry\schema\org\openoffice\TypeDetection nmake -
all oc_reg_schema_ooo_td NULL
-oc officecfg\registry\schema\org\openoffice\ucb nmake -
all oc_reg_schema_ooo_ucb NULL
-oc officecfg\registry\data\org\openoffice nmake -
all oc_reg_data_ooo oc_reg NULL
-oc officecfg\registry\data\org\openoffice\Office nmake -
all oc_reg_data_ooo_office oc_reg NULL
-oc officecfg\registry\data\org\openoffice\Office\UI nmake -
all oc_reg_data_ooo_office_ui oc_reg NULL
-oc officecfg\registry\data\org\openoffice\TypeDetection nmake -
all oc_reg_data_ooo_td oc_reg NULL
-oc officecfg\registry\data\org\openoffice\ucb nmake -
all oc_reg_data_ooo_ucb oc_reg NULL
-oc officecfg\util nmake -
all oc_util oc_reg_schema oc_reg_schema_ooo oc_reg_schema_ooo_office
oc_reg_schema_ooo_office_ui oc_reg_schema_ooo_office_dataaccess
oc_reg_schema_ooo_office_oooimprovement oc_reg_schema_ooo_td
oc_reg_schema_ooo_ucb oc_reg_data_ooo oc_reg_data_ooo_office
oc_reg_data_ooo_office_ui oc_reg_data_ooo_td oc_reg_data_ooo_ucb NULL
+oc officecfg\prj nmake - all oc_prj NULL
diff --git a/main/officecfg/prj/d.lst b/main/officecfg/prj/d.lst
deleted file mode 100644
index debb9659a9..0000000000
--- a/main/officecfg/prj/d.lst
+++ /dev/null
@@ -1,69 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\schema
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\DataAccess\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs
%_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml%_EXT%\registry\data
-mkdir: %_DEST%\xml%_EXT%\registry\data\org
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
-
-..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ldap.xcd.sample
-..\registry\schema\oo-ad-ldap.xcd.sample
%_DEST%\xml%_EXT%\oo-ad-ldap.xcd.sample
-
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice
-..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-..\%__SRC%\misc\registry\data\org\openoffice\Office\UI\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\data\org\openoffice\ucb\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-..\%__SRC%\misc\registry\data\org\openoffice\TypeDetection\*.xcu
%_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\spool\*.xcu %_DEST%\xml%_EXT%\registry\spool
-..\%__SRC%\misc\registry\spool\org\openoffice\*.xcu
%_DEST%\xml%_EXT%\registry\spool\org\openoffice
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\*.xcu
%_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\UI\*.xcu
%_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\spool\org\openoffice\ucb\*.xcu
%_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-..\%__SRC%\misc\registry\spool\org\openoffice\TypeDetection\*.xcu
%_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\pck%_EXT%
-
-..\%__SRC%\misc\*.properties %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldif %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.conf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.map %_DEST%\pck%_EXT%
-
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%
-
-mkdir: %_DEST%\xml%_EXT%\processing
-
-..\util\*.xsl %_DEST%\xml%_EXT%\processing
-..\registry\*.dtd %_DEST%\xml%_EXT%\registry
-
diff --git a/main/officecfg/prj/makefile.mk b/main/officecfg/prj/makefile.mk
new file mode 100644
index 0000000000..d30a7dd4f0
--- /dev/null
+++ b/main/officecfg/prj/makefile.mk
@@ -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.
+#***************************************************************
+
+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
diff --git a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index b3ee3e0dd4..0000000000
--- a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-LOCALIZEDFILES= \
- BasicIDECommands.xcu \
- BibliographyCommands.xcu \
- CalcCommands.xcu \
- ChartCommands.xcu \
- ChartWindowState.xcu \
- DbuCommands.xcu \
- BaseWindowState.xcu \
- WriterFormWindowState.xcu \
- WriterReportWindowState.xcu \
- DbQueryWindowState.xcu \
- DbTableWindowState.xcu \
- DbRelationWindowState.xcu \
- DbBrowserWindowState.xcu \
- DbTableDataWindowState.xcu \
- DrawImpressCommands.xcu \
- Effects.xcu \
- GenericCommands.xcu \
- MathCommands.xcu \
- StartModuleCommands.xcu \
- BasicIDEWindowState.xcu \
- CalcWindowState.xcu \
- DrawWindowState.xcu \
- ImpressWindowState.xcu \
- MathWindowState.xcu \
- StartModuleWindowState.xcu \
- WriterWindowState.xcu \
- XFormsWindowState.xcu \
- WriterGlobalWindowState.xcu \
- WriterWebWindowState.xcu \
- WriterCommands.xcu\
- GenericCategories.xcu\
- Sidebar.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
- Controller.xcu \
- Factories.xcu \
- GlobalSettings.xcu
-
-.INCLUDE : target.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
b/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 3c78e19621..0000000000
--- a/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Accelerators.xcu \
- Calc.xcu \
- Canvas.xcu \
- Common.xcu \
- Compatibility.xcu \
- DataAccess.xcu \
- Embedding.xcu \
- ExtensionDependencies.xcu \
- ExtensionManager.xcu \
- FormWizard.xcu \
- Histories.xcu \
- Impress.xcu \
- Jobs.xcu \
- Labels.xcu \
- Linguistic.xcu \
- Logging.xcu \
- Math.xcu \
- Paths.xcu \
- PresenterScreen.xcu \
- ProtocolHandler.xcu \
- SFX.xcu \
- Scripting.xcu \
- Security.xcu \
- TableWizard.xcu \
- UI.xcu \
- Views.xcu \
- WebWizard.xcu \
- Writer.xcu \
-
-MODULEFILES= \
- Accelerators-macosx.xcu \
- Accelerators-unxwnt.xcu \
- Common-brand.xcu \
- Common-writer.xcu \
- Common-calc.xcu \
- Common-draw.xcu \
- Common-impress.xcu \
- Common-base.xcu \
- Common-math.xcu \
- Common-unx.xcu \
- Common-unixdesktop.xcu \
- Common-gconflockdown.xcu \
- Common-macosx.xcu \
- Common-wnt.xcu \
- Common-UseOOoFileDialogs.xcu \
- Linguistic-ForceDefaultLanguage.xcu \
- Scripting-python.xcu \
- Common-cjk.xcu \
- Common-ctl.xcu \
- Common-korea.xcu \
- Paths-macosx.xcu \
- Paths-unxwnt.xcu \
- Paths-unixdesktop.xcu \
- Paths-internallibtextcatdata.xcu \
- Paths-externallibtextcatdata.xcu \
- Writer-cjk.xcu \
- Impress-ogltrans.xcu \
- Embedding-calc.xcu \
- Embedding-chart.xcu \
- Embedding-draw.xcu \
- Embedding-impress.xcu \
- Embedding-math.xcu \
- Embedding-base.xcu \
- Embedding-writer.xcu \
- UI-brand.xcu \
- Recovery-gconflockdown.xcu
-
-LOCALIZEDFILES= \
- Accelerators.xcu \
- Common.xcu \
- SFX.xcu \
- DataAccess.xcu \
- TableWizard.xcu \
- UI.xcu \
- Embedding.xcu \
- WebWizard.xcu \
- FormWizard.xcu \
- Writer.xcu \
- Impress.xcu \
- PresenterScreen.xcu
-
-
-.INCLUDE : target.mk
-
diff --git
a/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
b/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index 6c66b469b7..0000000000
--- a/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooTypeDetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- UISort.xcu
-
-MODULEFILES= \
- UISort-writer.xcu \
- UISort-calc.xcu \
- UISort-draw.xcu \
- UISort-impress.xcu \
- UISort-math.xcu
-
-LOCALIZEDFILES=
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/registry/data/org/openoffice/makefile.mk
b/main/officecfg/registry/data/org/openoffice/makefile.mk
deleted file mode 100644
index 11b08571aa..0000000000
--- a/main/officecfg/registry/data/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_oopenoffice
-PACKAGE=org.openoffice
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- FirstStartWizard.xcu \
- Inet.xcu \
- Interaction.xcu \
- Setup.xcu \
- System.xcu \
- UserProfile.xcu \
- VCL.xcu \
-
-
-MODULEFILES= \
- Inet-macosx.xcu \
- Inet-unixdesktop.xcu \
- Inet-wnt.xcu \
- Setup-brand.xcu \
- Setup-writer.xcu \
- Setup-calc.xcu \
- Setup-draw.xcu \
- Setup-impress.xcu \
- Setup-base.xcu \
- Setup-math.xcu \
- Setup-report.xcu \
- Setup-start.xcu \
- UserProfile-gconflockdown.xcu \
- VCL-gconflockdown.xcu \
- VCL-unixdesktop.xcu
-
-LOCALIZEDFILES=Setup.xcu
-
-.INCLUDE : target.mk
-
-LANGUAGEPACKS=$(MISC)$/registry$/spool$/Langpack-{$(alllangiso)}.xcu
-
-ALLTAR : $(LANGUAGEPACKS)
diff --git a/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk
b/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk
deleted file mode 100644
index c6c4cdb168..0000000000
--- a/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooucb
-PACKAGE=org.openoffice.ucb
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Configuration.xcu
-
-MODULEFILES= \
- Configuration-gio.xcu
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/registry/makefile.mk
b/main/officecfg/registry/makefile.mk
deleted file mode 100644
index 02c22ac9c8..0000000000
--- a/main/officecfg/registry/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#**************************************************************
-#
-# 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=..
-PRJNAME=officecfg
-TARGET=registry
-
-.INCLUDE : settings.mk
-
-# ---------------------------------------------------------
-
-COPYFILES = \
- $(MISC)$/component-update.dtd
-
-.INCLUDE : target.mk
-
-ALLTAR : $(COPYFILES)
-
-$(COPYFILES) : $$(@:f)
- $(COPY) $< $@
-
diff --git a/main/officecfg/registry/schema/makefile.mk
b/main/officecfg/registry/schema/makefile.mk
deleted file mode 100644
index 7121f6e96c..0000000000
--- a/main/officecfg/registry/schema/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..
-
-PRJNAME=officecfg
-TARGET=ldapschema
-
-.INCLUDE : settings.mk
-
-# --- Targets ------------------------------------------------------
-
-UNIXTEXT= \
- $(MISC)$/oo-org-map.properties \
- $(MISC)$/oo-ldap-attr-map.properties \
- $(MISC)$/oo-common.conf \
- $(MISC)$/oo-common.ldif \
- $(MISC)$/oo-common-ad.ldf
-
-.INCLUDE : target.mk
-
-ALLTAR: \
- $(UNIXTEXT)
diff --git
a/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
deleted file mode 100644
index 372568fbad..0000000000
---
a/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooODataAccess
-PACKAGE=org.openoffice.Office.DataAccess
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Drivers.xcs
-
-.INCLUDE : target.mk
-
diff --git
a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
deleted file mode 100644
index 7e50dc1155..0000000000
---
a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOImprovement
-PACKAGE=org.openoffice.Office.OOoImprovement
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Settings.xcs
-
-.INCLUDE : target.mk
-
diff --git
a/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index 01dcd84b10..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Controller.xcs \
- Factories.xcs \
- Commands.xcs \
- BasicIDECommands.xcs \
- BibliographyCommands.xcs \
- CalcCommands.xcs \
- ChartCommands.xcs \
- DbuCommands.xcs \
- BaseWindowState.xcs \
- WriterFormWindowState.xcs \
- WriterReportWindowState.xcs \
- DbBrowserWindowState.xcs \
- DbTableDataWindowState.xcs \
- DrawImpressCommands.xcs \
- GenericCommands.xcs \
- MathCommands.xcs \
- StartModuleCommands.xcs \
- WriterCommands.xcs \
- WindowState.xcs \
- BasicIDEWindowState.xcs \
- BibliographyWindowState.xcs \
- CalcWindowState.xcs \
- ChartWindowState.xcs \
- DbQueryWindowState.xcs \
- DbRelationWindowState.xcs \
- DbTableWindowState.xcs \
- DrawWindowState.xcs \
- ImpressWindowState.xcs \
- MathWindowState.xcs \
- StartModuleWindowState.xcs \
- WriterWindowState.xcs \
- XFormsWindowState.xcs \
- WriterGlobalWindowState.xcs \
- WriterWebWindowState.xcs \
- Effects.xcs \
- Category.xcs \
- GenericCategories.xcs \
- GlobalSettings.xcs \
- WindowContentFactories.xcs \
- Sidebar.xcs
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 2f5a0de341..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Accelerators.xcs \
- Addons.xcs \
- Calc.xcs \
- CalcAddIns.xcs \
- Canvas.xcs \
- Chart.xcs \
- Commands.xcs \
- Common.xcs \
- Compatibility.xcs \
- DataAccess.xcs \
- Draw.xcs \
- Embedding.xcs \
- Events.xcs \
- ExtendedColorScheme.xcs \
- ExtensionDependencies.xcs \
- ExtensionManager.xcs \
- FormWizard.xcs \
- Histories.xcs \
- Impress.xcs \
- Java.xcs \
- Jobs.xcs \
- Labels.xcs \
- Linguistic.xcs \
- Logging.xcs \
- Math.xcs \
- OOoImprovement.xcs \
- OptionsDialog.xcs \
- Paths.xcs \
- PresenterScreen.xcs \
- ProtocolHandler.xcs \
- Recovery.xcs \
- SFX.xcs \
- Scripting.xcs \
- Security.xcs \
- Substitution.xcs \
- TabBrowse.xcs \
- TableWizard.xcs \
- TypeDetection.xcs \
- UI.xcs \
- Views.xcs \
- WebWizard.xcs \
- Writer.xcs \
- WriterWeb.xcs \
-
-.INCLUDE : target.mk
-
diff --git
a/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index e8a30b3913..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooTypeDetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Types.xcs \
- Filter.xcs \
- GraphicFilter.xcs \
- Misc.xcs \
- UISort.xcs
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/registry/schema/org/openoffice/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/makefile.mk
deleted file mode 100644
index f5c58b9455..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooffice
-PACKAGE=org.openoffice
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- LDAP.xcs \
- Inet.xcs \
- Setup.xcs \
- System.xcs \
- UserProfile.xcs \
- VCL.xcs \
- FirstStartWizard.xcs \
- Interaction.xcs
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
b/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
deleted file mode 100644
index d08c24ea17..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooucb
-PACKAGE=org.openoffice.ucb
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Configuration.xcs \
- Hierarchy.xcs \
- InteractionHandler.xcs \
- Store.xcs
-
-.INCLUDE : target.mk
-
diff --git a/main/officecfg/util/makefile.mk b/main/officecfg/util/makefile.mk
deleted file mode 100644
index 90cd7f7d20..0000000000
--- a/main/officecfg/util/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#
-# 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=..
-
-
-PRJNAME=officecfg
-TARGET=util
-
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-# --- Targets ------------------------------------------------------
-
-$(MISC)$/$(TARGET)_delzip :
- -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip
-
-$(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
- cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru
..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
- $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-
-ALLTAR: \
- $(MISC)$/$(TARGET)_delzip \
- $(BIN)$/registry_{$(alllangiso)}.zip
-
diff --git a/main/officecfg/util/makefile.pmk b/main/officecfg/util/makefile.pmk
deleted file mode 100644
index c52ffa9244..0000000000
--- a/main/officecfg/util/makefile.pmk
+++ /dev/null
@@ -1,30 +0,0 @@
-#**************************************************************
-#
-# 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.
-#
-#**************************************************************
-
-
-
-XSLDIR=$(PRJ)$/util
-ABSXCSROOT=$(PWD)$/$(PRJ)
-XCSROOT=..
-DTDDIR=$(PRJ)
-PROCESSOUT=$(MISC)
-PROCESSORDIR=$(CLASSDIR)
-
