subject:"\[Libreoffice\-commits\] .\: solenv\/gbuild"

[Libreoffice-commits] .: solenv/gbuild

2013-02-01 Thread Luboš Luňák

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36e6f222cf9150407edf9dcf99b9eb1b2c597bed
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Feb 1 14:57:44 2013 +0100

one more config_host/ breakage

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 5ef198c..d52a4c1 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -162,7 +162,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
 gb_LinkTarget_INCLUDE :=\
$(subst -I. , ,$(SOLARINC)) \
$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-   -I$(BUILDDIR)/config \
+   -I$(BUILDDIR)/config_$(gb_Side) \
 
 gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-30 Thread Libreoffice Gerrit user

 solenv/gbuild/Rdb.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 161b43abb76a4180a7069d04ed251ad2108c9663
Author: Stephan Bergmann 
Date:   Wed Jan 30 09:44:24 2013 +0100

Apparent copy/paste typo

Change-Id: Ie4986f36f7f71df64b1c7c7b5e0190f4d5708c64

diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index e4df44c..bcaa3ff 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -60,7 +60,7 @@ $(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)) \
| $(dir $(call gb_Rdb_get_outdir_target,$(1))).dir
-$(call gb_Deliver_add_deliverable,$(call 
gb_ResTarget_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_Rdb_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
 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-21 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/solaris.mk |1 -
 solenv/gbuild/platform/unxgcc.mk  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 488823a140217e393298bc83e75084041a85ed45
Author: Stephan Bergmann 
Date:   Mon Jan 21 16:52:06 2013 +0100

Remove -Wsign-promo

...to avoid unhelpful "passing [enum] chooses 'int' over 'unsigned int'"
warnings from those new calls to rtl::OUString::number as introduced with
63bcb139b941a2eff1b5ad367046bca067e7d1f8 "Replaced O[U]String::valueOf(
static_cast<> ) with O[U]String::number()."

Change-Id: I2adb16e83865bd4cba4a1650eb54bb7f5cee31e0

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 1ae3f3c..67c5e88 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -69,7 +69,6 @@ gb_CXXFLAGS := \
$(gb_CXXFLAGS_COMMON) \
-fPIC \
-Wshadow \
-   -Wsign-promo \
-Woverloaded-virtual \
-Wno-non-virtual-dtor \
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index eaa567e..5f1eb80 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -54,7 +54,6 @@ gb_CXXFLAGS := \
$(gb_CXXFLAGS_COMMON) \
-fPIC \
-Wshadow \
-   -Wsign-promo \
-Woverloaded-virtual \
 
 ifneq ($(COM_GCC_IS_CLANG),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-16 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 41cc024a39d070911a5daa75ff8aa9340c71147e
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Jan 16 19:25:50 2013 +0100

T_xxxFLAGS_APPEND fixups

http://lists.freedesktop.org/archives/libreoffice/2013-January/043792.html

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 38cece0..0ec033f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -165,16 +165,16 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 define gb_CxxObject__set_pchflags
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND) 
$$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) 
$$(T_CXXFLAGS_APPEND) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call 
gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
 $$(info No precompiled header available for $$*.cxx .)
 $$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) 
$$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
 $$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) 
$$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info .   object flags: $$(sort $$(T_CXXFLAGS) $$(DEFS)))
+$$(info .   object flags: $$(sort $$(T_CXXFLAGS) 
$$(T_CXXFLAGS_APPEND) $$(DEFS)))
 $$@ : PCHFLAGS :=
 endif
 endif
@@ -542,11 +542,17 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND :=
+$(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := 
$$(gb_LinkTarget_CXXFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND :=
+$(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := 
$$(gb_LinkTarget_CXXFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := 
$$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND :=
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := 
$$(gb_LinkTarget_OBJCFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) 
$$(call gb_LinkTarget_rtl_defs,$(1)) $(CPPFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-14 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |   16 
 solenv/gbuild/platform/com_GCC_class.mk |   12 ++--
 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit fabae54c51c25dcb28febe8181de8a5ee360ce1b
Author: MatÃºÅ¡ Kukan 
Date:   Thu Jan 10 20:40:00 2013 +0100

append library specific compile flags at the end

Change-Id: If9d4640b59dd411734a581c66f9310d31ab9fbb7
Reviewed-on: https://gerrit.libreoffice.org/1632
Tested-by: Norbert Thiebaud 
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 2fb94f0..38cece0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -632,9 +632,9 @@ endif
 endef
 
 define gb_LinkTarget_add_cflags
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND += $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS_APPEND += $(2)
 endif
 
 endef
@@ -648,11 +648,11 @@ endef
 
 define gb_LinkTarget_add_cxxflags
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
 endif
 endef
@@ -664,9 +664,9 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget_add_objcxxflags
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
 endif
 endef
 
@@ -683,9 +683,9 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget_add_objcflags
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
 endif
 
 endef
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 350e000..4ea1a14 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \
-   $(T_CFLAGS) \
+   $(T_CFLAGS) $(T_CFLAGS_APPEND) \
-c $(3) \
-o $(1) \
$(call gb_cxx_dep_generation_options,$(1),$(4)) \
@@ -83,7 +83,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CC) \
$(DEFS) \
-   $(T_CFLAGS) \
+   $(T_CFLAGS) $(T_CFLAGS_APPEND) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
@@ -105,7 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \
-   $(T_CXXFLAGS) \
+   $(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
-c $(3) \
-o $(1) \
$(call gb_cxx_dep_generation_options,$(1),$(4)) \
@@ -124,7 +124,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CXX) \
$(DEFS) \
-   $(T_CXXFLAGS) \
+   $(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
@@ -142,7 +142,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(DEFS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-   $(T_OBJCXXFLAGS) \
+   $(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \
-c $(3) \
-o $(1) \
-MMD -MT $(1) \
@@ -161,7 +161,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(DEFS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-   $(T_OBJCFLAGS) \
+   $(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND) \

[Libreoffice-commits] .: solenv/gbuild

2013-01-07 Thread Libreoffice Gerrit user

 solenv/gbuild/UI.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 85e36d2baa54eb7b65cc680389eacb2b5884c100
Author: David Tardon 
Date:   Mon Jan 7 10:08:21 2013 +0100

deliver qtz translations for .ui files

regression from 76091d814ca084ba66fcb9db8bc4565c47ee16a5

Change-Id: I70c27cd3f72c453a1b4c2fb65b6172c8c251a741

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 5e28464..6078df3 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -158,9 +158,10 @@ $(foreach lang,$(3),$(call 
gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
 
 endef
 
-# gb_UI__add_translations target uifile langs
+# gb_UI__add_translations target uifile langs qtz
 define gb_UI__add_translations
-$(if $(strip $(3)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(3) $(4)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(4)),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(strip $(4
 
 endef
 
@@ -171,7 +172,8 @@ define gb_UI__add_uifile_translations
 $(call gb_UI__add_translations,$(1),$(2),\
$(foreach lang,$(gb_UI_LANGS),\
$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(2))).po),$(lang)) \
-   ) \
+   ),\
+   $(filter qtz,$(gb_UI_LANGS)) \
 )
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-06 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/android.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c441a51fd04a81020529b5f2bdaab72c9b332143
Author: Tor Lillqvist 
Date:   Mon Jan 7 01:45:54 2013 +0200

mkdir before touching

Change-Id: I262d479e0db7197e9afc7d8e9002862ae4f82a01

diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index 690b886..1f4bf81 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -113,7 +113,7 @@ gb_CppunitTest_EXT := .a
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(if $(filter CppunitTest,$(TARGETTYPE)), \
-   touch $(1), \
+   mkdir -p $(dir $(1)) && touch $(1), \
$(call gb_LinkTarget__command_staticlink,$(1)))
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-06 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/android.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ad9d21ac7111f6a3e68f55980f1308a32d3a954
Author: Tor Lillqvist 
Date:   Sun Jan 6 22:12:05 2013 +0200

Let's save a bit of disk space

Change-Id: I23c9d218792cd3debf30ea59c81e6687a656af31

diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index 526c18c..690b886 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -108,9 +108,13 @@ endef
 
 gb_CppunitTest_EXT := .a
 
+# No use for Cppunit targets now for Android (which would be just
+# static archives), they are just a waste of disk space.
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
-$(call gb_LinkTarget__command_staticlink,$(1))
+$(if $(filter CppunitTest,$(TARGETTYPE)), \
+   touch $(1), \
+   $(call gb_LinkTarget__command_staticlink,$(1)))
 endef
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-03 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 87f2e713ea819d1e36084ba7813ee6671237206c
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jan 3 17:50:43 2013 +0100

do not set LD_LIBRARY_PATH twice for unittests at all

It is already set by gb_CppunitTest_CPPTESTPRECOMMAND (or should be),
and doing it here again causes problems avoided
by 265feeb31ffc08cd4ccbe48398cd41d9cf1e2a25 , or when ICECREAM_RUN is set.

Change-Id: I5ebe8ad735ea6ff8cb1c205c55c45b93550c8b55

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 47c8687..e578dc03 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -53,13 +53,7 @@ endif
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions 
do not pop up as message box, but are routed to the shell
 ifneq ($(CROSS_COMPILING),YES)
 gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
-ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
-else ifneq ($(strip $(GDBCPPUNITTRACE)),)
 gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
-else
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_Helper_set_ld_path) $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
-endif
 endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call 
gb_CppunitTest_get_filename,$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-02 Thread Libreoffice Gerrit user

 solenv/gbuild/UI.mk |   34 +-
 1 file changed, 29 insertions(+), 5 deletions(-)

New commits:
commit 76091d814ca084ba66fcb9db8bc4565c47ee16a5
Author: David Tardon 
Date:   Wed Jan 2 13:51:20 2013 +0100

only package .ui translations that can be produced

That means that there is corresponding .po file for given language.

As a slight optimization, do not even try to run uiex if _no_
translation would be produced.

Change-Id: I901e88b20edfb55e4f8bc661bacf8218b603bdcb

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 16624813..5e28464 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -148,6 +148,34 @@ $(call 
gb_UI__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)
 
 endef
 
+# gb_UI__add_translations_impl target uifile langs
+define gb_UI__add_translations_impl
+$(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
+$(call gb_UI_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
+$(call gb_UI_get_clean_target,$(1)) : $(call 
gb_UILocalizeTarget_get_clean_target,$(2))
+$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call 
gb_UILocalizeTarget_get_target,$(2))
+$(foreach lang,$(3),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
+
+endef
+
+# gb_UI__add_translations target uifile langs
+define gb_UI__add_translations
+$(if $(strip $(3)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
+
+endef
+
+# Adds translations for languages that have corresponding .po file
+#
+# gb_UI__add_uifile_translations target uifile
+define gb_UI__add_uifile_translations
+$(call gb_UI__add_translations,$(1),$(2),\
+   $(foreach lang,$(gb_UI_LANGS),\
+   $(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(2))).po),$(lang)) \
+   ) \
+)
+
+endef
+
 # Adds .ui file to the package
 #
 # The file is relative to $(SRCDIR) and without extension.
@@ -157,11 +185,7 @@ define gb_UI_add_uifile
 $(call gb_UI__add_uifile,$(1),$(2))
 
 ifneq ($(gb_UI_LANGS),)
-$(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
-$(call gb_UI_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
-$(call gb_UI_get_clean_target,$(1)) : $(call 
gb_UILocalizeTarget_get_clean_target,$(2))
-$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call 
gb_UILocalizeTarget_get_target,$(2))
-$(foreach lang,$(gb_UI_LANGS),$(call 
gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
+$(call gb_UI__add_uifile_translations,$(1),$(2))
 endif
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2013-01-02 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 265feeb31ffc08cd4ccbe48398cd41d9cf1e2a25
Author: Noel Grandin 
Date:   Wed Jan 2 13:32:09 2013 +0200

fix 'DEBUGCPPUNIT=TRUE make subsequenttest'

When running a unit test under GDB, we do not want to prefix the
cppunittester executable with the LD_LIBRARY_PATH, because that has
already happened before the "gdb --args" part of the command line.

Change-Id: If3f81ba3fc3e5260142d7e9c2d4a78e9ca63382c
Reviewed-on: https://gerrit.libreoffice.org/1532
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 9c145b6..47c8687 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -53,7 +53,13 @@ endif
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions 
do not pop up as message box, but are routed to the shell
 ifneq ($(CROSS_COMPILING),YES)
 gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_command,cppunit/cppunittester)
+ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
+gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
+else ifneq ($(strip $(GDBCPPUNITTRACE)),)
+gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
+else
+gb_CppunitTest_CPPTESTCOMMAND := $(gb_Helper_set_ld_path) $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
+endif
 endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call 
gb_CppunitTest_get_filename,$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-31 Thread Libreoffice Gerrit user

 solenv/gbuild/Helper.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd9655868e60af0f67de715f1f04aa0989b6b58b
Author: David Tardon 
Date:   Mon Dec 31 20:19:14 2012 +0100

fix gb_Helper_execute

Change-Id: Ia3aa20d59a2d2a6e691242a420b3816fe0621325

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 898ac44..b587fa9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -206,7 +206,7 @@ $(foreach def,$(1),$(if $(filter TRUE 
YES,$($(def))),-D$(def)))
 endef
 
 define gb_Helper_execute
-$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,$(1))
+$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,$(firstword $(1))) 
$(wordlist 2,$(words $(1)),$(1))
 endef
 
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker 
need to use
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-31 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk|8 
 solenv/gbuild/CliUnoApi.mk   |4 ++--
 solenv/gbuild/Configuration.mk   |4 ++--
 solenv/gbuild/CppunitTest.mk |4 ++--
 solenv/gbuild/Dictionary.mk  |4 ++--
 solenv/gbuild/Executable.mk  |   24 
 solenv/gbuild/ExtensionTarget.mk |   24 
 solenv/gbuild/InstallModuleTarget.mk |   12 ++--
 solenv/gbuild/SdiTarget.mk   |4 ++--
 solenv/gbuild/TargetLocations.mk |   30 ++
 solenv/gbuild/UI.mk  |4 ++--
 solenv/gbuild/UnoApiTarget.mk|   16 
 12 files changed, 72 insertions(+), 66 deletions(-)

New commits:
commit 7d6112773e806630eeaffbfedb6ee89e81d2f8fc
Author: David Tardon 
Date:   Mon Dec 31 12:59:47 2012 +0100

I did not want to push that...

It does not work, anyway.

This reverts commit ee18b30b0391a443a51d7b97060f118478c202af.

Change-Id: Ibe21a2a62ecbfaf8dcd87113bde386050ffde25a

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 2af2a2e..c85b612 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -47,8 +47,8 @@
 
 # SrsPartMergeTarget class
 
-gb_SrsPartMergeTarget_TRANSEXDEPS = $(call 
gb_Executable_get_runtime_dependencies,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call 
gb_Executable_get_command,transex3)
+gb_SrsPartMergeTarget_TRANSEXDEPS := $(call 
gb_Executable_get_runtime_dependencies,transex3)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call 
gb_Executable_get_command,transex3)
 
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
@@ -86,8 +86,8 @@ endef
 # defined by platform
 #  gb_SrsPartTarget__command_dep
 
-gb_ResTarget_RSCDEPS = $(call gb_Executable_get_runtime_dependencies,rsc)
-gb_ResTarget_RSCCOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call 
gb_Executable_get_command,rsc)
+gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
+gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin 
$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc)
 
 define gb_SrsPartTarget__command
 $(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 5690413..92e599c 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -11,8 +11,8 @@
 
 gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
 
-gb_CliUnoApiTarget_DEPS = $(call 
gb_Executable_get_runtime_dependencies,climaker)
-gb_CliUnoApiTarget_COMMAND = $(call gb_Executable_get_command,climaker)
+gb_CliUnoApiTarget_DEPS := $(call 
gb_Executable_get_runtime_dependencies,climaker)
+gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApiTarget__command
 $(call gb_Output_announce,$(2),$(true),CLI,4)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 98f60dd..328c5a8 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -251,8 +251,8 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 # XcuMergeTarget class
 
-gb_XcuMergeTarget_CFGEXDEPS = $(call 
gb_Executable_get_runtime_dependencies,cfgex)
-gb_XcuMergeTarget_CFGEXCOMMAND = $(call gb_Executable_get_command,cfgex)
+gb_XcuMergeTarget_CFGEXDEPS := $(call 
gb_Executable_get_runtime_dependencies,cfgex)
+gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
 
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0fec6bf..9c145b6 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -52,8 +52,8 @@ endif
 #  gb_CppunitTest_get_filename
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions 
do not pop up as message box, but are routed to the shell
 ifneq ($(CROSS_COMPILING),YES)
-gb_CppunitTest_CPPTESTDEPS = $(call 
gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND = $(call 
gb_Executable_get_command,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_command,cppunit/cppunittester)
 endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call 
gb_CppunitTest_get_filename,$(1))
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 3397626..b916da2 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -11,8 +11,8 @@
 
 gb_ThesaurusIndexTarget_CHECK_TARGET := $(SRCDIR)/dictionaries/util/th_check.pl
 gb_ThesaurusIndexTarget_CHECK_COMMAND := PERL_UNICODE=0 $(PERL) -w 
$(gb_ThesaurusIndexTarget_CHECK_TARGET)
-gb_ThesaurusIndexTarget_INDEX_DEPS = $(call 
gb_Executable_get_runtime_dependenc

[Libreoffice-commits] .: solenv/gbuild

2012-12-31 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35aec8c0c028a0f071c184521a23c382333e5e3b
Author: David Tardon 
Date:   Mon Dec 31 09:11:37 2012 +0100

fix stupid typo

Change-Id: If10b00f0e19d7199380af16fedbdf2e9d0ad6871

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index f21c2e1..c003217 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -37,7 +37,7 @@ gb_ExtensionTarget_XRMEXDEPS := $(call 
gb_Executable_get_runtime_dependencies,xr
 gb_ExtensionTarget_XRMEXCOMMAND := $(call gb_Executable_get_command,xrmex)
 
 gb_ExtensionTarget_PROPMERGEDEPS := $(call 
gb_Executable_get_runtime_dependencies,propex)
-gb_ExtensionTarget_PROPMERGECOMMAND := $(call 
gb_Executable_get_command,propmerge)
+gb_ExtensionTarget_PROPMERGECOMMAND := $(call gb_Executable_get_command,propex)
 
 gb_ExtensionTarget_TREEXDEPS := $(call 
gb_Executable_get_runtime_dependencies,treex)
 gb_ExtensionTarget_TREEXCOMMAND := $(call gb_Executable_get_command,treex)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-30 Thread Libreoffice Gerrit user

 solenv/gbuild/Executable.mk  |   25 -
 solenv/gbuild/TargetLocations.mk |   25 +
 2 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit e4cb67b4dabe40fdf8ce703d6739db7863c52fb4
Author: David Tardon 
Date:   Sun Dec 30 18:13:09 2012 +0100

these functions must be defined early

... because their result is assigned to variables in various gbuild
classes.

Change-Id: I07c0fc54e10ddd76a6246ac4e9ed56541c9c1257

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 4683d0e..403497e 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -169,29 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2)
 
 endef
 
-# Get dependencies needed for running the executable
-#
-# This is not strictly necessary, but it makes the use more similar to
-# ExternalExecutable.
-#
-# gb_Executable_get_runtime_dependencies executable
-define gb_Executable_get_runtime_dependencies
-$(call gb_Executable_get_runtime_target,$(1))
-endef
-
-define gb_Executable__get_command
-$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call 
gb_Output_error,executable group NONE does not exist!))
-$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
-$(call gb_Executable_get_target_for_build,$(1))
-endef
-
-# Get complete command-line for running the executable
-#
-# This includes setting library path, if necessary.
-#
-# gb_Executable_get_command executable
-define gb_Executable_get_command
-$(strip $(call gb_Executable__get_command,$(1)))
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b201fbb..539c0aa 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -343,6 +343,31 @@ define gb_StaticLibrary_get_filename
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
+# Get dependencies needed for running the executable
+#
+# This is not strictly necessary, but it makes the use more similar to
+# ExternalExecutable.
+#
+# gb_Executable_get_runtime_dependencies executable
+define gb_Executable_get_runtime_dependencies
+$(call gb_Executable_get_runtime_target,$(1))
+endef
+
+define gb_Executable__get_command
+$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call 
gb_Output_error,executable group NONE does not exist!))
+$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
+$(call gb_Executable_get_target_for_build,$(1))
+endef
+
+# Get complete command-line for running the executable
+#
+# This includes setting library path, if necessary.
+#
+# gb_Executable_get_command executable
+define gb_Executable_get_command
+$(strip $(call gb_Executable__get_command,$(1)))
+endef
+
 gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
 gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
 gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call 
gb_StaticLibrary_get_filename,$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-28 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk  |2 +-
 solenv/gbuild/Configuration.mk |7 +++
 solenv/gbuild/ExtensionTarget.mk   |   14 +-
 solenv/gbuild/InstallModuleTarget.mk   |7 +++
 solenv/gbuild/UI.mk|3 +--
 solenv/gbuild/extensions/pre_SharedLangList.mk |2 ++
 6 files changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 7dd273da8a2c6ccd851d756f1cc7f6ea6f0961c8
Author: Zolnai TamÃ¡s 
Date:   Mon Dec 24 06:19:40 2012 +0100

Delete some lang variable

Change-Id: I4df609dad5de0cc45f00f4c4054b59fa014bb432

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 0dd69e5..65105b6 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY)
mkdir -p $(dir $@) && cp $< $@)
 
 define gb_SrsPartMergeTarget_SrsPartMergeTarget
-$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach 
lang,$(filter-out qtz,$(filter-out 
en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po)))
+$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po)))
 endef
 
 define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 47645a6..59e8a96 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -253,7 +253,6 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 gb_XcuMergeTarget_CFGEXTARGET := $(call 
gb_Executable_get_target_for_build,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) 
$(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_LANGS := $(filter-out qtz,$(filter-out 
en-US,$(gb_WITH_LANG)))
 
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
@@ -286,10 +285,10 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
 define gb_XcuMergeTarget_XcuMergeTarget
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
-   $(wildcard $(foreach 
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po))
+   $(wildcard $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po))
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
-   POFILES := $(foreach 
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po)
-$(foreach 
lang,$(gb_XcuMergeTarget_TRANS_LANG),$(gb_POLOCATION)/$(lang)/$(patsubst 
%/,%,$(dir $(1))).po) :
+   POFILES := $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
%/,%,$(dir $(1))).po) :
 endef
 
 
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index b3fb4f0..4899e13 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -148,10 +148,10 @@ $(call 
gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
 
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : \
-   POFILES := $(foreach lang,$(filter-out 
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po)
+   POFILES := $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
-   $(foreach lang,$(filter-out 
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po)
-$(foreach lang,$(filter-out 
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po) :
+   $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
 endif
 
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -235,9 +235,9 @@ endef
 # localize .properties file
 # source file is copied to $(WORKDIR)
 define gb_ExtensionTarget_localize_properties
-ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),)
+ifneq ($(gb_TRANS_LANGS),)
 ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
-$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst 
en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out 
en-US,$(gb_ExtensionTarget_ALL_LANGS
+$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst 
en_US,qtz,$(2)),$(3),qtz,$(firstword $(gb_TRANS_LANGS)))
 endif
 endif
 $(foreach lang,$(filter-out qtz,$(gb_ExtensionTarget_ALL_LANGS)),\
@@ -326,7 +326,6 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done 
: \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done : \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)

Re: [Libreoffice-commits] .: solenv/gbuild svl/source sw/source tools/source

2012-12-27 Thread Tor Lillqvist

Yep, I noticed too, will commit a follow-up fix in a moment.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] .: solenv/gbuild svl/source sw/source tools/source

