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

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

2012-04-23 Thread Tor Lillqvist

 solenv/gbuild/platform/macosx.mk |2 +-
 solenv/inc/unxmacx.mk|   12 +---
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit c29b6b2a065bbf7ade2d6b62dfd1c0245318f355
Author: Tor Lillqvist 
Date:   Sun Apr 22 22:44:08 2012 +0300

No -malign-natural in Clang, not Apple's at least

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d4d113d..819fbef 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -75,7 +75,7 @@ gb_CXXFLAGS := \
-Wno-non-virtual-dtor \
-fno-strict-aliasing \
-fsigned-char \
-   -malign-natural \
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \
#-Wshadow \ break in compiler headers already
#-fsigned-char \ might be removed?
#-malign-natural \ might be removed?
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 1ca6a82..1a7c891 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -88,7 +88,7 @@ CC*=gcc
 objc*=$(CC)
 objcpp*=$(CXX)
 
-CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
+CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS)
 
 .IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
 CFLAGS+=-Wno-deprecated-declarations
@@ -97,7 +97,10 @@ CFLAGS+=-Wno-deprecated-declarations
 #  Compilation flags
 # -
 # Normal C compilation flags
-CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
+CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS)
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSCC+=-malign-natural
+.ENDIF
 
 # Normal Objective C compilation flags
 #OBJCFLAGS=-no-precomp
@@ -117,7 +120,10 @@ CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
 # Normal C++ compilation flags
-CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS) 
-Wno-ctor-dtor-privacy
+CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSCXX+=-malign-natural
+.ENDIF
 .IF "$(HAVE_GCC_NO_LONG-DOUBLE)" == "TRUE"
 CFLAGSCXX+= -Wno-long-double
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-19 Thread David Tardon

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

New commits:
commit fba1422900c6d1763e2792b4a798d8c840d38fb1
Author: David Tardon 
Date:   Thu Apr 19 15:10:47 2012 +0200

extension libs should have no RPATH

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 28de7bd..1152c68 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,7 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -301,12 +301,15 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
-define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-L$(gb_Library_OUTDIRLOCATION)'
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)'))
 #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
 endef
 
+define gb_Library_get_rpath
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
+endef
+
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library_get_rpath,$(1))
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 37243ad..58bc7eb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,7 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
@@ -312,9 +312,12 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' 
'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
+endef
+
 define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
 endef
 
 define gb_Library_Library_platform
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-19 Thread David Tardon

 solenv/gbuild/platform/macosx.mk  |1 +
 solenv/gbuild/platform/solaris.mk |1 +
 solenv/gbuild/platform/unxgcc.mk  |1 +
 3 files changed, 3 insertions(+)

New commits:
commit b98c960e9707d8222dd7c8fad22e84bbfb725822
Author: David Tardon 
Date:   Thu Apr 19 14:31:40 2012 +0200

add OXT to gb_LinkTarget__RPATHS too

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a55af3a..2ab1336 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -157,6 +157,7 @@ gb_LinkTarget__RPATHS := \
UREBIN: \
OOO:@__OOO/ \
SDKBIN: \
+   OXT: \
NONE:@__VIA_LIBRARY_PATH__@ \
 
 # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index cc8a2a8..28de7bd 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,6 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 31859a2..37243ad 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,6 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-13 Thread Matus Kukan

 solenv/gbuild/Helper.mk |   17 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |7 +--
 solenv/gbuild/platform/com_GCC_defs.mk  |8 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 8fd5ba3749aa740b3c060db775b42f15a5ce50a7
Author: MatÃºÅ¡ Kukan 
Date:   Fri Apr 13 11:18:26 2012 +0200

gbuild: improve handling of paths

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3d41f77..e5106db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -43,13 +43,28 @@ $(gb_Helper_MISCDUMMY) :
 define gb_Helper_abbreviate_dirs
 S=$(SRCDIR) && \
 $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \
-$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst 
$(WORKDIR)/,$$W/,$(1
+$(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) && \
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,\
+$(call gb_Helper_unix_path,$(1)
 endef
 
 define gb_Helper_abbreviate_dirs_native
 $(call gb_Helper_native_path,$(call gb_Helper_abbreviate_dirs,$(1)))
 endef
 
+# Convert path to native notation
+# First convert to unix style to avoid problems when
+# $(SRCDIR) is substring of $(gb_Helper_SRCDIR_NATIVE)
+# and $(1) already contains $(gb_Helper_SRCDIR_NATIVE)
+define gb_Helper_native_path
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(call gb_Helper_unix_path,$(1)))
+endef
+
+# $(gb_Helper_SRCDIR_NATIVE) can't be substring of $(SRCDIR)
+define gb_Helper_unix_path
+$(subst $(gb_Helper_SRCDIR_NATIVE),$(SRCDIR),$(1))
+endef
+
 define gb_Helper_make_clean_target
 gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index fff0b8a..a6d88ff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -244,15 +244,10 @@ endif
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
 
 gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
-# Convert path to native notation
-define gb_Helper_native_path
-$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(1))
-endef
-
 # Convert path to file URL.
 define gb_Helper_make_url
 file:///$(strip $(1))
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 8287624..cf4dcab 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -115,7 +115,7 @@ gb_COMPILERNOOPTFLAGS := -O0
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
-
+# Helper class
 
 ifeq ($(OS_FOR_BUILD),MACOSX)
 gb_Helper_LIBRARY_PATH_VAR := DYLD_LIBRARY_PATH
