RepositoryModule_ooo.mk | 1
solenv/bin/make |binary
solenv/gbuild/Rdb.mk | 86 ++++++++++++++++++++++++++++++++++
solenv/gbuild/RdbTarget.mk | 97 ---------------------------------------
solenv/gbuild/TargetLocations.mk | 6 +-
solenv/gbuild/gbuild.mk | 2
ure/Makefile | 40 ++++++++++++++++
ure/Module_ure.mk | 37 ++++++++++++++
ure/Package_distribution.mk | 38 +++++++++++++++
ure/Package_uretest.mk | 32 ++++++++++++
ure/Rdb_ure.mk | 56 ++++++++++++++++++++++
ure/Zip_uretest.mk | 54 +++++++++++++++++++++
ure/prj/build.lst | 2
ure/prj/d.lst | 11 ----
ure/prj/makefile.mk | 1
ure/source/makefile.mk | 75 ------------------------------
16 files changed, 350 insertions(+), 188 deletions(-)
New commits:
commit 764f2b2790e02f80ec67e85f23472dd4db6fc977
Author: David Tardon <dtar...@redhat.com>
Date: Mon Dec 26 12:31:21 2011 +0100
gbuildize ure
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 281b198..1e4ff6e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
UnoControls \
unotools \
unoxml \
+ ure \
uui \
vbahelper \
vcl \
diff --git a/ure/Makefile b/ure/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/ure/Makefile
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword
$(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
new file mode 100644
index 0000000..0f75d4c
--- /dev/null
+++ b/ure/Module_ure.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,ure))
+
+$(eval $(call gb_Module_add_targets,ure,\
+ Package_distribution \
+ Package_uretest \
+ Rdb_ure \
+ Zip_uretest \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk
new file mode 100644
index 0000000..81a39cf
--- /dev/null
+++ b/ure/Package_distribution.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,ure_distribution,$(SRCDIR)/ure/source))
+
+$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/README,README))
+$(eval $(call
gb_Package_add_file,ure_distribution,bin/ure/THIRDPARTYLICENSEREADME.html,THIRDPARTYLICENSEREADME.html))
+$(eval $(call
gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3.ini,jvmfwk3.ini))
+$(eval $(call
gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3rc,jvmfwk3rc))
+$(eval $(call
gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh))
+$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini))
+$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ure/Package_uretest.mk b/ure/Package_uretest.mk
new file mode 100644
index 0000000..6e2d236
--- /dev/null
+++ b/ure/Package_uretest.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,ure_uretest,$(patsubst %/,%,$(dir $(call
gb_Zip_get_target,uretest)))))
+
+$(eval $(call gb_Package_add_file,ure_uretest,bin/uretest.zip,uretest.zip))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
new file mode 100644
index 0000000..b3b6531
--- /dev/null
+++ b/ure/Rdb_ure.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Rdb_Rdb,ure/services))
+
+$(eval $(call gb_Rdb_add_components,ure/services,\
+ acceptor \
+ binaryurp/source/binaryurp \
+ bootstrap \
+ connector \
+ introspection \
+ invocadapt \
+ invocation \
+ namingservice \
+ proxyfac \
+ reflection \
+ stocservices \
+ streams \
+ textinstream \
+ textoutstream \
+ uuresolver \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Rdb_add_components,ure/services,\
+ javaloader \
+ javavm \
+ juh \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ure/Zip_uretest.mk b/ure/Zip_uretest.mk
new file mode 100644
index 0000000..2c2bbb1
--- /dev/null
+++ b/ure/Zip_uretest.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,uretest,$(SRCDIR)/ure/source))
+
+$(eval $(call gb_Zip_add_files,uretest,\
+ uretest/JavaClient.java \
+ uretest/JavaMain.java \
+ uretest/JavaNative.java \
+ uretest/JavaTest.java \
+ uretest/Makefile \
+ uretest/Makefile.pln \
+ uretest/README \
+ uretest/Runner.java \
+ uretest/Tester.java \
+ uretest/cppmain.cc \
+ uretest/cppserver.cc \
+ uretest/cpptest.cc \
+ uretest/javaclient.mf.template \
+ uretest/javamain.mf.template \
+ uretest/javanative.mf.template \
+ uretest/javatest.mf.template \
+ uretest/runner.mf.template \
+ uretest/tester.mf.template \
+ uretest/types.idl \
+ uretest/types.mf.template \
+ uretest/version.map \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index 7618bf3..57ce50d 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
ur ure : LIBXSLT:libxslt binaryurp cli_ure io javaunohelper remotebridges
solenv stoc NULL
-ur ure\source nmake - all ur_source NULL
+ur ure\prj nmake - all ur_prj NULL
diff --git a/ure/prj/d.lst b/ure/prj/d.lst
index f9e2844..e69de29 100644
--- a/ure/prj/d.lst
+++ b/ure/prj/d.lst
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\bin\ure
-mkdir: %_DEST%\xml\ure
-..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin\uretest.zip
-..\%__SRC%\misc\services.rdb %_DEST%\xml\ure\services.rdb
-..\source\README %_DEST%\bin\ure\README
-..\source\THIRDPARTYLICENSEREADME.html
%_DEST%\bin\ure\THIRDPARTYLICENSEREADME.html
-..\source\jvmfwk3.ini %_DEST%\bin\ure\jvmfwk3.ini
-..\source\jvmfwk3rc %_DEST%\bin\ure\jvmfwk3rc
-..\source\startup.sh %_DEST%\bin\ure\startup.sh
-..\source\uno.ini %_DEST%\bin\ure\uno.ini
-..\source\unorc %_DEST%\bin\ure\unorc
diff --git a/ure/prj/makefile.mk b/ure/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/ure/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/ure/source/delzip b/ure/source/delzip
deleted file mode 100644
index e69de29..0000000
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
deleted file mode 100644
index 1f75890..0000000
--- a/ure/source/makefile.mk
+++ /dev/null
@@ -1,75 +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 = ure
-TARGET = source
-
-ZIP1TARGET = uretest
-ZIP1FLAGS = -r
-ZIP1LIST = uretest
-
-my_components = \
- acceptor \
- component/binaryurp/source/binaryurp \
- bootstrap \
- connector \
- introspection \
- invocadapt \
- invocation \
- namingservice \
- proxyfac \
- reflection \
- stocservices \
- streams \
- textinstream \
- textoutstream \
- uuresolver
-
-.IF "$(SOLAR_JAVA)" != ""
-
-my_components += \
- javaloader \
- javavm \
- juh
-
-.ENDIF
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/services.rdb
-
-$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/services.input
$(my_components:^"$(SOLARXMLDIR)/":+".component")
- $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
- $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
-
-$(MISC)/services.input :
- echo \
- '<list>$(my_components:^"<filename>":+".component</filename>")</list>'
\
- > $@
commit 95754019f4cd023fe8188366307c3a9c55d3b780
Author: David Tardon <dtar...@redhat.com>
Date: Mon Dec 26 12:25:06 2011 +0100
revamp Rdb class
diff --git a/solenv/bin/make b/solenv/bin/make
new file mode 100755
index 0000000..18a5855
Binary files /dev/null and b/solenv/bin/make differ
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
new file mode 100644
index 0000000..c7f9d0d
--- /dev/null
+++ b/solenv/gbuild/Rdb.mk
@@ -0,0 +1,86 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# Component paths created by the old build system does not contain any
+# directories.
+gb_Rdb__is_old_component_target = $(if $(findstring /,$(1)),$(false),$(true))
+
+gb_Rdb__get_old_component_target = $(OUTDIR)/xml/$(1).component
+
+define gb_Rdb__get_component_target
+$(strip $(if $(call gb_Rdb__is_old_component_target,$(component))\
+ ,$(call gb_Rdb__get_old_component_target,$(component))\
+ ,$(call gb_ComponentTarget_get_outdir_target,$(component))))
+endef
+
+define gb_Rdb__command
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && \
+ (\
+ echo '<list>' && \
+ $(foreach component,$(COMPONENTS),echo "<filename>$(call
gb_Rdb__get_component_target,$(component))</filename>" &&) \
+ echo '</list>' \
+ ) > $(1).input && \
+ $(gb_XSLTPROC) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt
$(1).input && \
+ rm $(1).input)
+endef
+
+$(call gb_Rdb_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),RDB,1)
+ $(call gb_Rdb__command,$@,$*,$?,$^)
+
+.PHONY : $(call gb_Rdb_get_clean_target,%)
+$(call gb_Rdb_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),RDB,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_Rdb_get_outdir_target,$*) $(call
gb_Rdb_get_target,$*))
+
+$(call gb_Rdb_get_outdir_target,%) :
+ $(call gb_Deliver_deliver,$<,$@)
+
+define gb_Rdb_Rdb
+$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
+$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS :=
+$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call
gb_ResTarget_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
+
+$$(eval $$(call gb_Module_register_target,$(call
gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
+endef
+
+define gb_Rdb_add_component
+$(call gb_Rdb_get_target,$(1)) : $(call gb_Rdb__get_component_target,$(2))
+$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
+$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2)
+
+endef
+
+define gb_Rdb_add_components
+$(foreach component,$(2),$(call gb_Rdb_add_component,$(1),$(component)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
deleted file mode 100644
index 6c2ba83..0000000
--- a/solenv/gbuild/RdbTarget.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
-gb_RdbTarget__get_rdbs = \
- $(foreach component,$(1),$(call
gb_ComponentTarget_get_target,$(component))) \
- $(foreach component,$(2),$(call
gb_RdbTarget__get_old_component_target,$(component)))
-
-$(call gb_RdbTarget_get_target,%) :
- $(call gb_Output_announce,$*,$(true),RDB,1)
- $(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $@) && \
- $(if $(strip $(call
gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS))),, \
- $(error no components to register, check RdbTarget is
included in gb_Module_add_check_targets - no rdb files)) \
- echo '<?xml version="1.0"?><components
xmlns="http://openoffice.org/2010/uno-components";>' > $@ && \
- $(gb_AWK) -- \
- ' BEGIN { RS=">"; } \
- /^<\?xml version.*/ { next; } \
- /.*[^\r\n\t\s].*/ { print $$0 ">"; }' \
- $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
- >> $@ && \
- echo '</components>' >> $@)
-
-.PHONY : $(call gb_RdbTarget_get_clean_target,%)
-$(call gb_RdbTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),RDB,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_RdbTarget_get_outdir_target,$*) $(call
gb_RdbTarget_get_target,$*))
-
-$(call gb_RdbTarget_get_outdir_target,%) :
- $(call gb_Deliver_deliver,$<,$@)
-
-define gb_RdbTarget_RdbTarget
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS :=
-ifeq ($(2),$(true))
-$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call
gb_RdbTarget_get_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call
gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
-endif
-# depend on the last sourced makefile, which should contain the declaration of
this target
-# thus, when you change the RdbTarget_*.mk, the target will get rebuild
-$(call gb_RdbTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
-
-$$(eval $$(call gb_Module_register_target,$(call
gb_RdbTarget_get_target,$(1)),$(call gb_RdbTarget_get_clean_target,$(1))))
-endef
-
-define gb_RdbTarget_add_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call
gb_ComponentTarget_get_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
-
-endef
-
-define gb_RdbTarget_add_components
-$(foreach component,$(2),$(call gb_RdbTarget_add_component,$(1),$(component)))
-
-endef
-
-define gb_RdbTarget_add_old_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call
gb_RdbTarget__get_old_component_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
-
-endef
-
-define gb_RdbTarget_add_old_components
-$(foreach component,$(2),$(call
gb_RdbTarget_add_old_component,$(1),$(component)))
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index cbe2ee7..65a8c75 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,7 +41,7 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/lib \
gb_PackagePart_get_target = $(OUTDIR)/$(1)
-gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
+gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
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
@@ -106,7 +106,7 @@ gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
-gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
+gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
@@ -164,7 +164,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
PackagePart \
Package \
Pyuno \
- RdbTarget \
+ Rdb \
ResTarget \
SdiTarget \
SrsTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a75fda2..1633bd9 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -283,7 +283,7 @@ include $(foreach class, \
CustomTarget \
ExternalLib \
Pyuno \
- RdbTarget \
+ Rdb \
CppunitTest \
Jar \
JavaClassSet \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