2012-12-27 Thread Lubos Lunak

On Thursday 27 of December 2012, Libreoffice Gerrit user wrote:
> commit c318f3b0224a57102614be0efec4b49c80a3aa82
> Author: Tor Lillqvist 
> Date:   Thu Dec 27 13:07:11 2012 +0200
>
> Check for _MSC_VER instead of MSC in sources
>
> Change-Id: Ibaf2501e6b655913963a53c1cd63668f1c4cccb2
>
> diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
> b/solenv/gbuild/platform/com_MSC_defs.mk index 1e9ac46..1e8004f 100644
> --- a/solenv/gbuild/platform/com_MSC_defs.mk
> +++ b/solenv/gbuild/platform/com_MSC_defs.mk
> @@ -50,7 +50,6 @@ gb_CXX := $(CXX)
>  endif
>
>  gb_COMPILERDEFS := \
> - -DMSC \
>   -D_CRT_NON_CONFORMING_SWPRINTFS \
>   -D_CRT_NONSTDC_NO_DEPRECATE \

 You have not removed all usage of this #define. I can see a number of '#ifdef 
MSC' in the sources (and I don't know if there are also other variants).

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/gbuild svl/source sw/source tools/source

2012-12-27 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 svl/source/inc/poolio.hxx  |2 +-
 sw/source/filter/html/css1atr.cxx  |4 +++-
 sw/source/filter/html/htmlatr.cxx  |4 +++-
 sw/source/filter/ww8/ww8atr.cxx|4 +++-
 tools/source/fsys/dirent.cxx   |2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit c318f3b0224a57102614be0efec4b49c80a3aa82
Author: Tor Lillqvist 
Date:   Thu Dec 27 13:07:11 2012 +0200

Check for _MSC_VER instead of MSC in sources

Change-Id: Ibaf2501e6b655913963a53c1cd63668f1c4cccb2

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 1e9ac46..1e8004f 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -50,7 +50,6 @@ gb_CXX := $(CXX)
 endif
 
 gb_COMPILERDEFS := \
-   -DMSC \
-D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index dd3e74a..13477eb 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -142,7 +142,7 @@ struct SfxItemPool_Impl
 #  undef DBG
 #endif
 
-#if defined(DBG_UTIL) && defined(MSC)
+#if defined(DBG_UTIL) && defined(_MSC_VER)
 #define DBG(x) x
 #else
 #define DBG(x)
diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 46c1ddb..796ac3c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -103,7 +103,9 @@ using ::editeng::SvxBorderLine;
  * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
  */
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(UNX) && !defined(_MSC_VER) && !defined(PPC) && 
!defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So 
remove this line and please tell me --t...@iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 7bd1af6..d48202e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -86,7 +86,9 @@ using namespace ::com::sun::star;
  * diese Section und die dazugeherigen Tabellen muessen in folgenden Files
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
  */
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(UNX) && !defined(_MSC_VER) && !defined(PPC) && 
!defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So 
remove this line and please tell me --t...@iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b45ee1a..2c9c3e9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -140,7 +140,9 @@ using namespace nsSwDocInfoSubType;
  * gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
 */
 
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(__MINGW32__)
+#if !defined(_MSC_VER) && !defined(UNX) && !defined(PPC) && 
!defined(__MINGW32__)
+
+#error Interesting, I though this ifdef block would never be compiled. So 
remove this line and please tell me --t...@iki.fi
 
 #define ATTRFNTAB_SIZE 130
 #if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index cc0d3ff..1e9000b 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1337,7 +1337,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
  * Welcome to the 21st century, we can have longer filenames now ;)
  * New format: pfx + "5 char milli/micro second res" + "current 
pid" + ".tmp"
  */
-#if (defined MSC || defined __MINGW32__) && defined WNT
+#ifdef _WIN32
 /* Milliseconds !! */
 static unsigned long u = GetTickCount();
 unsigned long mypid = static_cast(_getpid());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-22 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/IOS_ARM_GCC.mk |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 86c0b5d23af740460107668704949f90ae0cc7b8
Author: Tor Lillqvist 
Date:   Sun Dec 23 00:12:06 2012 +0200

Use CXXFLAGS_CXX11 here, too

Change-Id: I82735e3f09f22763ef48aab18dee867159dbf842

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index bd617e4..de8c590 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -62,15 +62,8 @@ gb_CXXFLAGS := \
-Wno-ctor-dtor-privacy \
-Wno-non-virtual-dtor \
-fno-strict-aliasing \
-   -fsigned-char
-
-# No idea if -malign-natural is needed, but macosx.mk uses it...
-# Why it isn't used in gb_CFLAGS I have no idea.
-# Anyway, Clang doesn't have this option.
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_CXXFLAGS += \
-   -malign-natural
-endif
+   -fsigned-char \
+   $(CXXFLAGS_CXX11) \
 
 # these are to get gcc to switch to Objective-C++ or Objective-C mode
 gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch 
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-19 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e9f373e35fd54e5cca4bf1eb5bf86230264d235
Author: Michael Meeks 
Date:   Tue Dec 18 16:25:07 2012 +

serialize all unit tests runs with icecream_run.

Change-Id: Iaed997a4c9a36d618934c5870c65c3006c44561d

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 6ea7f27..55d1181 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true)
 endif
 
 ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := $(ICECREAM_RUN) valgrind --tool=$(VALGRIND) 
--num-callers=50 --error-exitcode=1 --quiet --leak-check=no
+gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 
--error-exitcode=1 --quiet --leak-check=no
 ifeq ($(strip $(VALGRIND)),memcheck)
 G_SLICE := always-malloc
 GLIBCXX_FORCE_NEW := 1
@@ -91,7 +91,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_CPPTESTTARGET)
DISABLE_SAL_DBGBOX=t \
$(if 
$(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
STAR_RESOURCEPATH=$(dir $(call 
gb_ResTarget_get_outdir_target,example)) \
-   $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) 
$(gb_CppunitTest_CPPTESTTARGET) \
+   $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \
$(call gb_LinkTarget_get_target,CppunitTest/$(call 
gb_CppunitTest_get_libfilename,$*)) \
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat 
$@.log && $(UNIT_FAILED_MSG) && false
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-14 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bef07dc079523e9955c10e7792cbcdb818237cf2
Author: MatÃºÅ¡ Kukan 
Date:   Thu Dec 6 20:45:11 2012 +0100

let's have plain 'make' without '-r' even faster

Change-Id: I8338a6be0afbad456d1c5ca5d5a1b8a26ffca8ad
Reviewed-on: https://gerrit.libreoffice.org/1257
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9e621cd..5898cde 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -54,7 +54,8 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # FOR TAIL_BUILD THE IMPACT IS HUGE!
 # (unless you are doing make -r, which we should explicitly NOT require from
 # users)
-MAKEFLAGS+=-r
+MAKEFLAGS += r
+.SUFFIXES:
 
 # by default gbuild use /bin/sh
 # if you want to use a particular shell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-13 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit b988f64d37f1e46fb5a9449758b379fc01661fa2
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Dec 12 17:48:52 2012 +0100

do not disable msvc warning 4005

And in fact make it an error with PCH, as there's it's very likely
a PCH-specific problem.
History refers to i76713 when introducing this, and that was something
about .NET 2005, so this quite likely no longer applies.

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index e8d2f29..bea9b91 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -74,8 +74,6 @@ gb_AFLAGS := /c /Cp
 # cleaning away from the code, to avoid warnings when building with
 # gcc or Clang and -Wall -Werror.
 
-# C4005: 'identifier' : macro redefinition
-
 # C4127: conditional expression is constant
 
 # C4180: qualifier applied to function type has no meaning; ignored
@@ -149,7 +147,6 @@ gb_CFLAGS := \
-MD \
-nologo \
-W4 \
-   -wd4005 \
-wd4127 \
-wd4180 \
-wd4189 \
@@ -183,7 +180,6 @@ gb_CXXFLAGS := \
-MD \
-nologo \
-W4 \
-   -wd4005 \
-wd4127 \
-wd4180 \
-wd4189 \
@@ -220,11 +216,14 @@ ifeq ($(VCVER),100)
 
 endif
 
+# C4005: 'identifier' : macro redefinition
+
 gb_PCHWARNINGS = \
-we4650 \
-we4651 \
-we4652 \
-we4653 \
+   -we4005 \
 
 gb_STDLIBS := \
advapi32.lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-10 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c74fe188b178fab821084bb82d4574f77dc2e1ce
Author: Tor Lillqvist 
Date:   Mon Dec 10 19:33:43 2012 +0200

Create executables that can be run on Windows XP

Specify subsystem version 5.01 in the linker options. Otherwise, when
built with the linker in Windows Kit 8.0, executables are created with
the "operating system version" and "subsystem version" fields set to
6.0 (which means Vista).

Attempting to run such executables on Windows XP fails with an error
that claims them to be "invalid Win32 executables" (which is a blatant
lie, of course).

We can well set the subsystem version to 5.01 as we don't
unconditionally use any APIs that wouldn't be present on XP.

Note that you need Visual Studio 2012 Update 1 to be able to create
code that runs on XP. The original version creates executables that
importx entries from kernel32.dll like GetTickCount64 that aren't
present on XP.

Apparently it doesn't hurt on XP that DLL headers specify a "too new"
subsystem version.

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index ed08ec3..2d4d19e 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -187,7 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter 
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-   $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, 
-SUBSYSTEM:CONSOLE) \
+   $(if $(filter YES,$(TARGETGUI)), 
-SUBSYSTEM:WINDOWS$(COMMA)5.01, -SUBSYSTEM:CONSOLE$(COMMA)5.01) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-10 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.help.txt |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 688c668003739042c2431ec3f7a94d6b3ac6998a
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Dec 10 15:15:21 2012 +0100

little help for userfriendly gbuild make targets