@@ -134,11 +134,6 @@ define gb_Helper_extend_ld_path
 $(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
 endef
 
-# Convert path to native notation
-define gb_Helper_native_path
-$(1)
-endef
-
 # Convert path to file URL.
 define gb_Helper_make_url
 file://$(strip $(1))
@@ -146,5 +141,6 @@ endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
+gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
 
 gb_Helper_get_rcfile = $(1)rc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-09 Thread Matus Kukan

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

New commits:
commit 1a41f2730da3b9aa2c89d9420209a4b4d2ecb9aa
Author: MatÃºÅ¡ Kukan 
Date:   Mon Apr 9 23:45:15 2012 +0200

this was accidentally removed

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 9b302d3..8014915 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -28,6 +28,7 @@ gb_AsmObject_get_source = $(1)/$(2).s
 define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-06 Thread Lubos Lunak

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

New commits:
commit 6a7cb5088bc162c3bf2cadf6cd9e5b03865106e6
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Apr 7 02:17:28 2012 +0200

no trailing \ on last line, so that endif is taken as a directive

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 08b5351..c1cf033 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -95,7 +95,7 @@ endif
 
 ifeq ($(gb_PRODUCT),$(true))
 gb_LinkTarget_EXCEPTIONFLAGS += \
-   -fno-enforce-eh-specs \
+   -fno-enforce-eh-specs
 endif
 
 # At least sal defines its own __main, which would cause DLLs linking against
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-06 Thread Lubos Lunak

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 ++
 solenv/gbuild/platform/com_GCC_defs.mk  |2 ++
 solenv/inc/unxgcc.mk|2 ++
 solenv/inc/unxiosr.mk   |2 ++
 solenv/inc/unxmacx.mk   |2 ++
 solenv/inc/wntgcci.mk   |5 -
 6 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit cdd0e1810d4019d827563b436c1b3b8d1cf5b579
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Apr 6 21:29:43 2012 +0200

enable -fno-enforce-eh-specs only for non-dbgutil builds

The code uses exception specifications, so it doesn't make much
sense to have them, but disable them using a gcc option. MSVC
ignores them completely, so this would leave only clang as
the only compiler to enforce them. Either the majority compiler
needs to enforce it at least in dbgutil builds (in product builds
the option can be seen as a kind of NDEBUG), or alternatively
the exception specifications should be removed.

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 1ba676f..08b5351 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -93,8 +93,10 @@ ifeq ($(HAVE_CXX0X),TRUE)
 # FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x
 endif
 
+ifeq ($(gb_PRODUCT),$(true))
 gb_LinkTarget_EXCEPTIONFLAGS += \
-fno-enforce-eh-specs \
+endif
 
 # At least sal defines its own __main, which would cause DLLs linking against
 # sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4018ebc..c025e70 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -120,11 +120,13 @@ gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-fexceptions
 
+ifeq ($(gb_PRODUCT),$(true))
 # Clang doesn't have this option
 ifneq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LinkTarget_EXCEPTIONFLAGS += \
-fno-enforce-eh-specs
 endif
+endif
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 4f9ebee..151fc8b 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -83,9 +83,11 @@ CFLAGSENABLESYMBOLS=-g
 CFLAGSCC= -pipe $(ARCH_FLAGS)
 # Flags for enabling exception handling
 CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(dbgutil)"==""
 .IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
 .ENDIF
+.ENDIF
 # Flags for disabling exception handling
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 05bded5..089dc3d 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -53,9 +53,11 @@ OBJCXXFLAGS:=-x objective-c++ $(OBJCFLAGS)
 
 # Comp Flags for files that need exceptions enabled (C and C++)
 CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(dbgutil)"==""
 .IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
 .ENDIF
+.ENDIF
 
 # Comp Flags for files that do not need exceptions enabled (C and C++)
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8f36772..c829a45 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -107,9 +107,11 @@ OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
 
 # Comp Flags for files that need exceptions enabled (C and C++)
 CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(dbgutil)"==""
 .IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
 .ENDIF
+.ENDIF
 
 # Comp Flags for files that do not need exceptions enabled (C and C++)
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index bdf46b4..c8e39d1 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -51,8 +51,11 @@ CFLAGSCXX=-pipe $(ARCH_FLAGS)
 # FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x
 .ENDIF
 
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+CFLAGSEXCEPTIONS=-fexceptions
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+.IF "$(dbgutil)"==""
+CFLAGSEXCEPTIONS+= -fno-enforce-eh-specs
+.ENDIF
 PICSWITCH:=
 
 CFLAGSOBJGUIST=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-04-03 Thread Michael Stahl

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

New commits:
commit 72e7082f158d5d4216ea94a7617cdc39fc3a7e4b
Author: Michael Stahl 
Date:   Tue Apr 3 14:46:15 2012 +0200

LinkTarget.mk: fix stupid typo in 0683821d

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 83f395a..a217086 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -232,7 +232,7 @@ gb_ObjCObject_get_source = $(1)/$(2).m
 #  gb_ObjCObject__command
 
 $(call gb_ObjCObject_get_target,%) : $(call 
gb_ObjCObject_get_source,$(SRCDIR),%)
-   $(call gb_ObjCObject__command,$@,$*,$<,$(call 
gb_ObjObject_get_dep_target,$*))
+   $(call gb_ObjCObject__command,$@,$*,$<,$(call 
gb_ObjCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-31 Thread Matus Kukan

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

New commits:
commit 41f74a4c6a4a88b675a443436df7f409754d34f8
Author: MatÃºÅ¡ Kukan 
Date:   Sat Mar 31 23:19:58 2012 +0200

Revert "gbuild: do not let generated source files depend on headers"

There is a reason for that dependency. I will have to come up with
something better later.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ba3ea56..11eeb02 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,7 +745,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
-$(call gb_GenCObject_get_target,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCObject_get_source,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
 $(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
 $(call gb_GenCObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -762,7 +762,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += 
$(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
-$(call gb_GenCxxObject_get_target,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCxxObject_get_source,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
 $(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
 $(call gb_GenCxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-30 Thread Jan Holesovsky

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

New commits:
commit 3cf66a899ec1c8eed3a95b7f08824d5c8db0d0a8
Author: Jan Holesovsky 
Date:   Fri Mar 30 13:44:33 2012 +0200

filter-showIncludes.pl: Attempt to prevent creating incomplete .d files.

diff --git a/solenv/gbuild/filter-showIncludes.pl 
b/solenv/gbuild/filter-showIncludes.pl
index ee9a34b..d7082a2 100755
--- a/solenv/gbuild/filter-showIncludes.pl
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -13,6 +13,10 @@
 #
 # Original author: Jan Holesovsky 
 
+use File::Basename;
+use File::Copy;
+use File::Temp qw/tempfile/;
+
 my $outfile = $ARGV[0];
 my $objfile = $ARGV[1];
 my $srcfile = $ARGV[2];
@@ -25,8 +29,9 @@ if ( !defined( $showincludes_prefix ) || $showincludes_prefix 
eq "" ) {
 $showincludes_prefix = 'Note: including file:';
 }
 
-open( OUT, "> $outfile" ) or die "Cannot open $outfile for writing.";
-print OUT "$objfile: \\\n $srcfile";
+my ($OUT, $tmp_filename) = tempfile( 'showIncludesXX', DIR => dirname( 
$outfile ) ) or die "Cannot create a temp file.";
+
+print $OUT "$objfile: \\\n $srcfile";
 
 my %seen;
 my $first_line = 1;
@@ -45,7 +50,7 @@ while (  ) {
 
 if ( !defined $seen{$_} ) {
 $seen{$_} = 1;
-print OUT " \\\n  $_";
+print $OUT " \\\n  $_";
 }
 }
 else {
@@ -56,7 +61,7 @@ while (  ) {
 $first_line = 0;
 }
 
-print OUT "\n";
+print $OUT "\n";
 
 # fdo#40099 if header.h does not exist, it will simply be considered out of
 # date and any targets that use it as a prerequisite will be updated,
@@ -64,9 +69,11 @@ print OUT "\n";
 # as an include
 # see http://www.makelinux.net/make3/make3-CHP-8-SECT-3
 foreach my $key ( keys %seen ) {
-  print OUT "\n$key:\n";
+  print $OUT "\n$key:\n";
 }
 
-close( OUT ) or die "Cannot close $outfile.";
+close( $OUT ) or die "Cannot close $tmp_filename.";
+
+move( $tmp_filename, $outfile ) or die "Cannot move $tmp_filename to 
$outfile.";
 
 # vim: shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-22 Thread Norbert Thiebaud

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

New commits:
commit 9d2968d6dd12cda797aa31bc0f0798f835cd073a
Author: Norbert Thiebaud 
Date:   Thu Mar 22 23:57:09 2012 -0500

disable gb_FULLDEPS when TINDERBUILD is set _and_ we are really building

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a26f451..d16d33a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -113,14 +113,14 @@ endif
 
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
-ifdef TINDERBUILD
 gb_FULLDEPS := $(false)
 else
+ifdef TINDERBUILD
 gb_FULLDEPS := $(false)
-endif
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-22 Thread Norbert Thiebaud

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

New commits:
commit 7be7f9a7863cbd862dd5a5462c508db03c56c8d1
Author: Norbert Thiebaud 
Date:   Thu Mar 22 17:26:11 2012 -0500

gbuild: allow the tinderboxes to bypass the dependencies generations

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 119f6e5..5ad2378 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -113,8 +113,12 @@ endif
 
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
+ifdef TINDERBUILD
 gb_FULLDEPS := $(false)
 else
+gb_FULLDEPS := $(false)
+endif
+else
 gb_FULLDEPS := $(true)
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-22 Thread Stephan Bergmann

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 1e18fdb2fa0812f91685d9580d48e4d2f8452a26
Author: Stephan Bergmann 
Date:   Thu Mar 22 15:01:35 2012 +0100

MinGW: work around newly ambiguous boost::bind calls with GCC 4.6

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 363f1f3..1ba676f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -34,6 +34,10 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 include $(GBUILDDIR)/platform/windows.mk
 
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \
+'{ print $$1*1+$$2*100+$$3 }')
+gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
+
 gb_RC := $(WINDRES)
 
 ifeq ($(GXX_INCLUDE_PATH),)
@@ -45,7 +49,14 @@ gb_COMPILERDEFS += \
-D_NATIVE_WCHAR_T_DEFINED \
-D_MSC_EXTENSIONS \
-D_FORCENAMELESSUNION \
-   -DBOOST_MEM_FN_ENABLE_CDECL \
+
+# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL
+# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7,
+# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for
+# uses of boost::bind with functions annotated with SAL_CALL:
+ifeq ($(gb_GccLess470),0)
+gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
+endif
 
 gb_RCDEFS := \
 -DWINVER=0x0400 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-18 Thread Matus Kukan

 solenv/gbuild/templates/makefile.mk |   41 
 solenv/inc/gbuildbridge.mk  |4 +--
 2 files changed, 3 insertions(+), 42 deletions(-)

New commits:
commit 323a936e23e27d7691eb115d3d1a696acad94d9a
Author: MatÃºÅ¡ Kukan 
Date:   Sun Mar 18 12:01:25 2012 +0100

gbuildbridge: gb_MAKETARGET is empty, gb_PARTIALBUILD defined in 
partial_build

diff --git a/solenv/gbuild/templates/makefile.mk 
b/solenv/gbuild/templates/makefile.mk
index d4cf94e..0997622 100644
--- a/solenv/gbuild/templates/makefile.mk
+++ b/solenv/gbuild/templates/makefile.mk
@@ -1,40 +1 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF "$(VERBOSE)"!=""
-VERBOSEFLAG :=
-.ELSE
-VERBOSEFLAG := -s
-.ENDIF
-
-all:
-   cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+.INCLUDE : gbuildbridge.mk
diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
index de43800..b9b1264 100644
--- a/solenv/inc/gbuildbridge.mk
+++ b/solenv/inc/gbuildbridge.mk
@@ -34,8 +34,8 @@ TARGET=prj
 all:
 .ELIF "$(VERBOSE)"!=""
 all:
-   cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) gb_PARTIALBUILD=T
+   cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM)
 .ELSE
 all:
-   @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) gb_PARTIALBUILD=T
+   @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM)
 .END
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Lubos Lunak

 solenv/gbuild/platform/unxgcc.mk |4 
 solenv/inc/unxgcc.mk |4 
 2 files changed, 8 insertions(+)

New commits:
commit cc9a10185749210825fe6970ea4b103eb78e329e
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Mar 15 10:30:39 2012 +0100

clang doesn't have a problem with -Wnon-virtual-dtor

Even if some older version possibly does, I doubt anybody would
realistically use it.

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 1565d1c..9c2b405 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -65,6 +65,7 @@ gb_CXXFLAGS := \
-Wsign-promo \
-Woverloaded-virtual \
 
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 # Only GCC 4.6 has a fix for 
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -75,6 +76,9 @@ gb_CXXFLAGS += -Wno-non-virtual-dtor
 else
 gb_CXXFLAGS += -Wnon-virtual-dtor
 endif
+else
+gb_CXXFLAGS += -Wnon-virtual-dtor
+endif
 
 ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
 gb_COMPILERDEFS += \
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 5ef9f98..4f9ebee 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -148,6 +148,7 @@ CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 # Only GCC 4.6 has a fix for 
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -158,6 +159,9 @@ CFLAGSWARNCXX += -Wno-non-virtual-dtor
 .ELSE
 CFLAGSWARNCXX += -Wnon-virtual-dtor
 .END
+.ELSE
+CFLAGSWARNCXX += -Wnon-virtual-dtor
+.END
 
 COMPILER_WARN_ERRORS=TRUE
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Lubos Lunak

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 +
 solenv/inc/wntmsc.mk|4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 370b3b6232a0851d68bb894c2b8ee71b9504384b
Author: Lubos Lunak 
Date:   Thu Mar 15 11:45:08 2012 +0100

disable msvc warning 4265 (non-virtual dtor)

msvc2008 now prints out a lot of warnings, probably a result
of the recent -Wnon-virtual-dtor changes where msvc does not
understand the protected dtor actually makes the code to be ok

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6902642..ab7728e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -147,6 +147,7 @@ gb_CXXFLAGS := \
-wd4245 \
-wd4250 \
-wd4251 \
+   -wd4265 \
-wd4275 \
-wd4290 \
-wd4294 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index f7b2dbe..afafe38 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -173,6 +173,8 @@ CFLAGSOUTOBJ=-Fo
 #   (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx)
 # - "warning C4180: qualifier applied to function type has no meaning; ignored"
 #   (frequently seen with a recent boost)
+# - "warning C4265: 'identifier' : class has virtual functions, but destructor 
is not
+#   virtual"
 # For C, certain warnings from system headers (stdlib.h etc.) have to be
 # disabled globally (for C++, this is not necessary, as the system headers are
 # wrapped by STLport):
@@ -184,7 +186,7 @@ CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 
-wd4244 -wd4245 -wd4
 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4625 
-wd4626 \
 -wd4640 -wd4675 -wd4686 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 
-wd4503 -wd4619 \
 -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
--wd4180
+-wd4180 -wd4265
 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-12 Thread Matus Kukan

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

New commits:
commit 794f4e23290c8346b8e0ba2a2267a0eb2e745885
Author: MatÃºÅ¡ Kukan 
Date:   Tue Mar 13 01:55:12 2012 +0100

missing $: announce only if something is happening

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3bfc6b5..8011227 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -187,7 +187,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_SDFLOCATION)$(subst $(S
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
-   $(call gb_Output_announce,$(2),$(true),XHP,3)
+   $$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@) && \
$(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-08 Thread Noel Power

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

New commits:
commit c3d806be7d30a437607d924a4d33f13fe20dd1ba
Author: Noel Power 
Date:   Thu Mar 8 16:01:36 2012 +

fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index dc661d1..91d2be7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -366,7 +366,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(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 Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then 
mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+$(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) \
+; exit $$RC)
 endef
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-08 Thread François Tigeot

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

New commits:
commit 9ce48e3c881124b232f6689646122d7d6c4418ed
Author: FranÃ§ois Tigeot 
Date:   Thu Mar 8 16:09:41 2012 +0100

Use the same CFLAGS on DragonFly and NetBSD.

diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk 
b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index c0c31c9..6c79b78 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -28,7 +28,7 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_COMPILERDEFAULTOPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk 
b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index a426e2f..d4288fa 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -27,7 +27,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_COMPILERDEFAULTOPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-08 Thread François Tigeot

 solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk |   39 ---
 solenv/gbuild/platform/NETBSD_SPARC_GCC.mk   |   39 ---
 2 files changed, 78 deletions(-)

New commits:
commit cf7e8929323f1d65cd7539d77215115dad8cfc1b
Author: FranÃ§ois Tigeot 
Date:   Thu Mar 8 16:05:04 2012 +0100

Remove unused files.

They were identical to NETBSD_INTEL_GCC.mk anyway

diff --git a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk 
b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
deleted file mode 100644
index a426e2f..000
--- a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., CaolÃ¡n McNamara 
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-#please make generic modifications to unxgcc.mk
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
-
-gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk 
b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
deleted file mode 100644
index a426e2f..000
--- a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., CaolÃ¡n McNamara 
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-#please make generic modifications to unxgcc.mk
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
-
-gb_Helper_set_ld_path := 
LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := 
LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
-
-# vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-08 Thread David Tardon

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

New commits:
commit 74a6d7a135ca03c23eff8b360a748a8f964c92a3
Author: David Tardon 
Date:   Thu Mar 8 15:39:26 2012 +0100

fix mis-merge

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 49186c1..9fcaa33 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -183,7 +183,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst 
$(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-05 Thread Matus Kukan

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

New commits:
commit a5d28eaa69827ea3efe12f36517bb3e6915b1c8d
Author: MatÃºÅ¡ Kukan 
Date:   Tue Mar 6 01:13:36 2012 +0100

UnoApiTarget: add missing dependency

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index faee295..9d0cfc6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -55,7 +55,8 @@ endef
 
 define gb_UnoApiTarget_UnoApiTarget
 $$(eval $$(call gb_Module_register_target,$(call 
gb_UnoApiOutTarget_get_target,$(1)),$(call 
gb_UnoApiOutTarget_get_clean_target,$(1
-$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1)) \
+   | $(dir $(call gb_UnoApiOutTarget_get_target,$(1)))
 $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1))
 $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS :=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-03-02 Thread Andras Timar

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

New commits:
commit 48666b7d6006618d46e2a7686391440830f47ef1
Author: Andras Timar 
Date:   Fri Mar 2 14:35:43 2012 +0100

Cygwin uses internal Python which does not understand Cygwin paths

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6402b42..39853d9 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -700,6 +700,6 @@ gb_WinResTarget__command_dep =
 endif
 
 # Python
-gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" 
PYTHONHOME="$(OUTDIR)/lib/python" 
PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
+gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(shell cygpath -m $(OUTDIR)/bin)" 
PYTHONHOME="$(shell cygpath -m $(OUTDIR))/lib/python" PYTHONPATH="$(shell 
cygpath -m $(OUTDIR))/lib/python;$(shell cygpath -m 
$(OUTDIR))/lib/python/lib-dynload"
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-25 Thread Tor Lillqvist

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

New commits:
commit 9eb1c0cb7c3ae261d21b7efb30a6dbb1ec21c02f
Author: Tor Lillqvist 
Date:   Sun Feb 26 09:17:05 2012 +0200

Fix typos

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 6700ef8..10dac0b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -30,10 +30,10 @@ gb_Helper_NULLFILE := /dev/null
 
 gb_Helper_MISC := $(WORKDIR)/Misc
 
-# general propose phony target
+# general purpose phony target
 gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
 
-# general propose empty dummy target
+# general purpose empty dummy target
 gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
 
 .PHONY : $(WORKDIR)/Misc/PHONY
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-14 Thread Tor Lillqvist

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

New commits:
commit cc459ea8c1d2d398c0bad5e52591af93ebc4db38
Author: Tor Lillqvist 
Date:   Tue Feb 14 12:40:24 2012 +0200

Skip merged libraries

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index d542017..0fff77f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -467,8 +467,9 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.dll,%.ilk,$(3)) \
 )
 
+$(if $(filter $(gb_MERGEDLIBS),$(1)),,\
 $(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := 
$(OUTDIR)/bin/$(notdir $(3))
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := 
$(OUTDIR)/bin/$(notdir $(3)))
 
 ifneq ($(ENABLE_CRASHDUMP),)
 $(call gb_Library_get_target,$(1)) \
@@ -480,7 +481,7 @@ endif
 
 $(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
+$(if $(filter $(gb_MERGEDLIBS),$(1)),,$(call 
gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call 
gb_LinkTarget_get_pdbfile,$(2))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-08 Thread Stephan Bergmann

 solenv/gbuild/AllLangResTarget.mk |2 +-
 solenv/gbuild/Configuration.mk|2 +-
 solenv/gbuild/Extension.mk|5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit aa11b4c86e4b41be542623b7d98a3fb8e5d30745
Author: Stephan Bergmann 
Date:   Wed Feb 8 21:57:19 2012 +0100

Properly rebuild files generated by l10ntools programs

(Changing the corresponding build-order-only dependencies to proper ones 
should
be safe here, as all mentions of $^ are within $(filter) calls.)

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 21570c7..635778d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p 
$(dir $@) && cp $< $@)
 
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 0674837..1743be4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -238,7 +238,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-l all)
 endef
 
-$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET)
+$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
$(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter 
%.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
 
 $(call gb_XcuMergeTarget_get_clean_target,%) :
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 5ee8a97..fc7708e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -61,8 +61,7 @@ $(call gb_Extension_get_workdir,%)/description.xml :
mkdir -p $(call gb_Extension_get_workdir,$*) && \
cp -f $(LOCATION)/description.xml $@)
 else
-$(call gb_Extension_get_workdir,%)/description.xml : | \
-   $(gb_Extension_XRMEXTARGET)
+$(call gb_Extension_get_workdir,%)/description.xml : 
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
 ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -168,7 +167,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
-$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) gb_Extension_HELPEXTARGET
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
 ifeq ($(OS_FOR_BUILD),WNT)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild tail_build/Makefile

2012-02-05 Thread Norbert Thiebaud

 solenv/gbuild/extensions/post_BuildplTargets.mk |4 ++--
 solenv/gbuild/partial_build.mk  |2 +-
 tail_build/Makefile |6 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8d488bafe5d1aac82018e7b12e5ecaab5ede5342
Author: Norbert Thiebaud 
Date:   Sun Feb 5 22:54:18 2012 -0600

another tweak to bootstrap handling

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 2c632d6..58f12e8 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -173,9 +173,9 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
-dev-install: bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+dev-install: $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
 
-build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+build: $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
 cross_toolset: bootstrap $(SRCDIR)/src.downloaded
 
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 2059514..e95a0a6 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -11,7 +11,7 @@ include $(module_directory)/../config_$(gb_Side).mk
 endif
 
 $(WORKDIR)/bootstrap:
-   @cd $(SRCDIR) && ./bootstrap
+   @cd $(SRC_ROOT) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
 
 bootstrap: $(WORKDIR)/bootstrap
diff --git a/tail_build/Makefile b/tail_build/Makefile
index 4ee91d8..d89204e 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -31,6 +31,12 @@ ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../config_host.mk
 endif
 
+$(WORKDIR)/bootstrap:
+   @cd $(SRC_ROOT) && ./bootstrap
+   @mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
 gb_SourceEnvAndRecurse_STAGE=gbuild
 include $(SOLARENV)/gbuild/gbuild.mk
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-05 Thread Norbert Thiebaud

 solenv/gbuild/extensions/post_BuildplTargets.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 81e9525305cfe2b9455dadceeda0710e0176448c
Author: Norbert Thiebaud 
Date:   Sun Feb 5 21:00:54 2012 -0600

still invalid use of WORKDIR in top level Makefile

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1ba2ffb..8bd3151 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -110,7 +110,7 @@ endef
 
 # the build order dependencies are rather ugly...
 dev-install: \
-   $(WORKDIR)/bootstrap \
+   $(SRCDIR)/workdir/$(INPATH)/bootstrap \
$(SRCDIR)/src.downloaded \
$(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \
|   $(filter build,$(MAKECMDGOALS)) \
@@ -177,11 +177,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap  $(SRCDIR)/src.downloaded 
$(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter 
build,$(MAKECMDGOALS))
 
-build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
-cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded
 
 findunusedcode:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-05 Thread Norbert Thiebaud

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

New commits:
commit 4a08ed74f4da656f94eae1cc293073faaa937a89
Author: Norbert Thiebaud 
Date:   Sun Feb 5 20:35:07 2012 -0600

we can't use WORKDIR directly, on windows this is windows path

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 332e0d4..1ba2ffb 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,7 +27,7 @@
 
 .PHONY: cross-build-toolset dev-install build findunusedcode
 
-$(WORKDIR)/bootstrap:
+$(SRCDIR)/workdir/$(INPATH)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-31 Thread Stephan Bergmann

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

New commits:
commit 4171501c49e345266e892e35e6c224deb1b34f55
Author: Stephan Bergmann 
Date:   Tue Jan 31 12:50:52 2012 +0100

Avoid trailing slashes in xsltproc schemaRoot param

...as some xslt procs are confused by paths containing // IIRC
and that would explain a Win-x86@7-MinGW tinderbox failure.

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b49f890..4dabdac 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -49,7 +49,8 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 # outdir targets: $(1) is path
 gb_Configuration_registry = $(OUTDIR)/xml/registry
-gb_XcsTarget_get_outdir_target = $(gb_Configuration_registry)/schema/$(1)
+gb_XcsTarget_get_outdir_target = \
+$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
 gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
 gb_XcuLangpackTarget_get_outdir_target = 
$(gb_Configuration_registry)/spool/$(1)
 gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-30 Thread Stephan Bergmann

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

New commits:
commit 2b7cfe121426f72651499aca73f61cf2f274a0a2
Author: Stephan Bergmann 
Date:   Mon Jan 30 15:28:27 2012 +0100

Adapt gb_Module_DEBUGRUNCOMMAND to --disable-linkoo.

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

[Libreoffice-commits] .: solenv/gbuild unusedcode.easy

2012-01-23 Thread Caolán McNamara

 solenv/gbuild/extensions/post_BuildplTargets.mk |   16 ++
 unusedcode.easy |   56 
 2 files changed, 15 insertions(+), 57 deletions(-)

New commits:
commit 832cd0cfb7a66ed19033e793de37a312af8c0c20
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 23 13:36:30 2012 +

filter out confusing unused code from external libraries for unusedcode.easy

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 2f05f76..ee500a8 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -142,7 +142,21 @@ findunusedcode:
 #because non-c++ symbols could be dlsymed lets make a list of class level
 #unused methods which don't require much effort to determine if they need
 #to be just removed, or put behind appropiate platform or debug level ifdefs
-   @grep ::.*\( unusedcode.all | grep -v ^cppu:: > unusedcode.easy
+#
+#filter out cppu:: because there's a concern they might be required for the
+#extensions abi
+#
+#filter out boost:: and Icc*:: because there are external libraries we
+#build but don't include into our install sets
+#
+#filter out Atom*:: from libcmis, because its too painful to customize
+#it to only build the methods we directly call
+   @grep ::.*\( unusedcode.all \
+   | grep -v ^cppu:: \
+   | grep -v ^boost:: \
+   | grep -v ^CIcc \
+   | grep -v ^CAtom \
+   > unusedcode.easy
 
 subsequentcheck: dev-install
 
diff --git a/unusedcode.easy b/unusedcode.easy
index e06db0c..506807c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,52 +1,7 @@
-AtomDocument::AtomDocument(AtomPubSession*, std::basic_string, std::allocator >)
-AtomFolder::AtomFolder(AtomPubSession*, std::basic_string, std::allocator >)
-AtomPubSession::getCollectionUrl(Collection::Type)
 ByteString::Assign(char const*, unsigned short)
 ByteString::Assign(char)
 ByteString::ByteString(char const*, unsigned short)
 ByteString::SetToken(unsigned short, char, ByteString const&, unsigned short)
-CIccCLUT::Interp3dTetra(float*, float const*)
-CIccCLUT::Iterate(IIccCLUTExec*)
-CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
-CIccIO::ReadLine(void*, int)
-CIccInfo::GetSpotShapeName(icSpotShape)
-CIccMBB::Init(unsigned char, unsigned char)
-CIccMBB::NewCLUT(unsigned char*, unsigned char)
-CIccMBB::NewCLUT(unsigned char, unsigned char)
-CIccMemIO::Alloc(unsigned int, bool)
-CIccMpeCLUT::SetCLUT(CIccCLUT*)
-CIccMpeCreator::DoGetElementSigName(std::basic_string, std::allocator >&, icElemTypeSignature)
-CIccMpeCurveSet::SetCurve(int, CIccCurveSetCurve*)
-CIccProfile::DeleteTag(unsigned int)
-CIccProfile::Detach()
-CIccProfile::GetSpaceSamples() const
-CIccProfileIdDesc::CIccProfileIdDesc(CIccProfile&)
-CIccProfileIdDesc::CIccProfileIdDesc(icProfileID, CIccTagMultiLocalizedUnicode)
-CIccSegmentedCurve::Insert(CIccCurveSegment*)
-CIccTagCurve::SetGamma(float)
-CIccTagFixedNum::GetSize() const
-CIccTagFixedNum::GetSize() const
-CIccTagMultiLocalizedUnicode::SetText(unsigned short const*, unsigned short, 
unsigned short)
-CIccTagMultiProcessElement::GetElement(int)
-CIccTagNamedColor2::FindColor(char const*)
-CIccTagNamedColor2::FindDeviceColor(float*)
-CIccTagNamedColor2::FindPCSColor(float*, float)
-CIccTagNamedColor2::FindRootColor(char const*)
-CIccTagNamedColor2::GetColorName(std::basic_string, std::allocator >&, int)
-CIccTagNamedColor2::Lab4ToLab2(float*, float const*)
-CIccTagNamedColor2::NegClip(float)
-CIccTagNum::GetSize() const
-CIccTagNum::GetSize() const
-CIccTagNum::GetSize() const
-CIccTagNum::GetSize() const
-CIccTagProfileSequenceId::AddProfileDescription(CIccProfileIdDesc const&)
-CIccTagProfileSequenceId::GetFirst()
-CIccTagProfileSequenceId::GetLast()
-CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned int)
-CIccTagResponseCurveSet16::GetFirstCurves()
-CIccTagResponseCurveSet16::GetNextCurves()
-CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig)
-CIccTagResponseCurveSet16::SetNumChannels(unsigned short)
 CalendarWrapper::setFirstDayOfWeek(short)
 CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short)
 
CertificateContainer::impl_createFactory(com::sun::star::uno::Reference
 const&)
@@ -1327,17 +1282,6 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly 
const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned 
short, unsigned short)
 binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned 
char (*)(binfilter::_ZSortFly const&, void*), void*)
-boost::date_time::nth_as_str(int)
-boost::gregorian::create_facet_def(char)
-boost::gregorian::create_facet_def(wchar_t)
-boost::gregorian::generate_locale(std::locale&, char)
-boost::gregorian::generate_locale(std::locale&, wchar_t)
-boost::gregorian:

[Libreoffice-commits] .: solenv/gbuild

2012-01-22 Thread Tor Lillqvist

 solenv/gbuild/platform/ANDROID_ARM_GCC.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a76ab71b8b4582cde28e6937afe960e8737efea1
Author: Tor Lillqvist 
Date:   Mon Jan 23 00:20:26 2012 +0200

Use -z defs to catch undefineds at build time

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 1a7e56e..e10907a 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -49,6 +49,9 @@ gb_CppunitTest_CPPTESTPRECOMMAND := :
 # eventually enable this to be done this in some more elegant and less
 # redundant fashion.
 
+gb_LinkTarget_LDFLAGS += \
+-Wl,-z,defs \
+
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-20 Thread Fridrich Strba

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

New commits:
commit 7514488ad4c3e8289aebe3a03bd14c293479627b
Author: Fridrich Å trba 
Date:   Fri Jan 20 14:44:42 2012 +0100

Oops, my bad

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index a0559ff..284c2eb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -254,7 +254,7 @@ define gb_Helper_convert_native
 $(subst file:!!!,file:///, \
 $(subst //,/, \
 $(subst file:///,file:!!!, \
-$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
+$(subst $(REPODIR),$(patsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-20 Thread Fridrich Strba

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

New commits:
commit 29a3d25eb516adf3fbf73520c9196be11f5cb5e3
Author: Matus Kukan 
Date:   Fri Jan 20 14:35:41 2012 +0100

Fix windows build of cppu

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 7552f09..a0559ff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -254,7 +254,7 @@ define gb_Helper_convert_native
 $(subst file:!!!,file:///, \
 $(subst //,/, \
 $(subst file:///,file:!!!, \
-$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
+$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-19 Thread Tor Lillqvist

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

New commits:
commit f727553f3b8c6632d1d374b918221649a9427eac
Author: Tor Lillqvist 
Date:   Thu Jan 19 22:03:34 2012 +0200

Don't break file: URLs

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index b7b4e94..7552f09 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -246,13 +246,19 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
+
+# This file:/// -> file:!!! -> file:/// substitution is to protect the
+# slashes after file: in a file: URL from being unduplicated by the
+# // -> / substitution.
 define gb_Helper_convert_native
+$(subst file:!!!,file:///, \
 $(subst //,/, \
+$(subst file:///,file:!!!, \
 $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1))
+$(1
 endef
 
 # YaccTarget class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-19 Thread René Engelhard

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

New commits:
commit 80a1001a206a3e3b6bf83b9734580cc7f46b0e33
Author: Rene Engelhard 
Date:   Thu Jan 19 15:19:42 2012 +0100

honour JAVAFLAGS in gbuild

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 6befda1..6fd19fe 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
 gb_JavaClassSet_JAVACDEBUG :=
 
 ifneq ($(gb_DEBUGLEVEL),0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-16 Thread David Tardon

 solenv/gbuild/LinkTarget.mk |   19 ++-
 solenv/gbuild/TargetLocations.mk|3 ++-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
Author: David Tardon 
Date:   Mon Jan 16 14:55:57 2012 +0100

sort out dep problem with yacc-generated header (fdo#44707)

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e8f9bab..227fe96 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -185,18 +185,28 @@ endif
 gb_GenCxxObject_GenCxxObject =
 
 # YaccTarget class
+
+# XXX: This is more complicated than necessary, but we cannot just use
+# the generated C++ file as the main target, because we need to let the
+# header depend on that to ensure the header is present before anything
+# tries to use it.
+
 gb_YaccTarget_get_source = $(1)/$(2).y
 
 .PHONY : $(call gb_YaccTarget_get_clean_target,%)
 $(call gb_YaccTarget_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_YaccTarget_get_header_target,$*) $(call 
gb_YaccTarget_get_target,$*))
+   rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call 
gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
 
 $(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%)
-   $(call gb_YaccTarget__command,$<,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*))
+   $(call gb_YaccTarget__command,$<,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
-gb_YaccTarget_YaccTarget =
+define gb_YaccTarget_YaccTarget
+$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_header_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+
+endef
 
 gb_YACC := bison
 
@@ -791,13 +801,12 @@ endef
 # Add a bison grammar to the build.
 # gb_LinkTarget_add_grammar(,)
 define gb_LinkTarget_add_grammar
+$(call gb_YaccTarget_YaccTarget,$(2))
 $(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccTarget_get_clean_target,$(2))
 $(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccTarget_get_header_target,$(2)))
 
-
 endef
-#$(call gb_YaccTarget_YaccTarget,$(2))
 
 # Add bison grammars to the build.
 # gb_LinkTarget_add_grammars(, [*])
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 58b581a..59ad239 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -122,8 +122,9 @@ gb_UnoApiTarget_get_header_target = 
$(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = 
$(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is prefix/path
 gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
+gb_YaccTarget_get_grammar_target = $(WORKDIR)/YaccTarget/$(1).cxx
 gb_YaccTarget_get_header_target = $(WORKDIR)/YaccTarget/$(1).hxx
-gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).cxx
+gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).done
 gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
 gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
 gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index af59807..b7b4e94 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -261,7 +261,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
 
 endef
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 9e055ed..f2bf866 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -40,7 +40,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1) && mv $(3).h $(4) )
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1) && mv $(5).h $(4) && touch 
$(3) )
 
 endef
 
@@ -49,7 +49,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
 
 endef
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop

[Libreoffice-commits] .: solenv/gbuild

2012-01-16 Thread Matus Kukan

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

New commits:
commit 9847c3ec4dc276f52fd06b59dd8101506fe84cd9
Author: MatÃºÅ¡ Kukan 
Date:   Mon Jan 16 12:40:02 2012 +0100

gbuild: WNT_INTEL_MSC: replace also // with / in the path

Motivation behind this is to fix processing of idl files.
When LibO directory is toplevel disk directory, there are
two // in the path which could be the reason idlc fails.

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e0d6f12..af59807 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -247,11 +247,12 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
+$(subst //,/, \
 $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1)
+$(1))
 endef
 
 # YaccTarget class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-13 Thread Eike Rathke

 solenv/gbuild/platform/com_GCC_defs.mk |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 91d3c4a75f1f28b3f674e97b8c85948d5d9c
Author: Eike Rathke 
Date:   Sat Jan 14 01:02:27 2012 +0100

grml.. back to the drawing board

Reverted
80f60ef540528ec5304b9fb9624a7ff1b077f108
cf1f87948bcf9b8edf8487fa7938a928cfed8f2f
as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty
behavior and hope for the best until solved.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 847ef0f..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,18 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
-
-# At least with gcc 4.6.2 the situation was that if /usr/include was missing
-# from the -I... includes, header files were pulled from /usr/include/ instead
-# of solver/$INPATH/inc/external/
-# One should not add /usr/include, but ... have this as workaround now.
-# However, MacOSX would bail out with lots of deprecated methods as
-# /usr/include is not what's used on Mac.
-ifeq ($(OS_FOR_BUILD),MACOSX)
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-else
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) 
-I$(SYSBASE)/usr/include
-endif
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-13 Thread Eike Rathke

 solenv/gbuild/platform/com_GCC_defs.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit ebb95b5a20f88ae422292fcfbbf7781a347b9ce8
Author: Eike Rathke 
Date:   Fri Jan 13 23:45:29 2012 +0100

make MacOSX happy again and have no /usr/include there

Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 7dddcbb..847ef0f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
+
+# At least with gcc 4.6.2 the situation was that if /usr/include was missing
+# from the -I... includes, header files were pulled from /usr/include/ instead
+# of solver/$INPATH/inc/external/
+# One should not add /usr/include, but ... have this as workaround now.
+# However, MacOSX would bail out with lots of deprecated methods as
+# /usr/include is not what's used on Mac.
+ifeq ($(OS_FOR_BUILD),MACOSX)
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+else
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) 
-I$(SYSBASE)/usr/include
+endif
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-09 Thread Michael Stahl

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

New commits:
commit d979e52a6a8cf05da31a10bd2e5ecad1b19dddc7
Author: Michael Stahl 
Date:   Mon Jan 9 13:55:27 2012 +0100

gbuild: add urlmon library for MSVC

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 284572a..0c953f1 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -413,6 +413,7 @@ gb_Library_PLAINLIBS_NONE += \
oleaut32 \
shell32 \
shlwapi \
+   urlmon \
user32 \
uuid \
version \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-09 Thread Tor Lillqvist

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

New commits:
commit 89875941688ac94c7d9ddcee141bc16d1688
Author: Tor Lillqvist 
Date:   Mon Jan 9 13:40:47 2012 +0200

No need to mention the system "log" library, it clashes with our "log" 
library

It is not needed anyway. Only liblo-bootstrap uses the log API now,
our libraries on Android (including "executables") don't.

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index d9ed246..1a7e56e 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -40,7 +40,6 @@ gb_STDLIBS := \
 gb_Library_PLAINLIBS_NONE := \
android \
gnustl_shared \
-   log \
 
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-09 Thread Tor Lillqvist

 solenv/gbuild/platform/ANDROID_ARM_GCC.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 407542d7ed7d517e177ac17e67b2c2deb9f41bb4
Author: Tor Lillqvist 
Date:   Mon Jan 9 10:59:16 2012 +0200

Revert "gb_Library_PLAINLIBS_NONE should not contain system libs, says 
dtardon"

(10:49:45) dtardon: tml_, i rescinded :) " tml_, hm, well, that's 
not really true..."

This reverts commit b2b5357097a8a61fe80fb4f57ade0965099f61a6.

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 6f762ba..d9ed246 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -37,6 +37,11 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 gb_STDLIBS := \
gnustl_shared
 
+gb_Library_PLAINLIBS_NONE := \
+   android \
+   gnustl_shared \
+   log \
+
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-06 Thread Andras Timar

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit c7c65bc0d746b7fa6f63d7e76dc22202e689db09
Author: Andras Timar 
Date:   Fri Jan 6 23:17:43 2012 +0100

link versioninfo resource to dlls

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 318e0d2..284572a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -474,10 +474,10 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  
\
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
 
-$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
-
 endif
 
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
 $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
@@ -490,9 +490,13 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
 $(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
-   -DADDITIONAL_VERINFO1 \
-   -DADDITIONAL_VERINFO2 \
-   -DADDITIONAL_VERINFO3 \
+   -DVERVARIANT="$(BUILD)" \
+   -DRES_APP_VENDOR="$(OOO_VENDOR)" \
+   -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\
+   -DINTERNAL_NAME="$(subst $(gb_Library_DLLEXT),,$(call 
gb_Library_get_dllname,$(1)))" \
+   -DADDITIONAL_VERINFO1="" \
+   -DADDITIONAL_VERINFO2="" \
+   -DADDITIONAL_VERINFO3="" \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_WinResTarget_get_clean_target,$(2))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-05 Thread Matus Kukan

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

New commits:
commit 3082565d6291176ef1fcdc053f9851c82a02d19a
Author: MatÃºÅ¡ Kukan 
Date:   Thu Jan 5 17:09:21 2012 +0100

propmerge is not executable

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3069408..76fdccf 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,7 +36,7 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
 gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-05 Thread David Tardon

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

New commits:
commit 42b50a1234f2047e4d4eb4c4da37919eb61a047e
Author: David Tardon 
Date:   Thu Jan 5 10:20:24 2012 +0100

always put unlocalized properties files to the oxt

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 8e2e409..3069408 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -127,15 +127,18 @@ endef
 # localize .properties file
 # source file is copied to $(WORKDIR)
 define gb_Extension_localize_properties
+$(call gb_Extension_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
+$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $$(SDF2)
+endif
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)
cp -f $$< $$@
+ifneq ($(strip $(gb_WITH_LANG)),)
$(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-05 Thread David Tardon

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

New commits:
commit f84109c4577866227ac0d89368dfdceb5599954c
Author: David Tardon 
Date:   Thu Jan 5 09:44:14 2012 +0100

do not announce if nothing is done (without langs)

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 6044f4f..8e2e409 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -133,7 +133,7 @@ $(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subs
 $(call gb_Extension_get_target,$(1)) : $$(SDF2)
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
-   $(call gb_Output_announce,$(2),$(true),PRP,3)
+   $$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)
cp -f $$< $$@
$(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-03 Thread David Tardon

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

New commits:
commit 250491832a41eb18eaa58e2ee178afe47b254147
Author: David Tardon 
Date:   Wed Jan 4 08:49:22 2012 +0100

add dep on sdf file

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 6c6cb5e..7e3b6f3 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -127,6 +127,7 @@ define gb_Extension_localize_properties
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_target,$(1)) : $$(SDF2)
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-01-02 Thread Matus Kukan

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

New commits:
commit 5436f578ee7c7e4fe840cb243c2797f52b8b461d
Author: MatÃºÅ¡ Kukan 
Date:   Mon Jan 2 23:19:49 2012 +0100

gbuild: Rdb: blind fix for Windows, use gb_Helper_abbreviate_dirs_native

diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index c7f9d0d..bea289f 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -38,7 +38,7 @@ $(strip $(if $(call 
gb_Rdb__is_old_component_target,$(component))\
 endef
 
 define gb_Rdb__command
-$(call gb_Helper_abbreviate_dirs,\
+$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $@) && \
(\
echo '' && \
@@ -56,7 +56,7 @@ $(call gb_Rdb_get_target,%) :
 .PHONY : $(call gb_Rdb_get_clean_target,%)
 $(call gb_Rdb_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RDB,1)
-   $(call gb_Helper_abbreviate_dirs,\
+   $(call gb_Helper_abbreviate_dirs_native,\
rm -f $(call gb_Rdb_get_outdir_target,$*) $(call 
gb_Rdb_get_target,$*))
 
 $(call gb_Rdb_get_outdir_target,%) :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-24 Thread Peter Foley

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

New commits:
commit 99d994dcd24dfba07733f50eae09e5f00d360e27
Author: Peter Foley 
Date:   Sat Dec 24 10:14:19 2011 -0500

don't display bootstrap and src.downloaded as top level modules

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index daaae6e..24cc1e5 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -123,7 +123,7 @@ all : build unitcheck
$(info $(gb_Module_BUILDHINT))
 
 build : 
-   $(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
+   $(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap 
$(SRCDIR)/src.downloaded,$^),$(notdir $(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),ALL,6)
$(call gb_Output_announce_title,build done.)
$(call gb_Output_announce_bell)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-21 Thread René Engelhard

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

New commits:
commit b31375be84cd9a9418ad69d8df45aafc1989f46d
Author: Rene Engelhard 
Date:   Wed Dec 21 17:19:28 2011 +0100

don't remove configure and aclocal.m4 in distclean anymore

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 119536c..72414b7 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -78,8 +78,8 @@ clean-build:
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
-   cd $(SRCDIR) && rm -rf Env.Host.sh aclocal.m4 autogen.lastrun 
autom4te.cache \
-   bin/repo-list build_env config.log config.status configure \
+   cd $(SRCDIR) && rm -rf Env.Host.sh autogen.lastrun autom4te.cache \
+   bin/repo-list build_env config.log config.status \
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-20 Thread Lubos Lunak

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_class.mk |2 +-
 solenv/gbuild/platform/solaris.mk   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0e44efd3744d6355e31f623a21c22057f5b2628c
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Tue Dec 20 16:35:18 2011 +0100

missed this in b55dbc1e - show extension for .c files as well

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3aaf695..3809f3b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -281,7 +281,7 @@ endef
 # CObject class
 
 define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 5bf7740..da90948 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -25,7 +25,7 @@
 
 # $(call gb_CObject__command,object,relative-source,source,dep-file)
 define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index a3d055b..afb9629 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -160,7 +160,7 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 # CObject class
 
 define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(4) && \
mkdir -p $(dir $(1)) $(dir $(4)) && \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-17 Thread Norbert Thiebaud

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

New commits:
commit 5ed43db9e8a574a0c66706deeb2feefb89958f96
Author: Norbert Thiebaud 
Date:   Sat Dec 17 20:21:31 2011 -0600

Revert "gbuild: macosx.mk: remove salhelper hack"

This reverts commit 1d90f180cd263d7f99039bada57b3655d6f399df.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f1187cc..6a2751e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -149,8 +149,10 @@ gb_LinkTarget__RPATHS := \
SDKBIN: \
NONE:@__VIA_LIBRARY_PATH__@ \
 
+# The below contains a bad hack to set the correct install name for
+# libuno_salhepergcc3.dylib.3, with a trailing ".3":
 define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',$(error
+$(if $(2),-install_name '$(2)$(1)$(if $(filter 
$(1),libuno_salhelpergcc3.dylib),.3)',$(error
 cannot determine -install_name for $(2)))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-16 Thread Tor Lillqvist

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

New commits:
commit 5e57d6d5f0341c3a97ba4a89027554674e9ac9f5
Author: Tor Lillqvist 
Date:   Fri Dec 16 13:13:45 2011 +0200

Override gb_Library__set_soversion_script_platform as empty

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 775f803..b9235d2 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -86,4 +86,6 @@ endef
 
 gb_LinkTarget_LDFLAGS := $(subst 
-Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
 
+gb_Library__set_soversion_script_platform = 
+
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-15 Thread Lubos Lunak

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

New commits:
commit 039fd52b968349da8687dae1aeb5b42e2830dfa2
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Dec 15 14:23:48 2011 +0100

fix one -ggdb3 that got in in a merge after 0b5b56be4df609d

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 40027a1..5b49bff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -97,7 +97,7 @@ ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
-gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline
 ifeq ($(HAVE_GCC_DWARF_4),TRUE)
 gb_DEBUG_CFLAGS += -gdwarf-4
 endif
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 37c203f..851e020 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -161,7 +161,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 gb_LINKEROPTFLAGS := -Wl,-O1
 endif
 
-gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline
 ifeq ($(HAVE_GCC_DWARF_4),TRUE)
 gb_DEBUG_CFLAGS += -gdwarf-4
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-14 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_AuxTargets.mk |   25 -
 1 file changed, 8 insertions(+), 17 deletions(-)

New commits:
commit d8729cfc6413c15af7c9e9eaecbffcc23d37ab7b
Author: Bjoern Michaelsen 
Date:   Wed Dec 14 14:17:36 2011 +0100

bootstrap can be kept in both phases as it has a proper touchfile

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index b98ef3d..119536c 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -27,6 +27,14 @@
 
 .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build 
bootstrap
 
+$(WORKDIR)/bootstrap:
+   @cd $(SRCDIR) && ./bootstrap
+   @mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+autogen.lastrun:
+
 ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
 
 id:
@@ -56,14 +64,6 @@ fetch:
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
$(if $(filter 
reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot 
reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
 
-autogen.lastrun:
-
-
-$(WORKDIR)/bootstrap:
-   @cd $(SRCDIR) && ./bootstrap
-   @mkdir -p $(dir $@) && touch $@
-
-bootstrap: $(WORKDIR)/bootstrap
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
@@ -113,15 +113,6 @@ distro-pack-install:
 $(SRCDIR)/Env.Host.sh:
@true
 
-autogen.lastrun:
-   @true
-
-$(WORKDIR)/bootstrap:
-   @true
-
-bootstrap:
-   @true
-
 clean-host:
@true
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-14 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_AuxTargets.mk |   52 ++--
 1 file changed, 49 insertions(+), 3 deletions(-)

New commits:
commit fe6499cee5e84183844df41380519ed7eeb0c4dc
Author: Bjoern Michaelsen 
Date:   Wed Dec 14 12:13:23 2011 +0100

adding noop rules for auxtargets in buildpl, moved deps of buildpl into 
that phase

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 13dd2e0..b98ef3d 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -44,10 +44,13 @@ distro-pack-install: install
$(SRCDIR)/bin/distro-install-sdk
$(SRCDIR)/bin/distro-install-file-lists
 
-$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-   $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download 
./ooo.lst && touch $@,touch $@)
 
-fetch: $(SRCDIR)/src.downloaded
+#these need to stay in the buildpl phase as buildpl depends on them
+$(SRCDIR)/src.downloaded:
+   @true
+
+fetch:
+   @true
 
 # fixme: can we prevent these exports in the first place?
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
@@ -55,6 +58,7 @@ $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in 
ooo.lst.in set_soenv.in
 
 autogen.lastrun:
 
+
 $(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
@@ -88,6 +92,48 @@ install: build
 
 endif
 
+else
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+   $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download 
./ooo.lst && touch $@,touch $@)
+
+fetch: $(SRCDIR)/src.downloaded
+
+id:
+   @true
+
+tags:
+   @true
+
+docs:
+   @true
+
+distro-pack-install:
+   @true
+
+$(SRCDIR)/Env.Host.sh:
+   @true
+
+autogen.lastrun:
+   @true
+
+$(WORKDIR)/bootstrap:
+   @true
+
+bootstrap:
+   @true
+
+clean-host:
+   @true
+
+clean-build:
+   @true
+
+distclean:
+   @true
+
+install:
+   @true
+
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-14 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_AuxTargets.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9c197011a564c185db425d38425f3a89c1700c9d
Author: Bjoern Michaelsen 
Date:   Wed Dec 14 12:02:25 2011 +0100

skip AuxTargets in buildpl phase

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index da31aa6..13dd2e0 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -27,6 +27,8 @@
 
 .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build 
bootstrap
 
+ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
+
 id:
@create-ids
 
@@ -86,5 +88,6 @@ install: build
 
 endif
 
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-13 Thread David Tardon

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

New commits:
commit ee29bb2a47311d86f794d10bbcfad27644baebb5
Author: David Tardon 
Date:   Wed Dec 14 07:11:47 2011 +0100

force gbuild stage for CustomTargets

gb_SourceEnvAndRecurse_STAGE is unset in CustomTarget's make process
when the parent make has been started in sourced environment. This leads
to all sorts of "interesting" failures because the gbuild classes and
platform stuff are not loaded...

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 41b23b8..1e075af 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,6 +31,7 @@ define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' 
gb_AWK='$(gb_AWK)' \
+   gb_SourceEnvAndRecurse_STAGE=gbuild \
gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' 
SRCDIR='$(SRCDIR)' \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-13 Thread Jan Holesovsky

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

New commits:
commit ddf1cf333174777e7923aa0d6126daf2c8645fed
Author: Jan Holesovsky 
Date:   Tue Dec 13 11:18:03 2011 +0100

Improve quoting when calling submake for custom targets.

This should fix the Windows build, while keeping the
gb_Helper_abbreviate_dirs_native working in custom targets.

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0a278d4..41b23b8 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,7 +30,8 @@
 define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
-   gb_AWK="$(gb_AWK)" gb_XSLTPROC="$(gb_XSLTPROC)" 
GBUILDDIR="$(GBUILDDIR)" SRCDIR="$(SRCDIR)" \
+   O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' 
gb_AWK='$(gb_AWK)' \
+   gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' 
SRCDIR='$(SRCDIR)' \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-11 Thread Fridrich Strba

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

New commits:
commit e0ba066d4c84cf6ddc3b65ce6549ec25404f0d84
Author: Fridrich Å trba 
Date:   Mon Dec 12 03:13:43 2011 +0100

Fix a typo?

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 256261c..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-11 Thread Peter Foley

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

New commits:
commit a298986d627b944eb94fdd8b0c30a9298f14ab65
Author: Peter Foley 
Date:   Sun Dec 11 19:39:58 2011 -0500

alow make to run autogen.sh if autogen.lastrun doesn't exist

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 7622047..da31aa6 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -51,6 +51,8 @@ fetch: $(SRCDIR)/src.downloaded
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
$(if $(filter 
reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot 
reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
 
+autogen.lastrun:
+
 $(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-11 Thread Andras Timar

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

New commits:
commit f129c4f766c30b174544ec234cbd72c7050a2fc1
Author: Andras Timar 
Date:   Sun Dec 11 22:04:34 2011 +0100

fix VersionInfo resource build under MinGW

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 7363654..92b4dbb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -346,6 +346,8 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
 $(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
+   -DVERVARIANT="$(BUILD)" \
+   -DRES_APP_VENDOR="$(OOO_VENDOR)" \
-DADDITIONAL_VERINFO1="" \
-DADDITIONAL_VERINFO2="" \
-DADDITIONAL_VERINFO3="" \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Michael Stahl

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

New commits:
commit 39e4d05684d2aaaef76b2d31d17d8d5d1730c2ee
Author: Michael Stahl 
Date:   Fri Dec 9 15:55:29 2011 +0100

gbuild: Output.mk: fix typos

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index ab5ec5a..9bb3168 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -61,9 +61,9 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' 
-)
 # - gb_COLOR is set
 # - we have a known term
 KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm 
xterm xtermc
-KNOWN_TERM:=$(KNOW_TERM) $(patsubst %,%-color,$(KNOWN_TERM))
-KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%-256color,$(KNOWN_TERM))
-KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%+256color,$(KNOWN_TERM))
+KNOWN_TERM+=$(patsubst %,%-color,$(KNOWN_TERM))
+KNOWN_TERM+=$(patsubst %-color,%-256color,$(KNOWN_TERM))
+KNOWN_TERM+=$(patsubst %-color,%+256color,$(KNOWN_TERM))
 ifneq ($(strip $(gb_COLOR)),)
 ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Tor Lillqvist

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

New commits:
commit 91af205a93440b82ff1730528e98e6355092e02c
Author: Tor Lillqvist 
Date:   Fri Dec 9 14:31:53 2011 +0200

Don't misuse CLASSPATH for what goes into the -cp option to javac

CLASSPATH is supposed to show where to find the classes needed by Java
programs running at build time. The -cp switch to javac tells where to
find classes referenced by the code being compiled. These are
different things. (But it doesn't seem to have mattered much in our
build system.) So use T_CP instead, named in the same fashion as
T_CXXFLAGS etc.

But... for some reason this change, which as such should be just more
or less cosmetic, also fixes a build problem in the "scripting" module
on Windows, seen by Noel Grandin

(http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016
) and me.

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index cea27c0..16d914a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -43,7 +43,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(filter-out $(JARDEPS),$(4) && \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-   -cp "$(CLASSPATH)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
+   -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE &&) \
rm -f $$RESPONSEFILE && \
@@ -60,8 +60,8 @@ $(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
-# no initialization of scoped variable CLASSPATH as it is "inherited" from 
controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
+# No idea what above comment means, and whether still relevant
 define gb_JavaClassSet_JavaClassSet
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 endef
@@ -81,7 +81,7 @@ $(foreach sourcefile,$(2),$(call 
gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
 endef
 
 define gb_JavaClassSet_set_classpath
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2))
 
 endef
 
@@ -89,13 +89,13 @@ endef
 # build order dependency is a hack to get these prerequisites out of the way 
in the build command
 define gb_JavaClassSet_add_jar
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
 # this does not generate dependency on the jar
 define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5afe595..177cad6 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,7 +47,7 @@ $(call gb_JunitTest_get_target,%) :
 rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
 (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \
--cp "$(CLASSPATH)" \
+-cp "$(T_CP)" \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) > $@.log 2>&1 || \
@@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(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)) : T_CP := $(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))
 
@@ -105,12 +105,12 @@ $(foreach sourcefile,$(2),$(call 
gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 endef
 
 define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2)
 
 endef
 
 define gb_JunitTest_add_jar
-$(call

[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Jan Holesovsky

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

New commits:
commit c7052a5d6242df174ba21134635ac3d18530bf34
Author: Jan Holesovsky 
Date:   Thu Dec 8 23:55:45 2011 +0100

i18npool on Windows needed more fixes.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Lionel Elie Mamane

 solenv/gbuild/Output.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 13b93f40ab2dd0777c4051996e604858c4e2fafb
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 09:17:23 2011 +0100

Allow gb_COLOR and gb_TITLES for 256color TERMs, too

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index e4b811f..ab5ec5a 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -60,8 +60,12 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 
}' -)
 # only enable colorized output if
 # - gb_COLOR is set
 # - we have a known term
+KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm 
xterm xtermc
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %,%-color,$(KNOWN_TERM))
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%-256color,$(KNOWN_TERM))
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%+256color,$(KNOWN_TERM))
 ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen 
xterm xterm-color xtermc),)
+ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
 
 gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
 gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
@@ -121,7 +125,7 @@ endif
 # - gb_TITLES is set
 # - we have a known term
 ifneq ($(strip $(gb_TITLES)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm rxvt rxvt-unicode screen xterm 
xterm-color),)
+ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
 define gb_Output_announce_title
 $(info $(gb_Output_ESCAPE)]2;gbuild: 
$(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-08 Thread Jan Holesovsky

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

New commits:
commit ddbe08e1dd54f397f6fe8c04b2147f21a49db8b1
Author: Jan Holesovsky 
Date:   Thu Dec 8 17:09:41 2011 +0100

Fix build on Linux.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c154a7a..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
+gb_Helper_set_ld_path := 
$(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-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

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

New commits:
commit 855115d2f5845502e8619b35666512023584e012
Author: Bjoern Michaelsen 
Date:   Thu Dec 8 00:18:46 2011 +0100

fix typo

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index f4c653f..5e11850 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD)),rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

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

New commits:
commit 4d247bd3c0b3a2d7460dedfb7050260eff2c0999
Author: Bjoern Michaelsen 
Date:   Wed Dec 7 23:50:07 2011 +0100

do not clean INPATH_FOR_BUILD on noncrosscompiles

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index ce4a5cb..f4c653f 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

 solenv/gbuild/Pyuno.mk   |   26 ++
 solenv/gbuild/TargetLocations.mk |5 +++--
 2 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit ca23cdbf90b97f141fdcf4fbc237e8f945cdd1e6
Author: Bjoern Michaelsen 
Date:   Wed Dec 7 14:48:48 2011 +0100

reuse Zip Target for PyUno

diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 37512fb..9ad8b36 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -25,40 +25,26 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_Pyuno_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
-gb_Pyuno__get_outdir_path = $(patsubst 
$(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
-
 $(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
mkdir -p $(dir $@) && touch $@
 
-$(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
-   $(call gb_Output_announce,$*,$(true),PZP,3)
-   cd $(gb_Helper_OUTDIRLIBDIR)/pyuno && \
-   $(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
-   $(call gb_Pyuno_get_target_zip,$*) \
-   $(PYZFILES)
-
 .PHONY : $(call gb_Pyuno_get_clean_target,%)
 $(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
-   rm -f $@ $(gb_Pyuno_get_target_zip,$*)
+   rm -f $(call gb_Pyuno_get_target,$*) $(call 
gb_Pyuno_get_outdir_target,$*)
 
 define gb_Pyuno_Pyuno
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES :=
-$(call gb_Package_Package,$(1)_pyuno,$(2))
+$(call gb_Zip_Zip,Pyuno/$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call 
gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1
-$(call gb_Pyuno_get_target,$(1)) : \
-   $(call gb_Package_get_target,$(1)_pyuno) \
-   $(call gb_Pyuno_get_target_zip,$(1))
-$(call gb_Pyuno_get_clean_target,$(1)) : \
-   $(call gb_Package_get_clean_target,$(1)_pyuno)
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
+$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call 
gb_Zip_get_clean_target,Pyuno/$(1))
 
 endef
 
 define gb_Pyuno_add_file
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES += $(2)
-$(call gb_Package_add_file,$(1)_pyuno,$(call 
gb_Pyuno__get_outdir_path,$(2)),$(2))
+$(call gb_Zip_add_file,Pyuno/$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index d51b8ed..b7a4fde 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -103,8 +103,9 @@ gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
-gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
-gb_Pyuno_get_target_zip = $(OUTDIR)/bin/$(1).zip
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
+gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
+gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
 gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Lubos Lunak

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

New commits:
commit 4d204919623b98c5592a1d191bb854043523d170
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Dec 7 14:28:15 2011 +0100

when stripping is disabled, strip nothing

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 28fd943..43d832a 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -150,8 +150,6 @@ endif
 ifneq ($(gb_SYMBOL),$(true))
 ifeq ($(gb_STRIP),$(true))
 gb_LinkTarget_LDFLAGS += -Wl,--strip-all
-else
-gb_LinkTarget_LDFLAGS += -Wl,--strip-debug
 endif
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-06 Thread David Tardon

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

New commits:
commit d93b69fb930ca0b3e21a197beda0e0d503cce70b
Author: David Tardon 
Date:   Tue Dec 6 11:50:41 2011 +0100

three shall be the number thou shalt count

diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 57c5571..a18ef65 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -31,7 +31,7 @@ $(call gb_Pyuno_get_target,%) :
mkdir -p $(dir $@) && touch $@
 
 $(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
-   $(call gb_Output_announce,$*,$(true),PYZIP,3)
+   $(call gb_Output_announce,$*,$(true),PZP,3)
cd $(gb_Helper_OUTDIRLIBDIR)/pyuno && \
$(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
$(call gb_Pyuno_get_target_zip,$*) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-04 Thread Tor Lillqvist

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |8 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a35140f245d774745b806ef12346aa77f0256395
Author: Tor Lillqvist 
Date:   Fri Dec 2 11:41:33 2011 +0200

Fix library layer mapping for the URELIB ones, fdo#42826

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ae99f11..78ce3bd 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -292,13 +292,13 @@ gb_Library_PLAINLIBS_NONE += \
 gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+   $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 gb_Library_FILENAMES :=\
$(foreach 
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
 \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 7a56245..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -432,13 +432,13 @@ gb_Library_PLAINLIBS_NONE += \
 gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+   $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 gb_Library_FILENAMES :=\
$(foreach 
lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-02 Thread Kohei Yoshida

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

New commits:
commit c53c81d97eca4fd3f9a6957ed8b3988a61391da7
Author: Kohei Yoshida 
Date:   Fri Dec 2 21:25:49 2011 -0500

Revert "Don't overwrite OUTDIR & friends." once again

This reverts commit 0f1b0e5b7ad813069630e7ae719a800ecab640a8.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 828546f..6a0933b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,6 +35,15 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
+# HACK
+# unixify windoze paths
+ifeq ($(OS_FOR_BUILD),WNT)
+override WORKDIR := $(shell cygpath -u $(WORKDIR))
+override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
+override SRCDIR := $(shell cygpath -u $(SRCDIR))
+endif
+
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-01 Thread Tor Lillqvist

 solenv/gbuild/Module.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 08c9b47805dbb3c9ecba408bbf2accdfe3dbe2b9
Author: Tor Lillqvist 
Date:   Thu Dec 1 11:09:53 2011 +0200

Fix typos in "hint" and make more readable

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index c0f8ffd..c061099 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -105,8 +105,11 @@ define gb_Module_DEVINSTALLHINT
 
 Developer installation finished, you can now execute:
 
-make debugrun # on Linux
-dopen $(SRCDIR)/install/LibreOffice.app # on OSX
+on Linux:
+make debugrun
+
+on Mac OS X:
+open install/LibreOffice.app
 
 endef
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit 0e3f81ae4d277cd2cfeb1e70204266d769dc2a3e
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 19:18:17 2011 +0100

remove debug line

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 874b29c..5532579 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -48,7 +48,6 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-$(info MAKEFLAGS $(MAKEFLAGS) filter:$(filter s,$(MAKEFLAGS)):)
 cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if 
$(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) 
-P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit 7d3f21b27469d04b57dbd9f7befb3109001422ed
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 19:06:46 2011 +0100

dont read gbuild definitions on distclean

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index f5e17b8..e3b65b3 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Jan Holesovsky

 solenv/gbuild/BuildDirs.mk |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 28275d470f3a062cfa27d72bbf89328af1e83c68
Author: Jan Holesovsky 
Date:   Wed Nov 30 16:20:11 2011 +0100

Don't overwrite OUTDIR & friends.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 6a0933b..828546f 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
-# HACK
-# unixify windoze paths
-ifeq ($(OS_FOR_BUILD),WNT)
-override WORKDIR := $(shell cygpath -u $(WORKDIR))
-override OUTDIR := $(shell cygpath -u $(OUTDIR))
-override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
-override SRCDIR := $(shell cygpath -u $(SRCDIR))
-endif
-
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit 83e0a67b9384fdfe25306ada675f3325b3d93bba
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 17:12:02 2011 +0100

fix silent pass on to buildpl

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 702d84f..874b29c 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -48,7 +48,8 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if $(filter 
s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) 
gb_MAKETARGET=$(gb_MAKETARGET)
+$(info MAKEFLAGS $(MAKEFLAGS) filter:$(filter s,$(MAKEFLAGS)):)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if 
$(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) 
-P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |6 --
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   16 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit ab988b37908a0b8ee62869bd637bf176b03ac3ac
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 16:45:31 2011 +0100

fix conditions on when to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cd3101d..702d84f 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,12 +27,6 @@
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
-gb_Module_add_target=
-gb_Module_add_moduledir=
-gb_Module_add_check_target=
-gb_Module_add_subsequentcheck_target=
-gb_FULLDEPS=
-
 clean: clean-host clean-build
 
 subsequentcheck: smoketestoo_native
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 842f05e..f5e17b8 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,14 +27,26 @@
 
 
 # speed up if no target need to parse all modules
+gb_SpeedUpTargets_WRAPPEDBUILD:=
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
$(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
+$(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
-endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-30 Thread Lubos Lunak

On Wednesday 30 of November 2011, Bjoern Michaelsen wrote:
>  solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> New commits:
> commit 1f538764acdd67c3f294cd03da006ace27f736ef
> Author: Bjoern Michaelsen 
> Date:   Wed Nov 30 14:02:08 2011 +0100
>
> make build.pl verbose on non-silent builds

 This does not work, the build is verbose regardless of any -s passed to make. 
Moreover I question the usefullness of having verbose build by default.

> diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk
> b/solenv/gbuild/extensions/post_BuildplTargets.mk index 7e9b898..cd3101d
> 100644
> --- a/solenv/gbuild/extensions/post_BuildplTargets.mk
> +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
> @@ -54,7 +54,7 @@ endif
>
>  gb_BuildplTarget_COMPLETEDTARGETS=
>  define gb_BuildplTarget_command
> -cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
> -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
> +cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if
> $(filter s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2)
> -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET) $(eval
> gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
>  endef

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

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit ec894c5fb90bdee1c56d113d14b0bf524df9f5a9
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 15:21:28 2011 +0100

lets only depend build-order only on build from debugrun for now

- as long as we still have the slow build.pl run for top-level build

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 02e76ea..2efef85 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,6 +84,7 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
+debugrun :| build
 
 define gb_Module_BUILDHINT
 
@@ -108,6 +109,7 @@ else
 gb_Module_BUILDHINT=
 gb_Module_DEVINSTALLHINT=
 
+debugrun : build
 endif
 
 all : build unitcheck
@@ -142,7 +144,7 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)

-debugrun : build
+debugrun :
$(call gb_Module_DEBUGRUNCOMMAND)
 
 dev-install :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit 1f538764acdd67c3f294cd03da006ace27f736ef
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 14:02:08 2011 +0100

make build.pl verbose on non-silent builds

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 7e9b898..cd3101d 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -54,7 +54,7 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
-P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if $(filter 
s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) 
gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

 solenv/gbuild/Executable.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |8 +---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 509590426a08fd9cdc30d895d5adfd07efea0ebf
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 13:36:07 2011 +0100

fix TARGETGUI for windows

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 60841a0..7858967 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -60,7 +60,7 @@ $(call gb_Deliver_add_deliverable,$(call 
gb_Executable_get_target,$(1)),$(call g
 endef
 
 define gb_Executable_set_targettype_gui
-$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+$(call gb_LinkTarget_get_target,Executable/$(1)$(gb_Executable_EXT)) : 
TARGETGUI := $(2)
 endef
 
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 688d53d..ae99f11 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -173,7 +173,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) $(strip \
$(gb_Executable_TARGETTYPEFLAGS) \
-   $(if $(filter YES,$(gb_Executable_TARGETGUI)), -mwindows, 
-mconsole) \
+   $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
@@ -393,8 +393,10 @@ gb_StaticLibrary_StaticLibrary_platform =
 gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS :=
 gb_Executable_get_rpath :=
-gb_Executable_Executable_platform =
-gb_Executable_TARGETGUI :=
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
+endef
 
 # CppunitTest class
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3051f5d..7a56245 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -358,7 +358,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(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,$(gb_Executable_TARGETGUI)), 
-SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
+   $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, 
-SUBSYSTEM:CONSOLE) \
$(T_LDFLAGS) \
$(if $(gb_PRODUCT),,-NODEFAULTLIB) \
@$${RESPONSEFILE} \
@@ -548,7 +548,6 @@ gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS)
 
 gb_Executable_get_rpath :=
-gb_Executable_TARGETGUI := 
 
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_set_auxtargets,$(2),\
@@ -562,7 +561,8 @@ $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := 
$(call gb_Executable
 $(call gb_Deliver_add_deliverable,$(call 
gb_Executable_get_target,$(1)).manifest,$(call 
gb_LinkTarget_get_target,$(2)).manifest,$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call 
gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call 
gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-29 Thread Bjoern Michaelsen

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

New commits:
commit a8fd6eb67e988e83c2f441bc552ec18b800a5b64
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 20:37:41 2011 +0100

remove another debug line

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 306d0ad..a053420 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -62,7 +62,6 @@ endef
 
 smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native
$(call gb_BuildplTarget_command,$@,$(if $(filter 
instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from 
instsetoo_native,--all))
-   echo $@
 
 instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@,--all)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-29 Thread Bjoern Michaelsen

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

New commits:
commit eef80c23ffc790ae30feb5048e978c48e7b76e73
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 20:15:24 2011 +0100

use gb_MINISOLARENV for platform check

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 57387f1..f6a38af 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Helper_collect_libtargets))
 gb_Library_DLLPOSTFIX := lo
 
 # Include platform/cpu/compiler specific config/definitions
-ifneq ($(strip $(OS)),)
+ifeq ($(strip $(gb_MINISOLARENV)),)
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-29 Thread Bjoern Michaelsen

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

New commits:
commit 8bd1636b4da6ff2e5c28971b8c7864a70d935173
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 17:29:28 2011 +0100

remove debug output

diff --git a/solenv/gbuild/source_and_rerun.mk 
b/solenv/gbuild/source_and_rerun.mk
index 1fe62c8..2706a27 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -1,7 +1,6 @@
 
 gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-$(info gb_PARTIALBUILD $(gb_PARTIALBUILD))
 ifneq ($(strip $(gb_PARTIALBUILD)),)
 
 SRCDIR:=$(realpath $(gb_MAKEFILEDIR)/..)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit c0d26723ebcbfe81f3d66bc055168d6c584f3d36
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 00:15:45 2011 +0100

do not loop

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 182c8ae..74ce553 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -35,18 +35,21 @@ gb_FULLDEPS=
 
 clean: clean-host clean-build
 
-subsequentcheck: dev-install
-   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+subsequentcheck: smoketestoo_native
+   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=T
 
-unitcheck: dev-install
-   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+# instsetoo_native via build.pl already runs unittests
+unitcheck: instsetoo_native
+   @true
 
 all:
 
+gb_MAKETARGET=all
+# if we have only build as target use build instead of all
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out build,$(MAKECMDGOALS)),)
 gb_MAKETARGET=build
-else
-gb_MAKETARGET=all
+endif
 endif
 
 define gb_BuildplTarget_command
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit 70324f1e66bf64882d5ffc0b9215aa5524dc2e23
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 21:09:51 2011 +0100

dont overoptimize a plain make without an explicit target

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 1ac06ee..7e1a640 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,12 +27,14 @@
 
 
 # speed up if no target need to parse all modules
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out id tags docs distro-pack-install fetch help 
debugrun,$(MAKECMDGOALS)),)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit 92d68ce31ab351905e5411a523a557ea658b9802
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 19:42:21 2011 +0100

source build env for crosscompiles

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cba5b33..0dcc15a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -62,7 +62,7 @@ instsetoo_native: $(WORKDIR)/bootstrap 
$(SRCDIR)/src.downloaded $(if $(filter $(
$(call gb_BuildplTarget_command,$@)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-   $(call gb_BuildplTarget_command,$@)
+   source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Caolán McNamara

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

New commits:
commit bc8a2861b473043956e01aeb60a0f419b8705255
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 28 12:09:29 2011 +

tidy up escaping so this works for me

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c5c0324..fe2aa7e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -403,7 +403,7 @@ define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
 printf ". $(OUTDIR)/installation/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \
 printf "gdb $(OUTDIR)/installation/opt/program/soffice.bin" >> 
$${OFFICESCRIPT} && \
-printf " -ex \"set args --norestore --nologo 
\\\"--accept=pipe,name=$(USER);urp;\\\" 
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' 
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
 printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-25 Thread Bjoern Michaelsen

 solenv/gbuild/platform/unxgcc.mk |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3d37661a095c8d0a2a4376a859fa73c99a45ca56
Author: Bjoern Michaelsen 
Date:   Sat Nov 26 01:54:14 2011 +0100

dont attach, start own instance as otherwise it might be blocked 
via/proc/sys/kernel/yama/ptrace_scope

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9d07c9f..c5c0324 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -401,11 +401,10 @@ endef
 
 define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
-echo ". $(OUTDIR)/installation/opt/program/ooenv" > $${OFFICESCRIPT} && \
-echo "$(OUTDIR)/installation/opt/program/soffice.bin --norestore --nologo 
\"--accept=pipe,name=$(USER);urp;\" 
-env:UserInstallation=file://$(OUTDIR)/installation/ &" >> $${OFFICESCRIPT} && \
-echo "OFFICEPID=\$$!" >> $${OFFICESCRIPT} && \
-echo "echo \"office started as \$${OFFICEPID}\"" >> $${OFFICESCRIPT} && \
-echo "gdb -ex \"at \$${OFFICEPID}\" -ex \"c\"" >> $${OFFICESCRIPT} && \
+printf ". $(OUTDIR)/installation/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \
+printf "gdb $(OUTDIR)/installation/opt/program/soffice.bin" >> 
$${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo 
\\\"--accept=pipe,name=$(USER);urp;\\\" 
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
+printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-25 Thread Stephan Bergmann

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

New commits:
commit 58932ca2426320df5c7d7ec97cf2ad65f6539b22
Author: Stephan Bergmann 
Date:   Fri Nov 25 19:07:19 2011 +0100

fix stderr piping

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index ab0d67f..b6ce903 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -52,7 +52,7 @@ $(call gb_JunitTest_get_target,%) :
 -cp "$(CLASSPATH)" \
 $(DEFS) \
 org.junit.runner.JUnitCore \
-$(CLASSES) 2>&1 > $@.log || \
+$(CLASSES) > $@.log 2>&1 || \
(grep -v -e 'at org.junit.' \
-e 'at com.sun.star.lib.uno.' \
-e 'at java.lang.reflect.' \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild unotest/source

2011-11-24 Thread Bjoern Michaelsen

 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 
 solenv/gbuild/platform/macosx.mk  |1 
 solenv/gbuild/platform/solaris.mk |1 
 solenv/gbuild/platform/unxgcc.mk  |2 
 solenv/gbuild/platform/unxgcc_gdbforjunit.sh  |   52 ++
 unotest/source/java/org/openoffice/test/OfficeConnection.java |   81 ++
 6 files changed, 110 insertions(+), 28 deletions(-)

New commits:
commit 74f44646ba5b400cc39d78940677f136711459b5
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 04:16:28 2011 +0100

gdb stacktraces for subsequentchecks

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 8f013fb..f8d4454 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -302,6 +302,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}"
 \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4b84db4..3beb093 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -383,6 +383,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}"
 \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 28dbba8..a51edbf 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -367,6 +367,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}"
 \
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7df93f0..8c8380c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -382,6 +382,8 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}"
 \
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
+   
-Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh
 \
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh 
b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
new file mode 100755
index 000..ced0444
--- /dev/null
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Bjoern Michaelsen 
+# Portions created by the Initial Developer are Copyright (C) 2010 Canonical,
+# Ltd. . All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+# we expect our work directory to be where soffice had been started
+# $(1) should be the path to the executable
+
+OFFICEFILE=${1}
+WORKDIR=${2}
+
+if test -e ${WORKDIR}/core
+then
+STORELOCATION=`mktemp --tmpdir=${WORKDIR} core.`
+echo "Found a c

[Libreoffice-commits] .: solenv/gbuild

2011-11-22 Thread Stephan Bergmann

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

New commits:
commit 577c7ea310fa0417d2f2ca273f5541605883d2fd
Author: Stephan Bergmann 
Date:   Wed Nov 23 08:14:18 2011 +0100

Clean up gb_Library_set_componentfile argument handling.

It is only ever called with 2, never with 3 arguments.  And the
gb_ComponentTarget_ComponentTarget it calls only takes 3, not 4 arguments.

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 3e35228..7c55ec0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -78,8 +78,8 @@ $(call gb_Deliver_add_deliverable,$(call 
gb_Library_get_target,$(1)),$(call gb_L
 endef
 
 define gb_Library_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip 
$(2))),$(call gb_Library__get_componentprefix,$(1)),\
-   $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter 
$(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))),$(2))
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call 
gb_Library__get_componentprefix,$(1)),\
+   $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter 
$(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-16 Thread Norbert Thiebaud

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

New commits:
commit 8a7cfed28d15a7e64e897fa309189cce058fc48a
Author: Norbert Thiebaud 
Date:   Wed Nov 16 16:13:54 2011 -0600

support for various make goal in source_and_rerun

diff --git a/solenv/gbuild/source_and_rerun.mk 
b/solenv/gbuild/source_and_rerun.mk
index 937751f..0de1a9d 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -1,6 +1,11 @@
 
-all:
+dummy:
@if test -f ./config.mk; then . ./config.mk; else if test -f 
../config.mk ; then . ../config.mk; fi; fi && \
if test -f ./Env.Host.sh; then . ./Env.Host.sh; else if test -f 
../Env.Host.sh; then . ../Env.Host.sh; fi ; fi && \
if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 
1; fi && \
$(MAKE) $(MAKECMDGOALS)
+
+ifneq ($(strip $(MAKECMDGOALS)),)
+$(eval $(MAKECMDGOALS) : dummy)
+endif
+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-14 Thread Thorsten Behrens

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

New commits:
commit 7bd4f50af64e7fbec578e222cdf93a6003a12b09
Author: Thorsten Behrens 
Date:   Tue Nov 15 08:49:27 2011 +0100

Remove non-animated prefixes in gb_COLOR mode.

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 09885de..e4b811f 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -98,8 +98,8 @@ gb_Output_COLOR_ERROR := 
$(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
 
 define gb_Output__format_type
 $(subst :, ,$(word 2,$(1) \
-   
$(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))__.oO:$(subst
 $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
-   
$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))Xx.__:$(subst
 
$(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
+   
$(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))$(subst
 $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
+   
$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))$(subst
 
$(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
 endef
 
 define gb_Output_info
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-11 Thread Jan Holesovsky

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

New commits:
commit 4847eb96151d07f63ae91519f03c85932b0b51c0
Author: Jan Holesovsky 
Date:   Fri Nov 11 20:16:41 2011 +0100

Fix the TMPDIR setting, sorry.

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index d062037..b0b2bdb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -26,15 +26,14 @@
 #
 #*
 
-# please make generic modifications to either of these
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CPUDEFS := -D_M_IX86
+gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 
+# please make generic modifications to either of these
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 include $(GBUILDDIR)/platform/windows.mk
 
-gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
-
 gb_RC := $(WINDRES)
 
 gb_OSDEFS := \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 05a0b34..16694b3 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -26,12 +26,12 @@
 #
 #*
 
-# please make generic modifications to windows.mk
-include $(GBUILDDIR)/platform/windows.mk
-
 # set tmpdir to some mixed case path, suitable for native tools
 gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m 
/tmp))
 
+# please make generic Windows modifications to windows.mk
+include $(GBUILDDIR)/platform/windows.mk
+
 gb_CC := cl
 gb_CXX := cl
 gb_LINK := link
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 145 matches

Mail list logo