Library_merged.mk | 5 ---
RepositoryExternal.mk | 4 ---
postprocess/packcomponents/makefile.mk | 33 -------------------------
scripting/Module_scripting.mk | 12 ++++++---
scripting/Rdb_scriptproviderforbeanshell.mk | 16 ++++++++++++
scripting/Rdb_scriptproviderforjavascript.mk | 16 ++++++++++++
solenv/gbuild/ComponentTarget.mk | 7 +----
solenv/gbuild/CppunitTest.mk | 25 ------------------
solenv/gbuild/Rdb.mk | 16 +-----------
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 +
solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 --
solenv/gbuild/platform/solaris.mk | 2 -
solenv/gbuild/platform/unxgcc.mk | 2 -
solenv/gbuild/platform/windows.mk | 2 -
14 files changed, 48 insertions(+), 97 deletions(-)
New commits:
commit fe32762e119221d3738056b096a4ef054cdffa52
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Aug 9 00:15:52 2012 +0200
tubes: add to libmerged to fix circular dependency
Probably it belongs in there anyway.
Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8
diff --git a/Library_merged.mk b/Library_merged.mk
index 68874e1..cc54e95 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\
icuuc \
jpeg \
libxml2 \
+ telepathy \
zlib \
))
@@ -88,8 +89,4 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
endif
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_use_libraries,merged,tubes))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 08b3aa6..a07bdff 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1166,9 +1166,7 @@ endef
else # !ENABLE_TELEPATHY
-define gb_LinkTarget__use_telepathy
-
-endef
+gb_LinkTarget__use_telepathy :=
endif # ENABLE_TELEPATHY
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7bbf699..7a05039 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -58,6 +58,8 @@ gb_MERGEDLIBS := \
xmlscript \
xo \
+gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+
endif
# vim: set noet sw=4 ts=4:
commit 772d15fb8ccdaa46fab0961712177baf915ed70d
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Aug 8 21:21:48 2012 +0200
create these rdbs directly in scripting
Change-Id: I8a44de06f9a16308a5ff82ad77d059e5dde544f9
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index 92139ec..4ced4c1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -412,36 +412,3 @@ $(MISC)/services.input : makefile.mk
'<list>$(my_components:^"<filename>":+".component</filename>")</list>'
\
> $@
-.IF "$(ENABLE_SCRIPTING_BEANSHELL)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb
-
-$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \
- $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/scriptproviderforbeanshell.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component
- $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
- $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/scriptproviderforbeanshell.input
-
-$(MISC)/scriptproviderforbeanshell.input : makefile.mk
- echo \
-
'<list><filename>component/scripting/java/ScriptProviderForBeanShell.component</filename></list>'
\
- > $@
-.END
-
-.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforjavascript.rdb
-
-$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \
- $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/scriptproviderforjavascript.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component
- $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
- $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/scriptproviderforjavascript.input
-
-$(MISC)/scriptproviderforjavascript.input : makefile.mk
- echo \
-
'<list><filename>component/scripting/java/ScriptProviderForJavaScript.component</filename></list>'
\
- > $@
-.END
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 7312f51..bf385cd 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -36,11 +36,15 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_Highlight \
Jar_MemoryUsage \
Jar_ScriptFramework \
- $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
- Jar_ScriptProviderForBeanShell) \
+ $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+ Jar_ScriptProviderForBeanShell \
+ Rdb_scriptproviderforbeanshell \
+ ) \
Jar_ScriptProviderForJava \
- $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
- Jar_ScriptProviderForJavaScript) \
+ $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
+ Jar_ScriptProviderForJavaScript \
+ Rdb_scriptproviderforjavascript \
+ ) \
Zip_ScriptsJava \
) \
$(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\
diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk
b/scripting/Rdb_scriptproviderforbeanshell.mk
new file mode 100644
index 0000000..ef52d76
--- /dev/null
+++ b/scripting/Rdb_scriptproviderforbeanshell.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell))
+
+$(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
+ scripting/java/ScriptProviderForBeanShell \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Rdb_scriptproviderforjavascript.mk
b/scripting/Rdb_scriptproviderforjavascript.mk
new file mode 100644
index 0000000..aec5dc6
--- /dev/null
+++ b/scripting/Rdb_scriptproviderforjavascript.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript))
+
+$(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
+ scripting/java/ScriptProviderForJavaScript \
+))
+
+# vim: set noet sw=4 ts=4:
commit 82d8a500448fd5a5ed77a90dfd2dd79163c7979d
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Aug 8 20:34:14 2012 +0200
clean this out
Change-Id: Ia9724221778437b7d767c536953074ce3d4ad198
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 31dd441..e99ffab 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -27,7 +27,7 @@
#*************************************************************************
gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
-gb_ComponentTarget_get_source = $(1)/$(2).component
+gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
# In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we
# put just the static library filename into the uri parameter. For
@@ -52,12 +52,9 @@ $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_ComponentTarget_get_target,%) : \
- $(call gb_ComponentTarget_get_source,$(SRCDIR),%)
$(gb_XSLTPROCTARGET)
+ $(call gb_ComponentTarget_get_source,%) $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
-$(call gb_ComponentTarget_get_target,%) :
- $(eval $(call gb_Outpt_error,Unable to find component file $(call
gb_ComponentTarget_get_source,,$*) in the repositories:
$(gb_ComponentTarget_REPOS) or xsltproc is missing.))
-
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
commit 589ca848c2170ce1a67a33ad3a19a71d8d606e64
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Aug 8 19:04:25 2012 +0200
gbuild: there are no old components anymore
..and binfilter will die
Change-Id: I9a773f06ed5332c2258f0a29ea39349b27ece2ac
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a3e91de..190e40b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -258,31 +258,6 @@ $(foreach component,$(call
gb_CppunitTest__filter_not_built_components,$(2)),$(c
endef
-define gb_CppunitTest_add_old_component
-$$(call gb_Output_error,\
- gb_CppunitTest_add_old_component: use gb_CppunitTest_use_old_component
instead.)
-endef
-
-define gb_CppunitTest_use_old_component
-$(call gb_CppunitTest_get_target,$(1)) : \
- $(call gb_CppunitTest__get_old_component_target,$(2))
-$(call gb_CppunitTest_get_target,$(1)) : \
- UNO_SERVICES += $(call gb_ComponentTarget__get_old_component_target,$(2))
-
-endef
-
-define gb_CppunitTest_add_old_components
-$$(call gb_Output_error,\
- gb_CppunitTest_add_old_components: use gb_CppunitTest_use_old_components
instead.)
-endef
-
-define gb_CppunitTest_use_old_components
-$(foreach component,$(2),$(call
gb_CppunitTest_use_old_component,$(1),$(component)))
-
-endef
-
-gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
-
define gb_CppunitTest__use_configuration
$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call
gb_Helper_make_url,$(3))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 7a85ff2..0328156 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -25,24 +25,12 @@
# 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>" &&) \
+ $(foreach component,$(COMPONENTS),echo "<filename>$(call
gb_ComponentTarget_get_outdir_target,$(component))</filename>" &&) \
echo '</list>' \
) > $(1).input && \
$(gb_XSLTPROC) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt
$(1).input && \
@@ -78,7 +66,7 @@ $$(eval $$(call gb_Module_register_target,$(call
gb_Rdb_get_outdir_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)) : $(call
gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2)
commit 8e808a6fa82bac89bc32cbd16544a0dbfc63a365
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Aug 8 16:19:02 2012 +0200
these are set in configure
Change-Id: I8b130ecf9bac4ae5b0ec3d88a9f06fa2976ee228
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 27c9d64..279d5b9 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -26,9 +26,6 @@
#
#*************************************************************************
-GUI := UNX
-COM := GCC
-
gb_CPUDEFS := -DARM32
ifeq ($(CC),)
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index bf582c2..01f3e1e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -26,8 +26,6 @@
#
#*************************************************************************
-GUI := UNX
-
gb_Executable_EXT:=
include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 555aab1..b551130 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -26,8 +26,6 @@
#
#*************************************************************************
-GUI := UNX
-
gb_Executable_EXT:=
include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index 7bc1f0d..f33029f 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -25,8 +25,6 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-GUI := WNT
-
gb_Helper_get_rcfile = $(1).ini
gb_Helper_LIBRARY_PATH_VAR := PATH
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