Change-Id: I6b650781b11163eb99828d0d933ae9a38e0e09fa

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 8c30402..504cce7 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -46,6 +46,9 @@ AVAILABLE TARGETS
cmd  execute the command contained in the variable cmd=""
 in a shell with config_host.mk or config_build.mk
 environement set. (see gb_SIDE)
+build gbuild target (such as Library_vbaswobj or
+CppunitTest_sw_macros_test)
+   .clean   clean gbuild target
 
 INTERACTIVE VARIABLES:
DEBUG / debug   If not empty, build as with --enable-debug.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-10 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk |1 +
 solenv/gbuild/AllLangZip.mk   |1 +
 solenv/gbuild/CliLibrary.mk   |1 +
 solenv/gbuild/CliNativeLibrary.mk |1 +
 solenv/gbuild/CliUnoApi.mk|1 +
 solenv/gbuild/Configuration.mk|2 ++
 solenv/gbuild/CppunitTest.mk  |1 +
 solenv/gbuild/CustomTarget.mk |1 +
 solenv/gbuild/Dictionary.mk   |1 +
 solenv/gbuild/Executable.mk   |1 +
 solenv/gbuild/Extension.mk|1 +
 solenv/gbuild/ExternalPackage.mk  |1 +
 solenv/gbuild/ExternalProject.mk  |1 +
 solenv/gbuild/Helper.mk   |7 +++
 solenv/gbuild/InstallModule.mk|1 +
 solenv/gbuild/InstallScript.mk|1 +
 solenv/gbuild/InternalUnoApi.mk   |1 +
 solenv/gbuild/Jar.mk  |1 +
 solenv/gbuild/JunitTest.mk|4 
 solenv/gbuild/Library.mk  |1 +
 solenv/gbuild/Package.mk  |1 +
 solenv/gbuild/Pagein.mk   |1 +
 solenv/gbuild/Pyuno.mk|1 +
 solenv/gbuild/Rdb.mk  |1 +
 solenv/gbuild/StaticLibrary.mk|1 +
 solenv/gbuild/UI.mk   |2 ++
 solenv/gbuild/UnoApi.mk   |1 +
 solenv/gbuild/UnoApiMerge.mk  |1 +
 solenv/gbuild/UnpackedTarball.mk  |1 +
 solenv/gbuild/WinResTarget.mk |1 +
 solenv/gbuild/Zip.mk  |1 +
 31 files changed, 42 insertions(+)

New commits:
commit 28ae80a89dd44f32044a155a41c1106692feae61
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Dec 6 16:58:58 2012 +0100

userfriendly make targets for build and clean

