[Libreoffice-commits] .: 6 commits - officecfg/Configuration_officecfg.mk officecfg/Makefile officecfg/Module_officecfg.mk officecfg/Package_misc.mk officecfg/Package_tools.mk officecfg/prj officecfg/registry officecfg/util solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Sat Aug 13 07:08:25 PDT 2011
officecfg/Configuration_officecfg.mk | 262 +++++
officecfg/Makefile | 30
officecfg/Module_officecfg.mk | 28
officecfg/Package_misc.mk | 29
officecfg/Package_tools.mk | 36
officecfg/prj/build.lst | 17
officecfg/prj/d.lst | 69 -
officecfg/prj/makefile.mk | 32
officecfg/registry/data/org/openoffice/Office/UI/makefile.mk | 79 -
officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk | 51 -
officecfg/registry/data/org/openoffice/makefile.mk | 70 -
officecfg/registry/data/org/openoffice/ucb/makefile.mk | 45 -
officecfg/registry/makefile.mk | 44
officecfg/registry/schema/makefile.mk | 46 -
officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk | 42
officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk | 42
officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk | 80 -
officecfg/registry/schema/org/openoffice/Office/makefile.mk | 82 -
officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk | 46 -
officecfg/registry/schema/org/openoffice/makefile.mk | 49 -
officecfg/registry/schema/org/openoffice/ucb/makefile.mk | 45 -
officecfg/util/makefile.mk | 48 -
officecfg/util/makefile.pmk | 34
solenv/gbuild/Configuration.mk | 450 ++++++++++
solenv/gbuild/TargetLocations.mk | 22
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/android.mk | 3
solenv/gbuild/platform/dragonfly.mk | 13
solenv/gbuild/platform/freebsd.mk | 13
solenv/gbuild/platform/ios.mk | 3
solenv/gbuild/platform/linux.mk | 13
solenv/gbuild/platform/macosx.mk | 3
solenv/gbuild/platform/netbsd.mk | 13
solenv/gbuild/platform/openbsd.mk | 13
solenv/gbuild/platform/solaris.mk | 4
solenv/gbuild/platform/unxgcc.mk | 15
solenv/gbuild/platform/windows.mk | 3
solenv/gbuild/platform/winmingw.mk | 3
38 files changed, 925 insertions(+), 953 deletions(-)
New commits:
commit d135b41cef9f0337cc56ecd6345a0194622b1177
Author: David Tardon <dtardon at redhat.com>
Date: Sat Aug 13 14:24:38 2011 +0200
all unix/gcc platforms have the same gb_UnoApiTarget settings
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index 30a58de..0adf1b6 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -49,17 +49,4 @@ define gb_Helper_convert_native
$(1)
endef
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index a8a7966..fc5b714 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -47,17 +47,4 @@ define gb_Helper_convert_native
$(1)
endef
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index f3df981..cdd76d8 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -38,17 +38,4 @@ define gb_Helper_convert_native
$(1)
endef
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index 1785285..b141222 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -49,17 +49,4 @@ define gb_Helper_convert_native
$(1)
endef
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index fd4debc..05b4903 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -68,17 +68,4 @@ define gb_Helper_convert_native
$(1)
endef
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0dfe1ab..74276dd 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -465,6 +465,19 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
# Configuration
gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
commit d4b7950f88c9f2d59eb00a87b50f874a906a8265
Author: David Tardon <dtardon at redhat.com>
Date: Sat Aug 13 14:23:26 2011 +0200
all unix/gcc platforms have the same gb_Configuration settings
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index e950b2a..30a58de 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -62,7 +62,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 15d9782..a8a7966 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -60,7 +60,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index eba37f0..f3df981 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -51,7 +51,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index af5a2de..1785285 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -62,7 +62,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 6fec66b..fd4debc 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -81,7 +81,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d027d49..0dfe1ab 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -465,5 +465,7 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
# vim: set noet sw=4:
commit aab5c0bba1bb5d5730dd62690d6807509bdd3a39
Author: David Tardon <dtardon at redhat.com>
Date: Sat Aug 13 14:20:33 2011 +0200
config gb_Configuration for all platforms we build
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 03f85ec..a912c21 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -60,4 +60,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index 30a58de..e950b2a 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -62,4 +62,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index a8a7966..15d9782 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -60,4 +60,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 70f7313..1039497 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -432,4 +432,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SO
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index 1785285..af5a2de 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -62,4 +62,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index fd4debc..6fec66b 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -81,4 +81,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
commit 8a44fe8e812a7b16a12f15d5591ca0f6197d1665
Author: Michael Stahl <mst at openoffice.org>
Date: Sat Aug 13 11:35:33 2011 +0200
officecfg: convert to gbuild
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
new file mode 100644
index 0000000..51f61d9
--- /dev/null
+++ b/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/officecfg/Makefile b/officecfg/Makefile
new file mode 100644
index 0000000..3ac357a
--- /dev/null
+++ b/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/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
new file mode 100644
index 0000000..22d91c9
--- /dev/null
+++ b/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/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
new file mode 100644
index 0000000..c424069
--- /dev/null
+++ b/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/officecfg/Package_tools.mk b/officecfg/Package_tools.mk
new file mode 100644
index 0000000..7d7e2a4
--- /dev/null
+++ b/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/officecfg/prj/build.lst b/officecfg/prj/build.lst
index 2f2cbb8..f4a9142 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,17 +1,2 @@
oc officecfg : TRANSLATIONS:translations 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/officecfg/prj/d.lst b/officecfg/prj/d.lst
index ab622fc..e69de29 100644
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
@@ -1,69 +0,0 @@
-mkdir: %_DEST%\xml\registry
-mkdir: %_DEST%\xml\registry\schema
-mkdir: %_DEST%\xml\registry\schema\org
-mkdir: %_DEST%\xml\registry\schema\org\openoffice
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\UI
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\ucb
-mkdir: %_DEST%\xml\registry\schema\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs %_DEST%\xml\registry\schema\org\openoffice
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\DataAccess\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs %_DEST%\xml\registry\schema\org\openoffice\Office\OOoImprovement
-..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs %_DEST%\xml\registry\schema\org\openoffice\ucb
-..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs %_DEST%\xml\registry\schema\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml\registry\data
-mkdir: %_DEST%\xml\registry\data\org
-mkdir: %_DEST%\xml\registry\data\org\openoffice
-mkdir: %_DEST%\xml\registry\data\org\openoffice\Office
-mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\UI
-mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml\registry\data\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml\registry\data\org\openoffice\ucb
-mkdir: %_DEST%\xml\registry\data\org\openoffice\TypeDetection
-
-..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml\oo-ldap.xcd.sample
-..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml\oo-ad-ldap.xcd.sample
-
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml\registry\data\org\openoffice
-..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office
-..\%__SRC%\misc\registry\data\org\openoffice\Office\UI\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\data\org\openoffice\ucb\*.xcu %_DEST%\xml\registry\data\org\openoffice\ucb
-..\%__SRC%\misc\registry\data\org\openoffice\TypeDetection\*.xcu %_DEST%\xml\registry\data\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml\registry\spool
-mkdir: %_DEST%\xml\registry\spool\org
-mkdir: %_DEST%\xml\registry\spool\org\openoffice
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\UI
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\ucb
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\spool\*.xcu %_DEST%\xml\registry\spool
-..\%__SRC%\misc\registry\spool\org\openoffice\*.xcu %_DEST%\xml\registry\spool\org\openoffice
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\UI\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\spool\org\openoffice\ucb\*.xcu %_DEST%\xml\registry\spool\org\openoffice\ucb
-..\%__SRC%\misc\registry\spool\org\openoffice\TypeDetection\*.xcu %_DEST%\xml\registry\spool\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\pck
-
-..\%__SRC%\misc\*.properties %_DEST%\pck
-..\%__SRC%\misc\*.ldif %_DEST%\pck
-..\%__SRC%\misc\*.ldf %_DEST%\pck
-..\%__SRC%\misc\*.conf %_DEST%\pck
-..\%__SRC%\misc\*.map %_DEST%\pck
-
-..\%__SRC%\bin\*.zip %_DEST%\pck
-
-mkdir: %_DEST%\xml\processing
-
-..\util\*.xsl %_DEST%\xml\processing
-..\registry\*.dtd %_DEST%\xml\registry
-
diff --git a/officecfg/prj/makefile.mk b/officecfg/prj/makefile.mk
new file mode 100644
index 0000000..d30a7dd
--- /dev/null
+++ b/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/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
deleted file mode 100755
index 7979878..0000000
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# 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=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\
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
- Controller.xcu \
- Factories.xcu \
- GlobalSettings.xcu
-
-.INCLUDE : target.mk
-
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100755
index f09ab75..0000000
--- a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
deleted file mode 100755
index b51285a..0000000
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# 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=officecfg
-TARGET=data_oopenoffice
-PACKAGE=org.openoffice
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Inet.xcu \
- Setup.xcu \
- System.xcu \
- VCL.xcu \
- FirstStartWizard.xcu \
- UserProfile.xcu \
- Interaction.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/officecfg/registry/data/org/openoffice/ucb/makefile.mk b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
deleted file mode 100755
index fccb0e9..0000000
--- a/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/makefile.mk b/officecfg/registry/makefile.mk
deleted file mode 100755
index bc6f308..0000000
--- a/officecfg/registry/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# 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=officecfg
-TARGET=registry
-
-.INCLUDE : settings.mk
-
-# ---------------------------------------------------------
-
-COPYFILES = \
- $(MISC)$/component-update.dtd
-
-.INCLUDE : target.mk
-
-ALLTAR : $(COPYFILES)
-
-$(COPYFILES) : $$(@:f)
- $(COPY) $< $@
-
diff --git a/officecfg/registry/schema/makefile.mk b/officecfg/registry/schema/makefile.mk
deleted file mode 100755
index d735d03..0000000
--- a/officecfg/registry/schema/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
deleted file mode 100755
index d0fce09..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
deleted file mode 100755
index db7b694..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
deleted file mode 100755
index e5b949b..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# 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=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
-
-.INCLUDE : target.mk
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
deleted file mode 100755
index c59b2d8..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# 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=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 \
- Events.xcs \
- Embedding.xcs \
- ExtensionManager.xcs \
- Impress.xcs \
- Java.xcs \
- Jobs.xcs \
- Labels.xcs \
- Linguistic.xcs \
- Logging.xcs \
- Math.xcs \
- OptionsDialog.xcs \
- ProtocolHandler.xcs \
- SFX.xcs \
- Substitution.xcs \
- TableWizard.xcs \
- UI.xcs \
- Views.xcs \
- Writer.xcs \
- WriterWeb.xcs \
- Scripting.xcs \
- Security.xcs \
- WebWizard.xcs \
- Recovery.xcs \
- FormWizard.xcs \
- ExtendedColorScheme.xcs \
- TypeDetection.xcs \
- TabBrowse.xcs \
- Paths.xcs \
- Histories.xcs \
- OOoImprovement.xcs
-
-.INCLUDE : target.mk
-
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100755
index e2279a4..0000000
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/schema/org/openoffice/makefile.mk b/officecfg/registry/schema/org/openoffice/makefile.mk
deleted file mode 100755
index f928e44..0000000
--- a/officecfg/registry/schema/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/registry/schema/org/openoffice/ucb/makefile.mk b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
deleted file mode 100755
index d35de7a..0000000
--- a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
deleted file mode 100755
index c1fa542..0000000
--- a/officecfg/util/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# 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=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/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
deleted file mode 100755
index 28316b4..0000000
--- a/officecfg/util/makefile.pmk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-XSLDIR=$(PRJ)$/util
-ABSXCSROOT=$(PWD)$/$(PRJ)
-XCSROOT=..
-DTDDIR=$(PRJ)
-PROCESSOUT=$(MISC)
-PROCESSORDIR=$(CLASSDIR)
-
commit 31ca030dc63e0f9ac98706f1fcfba1ac57323f24
Author: David Tardon <dtardon at redhat.com>
Date: Sat Aug 13 11:32:15 2011 +0200
gb_Deliver_add_deliverable takes 3 args
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 59b78cd..54cbd95 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -190,10 +190,12 @@ $(call gb_XcuModuleTarget_get_outdir_target,%) :
# XcuLangpackTarget class
+gb_XcuLangpackTarget__get_name_with_lang = $(basename $(1))-$(2)$(suffix $(1))
+
gb_XcuLangpackTarget__get_outdir_target_with_lang = \
- $(call gb_XcuLangpackTarget_get_outdir_target,$(basename $(1))-$(2)$(suffix $(1)))
+ $(call gb_XcuLangpackTarget_get_outdir_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
gb_XcuLangpackTarget__get_target_with_lang = \
- $(call gb_XcuLangpackTarget_get_target,$(basename $(1))-$(2)$(suffix $(1)))
+ $(call gb_XcuLangpackTarget_get_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
@@ -343,7 +345,7 @@ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_XcsTarget_get_outdir_target,$(3)) : \
$(call gb_XcsTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
- $(call gb_XcsTarget_get_target,$(2)/$(3)))
+ $(call gb_XcsTarget_get_target,$(2)/$(3)),$(2)/$(3))
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
@@ -366,7 +368,8 @@ $(call gb_XcuDataTarget_get_outdir_target,$(3)) : \
$(call gb_XcuDataTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuDataTarget_get_outdir_target,$(3)),\
- $(call gb_XcuDataTarget_get_target,$(2)/$(3)))
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3)),\
+ $(2)/$(3))
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles)
@@ -388,7 +391,8 @@ $(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
$(call gb_XcuModuleTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
- $(call gb_XcuModuleTarget_get_target,$(2)/$(3)))
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\
+ $(2)/$(3))
endef
# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
@@ -410,7 +414,8 @@ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
- $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)))
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\
+ $(call gb_XcuLangpackTarget__get_name_with_lang,$(2)/$(3),$(4)))
endef
# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
commit 2655b04b0a8e02ea89ce75182eda1b94aa007e79
Author: Michael Stahl <mst at openoffice.org>
Date: Sat Aug 13 11:16:13 2011 +0200
add solenv/gbuild/Configuration.mk to build various XCS/XCU files
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
new file mode 100644
index 0000000..59b78cd
--- /dev/null
+++ b/solenv/gbuild/Configuration.mk
@@ -0,0 +1,445 @@
+#***************************************************************
+# 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.
+#***************************************************************
+
+# Configuration files: a bit of an overview of the targets:
+#
+# Configuration
+# => XcsTarget: schemas
+# => buildtools
+# => Xcs source
+# => XcuDataTarget: data
+# => buildtools
+# => XcsTarget (schema)
+# => Xcu data source
+# => XcuModuleTaret: modules
+# => buildtools
+# => Xcu data source
+# => XcuLangpackTarget: langpack (per lang)
+# => buildtools
+# => Xcu data source
+# => zip (per lang)
+# => XcuResTarget: resources (per lang)
+# => buildtools
+# => XcuMergeTarget: merge
+# => buildtools (cfgex)
+# => Xcu data source
+# => localize.sdf
+# => XcsTarget (schema)
+
+# Per-repo pattern rules for each repository do not work for all targets
+# because the prerequisites of some targets need to have the stem mangled
+# and this does not seem to be possible in GNU make because when the stem is
+# matched variables have already been expanded (this was possible in dmake).
+#
+# So to keep things consistent the Configuration takes a parameter for the
+# repository and all targets use that to find the source file.
+#
+# Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget
+# fails: XcuModuleTarget XcuLangpackTarget XcuResTarget
+#
+gb_Configuration__get_source = $($(gb_Configuration_REPO_$(1)))/$(2)
+
+
+# XcsTarget class
+
+# need to locate a schema file corresponding to some XCU file in the outdir
+define gb_XcsTarget_for_XcuTarget
+$(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs)
+endef
+
+gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
+gb_Configuration_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
+
+gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl
+gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl
+gb_XcsTarget_XSLT_SchemaTrim := $(OUTDIR)/xml/processing/schema_trim.xsl
+gb_XcsTarget_DTD_Schema := $(OUTDIR)/xml/registry/component-schema.dtd
+
+define gb_XcsTarget__command
+$(call gb_Output_announce,$(2),$(true),XCS,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).val \
+ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \
+ --stringparam root $(subst $(XCSFILE),,$(3)) \
+ $(gb_XcsTarget_XSLT_SchemaVal) \
+ $(3) \
+ && rm $(1).val && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).sanity \
+ $(gb_XcsTarget_XSLT_Sanity) \
+ $(3) \
+ && rm $(1).sanity && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ $(gb_XcsTarget_XSLT_SchemaTrim) \
+ $(3))
+endef
+
+$(call gb_XcsTarget_get_target,%) : \
+ $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
+ $(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema)
+ $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
+
+$(call gb_XcsTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCS,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcsTarget_get_target,$*) \
+ $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
+
+$(call gb_XcsTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuDataTarget class
+
+gb_XcuTarget_XSLT_AllLang := $(OUTDIR)/xml/processing/alllang.xsl
+gb_XcuDataTarget_XSLT_DataVal := $(OUTDIR)/xml/processing/data_val.xsl
+gb_XcuDataTarget_DTD_ComponentUpdate := $(OUTDIR)/xml/registry/component-update.dtd
+
+define gb_XcuDataTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,2)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).val \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuDataTarget_XSLT_DataVal) \
+ $(3) \
+ && rm -f $(1).val && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
+ $(gb_XcuTarget_XSLT_AllLang) $(gb_XcuDataTarget_DTD_ComponentUpdate)
+ $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
+
+$(call gb_XcuDataTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuDataTarget_get_target,$*) \
+ $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
+
+$(call gb_XcuDataTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuModuleTarget class
+
+define gb_XcuDataSource_for_XcuModuleTarget
+$(call gb_Configuration__get_source,$(1),$(basename $(subst -,.,$(basename $(2)))).xcu)
+endef
+
+define gb_XcsTarget_for_XcuModuleTarget
+$(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).xcs)
+endef
+
+define gb_XcuModuleTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(4) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
+ $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
+
+$(call gb_XcuModuleTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuModuleTarget_get_target,$*) \
+ $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
+
+$(call gb_XcuModuleTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuLangpackTarget class
+
+gb_XcuLangpackTarget__get_outdir_target_with_lang = \
+ $(call gb_XcuLangpackTarget_get_outdir_target,$(basename $(1))-$(2)$(suffix $(1)))
+gb_XcuLangpackTarget__get_target_with_lang = \
+ $(call gb_XcuLangpackTarget_get_target,$(basename $(1))-$(2)$(suffix $(1)))
+
+gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
+
+define gb_XcuLangpackTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,4)
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(1)) && \
+ sed -e "s/__LANGUAGE__/$(LANG)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
+ $(3) > $(1))
+endef
+
+$(call gb_XcuLangpackTarget_get_target,%) : \
+ $(gb_XcuLangpackTarget_SED_delcomment)
+ $(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^))
+
+$(call gb_XcuLangpackTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,4)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(foreach lang,$(gb_Configuration_LANGS),\
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
+
+$(call gb_XcuLangpackTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuMergeTarget class
+
+gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
+gb_XcuMergeTarget_CFGEXCOMMAND := \
+ $(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
+gb_XcuMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+
+# PRJNAME is computed from the stem (parameter $(2))
+define gb_XcuMergeTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,5)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XcuMergeTarget_CFGEXCOMMAND) \
+ -p $(firstword $(subst /, ,$(2))) \
+ -i $(3) \
+ -o $(1) \
+ -m $(SDF) \
+ -l all)
+endef
+
+$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET)
+ $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
+
+$(call gb_XcuMergeTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,5)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuMergeTarget_get_target,$*))
+
+# $(call gb_XcuMergeTarget_XcuMergeTarget,target,zipfile,prefix,xcufile)
+define gb_XcuMergeTarget_XcuMergeTarget
+$(call gb_XcuMergeTarget_get_target,$(1)) : \
+ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
+ $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_XcuMergeTarget_get_target,$(1)) : \
+ SDF := $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+endef
+
+
+# XcuResTarget class
+
+# locale is extracted from the stem (parameter $(2))
+define gb_XcuResTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,6)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --stringparam locale $(word 2,$(subst /, ,$(2))) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
+ $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+
+$(call gb_XcuResTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,6)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuResTarget_get_target,$*))
+
+# $(call gb_XcuResTarget_XcuResTarget,target,zipfile,prefix,xcufile,lang)
+# this depends either on the source or on the merge target (if WITH_LANG)
+define gb_XcuResTarget_XcuResTarget
+ifeq ($(strip $(gb_WITH_LANG)),)
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_Configuration__get_source,$(2),$(3)/$(4))
+else
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_XcuMergeTarget_get_target,$(3)/$(4))
+endif
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_XcsTarget_for_XcuTarget,$(4))
+$(call gb_XcuResTarget_get_target,$(1)) : XCUFILE := $(4)
+endef
+
+
+# Configuration class
+
+$(call gb_Configuration_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),CFG,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_Configuration_get_target,$*))
+
+$(call gb_Configuration_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),CFG,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && touch $@)
+
+# $(call gb_Configuration_Configuration,zipfile,repo)
+# cannot use target local variable for REPO because it's needed in prereq
+define gb_Configuration_Configuration
+$(if $(filter $(2),$(gb_Configuration_REPOSITORYNAMES)),,\
+ $(error Configuration: no or invalid repository given; known repositories: \
+ $(gb_Configuration_REPOSITORYNAMES)))
+$(eval gb_Configuration_REPO_$(1) := $(2))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_Zip_get_final_target,$(1)_$(lang))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_Zip_get_clean_target,$(1)_$(lang))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+endef
+
+# $(call gb_Configuration_add_schema,zipfile,prefix,xcsfile)
+define gb_Configuration_add_schema
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcsTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcsTarget_get_outdir_target,$(3))
+$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
+ $(call gb_Configuration__get_source,$(1),$(2)/$(3))
+$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
+$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
+$(call gb_XcsTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcsTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
+ $(call gb_XcsTarget_get_target,$(2)/$(3)))
+endef
+
+#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
+define gb_Configuration_add_schemas
+$(foreach xcs,$(3),$(eval $(call gb_Configuration_add_schema,$(1),$(2),$(xcs))))
+endef
+
+# $(call gb_Configuration_add_data,zipfile,prefix,xcufile)
+define gb_Configuration_add_data
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuDataTarget_get_outdir_target,$(3))
+$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
+ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+ $(call gb_XcsTarget_for_XcuTarget,$(3))
+$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuDataTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuDataTarget_get_outdir_target,$(3)),\
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3)))
+endef
+
+#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles)
+define gb_Configuration_add_datas
+$(foreach xcu,$(3),$(eval $(call gb_Configuration_add_data,$(1),$(2),$(xcu))))
+endef
+
+# $(call gb_Configuration_add_spool_module,zipfile,prefix,xcufile)
+define gb_Configuration_add_spool_module
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuModuleTarget_get_outdir_target,$(3))
+$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
+ $(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \
+ $(call gb_XcsTarget_for_XcuModuleTarget,$(3))
+$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)))
+endef
+
+# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
+define gb_Configuration_add_spool_modules
+$(foreach xcu,$(3),$(eval \
+ $(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu))))
+endef
+
+define gb_Configuration__add_langpack
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \
+ $($(gb_Configuration_REPO_$(1)))/$(2)/$(3).tmpl
+$(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4)
+$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)))
+endef
+
+# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
+define gb_Configuration_add_spool_langpack
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang))))
+endef
+
+# $(call gb_Configuration_add_localized_data,zipfile,prefix,xcufile)
+define gb_Configuration_add_localized_data
+$(eval $(call gb_Configuration_add_data,$(1),$(2),$(3)))
+ifneq ($(strip $(gb_WITH_LANG)),)
+$(eval $(call gb_XcuMergeTarget_XcuMergeTarget,$(2)/$(3),$(1),$(2),$(3)))
+$(eval $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuMergeTarget_get_clean_target,$(2)/$(3)))
+endif
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_XcuResTarget_XcuResTarget,$(1)/$(lang)/$(3),$(1),$(2),$(3),$(lang))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Zip_add_file,$(1)_$(lang),$(3))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuResTarget_get_clean_target,$(1)/$(lang)/$(3))))
+endef
+
+# $(call gb_Configuration_add_localized_datas,zipfile,prefix,xcufile)
+define gb_Configuration_add_localized_datas
+$(foreach xcu,$(3),$(eval \
+ $(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu))))
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index bc5326e..1337838 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -45,6 +45,13 @@ gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
+# outdir targets: $(1) is path
+gb_Configuration_registry = $(OUTDIR)/xml/registry
+gb_XcsTarget_get_outdir_target = $(gb_Configuration_registry)/schema/$(1)
+gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
+gb_XcuLangpackTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
+gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
+
define gb_Library_get_target
$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
@@ -108,6 +115,14 @@ gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+# workdir targets: $(1) is prefix/path
+gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
+gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
+gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
+gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
+gb_XcuModuleTarget_get_target = $(WORKDIR)/XcuModuleTarget/$(1)
+gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
+gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1)
gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
@@ -149,6 +164,13 @@ $(eval $(call gb_Helper_make_clean_targets,\
UnoApiTarget \
WinResTarget \
Zip \
+ XcsTarget \
+ XcuDataTarget \
+ XcuModuleTarget \
+ XcuLangpackTarget \
+ XcuMergeTarget \
+ XcuResTarget \
+ Configuration \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0ee9675..012915a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -297,6 +297,7 @@ include $(foreach class, \
Module \
UnoApiTarget \
Zip \
+ Configuration \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index f3df981..eba37f0 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -51,4 +51,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 586fda3..5f9fe9e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -504,4 +504,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index fe54d72..6b081a8 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -404,6 +404,7 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -417,4 +418,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 8e23ec9..e9057f4 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -753,4 +753,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 7962ee2..215b4ca 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -715,4 +715,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# Configuration
+gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
# vim: set noet sw=4:
More information about the Libreoffice-commits
mailing list