So that now it's possible to do just
'make CppunitTest_sw_macros_test'
instead of
'make 
/home/llunak/build/src/l2/workdir/unxlngx6/CppunitTest/sw_macros_test.test'

Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33
Reviewed-on: https://gerrit.libreoffice.org/1253
Reviewed-by: Peter Foley 
Reviewed-by: David Ostrovsky 
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index f56bbf9..0dd69e5 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -453,6 +453,7 @@ define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
 $$(eval $$(call gb_Module_register_target,$(call 
gb_AllLangResTarget_get_target,$(1)),$(call 
gb_AllLangResTarget_get_clean_target,$(1
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget)
 
 endef
 
diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index fa3b9de..c02ddf1 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -40,6 +40,7 @@ $(foreach lang,$(gb_AllLangZip_LANGS),$(call 
gb_Zip_Zip_internal,$(1)_$(lang),$(
 $(call gb_AllLangZip_get_target,$(1)) :| $(dir $(call 
gb_AllLangZip_get_target,$(1))).dir
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_AllLangZip_get_target,$(1)),$(call gb_AllLangZip_get_clean_target,$(1
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangZip)
 
 endef
 
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 6b3a4ef..6302cf4 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -141,6 +141,7 @@ $(call gb_CliLibrary_get_clean_target,$(1)) : $(call 
gb_CliAssembly_get_clean_ta
 $(call gb_Deliver_add_deliverable,$(call gb_CliLibrary_get_target,$(1)),$(call 
gb_CliLibraryTarget_get_target,$(1)),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_CliLibrary_get_target,$(1)),$(call gb_CliLibrary_get_clean_target,$(1
+$(call gb_Helper_make_userfriendly_targets,$(1),CliLibrary)
 
 endef
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index f5c1249..ecf8fea 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -100,6 +100,7 @@ $(call gb_CliNativeLibrary_get_clean_target,$(1)) : $(call 
gb_CliAssembly_get_cl
 $(call gb_Deliver_add_deliverable,$(call 
gb_CliNativeLibrary_get_target,$(1)),$(call 
gb_CliNativeLibraryTarget_get_target,$(1)),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_CliNativeLibrary_get_target,$(1)),$(call 
gb_CliNativeLibrary_get_clean_target,$(1
+$(call gb_Helper_make_userfriendly_targets,$(1),CliNativeLibrary)
 
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f0a2735..f72a4e0 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -124,6 +124,7 @@ $(call gb_CliUnoApi_get_clean_target,$(1)) : $(call 
gb_CliAssembly_get_clean_tar
 $(call gb_Deliver_add_deliverable,$(call gb_CliUnoApi_get_target,$(1)),$(call 
gb_CliUnoApiTarget_get_target,$(1)),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_CliUnoApiTarget_get_target,$(1)),$(call 
gb_CliUnoApiTarget_get_clean_target,$(1
+$(call gb_Helper_make_userfriendly_targets,$(1),C

[Libreoffice-commits] .: solenv/gbuild

2012-12-06 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e43d62fb39e0b6b3e59b22110460d23b6d507b59
Author: Andras Timar 
Date:   Thu Dec 6 09:53:47 2012 +0100

rm intermediate files that are input of helpindexer and should not be 
packaged

Change-Id: I8b3e526fd413bd3ced75bf1cd81f9be2540bf9e8

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index ff5b790..b3fb4f0 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -428,6 +428,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done 
: \
 $$(HELPFILES)) && \
 $(gb_ExtensionTarget_HELPINDEXERCOMMAND) -lang $(2) -mod help \
 -dir $$(basename $$@) && \
+rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \
 touch $$@)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-05 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9802c4500978198034116c27fc6add66b0c37769
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Dec 5 11:39:36 2012 +0100

serialize valgrind using icerun

Change-Id: I9225f668d0e585126cec07daf7621d6c6cade841

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 047cf81..682ae30 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true)
 endif
 
 ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 
--error-exitcode=1 --quiet --leak-check=no
+gb_CppunitTest_VALGRINDTOOL := $(ICECREAM_RUN) valgrind --tool=$(VALGRIND) 
--num-callers=50 --error-exitcode=1 --quiet --leak-check=no
 ifeq ($(strip $(VALGRIND)),memcheck)
 G_SLICE := always-malloc
 GLIBCXX_FORCE_NEW := 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild solenv/inc

2012-12-03 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |   94 +
 solenv/inc/wntmsc.mk   |2 
 2 files changed, 4 insertions(+), 92 deletions(-)

New commits:
commit ba65900509659aaca010bfddb1b09861235d9844
Author: Tor Lillqvist 
Date:   Mon Dec 3 14:25:56 2012 +0200

Use -W4 instead of -Wall, and don't disable warnings that are off by default

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index b45d47a..a81b5df 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -76,18 +76,12 @@ gb_AFLAGS := /c /Cp
 
 # C4005: 'identifier' : macro redefinition
 
-# C4061: enumerator 'identifier' in switch of enum 'enumeration' is
-#   not explicitly handled by a case label
-
 # C4127: conditional expression is constant
 
 # C4180: qualifier applied to function type has no meaning; ignored
 
 # C4189: 'identifier' : local variable is initialized but not referenced
 
-# C4191: 'operator/operation' : unsafe conversion from 'type of
-#   expression' to 'type required'
-
 # C4242: 'identifier' : conversion from 'type1' to 'type2', possible
 #   loss of data
 
@@ -114,16 +108,11 @@ gb_AFLAGS := /c /Cp
 # C4290: C++ exception specification ignored except to indicate a
 #   function is not __declspec(nothrow)
 
-# C4350: behavior change: 'member1' called instead of 'member2'
-
 # C4351: new behavior: elements of array 'array' will be default
 #   initialized
 
 # C4355: 'this' : used in base member initializer list
 
-# C4365: 'action' : conversion from 'type_1' to 'type_2',
-#   signed/unsigned mismatch
-
 # C4373: '%$S': virtual function overrides '%$pS', previous versions
 #   of the compiler did not override when parameters only differed by
 #   const/volatile qualifiers.
@@ -137,56 +126,19 @@ gb_AFLAGS := /c /Cp
 
 # C4512: 'class' : assignment operator could not be generated
 
-# C4514: 'function' : unreferenced inline function has been removed
-
-# C4555: expression has no effect; expected expression with
-#   side-effect
-
 # C4611: interaction between 'function' and C++ object destruction is
 #   non-portable
 
-# C4619: #pragma warning : there is no warning number 'number'
-
-# C4625: 'derived class' : copy constructor could not be generated
-#   because a base class copy constructor is inaccessible
-
 # C4626: 'derived class' : assignment operator could not be generated
 #   because a base class assignment operator is inaccessible
 
-# C4628: digraphs not supported with -Ze. Character sequence 'digraph'
-#   not interpreted as alternate token for 'char'
-
 # C4640: 'instance' : construction of local static object is not thread-safe
 
-# C4668: 'symbol' is not defined as a preprocessor macro, replacing
-#   with '0' for 'directives'
-
-# C4686: ' user-defined type ' : possible change in behavior, change
-#   in UDT return calling convention
-
-# C4692: 'function': signature of non-private member contains assembly
-#   private native type 'native_type'
-
 # C4706: assignment within conditional expression
 
-# C4710: 'function' : function not inlined
-
-# C4711: function 'function' selected for inline expansion
-
-# C4738: storing 32-bit float result in memory, possible loss of
-#   performance
-
 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance
 #   warning)
 
-# C4820: 'bytes' bytes padding added after construct 'member_name'
-
-# C4826: Conversion from 'type1 ' to 'type_2' is sign-extended. This
-#   may cause unexpected runtime behavior.
-
-# C4917: 'declarator' : a GUID can only be associated with a class,
-#   interface or namespace
-
 # C4996: 'function': was declared deprecated
 
 gb_CFLAGS := \
@@ -196,13 +148,11 @@ gb_CFLAGS := \
-GS \
-MD \
-nologo \
-   -Wall \
+   -W4 \
-wd4005 \
-   -wd4061 \
-wd4127 \
-wd4180 \
-wd4189 \
-   -wd4191 \
-wd4242 \
-wd4244 \
-wd4245 \
@@ -211,31 +161,16 @@ gb_CFLAGS := \
-wd4255 \
-wd4275 \
-wd4290 \
-   -wd4350 \
-wd4355 \
-   -wd4365 \
-wd4503 \
-wd4505 \
-wd4511 \
-wd4512 \
-   -wd4514 \
-   -wd4555 \
-wd4611 \
-   -wd4619 \
-   -wd4625 \
-wd4626 \
-wd4640 \
-   -wd4668 \
-   -wd4686 \
-   -wd4692 \
-wd4706 \
-   -wd4710 \
-   -wd4711 \
-   -wd4738 \
-wd4800 \
-   -wd4820 \
-   -wd4826 \
-   -wd4917 \
-Zc:forScope,wchar_t- \
-Zm500 \
 
@@ -247,13 +182,11 @@ gb_CXXFLAGS := \
-Gy \
-MD \
-nologo \
-   -Wall \
+   -W4 \
-wd4005 \
-   -wd4061 \
-wd4127 \
-wd4180 \
-wd4189 \
-   -wd4191 \
-wd4242 \
-wd4244 \
-wd4245 \
@@ -262,34 +195,18 @@ gb_CXXFLAGS := \
-wd4265 \
-wd4275 \
-wd4290 \
-   -wd4350 \
-wd4351 \
-wd4355

[Libreoffice-commits] .: solenv/gbuild

2012-12-02 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3e6bc1522fe7ef734f5ed51e4bffea62d96e6707
Author: Tor Lillqvist 
Date:   Sun Dec 2 11:32:17 2012 +0200

More -wd fixups

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 8e3f249..b45d47a 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -108,7 +108,7 @@ gb_AFLAGS := /c /Cp
 # C4265: 'class' : class has virtual functions, but destructor is not
 #   virtual
 
-# C4275: non  DLL-interface classkey 'identifier' used as base for
+# C4275: non-DLL-interface classkey 'identifier' used as base for
 #   DLL-interface classkey 'identifier'
 
 # C4290: C++ exception specification ignored except to indicate a
@@ -116,8 +116,6 @@ gb_AFLAGS := /c /Cp
 
 # C4350: behavior change: 'member1' called instead of 'member2'
 
-# C4355: 'this' : used in base member initializer list
-
 # C4351: new behavior: elements of array 'array' will be default
 #   initialized
 
@@ -126,6 +124,10 @@ gb_AFLAGS := /c /Cp
 # C4365: 'action' : conversion from 'type_1' to 'type_2',
 #   signed/unsigned mismatch
 
+# C4373: '%$S': virtual function overrides '%$pS', previous versions
+#   of the compiler did not override when parameters only differed by
+#   const/volatile qualifiers.
+
 # C4503: 'identifier' : decorated name length exceeded, name was
 #   truncated
 
@@ -209,11 +211,9 @@ gb_CFLAGS := \
-wd4255 \
-wd4275 \
-wd4290 \
-   -wd4294 \
-wd4350 \
-wd4355 \
-wd4365 \
-   -wd4373 \
-wd4503 \
-wd4505 \
-wd4511 \
@@ -266,6 +266,7 @@ gb_CXXFLAGS := \
-wd4351 \
-wd4355 \
-wd4365 \
+   -wd4373 \
-wd4503 \
-wd4505 \
-wd4511 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-01 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09849846eec9531bc48fa547b5c24c550b34
Author: Tor Lillqvist 
Date:   Sun Dec 2 09:52:53 2012 +0200

Argh, I meant Visual Studio 2010

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 5017283..e867e98 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -184,10 +184,10 @@ gb_CXXFLAGS := \
-Zc:forScope,wchar_t- \
-Zm500 \
 
-# New warning(s) in Visual Studio 2012, let's try disabling these only
+# New warning(s) in Visual Studio 2010, let's try disabling these only
 # for that specific compiler version, in case a later one will not
 # need them disabled.
-ifeq ($(VCVER),110)
+ifeq ($(VCVER),100)
 
 # C4986: 'function': exception specification does not match previous
 #   declaration. This warning is generated by VS2012 headers (!), and is
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-01 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_defs.mk |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit afa3ed9eafd50de4fa07b37acd4a317d515bf09d
Author: Tor Lillqvist 
Date:   Sun Dec 2 09:25:56 2012 +0200

Disable MSVC warning C4986

This is a new warning in Visual Studio 2012.

Otherwise, when using /Wall (as we do), you get tons of warnings from
the compiler's own headers:

.../crtdbg.h(1041) : warning C4986: 'operator new[]': exception
  specification does not match previous declaration
.../new(79) : see declaration of 'operator new[]'

It seems to be generally recommended not to use /Wall with MSVC (that
option does not really have the same intended use as gcc's -Wall,
people say), but use /W4 instead:
http://stackoverflow.com/a/4001759/259398

So maybe we should change that -Wall to -W4?

Also, we should go over the long list of -wd options and check each
whether we really want it or not. Maybe, while at it, add a comment
for each giving its one-line meaning.

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index aca825c..5017283 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -184,6 +184,20 @@ gb_CXXFLAGS := \
-Zc:forScope,wchar_t- \
-Zm500 \
 
+# New warning(s) in Visual Studio 2012, let's try disabling these only
+# for that specific compiler version, in case a later one will not
+# need them disabled.
+ifeq ($(VCVER),110)
+
+# C4986: 'function': exception specification does not match previous
+#   declaration. This warning is generated by VS2012 headers (!), and is
+#   C++-only.
+
+gb_CXXFLAGS += \
+   -wd4986 \
+
+endif
+
 gb_STDLIBS := \
advapi32.lib \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-01 Thread Libreoffice Gerrit user

 solenv/gbuild/extensions/pre_SharedLangList.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2291423c5e37c0c6de177880384b119dcad2b261
Author: Zolnai TamÃ¡s 
Date:   Sun Dec 2 05:32:12 2012 +0100

No lang no qtz

Change-Id: I6b5649077fda265a2aff253b5e2534bfd818b3bc

diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk 
b/solenv/gbuild/extensions/pre_SharedLangList.mk
index 06113a5..40c9467 100644
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ b/solenv/gbuild/extensions/pre_SharedLangList.mk
@@ -27,7 +27,9 @@ gb_WITH_LANG=$(completelangiso)
 endif
 
 ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
+ifneq ($(WITH_LANG),)
 gb_WITH_LANG += qtz
 endif
+endif
 
 # vim: set noet ts=4 sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-12-01 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cca017e1e00f5029dcc261c7c9cc9017f514c108
Author: Zolnai TamÃ¡s 
Date:   Sat Dec 1 15:03:12 2012 +0100

Not make qtz properties in release build

Change-Id: Ib012faeb3eb1bfd10cfce20426afa138a2ed8d34

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index b679cca..25d415a 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -236,8 +236,10 @@ endef
 # source file is copied to $(WORKDIR)
 define gb_ExtensionTarget_localize_properties
 ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),)
+ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
 $(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst 
en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out 
en-US,$(gb_ExtensionTarget_ALL_LANGS
 endif
+endif
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS),\
$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst 
en_US,$(subst -,_,$(lang)),$(2)),$(3),$(lang)))
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-28 Thread Libreoffice Gerrit user

 solenv/gbuild/UnoApiTarget.mk |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d61d02ba66308161150bedc472e8f766811d8662
Author: Michael Stahl 
Date:   Wed Nov 28 11:29:34 2012 +0100

gbuild: UnoApiTarget: fix spurious rebuilds:

Since commit 800f388206b15db545d8b96d5546b766a4fc7b32 there are spurious
rebuilds when a IDL file is rebuilt, because the rule for the idlc
invocation was changed to rebuild all IDL files, but the dummy rule for
.urd files only touched that when its own IDL file changes; this means
that the header target is not seen as outdated in this make run, but it
will be outdated in the next make run because then the .urd file
timestamp is checked and is newer.
The dummy rule for .urd files must touch the .urd file if and only if
the rule for the .done file re-builds that .urd file.

Change-Id: I37938aef0621c7d46809e02a06d22248de28271b

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 9bd5d1e..1b854b6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -67,10 +67,13 @@ define gb_UnoApiPartTarget__command
 
 endef
 
+# If idlc changed, rebuild everything; otherwise just the changed files.
+# In order for this to work the .urd files need to have a dependency on
+# idlc as well so their dummy rule fires if that changes.
 $(call gb_UnoApiPartTarget_get_target,%.done) : \
$(gb_UnoApiPartTarget_IDLCTARGET) \
| $(gb_UCPPTARGET)
-   $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out 
$(gb_UnoApiPartTarget_IDLCTARGET),$^))
+   $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out 
$(gb_UnoApiPartTarget_IDLCTARGET),$(if $(filter 
$(gb_UnoApiPartTarget_IDLCTARGET),$?),$^,$?)))
 
 ifeq ($(gb_FULLDEPS),$(true))
 
@@ -179,8 +182,9 @@ define gb_UnoApiTarget__add_idlfile
 $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 $(call gb_UnoApiTarget__add_urdfile,$(1),$(call 
gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
-$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \
-   $(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
+$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) \
+   : $(gb_UnoApiPartTarget_IDLCTARGET) \
+   | $(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-26 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6f3f04597f9c4260511d3bd352f1c89a29fa1973
Author: Rob Snelders 
Date:   Sun Nov 25 15:18:52 2012 +0100

Work around make 3.81 pattern rule problems

Change-Id: Ife5cccd8c7011199e370cd68a76a077451675a55

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0fa1aba..823b78d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -312,16 +312,16 @@ $(call gb_CppunitTest_get_target,$(1)) : \
 $(call gb_CppunitTest_get_clean_target,$(1)) : \
 $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
 
-endef
-
-$(call gb_CppunitTestFakeExecutable_get_target,%) : \
-$(call gb_Executable_get_target,%)
-   $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && cp $< $@)
+$(call gb_CppunitTestFakeExecutable_get_target,$(2)) : \
+$(call gb_Executable_get_target,$(2))
+   $(call gb_Helper_abbreviate_dirs,mkdir -p $$(dir $$@) && cp $$< $$@)
 
-.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,%)
-$(call gb_CppunitTestFakeExecutable_get_clean_target,%) :
+.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
+$(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) :
$(call gb_Helper_abbreviate_dirs, \
-rm -f $(call gb_CppunitTestFakeExecutable_get_target,$*))
+rm -f $(call gb_CppunitTestFakeExecutable_get_target,$(2)))
+
+endef
 
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call 
gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3),CppunitTest_$$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-23 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk|2 +-
 solenv/gbuild/Configuration.mk   |1 +
 solenv/gbuild/ExtensionTarget.mk |4 
 solenv/gbuild/InstallModuleTarget.mk |1 +
 solenv/gbuild/UI.mk  |1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d1bfce298bb0414cafcd94cc8cd4694bdc3b4811
Author: Andras Timar 
Date:   Sat Nov 24 00:11:01 2012 +0100

missing po files should not don't break the build

Change-Id: I686341c79e77f16c6a4cd81cf9fedcd25c4e4996

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 78a775e..1715fba 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -79,7 +79,7 @@ endef
 define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
 $(call gb_SrsPartMergeTarget_get_target,$(1)) : POFILES := $(2)
 $(call gb_SrsPartMergeTarget_get_target,$(1)) : $(2)
-
+$(2) :
 endef
 
 # SrsPartTarget class
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 95f20e3..84b9fab 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -282,6 +282,7 @@ $(call gb_XcuMergeTarget_get_target,$(1)) : \
$(wildcard $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po))
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
POFILES := $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po) :
 endef
 
 
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index dbe219d..b679cca 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -151,6 +151,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : \
POFILES := $(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
$(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
 endif
 
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -248,6 +249,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
POFILE := $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst 
$(SRCDIR),,$(dir $(3.po
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst 
$(SRCDIR),,$(dir $(3.po
+$(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir 
$(3.po :
 endif
 $(call gb_ExtensionTarget_get_target,$(1)) : $(call 
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
@@ -328,6 +330,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) 
: \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst 
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
 $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst 
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst 
./,.po,$(dir $(or $(4),$(3) :
 endif
 endif
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -369,6 +372,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) 
: \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst 
%/,/%.po,$(patsubst ./,.po,$(dir $(4
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
 $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst 
%/,/%.po,$(patsubst ./,.po,$(dir $(4
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst 
./,.po,$(dir $(4 :
 endif
 endif
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index 4ea77c9..f6ed5b2 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -146,6 +146,7 @@ $(call gb_ScpMergeTarget_get_target,$(1)) : \
SCP_POFILES := $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
 $(call gb_ScpMergeTarget_get_target,$(1)) : \
$(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po) :
 
 endef
 
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 73c69c5..92c1a57 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -53,6 +53,7 @@ $(call gb_UILocalizeTarget_get_target,$(1)) : $(foreach 
lang,$(gb_UITarget_LANGS
 $(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/

[Libreoffice-commits] .: solenv/gbuild

2012-11-23 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1474acef8a77926ae07d109256fecd2392b37510
Author: Andras Timar 
Date:   Fri Nov 23 18:16:32 2012 +0100

build XHP first, then TRE

Change-Id: Iab898ad984203e32df72f5ed643e3846a92548ee

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 472b50d..dbe219d 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -320,6 +320,8 @@ define gb_ExtensionTarget__localize_helpfile_onelang
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done : \
+$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
 ifneq ($(strip $(gb_WITH_LANG)),)
 ifneq ($(filter-out en-US,$(5)),)
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -342,7 +344,8 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) 
: \
 $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \
 -m {MERGEINPUT} && \
 rm -rf {MERGEINPUT}, \
-cp $$< $$@))
+cp $$< $$@)) && \
+touch $(call 
gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
 
 endef
 
@@ -369,6 +372,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) 
: \
 endif
 endif
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
 $(gb_ExtensionTarget_TREEXTARGET) | \
 $(2)/$(4)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-22 Thread Libreoffice Gerrit user

 solenv/gbuild/CppunitTest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c991b910af6fdf09fddfc32ec8ea6ecd657ebe8
Author: Tor Lillqvist 
Date:   Thu Nov 22 11:30:48 2012 +0200

Probably want to check CROSS_COMPILING here, not (just) iOS

Change-Id: I5b9f6323e80b69e5baf81016ac92eda0b5bdd13d

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e3003f8..0f81a4d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -51,7 +51,7 @@ endif
 #  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions 
do not pop up as message box, but are routed to the shell
-ifneq ($(OS),IOS)
+ifneq ($(CROSS_COMPILING),YES)
 gb_CppunitTest_CPPTESTTARGET := $(call 
gb_Executable_get_target,cppunit/cppunittester)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-21 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.help.txt |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4f4870ef032aa45242761205d31dc7ccd4f99fad
Author: Thorsten Behrens 
Date:   Wed Nov 21 10:19:23 2012 +0100

Improve gbuild help text with PARALLELISM env var.

Change-Id: I30c9700127d04aee200386c94307a45da41b0025

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index e2c427d..0b1e9ca 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -69,6 +69,9 @@ INTERACTIVE VARIABLES:
If not empty enable the RTL_LOGFILE_* time logging 
facility.
export RTL_LOGFILE=rtl_logfile.nopid when running 
office, to
get timestamps written out.
+   PARALLELISM If not empty, pass argument on as the -j switch
+   to recursive make invocations. Useful to
+   lower/increase build parallelism individually.
LEXFLAGSAdd as flags for LEX scanner generator invocation.
YACCFLAGS   Add as flags for YACC parser generator invocation.
CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ 
compilation.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-16 Thread Libreoffice Gerrit user

 solenv/gbuild/JavaClassSet.mk |2 +-
 solenv/gbuild/JunitTest.mk|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60d2248aef20aa1363ef8624ff303c854c68dafe
Author: Enrico Weigelt, metux ITS 
Date:   Wed Nov 14 18:19:26 2012 +0100

fixed java classpath parameter (required for gcj)

Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a
Reviewed-on: https://gerrit.libreoffice.org/1073
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index b5b7439..fab3ae4 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -47,7 +47,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(filter-out $(JARDEPS),$(4))) && \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-   -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
+   -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE &&) \
rm -f $$RESPONSEFILE &&) \
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index fbe87fd..6ed1f77 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -49,7 +49,7 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
 (DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \
$(gb_JunitTest_JAVACOMMAND) \
--cp "$(T_CP)" \
+-classpath "$(T_CP)" \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) > $@.log 2>&1 || \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-15 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 94c50851dde2c0750d589f92448e87d5f61689d7
Author: David Tardon 
Date:   Thu Nov 15 16:07:39 2012 +0100

use gb_WITH_LANG consistently

Change-Id: I50f5b8c95d82781029f3ae3dda1865dea9b336d5

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 7247b18..477ec83 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -132,7 +132,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_
$$(call gb_Helper_abbreviate_dirs,\
mkdir -p $$(dir $$@) && \
cp $$< $$@)
-ifneq ($(strip $(WITH_LANG)),)
+ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true))
 endif
 
@@ -165,13 +165,13 @@ endef
 # How it works:
 # We let _get_target depend on _get_update_target, so after they are
 # done, _get_target is newer than _get_update_target. If
-# WITH_LANG changes (from nonempty to empty or the other way around),
+# gb_WITH_LANG changes (from nonempty to empty or the other way around),
 # _get_target and _get_update_target are switched, therefore _get_target
 # is now _older_ than _get_update_target and must be regenerated :-)
 gb_SrsTemplateTarget__get_merged_target = $(call 
gb_SrsTemplateTarget_get_target,$(1))_merged_last
 gb_SrsTemplateTarget__get_unmerged_target = $(call 
gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
 
-ifeq ($(strip $(WITH_LANG)),)
+ifeq ($(strip $(gb_WITH_LANG)),)
 gb_SrsTemplateTarget__get_target = $(call 
gb_SrsTemplateTarget__get_unmerged_target,$(1))
 gb_SrsTemplateTarget__get_update_target = $(call 
gb_SrsTemplateTarget__get_merged_target,$(1))
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-08 Thread Libreoffice Gerrit user

 solenv/gbuild/Configuration.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bae23b5f78bca8c5c7e798d7a18e322d45d3cc33
Author: David Tardon 
Date:   Thu Nov 8 09:04:07 2012 +0100

propagate dep on schemas from another configuration

Change-Id: I1861fabd097249123688b22cded6e4a1b7557586

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 1655e44..3315a62 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -393,6 +393,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
 $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+   $(call gb_Configuration_get_preparation_target,$(1)) \
$(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)
@@ -425,6 +426,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
 $(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
$(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \
+   $(call gb_Configuration_get_preparation_target,$(1)) \
$(call gb_XcsTarget_for_XcuModuleTarget,$(3))
 $(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
 ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-07 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 949e06a801aa8b3939d621a450bf2b62c97fca16
Author: Michael Stahl 
Date:   Wed Nov 7 13:25:37 2012 +0100

gbuild: fix "missing separator" errors with --enable-crashdump

Add missing backslash in com_MSC_class.mk.
Thanks to Julien Nabet for finding this problem.
(regression from 85b6a93cf41fb05e726027e34fcd805330e20414)

Change-Id: Iaae670c58e42bc22691b141495598276fa23bf02

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index f94d159..d0b3cfc 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -239,7 +239,7 @@ $(if $(filter $(gb_MERGEDLIBS),$(1)),,\
 $(call gb_Library_add_auxtarget,$(1),$(OUTDIR)/bin/$(notdir $(3
 
 ifneq ($(ENABLE_CRASHDUMP),)
-$(call gb_Library_add_auxtargets,$(1),
+$(call gb_Library_add_auxtargets,$(1),\
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-03 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/WNT_INTEL_MSC.mk  |5 ++---
 solenv/gbuild/platform/WNT_X86_64_MSC.mk |5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 155f09b32f71e15c7c322e7a8f3452be9310f69f
Author: Tor Lillqvist 
Date:   Sat Nov 3 15:52:50 2012 +0200

Define gb_CPPU_ENV befire use

Change-Id: Ic2d06a2986cb27adb278570feaa2937c58619ea6

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index c21d44f..56795d7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -26,12 +26,11 @@
 #
 #*
 
-include $(GBUILDDIR)/platform/com_MSC_defs.mk
-
 gb_CPPU_ENV := msci
-
 gb_CPUDEFS := -D_X86_=1
 
+include $(GBUILDDIR)/platform/com_MSC_defs.mk
+
 include $(GBUILDDIR)/platform/com_MSC_class.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/WNT_X86_64_MSC.mk 
b/solenv/gbuild/platform/WNT_X86_64_MSC.mk
index 8edf0de..7a54dcb 100644
--- a/solenv/gbuild/platform/WNT_X86_64_MSC.mk
+++ b/solenv/gbuild/platform/WNT_X86_64_MSC.mk
@@ -26,12 +26,11 @@
 #
 #*
 
-include $(GBUILDDIR)/platform/com_MSC_defs.mk
-
 gb_CPPU_ENV := msc6
-
 gb_CPUDEFS := -D_AMD64_=1
 
+include $(GBUILDDIR)/platform/com_MSC_defs.mk
+
 include $(GBUILDDIR)/platform/com_MSC_class.mk
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-11-02 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_GCC_class.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 247b848902a2e939ba0c90a473c3ed23eb10b813
Author: Tor Lillqvist 
Date:   Fri Nov 2 15:09:17 2012 +0200

Pass $(INCLUDE) also in gb_AsmObject__command

Change-Id: I85368b32b06409ce8b2dd204093394d224c5f089

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index c3f10a4..9f2d15d 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -40,7 +40,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_CC) \
$(T_CFLAGS) \
-c $(3) \
-   -o $(1)) && \
+   -o $(1)) \
+   $(INCLUDE) && \
echo "$(1) : $(3)" > $(4)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-31 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad3f2bd585706d0880b75c8cbf8302104756dc3c
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Oct 31 14:01:42 2012 +0100

do not strip debuginfo if any explicit C(XX)FLAGS have been given

Because there may be -g explicitly specified there. This is in line
with using buildsystem's -O/-g flags only if nothing has been explicitly
specified.

Change-Id: If0309b6a7c52de19c4903978108e4e24362d3351

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ba91d4a..4b47c83 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -50,7 +50,7 @@ gb_LinkTarget__get_debugcxxflags=$(if $(call 
gb_LinkTarget__debug_enabled,$(1)),
 # similar for LDFLAGS, use linker optimization flags in non-debug case,
 # but moreover strip debug from libraries for which debuginfo is not wanted
 # (some libraries reuse .o files from other libraries, notably unittests)
-gb_LinkTarget__get_stripldflags=$(if $(call 
gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKERSTRIPDEBUGFLAGS))
+gb_LinkTarget__get_stripldflags=$(if $(strip 
$(CFLAGS)$(CXXFLAGS)$(OBJCFLAGS)$(OBJCXXFLAGS)$(LDFLAGS)),,$(gb_LINKERSTRIPDEBUGFLAGS))
 gb_LinkTarget__get_debugldflags=$(if $(call 
gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKEROPTFLAGS) $(call 
gb_LinkTarget__get_stripldflags,$(1)))
 
 # generic cflags/cxxflags to use (optimization flags, debug flags)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-26 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_GCC_defs.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 266bc4d87f63564776d11448bfc1dd48415f59a0
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Oct 26 14:44:10 2012 +0200

set up CCACHE_EXTRAFILES too, just like ICECC_EXTRAFILES

Change-Id: I39ce208c1e5dd307631c628217ff596632753f23

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 02642ec..9bb9cf7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -158,7 +158,8 @@ gb_COMPILER_PLUGINS := -Xclang -load -Xclang 
$(SRCDIR)/compilerplugins/obj/plugi
 else
 gb_COMPILER_PLUGINS := -Xclang -load -Xclang 
$(SRCDIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin 
-Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL)
 endif
-gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/sal/inc/sal/log-areas.dox
+# extra EF variable to make the command line shorter (just like is done with 
$(SRCDIR) etc.)
+gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox && 
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
 else
 gb_COMPILER_PLUGINS :=
 gb_COMPILER_PLUGINS_SETUP :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-23 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6a40553095d71ce8a884a08563d3b3764c41ce65
Author: David Tardon 
Date:   Tue Oct 23 17:26:39 2012 +0200

Revert "add missing dep on translations"

This reverts commit c55b916a1eeaf4f4caf50caaee96d949a49ff3e1.

There are dirs that contain only .src file(s) without any localizable
content. Subsequently there is no .po file for these dirs either, so it
would not do to expect it.

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index fa7341a..eaaf482 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -111,7 +111,6 @@ else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call 
gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir 
$(1))localize.sdf
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir 
$(1))localize.sdf
 endif
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-22 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/com_GCC_class.mk |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 012a996721b12baf6365300bf6f4e691260d26de
Author: Stephan Bergmann 
Date:   Mon Oct 22 12:11:40 2012 +0200

Remove arguments unused when compiling assembler object (-D, -I, etc.)

...at least Clang 3.2 warns about them, and with -Werror would produce fatal
errors for them.

Change-Id: I59568adc969ebd1ba2f20ef6c41edc7c5f5d29ed

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 1a88a36..a8f2d4b 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -38,13 +38,9 @@ $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
-   $(DEFS) \
-   $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
$(T_CFLAGS) \
-c $(3) \
-   -o $(1) \
-   -I$(dir $(3)) \
-   $(INCLUDE)) && \
+   -o $(1)) && \
echo "$(1) : $(3)" > $(4)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-17 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit bd47dac253505ef1050aa38940c0c4e059236e45
Author: David Tardon 
Date:   Wed Oct 17 12:57:10 2012 +0200

add newlines

This is to avoid problems if the function is called from $(foreach .

Change-Id: I355ebfbd7ca6db74cad28ffa1e45b467315e327f

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 00c2186..1d7d66c 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -662,15 +662,18 @@ endef
 
 define gb_LinkTarget_add_ldflags
 $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
+
 endef
 
 # real use in RepositoryExternal.mk
 define gb_LinkTarget_set_ldflags
 $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
+
 endef
 
 define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
+
 endef
 
 # remove platform specific standard libraries for linktarget $(1)
@@ -678,6 +681,7 @@ endef
 # exceptional cases this disable method may be used
 define gb_LinkTarget_disable_standard_system_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out 
$$(gb_STDLIBS),$$(LIBS))
+
 endef
 
 define gb_LinkTarget_add_api
@@ -1059,16 +1063,19 @@ endef
 define gb_LinkTarget_set_targettype
 $(call gb_LinkTarget_get_target,$(1)) \
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2)
+
 endef
 
 define gb_LinkTarget_set_x64
 $(call gb_LinkTarget_get_target,$(1)) \
 $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 := $(2)
+
 endef
 
 define gb_LinkTarget_set_dlltarget
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
+
 endef
 
 define gb_LinkTarget_set_auxtargets
@@ -1113,6 +1120,7 @@ endef
 define gb_LinkTarget_add_sdi_headers
 $(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call 
gb_SdiTarget_get_target,$(sdi
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call 
gb_SdiTarget_get_clean_target,$(sdi)))
+
 endef
 
 define gb_LinkTarget_add_external_headers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-04 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/macosx.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 02235d101f934178c1e63acd09e9e28f90961a0e
Author: Christian Lohmaier 
Date:   Thu Oct 4 05:12:35 2012 +0200

old Mac linker is picky about argument order - static libs last

and also after stuff that references external symbols, as it only looks
for symbols it has encountered so far in the object files. Stuff that
comes after the specified library then results in symbols not found
despite the lib being on the commandline earlier.

(another solution than reordering the arguments would be to use
-Wl,-all_load)

Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1aad554..2e2c203 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -212,10 +212,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
-   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
+   `cat $${DYLIB_FILE}` \
$(LIBS) \
-   -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) \
-   `cat $${DYLIB_FILE}` && \
+   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
+   -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
$(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \
 $(if $(filter Executable,$(TARGETTYPE)), \
 $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-03 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1d9803bacc4dc650a2ccf1c7a76e0e61759d1d27
Author: Tor Lillqvist 
Date:   Wed Oct 3 22:53:16 2012 +0300

Use also the ASMOBJECTS

Change-Id: Iee09fc308097ab0a5f73e321da30b7e301b9f4dd

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 7636cef..fb4ba18 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -162,6 +162,7 @@ define gb_LinkTarget__command_dynamiclink
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
+   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
@@ -180,6 +181,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
+   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-10-02 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/solaris.mk |   10 +++---
 solenv/gbuild/platform/unxgcc.mk  |9 ++---
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit e2dcbf5e1791badab39361782057005681866e5d
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Tue Oct 2 17:41:01 2012 +0200

don't use empty rpath

Besides the usual problem this causes with rpath (security), clang
also doesn't like empty arguments in -Wl.

Change-Id: I5c0896ae06ffcf6d2a268bf98a2b3f031cb8a70f

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 47c12d2..6c0bded 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -301,12 +301,16 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
 
 
-define gb_Executable_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Executable_get_layer,$(1)))' \
--L$(gb_Library_OUTDIRLOCATION)
+define gb_Executable__get_rpath
+$(strip $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') \
+-L$(gb_Library_OUTDIRLOCATION))
 #JAD#-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
 endef
 
+define gb_Executable_get_rpath
+$(call gb_Executable__get_rpath,$(call 
gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1
+endef
+
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Executable_get_rpath,$(1))
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d996bd4..73a354c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -262,7 +262,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 define gb_Library__get_rpath
-$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' 
'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
+$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' 
-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)))
 endef
 
 define gb_Library_get_rpath
@@ -299,9 +299,12 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
 
 
+define gb_Executable__get_rpath
+$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') 
-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION))
+endef
+
 define gb_Executable_get_rpath
--Wl,-z,origin '-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Executable_get_layer,$(1)))' \
--Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+$(call gb_Executable__get_rpath,$(call 
gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1
 endef
 
 define gb_Executable_Executable_platform
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-29 Thread Libreoffice Gerrit user

 solenv/gbuild/TargetLocations.mk |1 +
 solenv/gbuild/UnpackedTarball.mk |   31 ++-
 solenv/gbuild/gbuild.mk  |8 
 3 files changed, 39 insertions(+), 1 deletion(-)

New commits:
commit 363e0b67e9ce5de317603a76a5ffc159fc964722
Author: Norbert Thiebaud 
Date:   Thu Sep 27 16:19:14 2012 -0500

add supporting target and options to generate patches for ExternalProjects

also add the support for the convention that a patch filename
encode the -p value if it end with .[0-9]
for instance foo.patch.2 indicate a -p2 patch

usage:

generate a 'reference' copy of the expanded and patched file structure
$> make clucene.clean
$> patches=t make clucene

go to the module
$> cd clucene

edit files in $WORKDIR/UnpackedTarball/clucene

force a rebuild of things that depend on that UnpackedTarball
$> make clucene.rebuild


create a -p1 patch named clucene.new.patch.1 in the module's directory
$> make clucene.genpatch

you can then rename it, place it where appropriate in the module
hierarchy, update the UnpackedTarball_lucene.mk to apply it.

rinse and repeat from the top (yes the make lucene.clean is needed
to regenerate a 'reference' expanded and patched tarball)

Change-Id: I419c54a5981cffa385521596ba5016d2ca7ef52a
Reviewed-on: https://gerrit.libreoffice.org/712
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index be268ba..28c7dd4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -171,6 +171,7 @@ gb_UnoApiHeadersTarget_get_comprehensive_target = 
$(WORKDIR)/UnoApiHeadersTarget
 gb_UnoApiHeadersTarget_get_target = 
$(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done
 gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
 gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1)
+gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org
 gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update
 gb_UnpackedTarball_get_target = $(WORKDIR)/UnpackedTarball/$(1).done
 gb_UnpackedTarball_get_preparation_target = 
$(WORKDIR)/UnpackedTarball/$(1).prepare
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a9cf53e..c96d4ce 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -131,7 +131,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach file,$(UNPACKED_FIX_EOL),$(call 
gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \
$(if $(UNPACKED_PATCHES),\
for p in $(UNPACKED_PATCHES); do \
-   $(GNUPATCH) -s -p$(UNPACKED_PATCHLEVEL) < "$$p" 
|| exit 1;\
+   pl=$(UNPACKED_PATCHLEVEL); \
+   s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) 
pl="$$s"; ;; esac ; \
+   $(GNUPATCH) -s -p$$pl < "$$p" || exit 1;\
done && \
) \
$(foreach file,$(UNPACKED_FIX_EOL),$(call 
gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \
@@ -145,6 +147,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(UNPACKED_POST_ACTION),\
$(UNPACKED_POST_ACTION) && \
) \
+   $(if $(gb_KEEP_PRISTINE), \
+   rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2)) 
&& \
+   cp -r $(call gb_UnpackedTarball_get_dir,$(2)) $(call 
gb_UnpackedTarball_get_pristine_dir,$(2)) && \
+   ) \
touch $(1) \
) || \
( \
@@ -174,6 +180,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_UnpackedTarball_get_target,$*) \
$(call gb_UnpackedTarball_get_preparation_target,$*) \
$(call gb_UnpackedTarball_get_dir,$*) \
+   $(call gb_UnpackedTarball_get_pristine_dir,$*) \
$(foreach 
subdir,$(UNPACKED_SUBDIRS),$(gb_EXTERNAL_HEADERS_DIR)/$(subdir)) \
)
 
@@ -365,4 +372,26 @@ $(foreach file,$(2),$(call 
gb_UnpackedTarball_mark_output_file,$(1),$(file)))
 
 endef
 
+# force the rebuild of an external target
+# this only works when running as partial build.
+#
+%.rebuild :
+   if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \
+   touch $(call gb_UnpackedTarball_get_target,$*) ; \
+   make ;\
+   fi
+
+%.genpatch :
+   if [ -d $(call gb_UnpackedTarball_get_dir,$*) -a -d  $(call 
gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \
+   ( \
+   patch_file=$$(pwd)/$*.new.patch.1; \
+   cd $(call gb_UnpackedTarball_get_dir,) ; \
+   diff -ur $*.org $* > $$patch_file; \
+   echo

[Libreoffice-commits] .: solenv/gbuild

2012-09-27 Thread Libreoffice Gerrit user

 solenv/gbuild/UnoApiTarget.mk |2 +-
 solenv/gbuild/gbuild.mk   |2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 72846a5c528cf66f01036978bf77eabc9f039025
Author: MatÃºÅ¡ Kukan 
Date:   Fri Sep 28 00:39:43 2012 +0200

and also use new gb_UCPPTARGET; gb_UCPP unused

Change-Id: I8cd066e61cdfdef65385a2482f1a8f0aa1fb90cb

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index a4c6e19..fd7a0a3 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -69,7 +69,7 @@ endef
 
 $(call gb_UnoApiPartTarget_get_target,%.done) : \
$(gb_UnoApiPartTarget_IDLCTARGET) \
-   | $(gb_UnoApiPartTarget_UCPPTARGET)
+   | $(gb_UCPPTARGET)
$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out 
$(gb_UnoApiPartTarget_IDLCTARGET),$?))
 
 ifeq ($(gb_FULLDEPS),$(true))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 2a51440..85f2956 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -405,10 +405,8 @@ gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
 endif
 
 ifneq (,$(SYSTEM_UCPP))
-gb_UCPP := $(SYSTEM_UCPP)
 gb_UCPPTARGET :=
 else
-gb_UCPP := ucpp
 gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-27 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 8c20367a2e6d61f830f6dc336761909e38a6bcca
Author: Norbert Thiebaud 
Date:   Thu Sep 27 07:56:12 2012 -0500

gbuild: allow for SHELL to be set by the env variable gb_SHELL

This allow to build using a non bash shell on system for which
/bin/sh is bash

Change-Id: I276c777d1fca20858219ac95457a367300644b16

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0f11ea0..ee2f985 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -48,7 +48,16 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 
 .DELETE_ON_ERROR:
 
+# by default gbuild use /bin/sh
+# if you want to use a particular shell
+# you can export gb_SHELL=
+#
+ifdef gb_SHELL
+SHELL := $(gb_SHELL)
+else
 SHELL := /bin/sh
+endif
+
 true := T
 false :=
 define NEWLINE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-27 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dca431cfea27385ffbcbebd3f080176a809bf9a2
Author: Norbert Thiebaud 
Date:   Thu Sep 27 07:38:02 2012 -0500

revert the change in gbuild.mk : use /bin/sh as SHELL

This is for performance reasons.
there is a measurable benefit of being able to use /bin/dash
vs /bin/bash
and since make is a big consumer of shells, it is worth the pain.

Change-Id: I0654bee1e7bab1041cd00b5e71498bd593aeeecb

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c7f8a83..0f11ea0 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -48,7 +48,7 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 
 .DELETE_ON_ERROR:
 
-SHELL := /usr/bin/env bash
+SHELL := /bin/sh
 true := T
 false :=
 define NEWLINE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-27 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35ce9c76c3ac768332998428e48ec839da709f4a
Author: Norbert Thiebaud 
Date:   Thu Sep 27 05:25:53 2012 -0500

bash is already a pre-req. and ubuntu /bin/sh is a borked variation of it

Change-Id: Ic3d9aee7d5ee50dfc3ffedc30d6a9c88260d7794

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0f11ea0..c7f8a83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -48,7 +48,7 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 
 .DELETE_ON_ERROR:
 
-SHELL := /bin/sh
+SHELL := /usr/bin/env bash
 true := T
 false :=
 define NEWLINE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-26 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83fc0c59037fa743c3ebc58e784eef3d120ffc2e
Author: Michael Stahl 
Date:   Wed Sep 26 19:34:14 2012 +0200

solenv: revert more of 599a94827e2b3957db3abf758d48ff7b3977e2f2

... should hopefully un-break msvc build.

Change-Id: Iee6cc54dd488d124948d7a033811e25e2fc4044c

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index f23c478..3e375ba 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -461,7 +461,7 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 gb_Library_FILENAMES :=\
-   $(foreach 
lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+   $(foreach 
lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
 
 gb_Library_DLLEXT := .dll
 gb_Library_MAJORVER := 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-26 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/ANDROID_ARM_GCC.mk|   71 
 solenv/gbuild/platform/ANDROID_GODSON_GCC.mk |   71 
 solenv/gbuild/platform/ANDROID_INTEL_GCC.mk  |   71 
 solenv/gbuild/platform/android.mk|   79 +++
 4 files changed, 85 insertions(+), 207 deletions(-)

New commits:
commit 7372bbced8d99d6fd479a464095e4f827c39422e
Author: Michael Stahl 
Date:   Wed Sep 26 15:42:02 2012 +0200

gbuild: split out a common android.mk

Change-Id: Ie0858cb137aeaeb18815e3085de4d4000c62218b

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index a52a28c..f603e10 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -25,80 +25,13 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-#please make generic modifications to unxgcc.mk or linux.mk
+# please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DARM32
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
-
-# Link almost everything with -lgnustl_shared
-gb_STDLIBS := \
-   gnustl_shared
-
-gb_Library_PLAINLIBS_NONE := \
-   android \
-   gnustl_shared \
-
-# No unit testing can be run
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-
-# Re-define this from unxgcc.mk with some small but important
-# changes. Just temporarily done this way, shm_get promised to
-# eventually enable this to be done this in some more elegant and less
-# redundant fashion.
-
-gb_LinkTarget_LDFLAGS += \
--Wl,-z,defs \
-   -Wl,--as-needed \
-   -Wl,--no-add-needed
-
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) && \
-   $(gb_CXX) \
-   -shared \
-   $(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
-   $(subst \d,$$,$(RPATH)) \
-   $(T_LDFLAGS) \
-   $(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
-   $(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
-   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
-   $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
-   $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
-   $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
-   -Wl$(COMMA)--start-group $(foreach 
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) 
-Wl$(COMMA)--end-group \
-   $(LIBS) \
-   $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib) \
-   -o $(1))
-endef
-
-# Prefix UNO library filenames with "lib"
-gb_Library_FILENAMES := \
-   $(foreach 
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-   $(foreach 
lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-   $(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
-   $(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
-
-
-# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
-# don't bother generating such.
-
-define gb_Library_get_rpath
-endef
-
-define gb_Executable_get_rpath
-endef
-
-gb_LinkTarget_LDFLAGS := $(subst 
-Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
-
-gb_Library__set_soversion_script_platform = 
+include $(GBUILDDIR)/platform/android.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk 
b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
index bb2a90b..f5d195a 100644
--- a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
@@ -25,78 +25,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-#please make generic modifications to unxg

[Libreoffice-commits] .: solenv/gbuild

2012-09-26 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangZip.mk  |3 +++
 solenv/gbuild/CliAssembly.mk |9 +
 solenv/gbuild/CliLibrary.mk  |6 ++
 solenv/gbuild/CliNativeLibrary.mk|6 ++
 solenv/gbuild/CliUnoApi.mk   |6 ++
 solenv/gbuild/ComponentTarget.mk |4 
 solenv/gbuild/Configuration.mk   |   22 ++
 solenv/gbuild/CustomTarget.mk|4 
 solenv/gbuild/Dictionary.mk  |6 ++
 solenv/gbuild/ExtensionTarget.mk |3 +++
 solenv/gbuild/ExternalPackage.mk |6 ++
 solenv/gbuild/ExternalProject.mk |6 ++
 solenv/gbuild/InstallModule.mk   |3 +++
 solenv/gbuild/InstallModuleTarget.mk |   18 ++
 solenv/gbuild/InstallScript.mk   |6 ++
 solenv/gbuild/Package.mk |5 +
 solenv/gbuild/Rdb.mk |5 +
 solenv/gbuild/UnoApiTarget.mk|4 
 solenv/gbuild/UnpackedTarball.mk |6 ++
 solenv/gbuild/gbuild.mk  |7 ---
 20 files changed, 128 insertions(+), 7 deletions(-)

New commits:
commit 300621ff72be787c5413edf46139b8c45ba0ff45
Author: MatÃºÅ¡ Kukan 
Date:   Wed Sep 26 12:14:48 2012 +0200

Revert "gbuild: use one pattern rule for creating directories"

It does not work with make 3.82 which prefers pattern rules
with longest match, so wrong rules are chosen in workdir.

This reverts commit bc234b4e1103cf8f79a7526ad80dcd9d0b78b89b.

diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index e3cbc6a..fa3b9de 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -14,6 +14,9 @@
 
 gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
 
+$(dir $(call gb_AllLangZip_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_AllLangZip_get_target,%) :
$(call gb_Output_announce,$*,$(true),ALZ,4)
touch $@
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index f78fae5..e3a87bd 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -21,6 +21,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliConfigTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliConfigTarget_get_target,%) :
$(call gb_CliConfigTarget__command,$@,$*,$<)
 
@@ -61,6 +64,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliAssemblyTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliAssemblyTarget_get_target,%) :
$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly 
version not set))
$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call 
gb_Output_error,assembly configuration file not set))
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index d22fc2e..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -47,6 +47,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliLibraryTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliLibraryTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliLibraryTarget_get_target,%) :
$(call gb_CliLibraryTarget__command,$@,$*,$<,$?,$^)
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index 6ced5e9..f5c1249 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -22,6 +22,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliNativeLibraryTarget_get_target,%) :
$(call gb_CliNativeLibraryTarget__command,$@,$*,$<)
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index fae0343..f0a2735 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -29,6 +29,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 # TODO depending on the whole URE might be overkill, but I do not have a
 # Windows machine to debug it...
 $(call gb_CliUnoApiTarget_get_target,%) : \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index f01a687..e99ffab 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -55,6 +55,10 @@ $(call gb_Comp

[Libreoffice-commits] .: solenv/gbuild

2012-09-25 Thread Libreoffice Gerrit user

 solenv/gbuild/InstallModuleTarget.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9642ae95a82f3040b0e6af3ef2408a4099ac0362
Author: David Tardon 
Date:   Tue Sep 25 17:27:52 2012 +0200

apparently cpp.lcc does not have .exe ext. on windows

Change-Id: I87ed6ba66b739638379adea2a137fa1ab6c502ee

diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index 53e97e9..b008bdd 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -74,7 +74,9 @@ endef
 
 # ScpPreprocessTarget class
 
-gb_ScpPreprocessTarget_TARGET := $(call 
gb_Executable_get_target_for_build,cpp.lcc)
+# TODO change to gb_Executable_get_target_for_build after soltools has
+# been gbuildified
+gb_ScpPreprocessTarget_TARGET := $(OUTDIR_FOR_BUILD)/bin/cpp.lcc
 gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) 
$(gb_ScpPreprocessTarget_TARGET)
 
 gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-25 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/IOS_ARM_GCC.mk |4 ++--
 solenv/gbuild/platform/macosx.mk  |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e13ee4d45d1b17e422e35dcd1446c73ad8bc920a
Author: Tor Lillqvist 
Date:   Tue Sep 25 10:41:21 2012 +0300

Be more consistent

Change-Id: I606af5ddbf406b7c3c2fb1bc6b22768a3c108a03

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index a1f0ba0..7656bdd 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -88,7 +88,7 @@ gb_DEBUG_CFLAGS := -g -fno-inline
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
-$(call gb_Output_announce,$(2),$(true),OCX,3)
+$(call gb_Output_announce,$(2).mm,$(true),OCX,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
@@ -106,7 +106,7 @@ endef
 # ObjCObject class
 
 define gb_ObjCObject__command
-$(call gb_Output_announce,$(2),$(true),OCC,3)
+$(call gb_Output_announce,$(2).m,$(true),OCC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fe3aa96..984621f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -101,7 +101,7 @@ gb_COMPILERNOOPTFLAGS := -O0
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
-$(call gb_Output_announce,$(2),$(true),OCX,3)
+$(call gb_Output_announce,$(2).mm,$(true),OCX,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
@@ -120,7 +120,7 @@ endef
 # ObjCObject class
 
 define gb_ObjCObject__command
-$(call gb_Output_announce,$(2),$(true),OCC,3)
+$(call gb_Output_announce,$(2).m,$(true),OCC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-24 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dee38dd178fce6bfe97865e6a2a67bdfde1ad6fe
Author: Michael Stahl 
Date:   Mon Sep 24 16:39:38 2012 +0200

LinkTarget: d'oh, forgot to escape $

Change-Id: I817c9e1f3f712a802e167e50478931f0a975a1ec

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f7fa86b..6d371fa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -752,7 +752,7 @@ $$(eval $$(call gb_Output_info, currently known static 
libraries are: $(sort $(g
 $$(eval $$(call gb_Output_error,Cannot link against static library/libraries 
$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be 
registered in Repository.mk))
 endif
 
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(if 
$(filter-out StaticLibrary,$(TARGETTYPE)),$(2))
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if 
$$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
 
 $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call 
gb_StaticLibrary_get_target,$$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-24 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk|3 ++-
 solenv/gbuild/StaticLibrary.mk |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8b6ea31961fedc3e94d8d1bb0d599b14bcaaa618
Author: Michael Stahl 
Date:   Mon Sep 24 16:16:10 2012 +0200

add gb_StaticLibrary_use_static_libraries

... which is probably not needed for LO internal code, but
very useful for RepositoryExternals.

Change-Id: I5bd8edb97454f89ed33b041460019738e9552f18
Reviewed-on: https://gerrit.libreoffice.org/692
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dae1138..f7fa86b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,13 +745,14 @@ $$(call gb_Output_error,\
  gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries 
instead.)
 endef
 
+# for a StaticLibrary, dependent libraries are not actually linked in
 define gb_LinkTarget_use_static_libraries
 ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)))
 $$(eval $$(call gb_Output_info, currently known static libraries are: $(sort 
$(gb_StaticLibrary_KNOWNLIBS)),ALL))
 $$(eval $$(call gb_Output_error,Cannot link against static library/libraries 
$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be 
registered in Repository.mk))
 endif
 
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(if 
$(filter-out StaticLibrary,$(TARGETTYPE)),$(2))
 
 $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call 
gb_StaticLibrary_get_target,$$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index dd972fd..12834d8 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -125,6 +125,7 @@ $(eval $(foreach method,\
use_package \
use_packages \
use_unpacked \
+   use_static_libraries \
add_sdi_headers \
set_warnings_not_errors \
set_generated_cxx_suffix \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-24 Thread Libreoffice Gerrit user

 solenv/gbuild/CliUnoApi.mk |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f79641a61572b9c3e4fc28841a16493e0da41ccf
Author: David Tardon 
Date:   Mon Sep 24 11:01:15 2012 +0200

it seems climaker needs URE

Change-Id: Idc8a30048c9c5520004fef1976a1fb5eeb74fbea

diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index b9ed03b..f0a2735 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -35,7 +35,13 @@ $(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
 $(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_CliUnoApiTarget_get_target,%) : $(gb_CliUnoApiTarget_TARGET)
+# TODO depending on the whole URE might be overkill, but I do not have a
+# Windows machine to debug it...
+$(call gb_CliUnoApiTarget_get_target,%) : \
+   $(gb_CliUnoApiTarget_TARGET) \
+   $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+   $(call gb_Package_get_target,cppuhelper_unorc) \
+   $(call gb_Rdb_get_outdir_target,ure/services)
$(call gb_CliUnoApiTarget__command,$@,$*,$<)
 
 .PHONY : $(call gb_CliUnoApiTarget_get_clean_target,%)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-23 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangResTarget.mk|2 +-
 solenv/gbuild/CliAssembly.mk |2 +-
 solenv/gbuild/CliNativeLibrary.mk|   11 +++
 solenv/gbuild/InstallModuleTarget.mk |2 +-
 solenv/gbuild/TargetLocations.mk |1 +
 solenv/gbuild/WinResTarget.mk|2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 9d554cf886bb8b4d902aa5e755b84bbfb2d92ae8
Author: David Tardon 
Date:   Sun Sep 23 17:17:29 2012 +0200

change the rest of deps on target-spec. var

Change-Id: I8e8be3d5b419e79902847ffab74e5c50e839444c

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 27ac952..a82f98f 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -124,7 +124,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_
cp $$< $$@)
 ifneq ($(strip $(WITH_LANG)),)
 $(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard 
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(wildcard 
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
 endif
 
 endef
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index d068fa5..e3a87bd 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -39,7 +39,7 @@ $(call gb_CliConfigTarget_get_target,$(1)) : 
CLI_CONFIG_VERSIONFILE := $(gb_CliC
 
 $(call gb_CliConfigTarget_get_target,$(1)) : $(2)
 $(call gb_CliConfigTarget_get_target,$(1)) : $(gb_CliConfigTarget_TARGET)
-$(call gb_CliConfigTarget_get_target,$(1)) : $$(CLI_CONFIG_VERSIONFILE)
+$(call gb_CliConfigTarget_get_target,$(1)) : 
$(gb_CliConfigTarget_VERSIONFILE_DEFAULT)
 $(call gb_CliConfigTarget_get_target,$(1)) :| $(dir $(call 
gb_CliConfigTarget_get_target,$(1))).dir
 
 endef
diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index 87909da..f5c1249 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -31,11 +31,15 @@ $(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir 
:
 $(call gb_CliNativeLibraryTarget_get_target,%) :
$(call gb_CliNativeLibraryTarget__command,$@,$*,$<)
 
+$(call gb_CliNativeLibraryTarget_get_external_target,%) :
+   touch $@
+
 .PHONY : $(call gb_CliNativeLibraryTarget_get_clean_target,%)
 $(call gb_CliNativeLibraryTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),SN ,4)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \
+$(call 
gb_CliNativeLibraryTarget_get_external_target,$*) \
)
 
 define gb_CliNativeLibraryTarget_CliNativeLibraryTarget
@@ -43,17 +47,15 @@ $(call gb_CliNativeLibraryTarget_get_target,$(1)) : 
CLI_NATIVE_ASSEMBLIES := $(g
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_KEYFILE :=
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY :=
 
+$(call gb_CliNativeLibraryTarget_get_external_target,$(1)) :| $(dir $(call 
gb_CliNativeLibraryTarget_get_target,$(1))).dir
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) :| $(dir $(call 
gb_CliNativeLibraryTarget_get_target,$(1))).dir
 
 endef
 
-# TODO gb_Library_get_target might be sufficient here. I do not know if
-# #using  actually does anything at compile time, or if it is
-# only needed at link time.
 define gb_CliNativeLibraryTarget_wrap_library
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY := 
$(call gb_CliNativeLibraryTarget__get_library,$(2))
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : $(call 
gb_Library_get_target,$(2))
-$(call gb_Library_get_external_headers_target,$(2)) : $$(CLI_NATIVE_ASSEMBLIES)
+$(call gb_Library_get_external_headers_target,$(2)) : $(call 
gb_CliNativeLibraryTarget_get_external_target,$(1))
 
 endef
 
@@ -65,6 +67,7 @@ endef
 
 define gb_CliNativeLibraryTarget_use_assembly
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES += 
$(call gb_CliLibrary_get_target,$(2))
+$(call gb_CliNativeLibraryTarget_get_external_target,$(1)) : $(call 
gb_CliLibrary_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index 5125b4c..8e63132 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -135,7 +135,7 @@ define gb_ScpMergeTarget_ScpMergeTarget
 $(call gb_ScpMergeTarget_get_target,$(1)) : $(call 
gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call 
gb_ScpMergeTarget_get_target,$(1))).dir
 $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir 
$(1))/localize.sdf
-$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_SDF)
+$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir 
$(1))/localize.sdf
 
 endef
 
diff --git a/solenv/gbuild/TargetLocati

[Libreoffice-commits] .: solenv/gbuild

2012-09-23 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 751f3aea6805140775bb6ad28f92a1f2795373a6
Author: David Tardon 
Date:   Sun Sep 23 16:29:10 2012 +0200

fix build of dictionaries with l10n enabled

It seems that

foo : BAR := xyz
foo $$(BAR)

does not really work, i.e., it does not generate a dep on xyz, but
$$(BAR) expands into an empty string. It is unclear to me whether it is
a bug in make or it does not work by design. Info documentation for make
only says that target-specific variable _assignments_ are evaluated in
the context of the target, so previously defined target-specific
variables shall be in scope. There is no mention whether this should
work for use of such a variable too (like in the example above). I have
always expected it does; experimental evidence shows it does not .-)

Change-Id: If99bdcacea403aa925127dd993a7e94ed7d57ae4

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index d68f79e..7c5d3d3 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -132,7 +132,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := 
$(firstword $(subst /, ,
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : 
$(SRCDIR)/$(2)/description.xml
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : SDF := 
$(gb_SDFLOCATION)/$(2)/localize.sdf
-$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(SDF)
+$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : 
$(gb_SDFLOCATION)/$(2)/localize.sdf
 endif
 
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -219,7 +219,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : SDF := 
$(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(SDF)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_SDFLOCATION)$(subst 
$(SRCDIR),,$(dir $(3)))localize.sdf
 endif
 $(call gb_ExtensionTarget_get_target,$(1)) : $(call 
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
@@ -288,7 +288,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done 
: \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
 SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
-$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : $$(SDF)
+$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
+$(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
 $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir
@@ -320,7 +321,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done 
: \
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
 SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
-$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : $$(SDF)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
+$(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst 
$(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)localize.sdf
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
 $(if $(filter-out 
en-US,$(WITH_LANG)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \
 $(2)/$(4)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-21 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/NETBSD_INTEL_GCC.mk  |4 ++--
 solenv/gbuild/platform/NETBSD_X86_64_GCC.mk |4 ++--
 solenv/gbuild/platform/com_GCC_defs.mk  |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a481a40961bf6a5036ecd1c0550f45b50e7b221f
Author: Stephan Bergmann 
Date:   Fri Sep 21 14:14:34 2012 +0200

Cut/paste typos

Change-Id: I2ff0ee983d008d580bd9d52cedc2643293b9710e

diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk 
b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index 81afdf3..cadcec4 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -34,7 +34,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk 
b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index 3ece48b..9636971 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -33,7 +33,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 6145e82..c851b74 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -152,7 +152,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+:$$$(gb_Helper_LIBRARY_PATH_VAR)}"$(OUTDIR_FOR_BUILD)/lib"
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-20 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/unxgcc.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4ba760078019fba15f9d0d33a6094960026b9dfb
Author: Stephan Bergmann 
Date:   Thu Sep 20 15:54:23 2012 +0200

Make "make debugrun" less fancy but more useful

For one, --tui has negative impact on terminal behavior in certain ssh 
scenarios
for me.  Whether and how to use it should be a user's personal choice 
anyway.

For another, you sometimes need to interact with gdb early, so do not
automatically start to run soffice.bin.

Change-Id: I1a1a02f5359aae2a11effa6620aebf01202357f9

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e6ed9e3..080a3ad 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -390,9 +390,8 @@ endef
 define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
 printf 'if [ -e $(DEVINSTALLDIR)/opt/program/ooenv ]; then . 
$(DEVINSTALLDIR)/opt/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
-printf "gdb --tui $(DEVINSTALLDIR)/opt/program/soffice.bin" >> 
$${OFFICESCRIPT} && \
+printf "gdb $(DEVINSTALLDIR)/opt/program/soffice.bin" >> $${OFFICESCRIPT} && \
 printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' 
-env:UserInstallation=file://$(DEVINSTALLDIR)/\"" >> $${OFFICESCRIPT} && \
-printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-19 Thread Libreoffice Gerrit user

 solenv/gbuild/gbuild.help.txt |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 24f9a1864d925db58c7637cc490b0a1c70159760
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Sep 19 16:33:03 2012 +0200

make .all is apparently not just for dmake modules

Change-Id: I5a692b10f259cf95357b1b3da39e0cbc8e68c044

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index b658867..3b15639 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -40,8 +40,7 @@ AVAILABLE TARGETS
 against it
 build the named module
.clean   clean the named module
-   .all for dmake modules only, build the named module and
-the pre-requisite modules for this module
+   .all build the named module and the pre-requisite modules 
for it
.deliver for dmake modules only, deliver the named module
cmd  execute the command contained in the variable cmd=""
 in a shell with config_host.mk or config_build.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-09-10 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6266df99cc0782476478c45cbb6a48006c142489
Author: Michael Stahl 
Date:   Mon Sep 10 15:56:43 2012 +0200

gbuild: disable MSVC warning C4351

"new behavior: elements of array FOO will be default initialized"
sounds utterly useless.

Change-Id: I7870734c92bcd52c7fc0a9a251f6d007122c95a6

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5fe282d..2b9bae7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -152,6 +152,7 @@ gb_CXXFLAGS := \
-wd4290 \
-wd4294 \
-wd4350 \
+   -wd4351 \
-wd4355 \
-wd4365 \
-wd4503 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-31 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 152ffaa15f963f92b1564946a648c53d6b5c808c
Author: Stephan Bergmann 
Date:   Fri Aug 31 18:28:41 2012 +0200

Call HelpIndexer/Linker with gb_Helper_set_ld_path

Change-Id: Id3d1b203dee34ab6e59e8790c9caa5ea9d565f45

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 94e4832..14b50e0 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -41,6 +41,14 @@ gb_ExtensionTarget_PROPMERGECOMMAND := \
 gb_ExtensionTarget_HELPEXTARGET := $(call 
gb_Executable_get_target_for_build,helpex)
 gb_ExtensionTarget_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPEXTARGET)
+gb_ExtensionTarget_HELPINDEXERTARGET := \
+$(call gb_Executable_get_target_for_build,HelpIndexer)
+gb_ExtensionTarget_HELPINDEXERCOMMAND := \
+   $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPINDEXERTARGET)
+gb_ExtensionTarget_HELPLINKERTARGET := \
+$(call gb_Executable_get_target_for_build,HelpLinker)
+gb_ExtensionTarget_HELPLINKERCOMMAND := \
+   $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPLINKERTARGET)
 # does not contain en-US because it is special cased in 
gb_ExtensionTarget_ExtensionTarget
 gb_ExtensionTarget_TRANS_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 gb_ExtensionTarget_ALL_LANGS := en-US $(gb_ExtensionTarget_TRANS_LANGS)
@@ -282,8 +290,8 @@ endef
 # gb_ExtensionTarget_add_helpfile)
 define gb_ExtensionTarget__compile_help_onelang
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \
-$(call gb_Executable_get_target_for_build,HelpIndexer) \
-$(call gb_Executable_get_target_for_build,HelpLinker) \
+$(gb_ExtensionTarget_HELPINDEXERTARGET) \
+$(gb_ExtensionTarget_HELPLINKERTARGET) \
 $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
 $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
 $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \
@@ -292,7 +300,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done 
: \
$$(call gb_Helper_abbreviate_dirs, \
 rm -rf $$(basename $$@) && \
 mkdir $$(basename $$@) && \
-$(call gb_Executable_get_target_for_build,HelpLinker) -mod help \
+$(gb_ExtensionTarget_HELPLINKERCOMMAND) -mod help \
 -extlangsrc $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(2) \
 -sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
 -extlangdest $$(basename $$@) \
@@ -302,8 +310,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done 
: \
 (cd $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(2) && \
 $(gb_ExtensionTarget_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
 $$(HELPFILES)) && \
-$(call gb_Executable_get_target_for_build,HelpIndexer) -lang $(2) \
--mod help -dir $$(basename $$@) && \
+$(gb_ExtensionTarget_HELPINDEXERCOMMAND) -lang $(2) -mod help \
+-dir $$(basename $$@) && \
 touch $$@)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-31 Thread Libreoffice Gerrit user

 solenv/gbuild/UnoApiTarget.mk |   28 
 1 file changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 21ce2a53e518e2e20c7736ef48f978d1e3c1d28b
Author: Tor Lillqvist 
Date:   Thu Aug 30 11:42:00 2012 +0300

For iOS always generate comprehensive headers for udkapi

Seems to get rid of one bootstrapping problem, where URE types are
needed before their rdb file has been read.

Change-Id: If9ae2f282dee06841a538ff1983bb3e836aa5706

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 7e44d06..3c84bd3 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -288,10 +288,25 @@ define gb_UnoApiHeadersTarget__command
 
 endef
 
+# On iOS we use static linking because dynamic loading of own code
+# isn't allowed by the iOS App Store rules, and we want our code to be
+# eventually distributable there as part of apps.
+
+# To avoid problems that this causes together with the lovely
+# intentional breaking of the One Definition Rule, for iOS we always
+# generate comprehensive headers for udkapi. (The ODR breakage doesn't
+# harm, by accident or careful design, on platforms where shared
+# libraries are used.)
+
 $(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
-   $(call gb_Output_announce,$*,$(true),HPB,3)
-   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_bootstrap_dir,$*))
+   $(if $(filter IOSudkapi,$(OS)$*), \
+   $(call gb_Output_announce,$*,$(true),HPB,3) \
+   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \
+   \
+   $(call gb_Output_announce,$*,$(true),HPB,3) \
+   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) \
+   )
 
 $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
@@ -300,8 +315,13 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) 
: \
 
 $(call gb_UnoApiHeadersTarget_get_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
-   $(call gb_Output_announce,$*,$(true),HPP,3)
-   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_dir,$*),-L)
+   $(if $(filter IOSudkapi,$(OS)$*), \
+   $(call gb_Output_announce,$*,$(true),HPP,3) \
+   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_dir,$*),-C), \
+   \
+   $(call gb_Output_announce,$*,$(true),HPP,3) \
+   $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call 
gb_UnoApiHeadersTarget_get_dir,$*),-L) \
+   )
 
 .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%)
 $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-30 Thread Libreoffice Gerrit user

 solenv/gbuild/UnoApiTarget.mk |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit b7afe94667d4acd1979fb0aff32b8b55d617dfbc
Author: Tor Lillqvist 
Date:   Thu Aug 30 10:18:28 2012 +0300

Make verbose make output more informative for cppumaker commands

Put only the presumably not so interesting long list of input files
into the response file, have options (which might be what one wants to
see if using verbose=t) on the command line as such.

Change-Id: Ia73614744f4fba65bc47dc463197941e65eae78f

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 87fd57b..7e44d06 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -56,11 +56,12 @@ define gb_UnoApiPartTarget__command
$(call gb_Output_announce,$(2),$(true),IDL,2)
mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+   $(sort $(patsubst $(call 
gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3 && \
+   $(gb_UnoApiPartTarget_IDLCCOMMAND) \
$(INCLUDE) \
-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir 
$(2 \
-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose \
-   $(sort $(patsubst $(call 
gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3 && \
-   $(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+   @$${RESPONSEFILE} > /dev/null && \
rm -f $${RESPONSEFILE} && \
touch $(1)
 
@@ -276,12 +277,14 @@ gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call 
gb_Executable_get_target_for_bu
 gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
 
 define gb_UnoApiHeadersTarget__command
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
-   -Gc $(4) -BUCR \
-   -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS)) && \
-$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE} && \
-touch $(1)
+   RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+   $(UNOAPI_DEPS)) && \
+   $(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \
+   -Gc $(4) -BUCR \
+   -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) \
+   @$${RESPONSEFILE} && \
+   rm -f $${RESPONSEFILE} && \
+   touch $(1)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-24 Thread Libreoffice Gerrit user

 solenv/gbuild/AllLangZip.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e19be74ff56422ba908a4e7a70dccda6a94c7026
Author: David Tardon 
Date:   Fri Aug 24 14:11:42 2012 +0200

build for en-US if no langs are specified

Change-Id: I21323d275f8381ecffa937563fccbc7bbb4b497e

diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index 6534a98..fa3b9de 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -12,7 +12,7 @@
 # Handles creation of a bunch of zip files with content dependent on
 # language
 
-gb_AllLangZip_LANGS := $(gb_WITH_LANG)
+gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
 
 $(dir $(call gb_AllLangZip_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-24 Thread Libreoffice Gerrit user

 solenv/gbuild/UnpackedTarball.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4b00567f578190fe2d0413cb25538f518c439b66
Author: David Tardon 
Date:   Fri Aug 24 13:42:47 2012 +0200

it seems unzip on MacOS X does not know this opt

Change-Id: I48d86df772655229a08653e6c8f263338f69fbfb

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 52b496b..0bd9128 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -40,7 +40,6 @@ endef
 define gb_UnpackedTarget__command_unzip
 unzip \
-qq \
-   -DD  \
-d $(UNPACKED_DIR) $(UNPACKED_TARBALL) && \
 $(if $(filter-out 0,$(UNPACKED_STRIP_COMPONENTS)),\
UNZIP_DIR=`ls $(UNPACKED_DIR)` && \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-23 Thread Libreoffice Gerrit user

 solenv/gbuild/LinkTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1db0bd299f3b9a3ed6785a3f434b010a1174feb
Author: MatÃºÅ¡ Kukan 
Date:   Thu Aug 23 23:19:10 2012 +0200

gbuild: also in libmerge case library needs to depend on all headers

Change-Id: Ib1c3e37dfa6b9cd9708b721a7ad5b1bdb468b020
Reviewed-on: https://gerrit.libreoffice.org/469
Reviewed-by: TomÃ¡Å¡ ChvÃ¡tal 
Tested-by: TomÃ¡Å¡ ChvÃ¡tal 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 826a820..52a3f37 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -720,7 +720,7 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += 
$$(gb_LINKED_LIBS)
 
 $(call gb_LinkTarget_get_target,$(1)) : $$(foreach 
lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$$(gb_LINKED_LIBS),$$(call 
gb_Library_get_headers_target,$$(lib)))
+   $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib)))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-10 Thread Stephan Bergmann

 solenv/gbuild/ExtensionTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff795d058b36707ec65f8b6e159646e5c2c8c8c5
Author: Stephan Bergmann 
Date:   Fri Aug 10 12:18:38 2012 +0200

One more cygwin symlink kludge needed

Change-Id: I0d7afd105ec093609fe1ecc9f19d541a43d77e9a

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 2a434ef..105e58e 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -76,7 +76,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : 
$(gb_ExtensionTarget_
mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
$(gb_ExtensionTarget_XRMEXCOMMAND) \
-p $(PRJNAME) \
-   -i $(filter %.xml,$^) \
+   -i $(call gb_Helper_symlinked_native,$(filter 
%.xml,$^)) \
-o $@ \
-m $(SDF) \
-l all)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-09 Thread Michael Stahl

 solenv/gbuild/Configuration.mk  |   10 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 ++
 solenv/gbuild/platform/com_GCC_defs.mk  |2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6292b12acf51a816fad3b3ea8073a58eb3c2
Author: Michael Stahl 
Date:   Thu Aug 9 13:08:17 2012 +0200

gbuild: add a kludge to get dictionaries to build in cygwin:

Due to the scourge of symlinked git repositories, building the
configuration files in dictionaries fails on cygwin because the native
xsltproc cannot understand cygwin symlinks; work around that with a
new gb_Helper_symlinked_native function.
Should be reverted once git sub modules liberate us from the scourge.

Change-Id: Idc48da9b60348dc66160219909479c3c83daeaf2

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 53a11e1..61254ce 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -93,7 +93,7 @@ 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__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcs,$^)))
 
 $(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1)
@@ -140,7 +140,7 @@ 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__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuDataTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,2)
@@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter 
%.xcs,$^))
+   $(call gb_XcuModuleTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)),$(filter %.xcs,$^))
 
 $(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,3)
@@ -253,7 +253,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-   -i $(3) \
+   -i $(call gb_Helper_symlinked_native,$(3)) \
-o $(1) \
-m $(SDF) \
-l all)
@@ -295,7 +295,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+   $(call gb_XcuResTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,6)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0c0c98f..7b64e2b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -248,6 +248,12 @@ define gb_Helper_make_url
 file:///$(strip $(1))
 endef
 
+# for source files in non-core repositories, the cygwin symlink is not
+# understood by native tools, so find the real path to the file
+define gb_Helper_symlinked_native
+$(shell cygpath -m $(realpath $(1)))
+endef
+
 # YaccTarget class
 
 define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 60ae0c3..39fa02b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -158,6 +158,8 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
+gb_Helper_symlinked_native = $(1)
+
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-06 Thread Michael Stahl

 solenv/gbuild/Library.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4621e2dbef28b1307ec0b571c0838823a21ff62
Author: Michael Stahl 
Date:   Mon Aug 6 13:45:32 2012 +0200

gbuild: don't complain about duplicate components for libmerged

It seems that it is possible to have multiple components per library
nowadays, however i think it's confusing to actually do this except when
necessary, i.e. when using --enable-mergelibs.

Change-Id: I4d6260974f83ea8c42d02578f45c6d9aa2ace330

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b9ea45e..0cb0fdb 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -109,7 +109,7 @@ endef
 # gb_Library__get_final_target has been invented for that purpose...
 define gb_Library_set_componentfile
 $(call gb_Library_get_target,$(gb_Library__get_name)) : \
-   COMPONENT := $$(if $$(COMPONENT),\
+   COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out 
$(gb_MERGEDLIBS),$(1))),\
  $$(call gb_Output_error,$(1) already has a component file 
$$(COMPONENT)))$(2)
 $(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-01 Thread Michael Stahl

 solenv/gbuild/filter-showIncludes.pl |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e9da4879384c15da84e26d137302ae1ccc30f86a
Author: Michael Stahl 
Date:   Wed Aug 1 20:52:50 2012 +0200

filter-showIncludes: filter out system headers

A blacklist based approach doesn't seem easy since there are various
different SDKs, MFC, ATL and whatnot each potentially with an own
include path; so simply whitelist the known source and build dirs.

Change-Id: I93b27bd0ffbd57237da2d23afa95dea7c0785774

diff --git a/solenv/gbuild/filter-showIncludes.pl 
b/solenv/gbuild/filter-showIncludes.pl
index d7082a2..1ed3679 100755
--- a/solenv/gbuild/filter-showIncludes.pl
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -43,6 +43,11 @@ while (  ) {
 chomp;
 s/\\/\//g;
 
+
+# skip system headers, i.e. everything not under source or build dirs
+if ( /$ENV{'SRCDIR'}|$ENV{'OUTDIR'}|$ENV{'WORKDIR'}/ )
+{
+
 # X: -> /cygdrive/x/
 s/^(.):/\/cygdrive\/\l\1/;
 
@@ -52,6 +57,7 @@ while (  ) {
 $seen{$_} = 1;
 print $OUT " \\\n  $_";
 }
+}
 }
 else {
 # skip the first line, it always just duplicates what is being
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-08-01 Thread Bjoern Michaelsen

 solenv/gbuild/StaticLibrary.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23e5bb66436991d809d8d807f27d25f922fb062f
Author: Bjoern Michaelsen 
Date:   Wed Aug 1 18:28:26 2012 +0200

StaticLibrary too

Change-Id: I2bda0e3117fb70353c52d5998e7784b6123ab38e

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 2d4a9d5..c84e822 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -66,7 +66,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
 )
-$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) \
+$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) $(gb_LinkTarget_get_dep_target,$(2)) \
| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-07-10 Thread Stephan Bergmann

 solenv/gbuild/JunitTest.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a3a0b819bbc597db7c536180c86986b91dd9b063
Author: Stephan Bergmann 
Date:   Tue Jul 10 19:38:11 2012 +0200

Avoid unhelpful 'Binary file ... matches' output instead of error 
information

...when grep happens to consider the log file to be binary (for whatever 
reason)
as can be obvserved to happen on Linux-RHEL6-x86_64@14-with-check tinderbox.

Change-Id: I5da0a792b45b83939c9c26897d30ddf8b0a0c0b0

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 31cf96e..5eb7d3a 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -51,10 +51,7 @@ $(call gb_JunitTest_get_target,%) :
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) > $@.log 2>&1 || \
-   (grep -v -e 'at org.junit.' \
-   -e 'at java.lang.reflect.' \
-   -e 'at sun.reflect.' $@.log \
-   && echo "see full error log at $@.log" \
+   (cat $@.log \
&& echo "to rerun just this failed test without all others, 
run:" \
&& echo && echo "make $@" && echo \
&& echo "cd into the module dir to run the tests faster" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-07-10 Thread Michael Stahl

 solenv/gbuild/JunitTest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9991c0f552bfc9c6ea3e6e6d65fe67cc32f243fd
Author: Michael Stahl 
Date:   Tue Jul 10 16:22:29 2012 +0200

gbuild: sigh... that didn't help... let's try an eval here

Change-Id: Ief6367a5fb8e2e1000bb94c7a4e6cf2095b24543

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index c74a7ce..31cf96e 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -70,7 +70,7 @@ $(call gb_JunitTest_get_target,%) :
 define gb_JunitTest_JunitTest
 $(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value 
XCLASSPATH),$(value XCLASSPATH)$(gb_CLASSPATHSEP))$(call 
gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
-$(call gb_JunitTest_JunitTest_platform,$(1))
+$(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
 
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
 $(call gb_JavaClassSet_use_system_jar,$(call 
gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-07-10 Thread Michael Stahl

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c854d36984789c1ffac8c83c929406c10ba99462
Author: Michael Stahl 
Date:   Tue Jul 10 15:29:02 2012 +0200

gbuild: remove trailing \ that is apparently...

... causing LO patched make 3.82 to fail with "Malformed target-specific
variable definition" on the next line.

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 857b91a..05d7628 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -638,7 +638,7 @@ $(call 
gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:`cat 
$(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 
3/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-   -Dorg.openoffice.test.arg.user=file:///$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.user=file:///$(call 
gb_JunitTest_get_userdir,$(1))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-07-10 Thread Michael Stahl

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a6e3c2b4800144df40e5f78f6f912cdc6a575a32
Author: Michael Stahl 
Date:   Tue Jul 10 13:37:34 2012 +0200

gbuild: Microsoft Resource Compiler does not do -nologo

At least the version 6.1.6723.1 that is in the Windows SDK 6.0A only
complains about "invalid option: -ologo".

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 41a231e..857b91a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -672,7 +672,6 @@ $(call gb_Output_announce,$(2),$(true),RES,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_RC) \
-   -nologo \
$(DEFS) $(FLAGS) \
$(INCLUDE) \
-Fo$(1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-07-04 Thread Lubos Lunak

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c42a8d41afbd8c49b68046eeb8480e04d4f072c4
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Jul 4 18:22:36 2012 +0200

use -nologo with other MSVC build tools too

Except for non-silent linking, where it would for some strange reason
also disable printing of contents of response files (=objects to be linked).

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5629ee5..efb000e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -205,6 +205,7 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
 
 gb_LinkTarget_LDFLAGS := \
+   $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
-MANIFEST \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst 
\,/,$(ILIB) \
 
@@ -355,8 +356,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); 
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; 
fi) \
-   $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
-   $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+   $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
+   $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
; exit $$RC)
 endef
 
@@ -670,6 +671,7 @@ $(call gb_Output_announce,$(2),$(true),RES,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_RC) \
+   -nologo \
$(DEFS) $(FLAGS) \
$(INCLUDE) \
-Fo$(1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-06-13 Thread Miklos Vajna

 solenv/gbuild/Module.mk |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit c6bb0ce39c6d5f74258e9269176420b436d8c83b
Author: Miklos Vajna 
Date:   Wed Jun 13 15:10:42 2012 +0200

gbuild: don't suggest make install on WNT

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index e5f87f0..20fbba5 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -100,6 +100,7 @@ ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
 debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
 endif
 
+ifneq ($(OS),WNT)
 define gb_Module_BUILDHINT
 
 LibreOffice build successfully finished.
@@ -110,6 +111,15 @@ To run smoketest, issue: $(MAKE) check
 For crosscompiles, please consult README.cross how to install it.
 
 endef
+else
+define gb_Module_BUILDHINT
+
+LibreOffice build succesfully finished.
+
+Please consult instsetoo_native/README on installing it.
+
+endef
+endif
 
 define gb_Module_DEVINSTALLHINT
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-06-07 Thread Michael Stahl

 solenv/gbuild/InstallModule.mk  |2 +-
 solenv/gbuild/InternalUnoApi.mk |6 +-
 solenv/gbuild/Package.mk|   11 ---
 solenv/gbuild/UnoApi.mk |4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 31a353719851b08664b7f13ca59f39a993e66ba6
Author: Michael Stahl 
Date:   Thu Jun 7 14:04:06 2012 +0200

gbuild: introduce gb_Package_Package_internal:

The gb_InternalUnoApi_set_xmlfile function creates a new package, which
registers at the current Module, overwriting the InternalUnoApi targets set
there and causing make clean not to clean the InternalUnoApi.

Change-Id: I46e9b4437788a479701187334325fe1e065e612c

diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index c04e151..f1b9dbe 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -40,7 +40,7 @@ $(call gb_InstallModule_get_clean_target,%) :
 
 define gb_InstallModule_InstallModule
 $(call gb_InstallModuleTarget_InstallModuleTarget,$(1))
-$(call gb_Package_Package,$(1)_par,$(call 
gb_InstallModuleTarget_get_workdir,$(1)))
+$(call gb_Package_Package_internal,$(1)_par,$(call 
gb_InstallModuleTarget_get_workdir,$(1)))
 
 $(call gb_InstallModule_get_target,$(1)) : $(call 
gb_InstallModuleTarget_get_target,$(1))
 $(call gb_InstallModule_get_target,$(1)) : $(call 
gb_Package_get_target,$(1)_par)
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index f5c2aa2..a32984f 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -113,8 +113,12 @@ endef
 
 define gb_InternalUnoApi_set_xmlfile
 $(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2))
-$(call gb_Package_Package,$(1)_xml,$(SRCDIR))
+$(call gb_Package_Package_internal,$(1)_xml,$(SRCDIR))
 $(call gb_Package_add_file,$(1)_xml,xml/$(notdir $(2)),$(2))
+$(call gb_InternalUnoApi_get_target,$(1)) :| \
+   $(call gb_Package_get_target,$(1)_xml)
+$(call gb_InternalUnoApi_get_clean_target,$(1)) : \
+   $(call gb_Package_get_clean_target,$(1)_xml)
 
 endef
 
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 02d447c..e1d199e 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -67,15 +67,20 @@ $(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
mkdir -p $(dir $@) && touch $@
 
-
-define gb_Package_Package
+# for other targets that want to create Packages, does not register at Module
+define gb_Package_Package_internal
 gb_Package_SOURCEDIR_$(1) := $(2)
 $(call gb_Package_get_clean_target,$(1)) : FILES := $(call 
gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call 
gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1
 $(call gb_Package_get_target,$(1)) : $(call 
gb_Package_get_preparation_target,$(1))
 
 endef
 
+define gb_Package_Package
+$(call gb_Package_Package_internal,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call 
gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1
+
+endef
+
 define gb_Package_add_file
 $(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
 $(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 6455999..3619e9a 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -33,8 +33,8 @@ $(call gb_UnoApi_get_clean_target,%) :
 define gb_UnoApi_UnoApi
 $(call gb_UnoApiTarget_UnoApiTarget,$(1))
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
-$(call gb_Package_Package,$(1)_idl,$(SRCDIR))
-$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
+$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
+$(call gb_Package_Package_internal,$(1)_inc,$(call 
gb_UnoApiHeadersTarget_get_dir,$(1)))
 
 $(call gb_UnoApiTarget_set_root,$(1),UCR)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-06-06 Thread Norbert Thiebaud

 solenv/gbuild/platform/com_GCC_class.mk |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3212b694eebb260495bee1fa46c2e20b3f8c630c
Author: Norbert Thiebaud 
Date:   Wed Jun 6 12:31:17 2012 -0500

fix typo that prevented the proper management of .d files

Change-Id: I2e958fde37bc2cf13d4b37d8e8ae9e7bd64061d2

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 478d5fd..b098c99 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -21,10 +21,10 @@
 # instead of those above.
 
 ifeq ($(gb_FULLDEPS),$(true))
-gb_ccx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
-gb_cxx_dep_copy=&& mv $(4)_ $(4)
+gb_cxx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
+gb_cxx_dep_copy=&& mv $(4)_ $(4)
 else
-gb_ccx_dep_generation_options=
+gb_cxx_dep_generation_options=
 gb_cxx_dep_copy=
 endif
 
@@ -62,10 +62,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
-   $(gb_ccx_dep_generation_options) \
+   $(gb_cxx_dep_generation_options) \
-I$(dir $(3)) \
$(INCLUDE) \
-   $(gb_ccx_dep_copy) \
+   $(gb_cxx_dep_copy) \
)
 endef
 
@@ -83,10 +83,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-   $(gb_ccx_dep_generation_options) \
+   $(gb_cxx_dep_generation_options) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
-   $(gb_ccx_dep_copy) \
+   $(gb_cxx_dep_copy) \
)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-06-05 Thread Norbert Thiebaud

 solenv/gbuild/platform/com_GCC_class.mk |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

New commits:
commit b1ad78d25c298e4f9b24ef7a761c9bba1f34c2ed
Author: Norbert Thiebaud 
Date:   Tue Jun 5 14:13:14 2012 -0500

Do not build c/cxx .d file when --disable-dependency-tracking

--disable-dependency-tracking is for build environment that
always do make clea + make to build
These do not need the dependency information and therefore
can save the expenses of tracking them.
the gc c/cxx compile command was using -MMD etc.. systematically.
this patch take gb_FULLDEPS value into account to avoid
-MMD when not necessary

Change-Id: Ic5c3c368c81da2b260a4fcdf03fdc01b45a9cb1f

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b864ba4..478d5fd 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -20,6 +20,14 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+ifeq ($(gb_FULLDEPS),$(true))
+gb_ccx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
+gb_cxx_dep_copy=&& mv $(4)_ $(4)
+else
+gb_ccx_dep_generation_options=
+gb_cxx_dep_copy=
+endif
+
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
@@ -54,11 +62,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
-   -MMD -MT $(1) \
-   -MP -MF $(4)_ \
+   $(gb_ccx_dep_generation_options) \
-I$(dir $(3)) \
-   $(INCLUDE) && \
-   mv $(4)_ $(4))
+   $(INCLUDE) \
+   $(gb_ccx_dep_copy) \
+   )
 endef
 
 # CxxObject class
@@ -75,11 +83,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-   -MMD -MT $(1) \
-   -MP -MF $(4)_ \
+   $(gb_ccx_dep_generation_options) \
-I$(dir $(3)) \
-   $(INCLUDE_STL) $(INCLUDE) && \
-   mv $(4)_ $(4))
+   $(INCLUDE_STL) $(INCLUDE) \
+   $(gb_ccx_dep_copy) \
+   )
 endef
 
 define gb_SrsPartTarget__command_dep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-30 Thread David Tardon

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bdb1df4b009758c5f26b84acfc10f814ad77fd7
Author: David Tardon 
Date:   Wed May 30 10:10:50 2012 +0200

look for win x64 libs in $(OUTDIR)/lib/x64

Change-Id: I5388132b0dbb0d904a5b235139bfa1f0e078e5ba

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3882327..23ccc7f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -343,7 +343,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, 
-SUBSYSTEM:CONSOLE) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) 
\
-   $(if $(filter YES,$(LIBRARY_X64)), 
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
+   $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib))) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-29 Thread Andras Timar

 solenv/gbuild/StaticLibrary.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e8551287cf2161ba7a55eb19df23069e693d6b3e
Author: Andras Timar 
Date:   Wed May 30 00:11:07 2012 +0200

remove already added set_x64

Change-Id: I62c72e499119eb43ed0c75fe1f5cb1c9fc06c113

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index e8ef3e6..2d4a9d5 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -102,7 +102,6 @@ $(eval $(foreach method,\
add_objcflags \
add_objcxxflags \
set_objcxxflags \
-   set_x64 \
add_defs \
set_defs \
set_include \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-25 Thread Stephan Bergmann

 solenv/gbuild/UnoApiTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d199e410bda1ba148eed26176e1003df21eaa75
Author: Stephan Bergmann 
Date:   Fri May 25 10:27:30 2012 +0200

Removed documentation from type rdbs

Before gbuild'ification, solenv/inc/target.mk carefully produced two 
variants of
each type rdb, a plain one from calling idlc w/o -C and a *_doc variant from
calling idlc w/ -C ("generate complete type information, including
documentation").  After gbuild'ification, solenv/gbuild/UnoApiTarget.mk
unconditionally only produced "complete" type rdbs from calling idlc w/ -C.

It is unclear to me whether the old *_doc variants had actually been used 
for
anything (what got packaged into installation sets apparently were the 
plain,
slim variants; and autodoc apparently does not need the *_doc variants, 
either,
as it produces UNOIDL documentation directly from .idl files).  It is also
unclear to me whether the gbuild switch to effectively package complete, fat
rdbs was deliberate or not.  (The only client-visible change I see is that 
low-
level C/C++ typereg_reader_getDocumentation could now report something.  The
reflective UNO services at com.sun.star.reflection would not offer access 
to the
documenation anyway, however.)

The benefit of no longer including documentation in the packaged type rdbs 
is
size; the URE types.rdb shrinks from 1.2 MiB to 819 KiB, and offapi.rdb 
shrinks
from 11 MiB to 6.5 MiB.

Change-Id: Ib278f74fc3b22169e00a09d778807f8cf58520c4

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 42584ce..206bbb9 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -58,7 +58,7 @@ define gb_UnoApiPartTarget__command
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
$(INCLUDE) \
-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir 
$(2 \
-   -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose 
-C \
+   -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose \
$(sort $(patsubst $(call 
gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3 && \
$(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
rm -f $${RESPONSEFILE} && \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-17 Thread François Tigeot

 solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk  |2 +-
 solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99ea506a582d547bb14ec7f1a0bf469991e3f669
Author: FranÃ§ois Tigeot 
Date:   Thu May 17 17:32:54 2012 +0200

DragonFly: use -O2 as default CFLAGS

Change-Id: Ifb9f4627c15d5f1410af2b87bf2e2f39c945671c

diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk 
b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index 82db0b3..e875c99 100644
--- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -28,7 +28,7 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
+gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk 
b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
index 403db53..4bf2d99 100644
--- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -27,7 +27,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
+gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-15 Thread Stephan Bergmann

 solenv/gbuild/Library.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 47ba662ce60d89572a2269523d07034f16edf33c
Author: Stephan Bergmann 
Date:   Tue May 15 11:22:44 2012 +0200

Explicitly initialize target-specific variables

...so they do not erroneously inherit values from other targets.

Change-Id: I6c84cecad4ea858b77d5d83eb93938c397aed076

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 3197265..cd49b27 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -61,6 +61,8 @@ $$(eval $$(call gb_Output_info,Currently known libraries are: 
$(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Library $(1) must be registered in 
Repository.mk))
 endif
 $(call gb_Library_get_target,$(1)) : AUXTARGETS :=
+$(call gb_Library_get_target,$(1)) : SOVERSION :=
+$(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT :=
 $(call gb_Library__Library_impl,$(1),$(call 
gb_Library_get_linktargetname,$(1)))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-09 Thread Michael Stahl

 solenv/gbuild/Helper.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e636c23bb9247325fba469612843399732ed4cd0
Author: Michael Stahl 
Date:   Wed May 9 15:39:43 2012 +0200

fix gb_Helper_abbreviate_dirs_native $ quoting

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3ac278d..93a0ad7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -48,11 +48,11 @@ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst 
$(WORKDIR)/,$$W/,$(1
 endef
 
 define gb_Helper_abbreviate_dirs_native
-$$(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use 
gb_Helper_abbreviate_dirs instead.)
+$(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use 
gb_Helper_abbreviate_dirs instead.)
 endef
 
 define gb_Helper_native_path
-$$(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be 
necessary.)
+$(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be 
necessary.)
 endef
 
 define gb_Helper_make_clean_target
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-09 Thread Tor Lillqvist

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eeccd69e49f9c237f3966a69f678894c9e5d4750
Author: Tor Lillqvist 
Date:   Wed May 9 12:07:07 2012 +0300

Add usp10 here, too

Change-Id: Ice9bf5cbd894950ef3db5fb32778c83bc4ab5baa

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index f425d36..a0cf531 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -244,6 +244,7 @@ gb_Library_PLAINLIBS_NONE += \
shlwapi \
urlmon \
user32 \
+   usp10 \
uuid \
winmm \
version \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 128 matches

Mail list logo