[Libreoffice-commits] .: l10n/prj

[Bjoern Michaelsen]

 0 files changed

New commits:
commit 15dcf02f0e2633830c48fede5e54766a7fd3ba7d
Author: Bjoern Michaelsen 
Date:   Sun Apr 29 13:18:06 2012 +0200

add dmake flagfile for build.pl

diff --git a/l10n/prj/dmake b/l10n/prj/dmake
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/prj

[Bjoern Michaelsen]

 0 files changed

New commits:
commit ea53b6fe73dbdce48c0b16309b78f7a1b78e06d8
Author: Bjoern Michaelsen 
Date:   Sun Apr 29 13:08:57 2012 +0200

add dmake flagfile for build.pl

diff --git a/binfilter/prj/dmake b/binfilter/prj/dmake
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

[Bjoern Michaelsen]

 extensions/source/bibliography/bibload.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 312e6b06dfeb707887953121b45d136ce45d5001
Author: Bjoern Michaelsen 
Date:   Sat Apr 21 03:13:12 2012 +0200

lp#527938: triple paperbag -- tweak bibloader again

diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index 9c84cdb..c5d3b13 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -248,9 +248,16 @@ namespace
 // lp#527938, debian#602953, fdo#33266, i#105408
 static bool lcl_isBaseAvailable()
 {
-Reference< XMultiServiceFactory >  xMgr = 
comphelper::getProcessServiceFactory();
-Reference< XAggregation > xAggregate = Reference< XAggregation >( 
xMgr->createInstance(C2U("com.sun.star.sdbc.RowSet")), UNO_QUERY);
-return xAggregate.is();
+try
+{
+Reference< XMultiServiceFactory >  xMgr = 
comphelper::getProcessServiceFactory();
+Reference< XAggregation > xAggregate = Reference< XAggregation >( 
xMgr->createInstance(C2U("com.sun.star.sdb.RowSet")), UNO_QUERY);
+return xAggregate.is();
+}
+catch(...)
+{
+return false;
+}
 }
 }
 void BibliographyLoader::load(const Reference< XFrame > & rFrame, const 
rtl::OUString& rURL,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Bjoern Michaelsen]

 vcl/unx/gtk/window/gtkframe.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9eed733f85e8003696271e63a3fcfc660511b7ef
Author: Michael Meeks 
Date:   Thu Apr 19 14:34:35 2012 +0100

fdo#46687 - fix find toolbar X error handling

Signed-off-by: Bjoern Michaelsen 

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4869c45..f96df12 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2224,6 +2224,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
 // to do this we need to synchronize with the XServer
 GetGenericData()->ErrorTrapPush();
 XSetInputFocus( getDisplay()->GetDisplay(), 
widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some 
reason it is.
+XSync( getDisplay()->GetDisplay(), False );
 GetGenericData()->ErrorTrapPop();
 }
 #endif
@@ -3282,9 +3284,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, 
GdkEvent*, gpointer frame )
 #if !GTK_CHECK_VERSION(3,0,0)
 if( bSetFocus )
 {
+GetGenericData()->ErrorTrapPush();
 XSetInputFocus( pThis->getDisplay()->GetDisplay(),
 widget_get_xid(pWidget),
 RevertToParent, CurrentTime );
+GetGenericData()->ErrorTrapPop();
 }
 #else
 (void)pWidget; (void)bSetFocus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in sysui/desktop

[Bjoern Michaelsen]

 configure.in|4 +++-
 sysui/desktop/share/launcher_unityquicklist.ulf |   23 +++
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 04ce0e891ecb9c4bb51fd19e9588ecb8613ac788
Author: Bjoern Michaelsen 
Date:   Wed Apr 18 13:14:07 2012 +0200

lp#720716: add unity quicklist support (add missed file)

diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf 
b/sysui/desktop/share/launcher_unityquicklist.ulf
new file mode 100644
index 000..d1b0c86
--- /dev/null
+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
@@ -0,0 +1,23 @@
+[writer]
+en-US = "New Document"
+
+[impress]
+en-US = "New Presentation"
+
+[calc]
+en-US = "New Spreadsheet"
+
+[base]
+en-US = "New Database"
+
+[math]
+en-US = "New Formula"
+
+[draw]
+en-US = "New Drawing"
+
+[startcenter]
+en-US = ""
+
+[javafilter]
+en-US = ""
commit 79e185898a577a2f90493f128628e559a481a374
Author: Bjoern Michaelsen 
Date:   Wed Apr 18 13:07:51 2012 +0200

update configure help for --enable-debug

diff --git a/configure.in b/configure.in
index 499cbf0..4f981fc 100644
--- a/configure.in
+++ b/configure.in
@@ -637,7 +637,9 @@ AC_ARG_ENABLE(debug,
 [Include debugging symbols from --enable-symbols plus extra debugging
  code. Extra large build! (enables -g compiler flag and dmake 
debug=true)
  If you need even more verbose output, build a module with
- "build -- debug=true dbglevel=2".]))
+ "build -- debug=true dbglevel=2". You can also use this switch as 
follows:
+ --enable-debug="tl svx" to enable debug only for the specified
+ gbuild-build libraries.]))
 
 AC_ARG_ENABLE(dbgutil,
 AS_HELP_STRING([--enable-dbgutil],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sysui/desktop

[Bjoern Michaelsen]

 sysui/desktop/menus/base.desktop|5 +
 sysui/desktop/menus/calc.desktop|5 +
 sysui/desktop/menus/draw.desktop|7 ++-
 sysui/desktop/menus/impress.desktop |5 +
 sysui/desktop/menus/math.desktop|5 +
 sysui/desktop/menus/writer.desktop  |5 +
 sysui/desktop/share/makefile.mk |4 +++-
 sysui/desktop/share/translate.pl|   18 +++---
 8 files changed, 49 insertions(+), 5 deletions(-)

New commits:
commit b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6
Author: Bjoern Michaelsen 
Date:   Wed Apr 18 12:00:30 2012 +0200

lp#720716: add unity quicklist support

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 56a25a2..8cc8e7c 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Base
 GenericName=Database Development
 Comment=Manage databases, create queries and reports to track and manage your 
information by using Base.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Database
+Exec=libreoffice --base %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index f58a164..d1a4147 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculations, analyze information and manage lists in 
spreadsheets by using Calc.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Spreadsheet
+Exec=libreoffice --calc %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 7819d81..e558330 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Drawing
+Exec=libreoffice --draw %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 84f16a9..1ea00aa 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by 
using Impress.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Presentation
+Exec=libreoffice --impress %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 9b87ef0..70b5695 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -11,3 +11,8 @@ Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Formula
+Exec=libreoffice --math %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index 0b6f116..8698e97 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and 
Web pages by using Writer.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Document
+Exec=libreoffice --writer %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 1d99c84..0a7c549 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -50,6 +50,7 @@ ULFFILES= \
 documents.ulf \
 launcher_comment.ulf \
 launcher_genericname.ulf \
+launcher_unityquicklist.ulf \
 launcher_name.ulf
 
 LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
@@ -146,7 +147,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) 
$(COMMONMISC)$/{$(PRODUCTLIST)}$/build
 # merge-in the translations. 
 #
 
-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl 
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf 
$(ULFDIR)/launcher_genericname.ulf
+$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl 
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf 
$(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
 $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
 @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
 @echo Creating desktop entries for $(@:f) ..
@@ -155,6 +156,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
 @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d 
$(@:db).$(INPATH).$(@:f) --ext "deskt

[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild

[Bjoern Michaelsen]

 config_host.mk.in   |1 
 configure.in|   15 +++---
 solenv/gbuild/LinkTarget.mk |   64 ++--
 3 files changed, 33 insertions(+), 47 deletions(-)

New commits:
commit ebed42c38ae91147633c47873307e07984bc62c1
Author: Bjoern Michaelsen 
Date:   Mon Apr 16 00:42:28 2012 +0200

introduce ENABLE_DEBUG_ONLY

with this you can now do:

 ./autogen.sh --enable-debug="sw sc"

and your build will have debug version of the libraries sw and sc, but a
non-debug build elsewhere. This currently only works for libraries. It 
would be
also possible to extend that to excutables, but that would need explicit in 
the
enable-debug switch then:

 ./autogen.sh --enable-debug="Library/sw Library/sc Executable/mkunroll"

so I dont know if it is worth it.

diff --git a/config_host.mk.in b/config_host.mk.in
index 378dc07..8ad7f5c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -74,6 +74,7 @@ export DBUS_LIBS=@DBUS_LIBS@
 export DB_CPPLIB=@DB_CPPLIB@
 export DB_LIB=@DB_LIB@
 export debug=@ENABLE_DEBUG@
+export ENABLE_DEBUG_ONLY=@ENABLE_DEBUG_ONLY@
 export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
diff --git a/configure.in b/configure.in
index 01b86c2..e75f81c 100644
--- a/configure.in
+++ b/configure.in
@@ -3426,15 +3426,22 @@ AC_SUBST(EXTERNAL_WARNINGS_NOT_ERRORS)
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===
 AC_MSG_CHECKING([whether to do a debug build])
-if test -n "$enable_debug" -a "$enable_debug" != "no"; then
-ENABLE_DEBUG="TRUE"
-enable_symbols="yes"
-AC_MSG_RESULT([yes])
+if test -n "$enable_debug" && test "$enable_debug" != "no"; then
+if test "$enable_debug" = "y" || test "$enable_debug" = "yes"; then
+ENABLE_DEBUG="TRUE"
+ENABLE_DEBUG_ONLY=
+else
+ENABLE_DEBUG=""
+ENABLE_DEBUG_ONLY="$enable_debug"
+AC_MSG_RESULT([for $enable_debug])
+fi
 else
 ENABLE_DEBUG=""
+ENABLE_DEBUG_ONLY=""
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ENABLE_DEBUG_ONLY)
 
 
 dnl Determine whether to use linkoo for the smoketest installation
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8d886c6..dc75200 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -35,15 +35,22 @@
 # OBJCXXFLAGS
 # LDFLAGS
 
-# CFLAGS from environment override debug/optimization flags
+# this returns the cflags/cxxflags to use from either the environment or
+# otherwise debug flags, if ENABLE_DEBUG is set or the LinkTarget is named
+# in the list of libraries of ENABLE_DEBUG_ONLY
+
 ifeq ($(gb_DEBUGLEVEL),2)
-CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
+define gb_LinkTarget__get_debugcflags
+$(if $(CFLAGS),$(CFLAGS),$(gb_DEBUG_CFLAGS))
+endef
+
+define gb_LinkTarget__get_debugcxxflags
+$(if $(CXXFLAGS),$(CXXFLAGS),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
+endef
+
 else
-CFLAGS ?= $(gb_COMPILEROPTFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget__get_debugcflags=$(if $(filter $(1),$(foreach 
lib,$(ENABLE_DEBUG_ONLY),$(call 
gb_Library_get_linktargetname,$(lib,$(gb_DEBUG_CFLAGS))
+gb_LinkTarget__get_debugcxxflags=$(if $(filter $(1),$(foreach 
lib,$(ENABLE_DEBUG_ONLY),$(call 
gb_Library_get_linktargetname,$(lib,$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
 endif
 
 # Overview of dependencies and tasks of LinkTarget
@@ -426,10 +433,10 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) 
$(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := 
$$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := 
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := 
$$(gb_LinkTarget_OBJCXXFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := 
$$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) 
$(CPPFLAGS)
@@ -459,7 +466,7 @@ $(call gb_LinkTarget_g

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source

[Bjoern Michaelsen]

 sfx2/source/dialog/filedlghelper.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit cac9cf690bf337a97ede781c38c5e7ddb3f37ca5
Author: Michael Stahl 
Date:   Thu Apr 5 18:09:41 2012 +0200

fdo#43895 lp#905355: fix the fix so it doesn't crash

rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex >= 0 && beginIndex <= getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)

    Signed-off-by: Bjoern Michaelsen 

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 79c1e4e..6acb006 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1654,8 +1654,17 @@ void FileDialogHelper_Impl::getRealFilter( String& 
_rFilter ) const
 void FileDialogHelper_Impl::verifyPath()
 {
 #ifdef UNX
+static char const s_FileScheme[] = "file://";
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
 struct stat aFileStat;
-const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, 
osl_getThreadTextEncoding() );
 stat( sFullPath.getStr(), &aFileStat );
 // lp#905355, fdo#43895
 // Check that the file has read only permission and is in /tmp -- this is
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sfx2/source vcl/unx

[Bjoern Michaelsen]

 sfx2/source/dialog/filedlghelper.cxx |   23 +++
 sfx2/source/dialog/filedlgimpl.hxx   |2 ++
 vcl/unx/gtk/gdi/salprn-gtk.cxx   |2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit d347e443e2c847d50f45ac810c5f78de3b892e3a
Author: David Tardon 
Date:   Wed Mar 28 13:25:25 2012 +0200

bypass GtkSalPrinter when it is not enabled

Signed-off-by: Bjoern Michaelsen 

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index fb25aec..b8c182f 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -236,7 +236,7 @@ GtkSalPrinter::StartJob(
 vcl::PrinterController& io_rController)
 {
 if (!lcl_useSystemPrintDialog())
-return impl_doJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, 
1, false, io_rController);
+return PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName, 
io_pSetupData, io_rController);
 
 assert(!m_pImpl);
 
commit 2890ca399dd23abd9b8b507d80f7242fce735278
Author: Andrzej J. R. Hunt 
Date:   Tue Mar 27 10:32:52 2012 +0200

fdo#43895 lp#905355: Never let users save in /tmp by default
(cherry picked from commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e)

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 141b389..79c1e4e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -100,6 +100,9 @@
 #include 
 #include 
 #include 
+#ifdef UNX
+#include 
+#endif
 
 //-
 
@@ -1648,6 +1651,24 @@ void FileDialogHelper_Impl::getRealFilter( String& 
_rFilter ) const
 }
 }
 
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, 
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), &aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+//  the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL("file:///tmp",11) == 0 &&
+( aFileStat.st_mode & (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg->setDisplayDirectory( maPath );
+}
+#endif
+}
+
 // 
 void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
 {
@@ -1661,6 +1682,7 @@ void FileDialogHelper_Impl::displayFolder( const 
::rtl::OUString& _rPath )
 try
 {
 mxFileDlg->setDisplayDirectory( maPath );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
@@ -1678,6 +1700,7 @@ void FileDialogHelper_Impl::setFileName( const 
::rtl::OUString& _rFile )
 try
 {
 mxFileDlg->setDefaultName( maFileName );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx 
b/sfx2/source/dialog/filedlgimpl.hxx
index 6770bb7..3433883 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -155,6 +155,8 @@ namespace sfx2
 
 voidimplInitializeFileName( );
 
+voidverifyPath( );
+
 voidimplGetAndCacheFiles( const 
::com::sun::star::uno::Reference< XInterface >& xPicker  ,
 SvStringsDtor*&
   rpURLList,
   const SfxFilter* 
   pFilter  );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Bjoern Michaelsen]

 sfx2/source/dialog/filedlghelper.cxx |   23 +++
 sfx2/source/dialog/filedlgimpl.hxx   |2 ++
 2 files changed, 25 insertions(+)

New commits:
commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e
Author: Andrzej J. R. Hunt 
Date:   Tue Mar 27 10:32:52 2012 +0200

fdo#43895 lp#905355: Never let users save in /tmp by default

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 3bf4fb5..0018912 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -101,6 +101,9 @@
 #include 
 #include 
 #include 
+#ifdef UNX
+#include 
+#endif
 
 //-
 
@@ -1635,6 +1638,24 @@ void FileDialogHelper_Impl::getRealFilter( String& 
_rFilter ) const
 }
 }
 
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, 
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), &aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+//  the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL("file:///tmp",11) == 0 &&
+( aFileStat.st_mode & (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg->setDisplayDirectory( maPath );
+}
+#endif
+}
+
 // 
 void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
 {
@@ -1648,6 +1669,7 @@ void FileDialogHelper_Impl::displayFolder( const 
::rtl::OUString& _rPath )
 try
 {
 mxFileDlg->setDisplayDirectory( maPath );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
@@ -1665,6 +1687,7 @@ void FileDialogHelper_Impl::setFileName( const 
::rtl::OUString& _rFile )
 try
 {
 mxFileDlg->setDefaultName( maFileName );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx 
b/sfx2/source/dialog/filedlgimpl.hxx
index 4f4e86d..4c3c68b 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -152,6 +152,8 @@ namespace sfx2
 
 voidimplInitializeFileName( );
 
+voidverifyPath( );
+
 voidimplGetAndCacheFiles( const 
::com::sun::star::uno::Reference< XInterface >& xPicker  ,
   
std::vector&   rpURLList,
   const SfxFilter* 
   pFilter  );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in

[Bjoern Michaelsen]

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb1400e33049b447869234134da59afe6553ad72
Author: Tomas Chvatal 
Date:   Sun Mar 18 12:28:44 2012 +0100

Add check for hamcrest even if it is not first in classpath.

Conflicts:

configure.in

Signed-off-by: Bjoern Michaelsen 

diff --git a/configure.in b/configure.in
index f7ee08f..ea959e6 100644
--- a/configure.in
+++ b/configure.in
@@ -9154,8 +9154,8 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != 
"no"; then
 if test $? -eq 0; then
 # check if either class-path entry is available for hamcrest or
 # it's bundled
-if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
-"$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 
'Class-Path: hamcrest'; then
+if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
+"$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP 
'Class-Path:' | $GREP -q 'hamcrest'; then
 AC_MSG_RESULT([$OOO_JUNIT_JAR])
 else
 AC_MSG_ERROR([your junit jar neither sets a classpath nor includes 
hamcrest; please
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - binaryurp/prj configure.in solenv/gbuild

[Bjoern Michaelsen]

 binaryurp/prj/build.lst |2 +-
 configure.in|3 +++
 solenv/gbuild/LinkTarget.mk |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3b6773c9d4550ad322248db8b16caa0206fbb3cb
Author: Bjoern Michaelsen 
Date:   Tue Mar 13 13:45:15 2012 +0100

add bug-id directly to the error message

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c547891..3d691cc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -85,7 +85,7 @@ endif
 # require different compiler flags
 define gb_Object__owner
 $$(if $$(OBJECTOWNER),\
-  $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
+  $$(call gb_Output_error,fdo#47246: $(1) is linked in by $$(OBJECTOWNER) 
$(2)))$(2)
 endef
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
commit d54e03caf915d5d89d35f73ea5fdd0b8d2fdb9db
Author: Bjoern Michaelsen 
Date:   Tue Mar 13 13:40:30 2012 +0100

binaryurp has cppunit tests

diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst
index eba5c27..7a32eda 100644
--- a/binaryurp/prj/build.lst
+++ b/binaryurp/prj/build.lst
@@ -1,2 +1,2 @@
-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal 
salhelper NULL
+bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal 
salhelper CPPUNIT:cppunit NULL
 bu binaryurp\prj nmake - all bu_prj NULL
commit 567a22f15ab35638ba04d51fdb1e8c91471bf8d1
Author: Bjoern Michaelsen 
Date:   Tue Mar 13 12:56:56 2012 +0100

upstream pkgconfig-mozilla-plugin.diff from Ubuntu/Debian packaging

diff --git a/configure.in b/configure.in
index 8ccb1e7..764b9c0 100644
--- a/configure.in
+++ b/configure.in
@@ -7274,6 +7274,9 @@ if test "$with_system_mozilla_headers" = "yes"; then
 if test "x$LOCATED" != "xyes"; then
 PKG_CHECK_MODULES(MOZILLA_HEADERS, libxul, [LOCATED=yes], [LOCATED=no])
 fi
+if test "x$LOCATED" != "xyes"; then
+PKG_CHECK_MODULES(MOZILLA_HEADERS, mozilla-plugin, [LOCATED=yes], 
[LOCATED=no])
+fi
 # if still not found bail out
 if test "x$LOCATED" != "xyes"; then
 AC_MSG_ERROR([npapi.h header file not found])
commit 58f5a26e2d4d6998a30e423ac67335cf62e97226
Author: Bjoern Michaelsen 
Date:   Tue Mar 13 11:16:32 2012 +0100

fdo#47246: abort on duplicate linked objects

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 555a805..c547891 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -85,7 +85,7 @@ endif
 # require different compiler flags
 define gb_Object__owner
 $$(if $$(OBJECTOWNER),\
-  $$(call gb_Output_warn,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
+  $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
 endef
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

[Bjoern Michaelsen]

 extensions/source/bibliography/bibload.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 1889c1af41650576a29c587a0b2cdeaf0d297587
Author: Bjoern Michaelsen 
Date:   Tue Mar 6 18:16:35 2012 +0100

lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking 
bibliography when base isnt installed

diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index 882b9a2..d20d34c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -242,13 +243,27 @@ void BibliographyLoader::cancel(void) throw 
(::com::sun::star::uno::RuntimeExcep
 }
 
 // ---
+namespace
+{
+// lp#527938, debian#602953, fdo#33266, i#105408
+static bool lcl_isBaseAvailable()
+{
+Reference< XMultiServiceFactory >  xMgr = 
comphelper::getProcessServiceFactory();
+Reference< XAggregation > xAggregate = Reference< XAggregation >( 
xMgr->createInstance(C2U("com.sun.star.sbd.RowSet")), UNO_QUERY);
+return xAggregate.is();
+}
+}
 void BibliographyLoader::load(const Reference< XFrame > & rFrame, const 
rtl::OUString& rURL,
 const Sequence< PropertyValue >& rArgs,
 const Reference< XLoadEventListener > & rListener) throw 
(::com::sun::star::uno::RuntimeException)
 {
-//!
+// lp#527938, debian#602953, fdo#33266, i#105408
+// make sure we actually can instanciate services from base first
+if(!lcl_isBaseAvailable())
+return;
 
 SolarMutexGuard aGuard;
+
 m_pBibMod = OpenBibModul();
 
 String aURLStr( rURL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

[Bjoern Michaelsen]

 framework/source/services/desktop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8550f6a66af279a34731a2d7921fb63550e463b
Author: Bjoern Michaelsen 
Date:   Mon Mar 5 09:21:38 2012 +0100

add a space

diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 3d164f0..8a03aa3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
 bool SAL_CALL Desktop::terminateQuickstarterToo()
 throw( css::uno::RuntimeException )
 {
-QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
 return terminate();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

[Bjoern Michaelsen]

 framework/source/services/desktop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3d78616dfc0805ff31038e00148e115d409ef9a
Author: Bjoern Michaelsen 
Date:   Mon Mar 5 08:50:10 2012 +0100

lp#562027: actually give the quickstart suppressor a scope

diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 6c63aea..3d164f0 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
 bool SAL_CALL Desktop::terminateQuickstarterToo()
 throw( css::uno::RuntimeException )
 {
-QuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
 return terminate();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svl/source

[Bjoern Michaelsen]

 svl/source/inc/poolio.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e530692e5527f3286547647604cbcd2e410b82
Author: Michael Stahl 
Date:   Mon Feb 27 20:43:28 2012 +0100

SfxItemPool: replace deque with vector for SfxPoolItem array

Yields measurable speedup on load/store of large documents, wonder where
the equivalent patch i committed long time ago to OOo went...

Signed-off-by: Bjoern Michaelsen 

diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 15f55ee..7c2cfc6 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -56,7 +56,7 @@ struct SfxPoolVersion_Impl
 {}
 };
 
-typedef std::deque SfxPoolItemArrayBase_Impl;
+typedef std::vector SfxPoolItemArrayBase_Impl;
 
 typedef boost::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr;
 typedef std::deque< SfxPoolVersion_ImplPtr > SfxPoolVersionArr_Impl;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Bjoern Michaelsen]

 vcl/unx/generic/plugadapt/salplug.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e532d4932b8a265cc82bf06ef54db58c9b532e38
Author: Tomas Chvatal 
Date:   Tue Feb 28 21:09:08 2012 +0100

Fix crash on exit using KDE interface
This is slightly modified version of patch from Lubos Lunak
.

This fixes downstream bugs:
https://bugs.gentoo.org/show_bug.cgi?id=394533
https://bugs.launchpad.net/bugs/925049

Signed-off-by: Bjoern Michaelsen 

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 72d236f..f94d6e5 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -96,8 +96,10 @@ static SalInstance* tryInstance( const OUString& rModuleBase 
)
 /*
  * #i109007# KDE3 seems to have the same problem; an atexit 
cleanup
  * handler, which cannot be resolved anymore if the plugin is 
already unloaded.
+* Same applies for kde4.
  */
-else if( 
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
+else if( 
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) ||
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) )
 {
 pCloseModule = NULL;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - configmgr/source

[Bjoern Michaelsen]

 configmgr/source/partial.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 8eb49978a2454c154e94588c9e0e53bcb110253d
Author: Stephan Bergmann 
Date:   Fri Feb 24 17:19:32 2012 +0100

Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node

Paths that already "failed" at the root node were not reported as 
CONTAINS_NOT,
so that they were erroneously migrated, but with broken content (values of 
set
member properties were nil).

Signed-off-by: Caolán McNamara 
Signed-off-by: Michael Meeks 
Signed-off-by: Bjoern Michaelsen 

diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 7922e2c..088de36 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -76,6 +76,12 @@ Partial::Partial(
 std::set< rtl::OUString > const & includedPaths,
 std::set< rtl::OUString > const & excludedPaths)
 {
+// The Partial::Node tree built up here encodes the following information:
+// * Inner node, startInclude: an include starts here that contains 
excluded
+//   sub-trees
+// * Inner node, !startInclude: contains in-/excluded sub-trees
+// * Leaf node, startInclude: an include starts here
+// * Leaf node, !startInclude: an exclude starts here
 for (std::set< rtl::OUString >::const_iterator i(includedPaths.begin());
  i != includedPaths.end(); ++i)
 {
@@ -119,12 +125,19 @@ Partial::~Partial() {}
 Partial::Containment Partial::contains(Path const & path) const {
 //TODO: For set elements, the segment names recorded in the node tree need
 // not match the corresponding path segments, so this function can fail.
+
+// * If path ends at a leaf node or goes past a leaf node:
+// ** If that leaf node is startInclude: => CONTAINS_NODE
+// ** If that leaf node is !startInclude: => CONTAINS_NOT
+// * If path ends at inner node:
+// ** If there is some startInclude along its trace: => CONTAINS_NODE
+// ** If there is no startInclude along its trace: => CONTAINS_SUBNODES
 Node const * p = &root_;
 bool includes = false;
 for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
 Node::Children::const_iterator j(p->children.find(*i));
 if (j == p->children.end()) {
-break;
+return p->startInclude ? CONTAINS_NODE : CONTAINS_NOT;
 }
 p = &j->second;
 includes |= p->startInclude;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - framework/inc framework/source sfx2/source vcl/inc vcl/unx

[Bjoern Michaelsen]

 framework/inc/services/desktop.hxx|4 +
 framework/source/services/desktop.cxx |   30 
 framework/source/services/sessionlistener.cxx |   27 +++
 sfx2/source/appl/shutdownicon.cxx |1 
 vcl/inc/unx/sm.hxx|1 
 vcl/unx/generic/app/sm.cxx|   96 ++
 6 files changed, 100 insertions(+), 59 deletions(-)

New commits:
commit 5279616d50b0394e8ec6d8e2109471ca649412b7
Author: Bjoern Michaelsen 
Date:   Tue Feb 28 14:29:06 2012 +0100

lp#562027: fix logout with quickstarter

diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index ac51f25..530d615 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -339,6 +339,10 @@ class Desktop   :   // interfaces
 virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
 throw (css::uno::RuntimeException);
 
+// we need this wrapped terminate()-call to terminate even the 
QuickStarter
+// non-virtual and non-UNO for now
+bool SAL_CALL terminateQuickstarterToo()
+throw( css::uno::RuntimeException );
 
//-
 //  protected methods
 
//-
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index eccd010..6c63aea 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -401,6 +401,36 @@ sal_Bool SAL_CALL Desktop::terminate()
 return bTerminate;
 }
 
+namespace
+{
+class QuickstartSuppressor
+{
+Desktop* const m_pDesktop;
+css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher;
+public:
+QuickstartSuppressor(Desktop* const pDesktop, css::uno::Reference< 
css::frame::XTerminateListener > xQuickLauncher)
+: m_pDesktop(pDesktop)
+, m_xQuickLauncher(xQuickLauncher)
+{
+SAL_INFO("fwk.desktop", "temporary removing Quickstarter");
+if(m_xQuickLauncher.is())
+m_pDesktop->removeTerminateListener(m_xQuickLauncher);
+}
+~QuickstartSuppressor()
+{
+SAL_INFO("fwk.desktop", "readding Quickstarter");
+if(m_xQuickLauncher.is())
+m_pDesktop->addTerminateListener(m_xQuickLauncher);
+}
+};
+}
+
+bool SAL_CALL Desktop::terminateQuickstarterToo()
+throw( css::uno::RuntimeException )
+{
+QuickstartSuppressor(this, m_xQuickLauncher);
+return terminate();
+}
 
 //=
 void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< 
css::frame::XTerminateListener >& xListener )
diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index b6c94b2..92b479d 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -30,6 +30,7 @@
 // my own includes
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -326,7 +327,19 @@ void SAL_CALL SessionListener::approveInteraction( 
sal_Bool bInteractionGranted
 StoreSession( sal_False );
 
 css::uno::Reference< css::frame::XDesktop > xDesktop( 
m_xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
-m_bTerminated = xDesktop->terminate();
+// honestly: how many implementations of XDesktop will we ever 
have?
+// so casting this directly to the implementation
+Desktop* pDesktop(dynamic_cast(xDesktop.get()));
+if(pDesktop)
+{
+SAL_INFO("fwk.session", "XDesktop is a framework::Desktop -- 
good.");
+m_bTerminated = pDesktop->terminateQuickstarterToo();
+}
+else
+{
+SAL_WARN("fwk.session", "XDesktop is not a framework::Desktop 
-- this should never happen.");
+m_bTerminated = xDesktop->terminate();
+    }
 
 if ( m_rSessionManager.is() )
 {
commit 478485d19f290f417f824dbecad3e3588bf553f5
Author: Bjoern Michaelsen 
Date:   Tue Feb 28 14:27:41 2012 +0100

some fancy new SAL_LOG tracing for sfx2

diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index ffaa63d..2f56e0b 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -686,6 +686,7 @@ void SAL_CALL ShutdownIcon::disposing( const 
::com::sun::star::lang::EventObje

[Libreoffice-commits] .: solenv/bin

[Bjoern Michaelsen]

 solenv/bin/linkoo |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43eefa11eb1d025b7967e75574f07603f6ac8a96
Author: Bjoern Michaelsen 
Date:   Tue Feb 21 13:43:04 2012 +0100

pythonloader.uno.so, libpyuno and pyuno are duplicates for linkoo too

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5c15611..97ae2e3 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -136,7 +136,7 @@ my %replaceable = (
 
 my @search_dirs = ( 'lib', 'bin', 'class' );
 
-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 
'libsqlite3', 'libnssutil3' );
+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 
'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
 
 sub sniff_target($)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

[Bjoern Michaelsen]

 Makefile |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41ad8739cba290a309bffe85aaf2088289054933
Author: Bjoern Michaelsen 
Date:   Tue Feb 21 00:59:19 2012 +0100

make debugrun run debugrun and not subsequentcheck

diff --git a/Makefile b/Makefile
index 346e91c..4899664 100644
--- a/Makefile
+++ b/Makefile
@@ -448,10 +448,10 @@ findunusedcode:
 check: subsequentcheck
 
 subsequentcheck: dev-install
-   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile 
subsequentcheck
+   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@
 
 debugrun:
-   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile 
debugrun
+   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@
 
 endif # not clean or distclean
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sc/Module_sc.mk solenv/gbuild

[Bjoern Michaelsen]

 sc/Module_sc.mk   |5 +-
 solenv/gbuild/Module.mk   |   43 +++---
 solenv/gbuild/TargetLocations.mk  |1 
 solenv/gbuild/extensions/post_DisableIosUnitchecks.mk |1 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk   |1 
 solenv/gbuild/gbuild.help.txt |1 
 6 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit 17f59f3aa995dd324ec88974b6196402f8fd89f0
Author: Bjoern Michaelsen 
Date:   Wed Feb 8 15:28:09 2012 +0100

stick to three-letter length

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f99c4cb..c46a2e8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -69,7 +69,7 @@ $(call gb_Module_get_check_target,%) :
touch $@)
 
 $(call gb_Module_get_slowcheck_target,%) :
-   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce,$*,$(true),SLC,5)
$(call gb_Output_announce_title,module $* slowchecks done.)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
commit 7472fe259e2cc94ddf66de29ab1d287d0775ceb3
Author: Bjoern Michaelsen 
Date:   Wed Feb 8 15:07:40 2012 +0100

remove superflous whitespace

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2825cce..ef47326 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_filters_test \
 ))
 
-$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+$(eval $(call gb_Module_add_slowcheck_targets,sc,\
 CppunitTest_sc_ucalc \
 ))
 
commit 590c2400f168faa6eccf793b478d681dcdb73ca7
Author: Markus Mohrhard 
Date:   Fri Jan 13 20:51:34 2012 +0100

first try to add slowcheck build target

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 112fa40..2825cce 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,10 +42,13 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+CppunitTest_sc_ucalc \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 JunitTest_sc_complex \
 JunitTest_sc_unoapi \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 24cc1e5..f99c4cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -34,10 +34,12 @@
 #  excluding tests recursive Modules
 # Module/unitcheckrun unit tests   all unit tests
 #  recursive 
Module/checks
+# Module/slowcheckrun all slow unit tests
 # Module/subsequentcheck  run system tests all system tests
 #  recursive 
Module/subsequentchecks
 # build (global)  build the producttop-level Module
 # unitcheck (global)  run unit tests   top-level 
Module/unitcheck
+# slowcheck (global)  run slow unit tests  top-level 
Module/slowcheck
 # subsequentcheck (global)run system tests top-level 
Module/subsequentcheck
 # all (global)default goal build unitcheck
 
@@ -48,6 +50,7 @@ gb_Module_ALLMODULES :=
 gb_Module_MODULELOCATIONS :=
 gb_Module_TARGETSTACK :=
 gb_Module_CHECKTARGETSTACK :=
+gb_Module_SLOWCHECKTARGETSTACK :=
 gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
 
@@ -56,7 +59,7 @@ $(call gb_Module_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),MOD,5)
$(call gb_Output_announce_title,module $* cleared.)
-$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call 
gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_check_target,%) :
$(call gb_Output_announce,$*,$(true),CHK,5)
@@ -65,6 +68,13 @@ $(call gb_Module_get_check_target,%) :
mkdir -p $(dir $@) && \
touch $@)
 
+$(call gb_Module_get_slowcheck_target,%) :
+   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce_title,module $* slowchecks done.)
+   -$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $@) && \
+   touch $@)
+
 $(call gb_Module_get_subsequentcheck_target,%) :
$(call gb_Output_announce,$*,$(true),SCK,5)
$(call gb_Output_announce_title,module $* subsequentchecks done.)
@@ -79,7 +89,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch

[Libreoffice-commits] Changes to 'distro/ubuntu/oneiric-3.4'

[Bjoern Michaelsen]

New branch 'distro/ubuntu/oneiric-3.4' available with the following commits:
commit 3129d7d23d06ac9609957d141cedbc04ac42c48a
Author: Caolán McNamara 
Date:   Tue Dec 13 21:01:28 2011 +

Resolves: rhbz#761009 IFSD_Equal is asymmetrical

commit 6a98980289ecc5b21a9c1044ca22e8de4f8f9c93
Author: Bjoern Michaelsen 
Date:   Thu Aug 25 00:23:31 2011 +0200

lp#832121: libgcc_s magic breaks horribly on armel and powerpc

commit 1518416ac6a692c2234dfa3cb4b98a382ebe65cc
Author: Bjoern Michaelsen 
Date:   Wed Jun 29 19:20:43 2011 +0200

lp#746375: soffice.bin crashed with SIGSEGV in uno_type_sequence_construct()

commit 9d3fb278999edb233eb1c2612412a06cd150e396
Author: Bjoern Michaelsen 
Date:   Wed Jun 29 19:15:31 2011 +0200

lp#720716: more translations in desktop files

commit 2c1ac0ff6558bd2b3dafe79a76a5fbaaa6507ba3
Author: Bjoern Michaelsen 
Date:   Wed Jun 29 19:49:36 2011 +0200

apply ubuntu-palette.diff

commit 4441ba7add7cd954b7f9077585d10033cc4ded2b
Author: Bjoern Michaelsen 
Date:   Tue Jul 19 13:16:14 2011 +0200

disable default as-needed on linking for gbuild too

 * for not breaking pkg-config provided link switches (because of order)

commit 903c82fa3bfeafe33965ca5d38c4ff144dbad572
Author: Bjoern Michaelsen 
Date:   Sun Jul 3 11:37:02 2011 +0200

adding human theme to scp2

commit 83eed6f49ede0f7b60d3b19e9cc558a90c762ecc
Author: Bjoern Michaelsen 
Date:   Fri Jul 1 10:45:59 2011 +0200

disable default as-needed on linking

 * for not breaking pkg-config provided link switches (because of order)

commit 1821350817000893ed9643f3081fca225ca151c2
Author: Rene Engelhard 
Date:   Thu Jun 30 10:18:47 2011 +0200

apply system-lpsolve-rpath.diff from libreoffice-build

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/ubuntu/oneiric-3.4' - 0 commits -

[Bjoern Michaelsen]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

[Bjoern Michaelsen]

 extensions/source/nsplugin/source/so_env.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03f4f6e17a0a159eb48282bde0a5392c104a0b19
Author: Bjoern Michaelsen 
Date:   Wed Jan 18 00:49:51 2012 +0100

lp#711673: mozilla-libreoffice mislabeled as OpenOffice.org Plug-in

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 322a2ff..92faaa2 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -63,7 +63,7 @@
 #include "ns_debug.hxx"
 #include 
 
-#define PLUGIN_NAME "OpenOffice.org"
+#define PLUGIN_NAME "LibreOffice"
 
 // Tranform all strings like %20 in pPath to one char like space
 /*int retoreUTF8(char* pPath)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - configure.in sal/StaticLibrary_salcpprt.mk scp2/source

[Bjoern Michaelsen]

 configure.in  |4 ++--
 sal/StaticLibrary_salcpprt.mk |5 -
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 3c1ddd4de187363cf1c3f14c43b4a2c66b1de6d6
Author: Bjoern Michaelsen 
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5263c11..cae313a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1295,6 +1295,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = "images_human.zip";
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 867677d..67499de 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -711,6 +711,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit f8766b4c489e5fb7101ae71fbe41fceaff88f941
Author: Bjoern Michaelsen 
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

diff --git a/configure.in b/configure.in
index 20411f3..251cfa8 100644
--- a/configure.in
+++ b/configure.in
@@ -882,7 +882,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -8753,7 +8753,7 @@ fi
 WITH_THEMES=""
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES="$WITH_THEMES $theme"
commit 605b8a0bc0201ea0bb07190a57213236dd009216
Author: Bjoern Michaelsen 
Date:   Tue Jan 17 01:09:48 2012 +0100

salcpprt also uses headers from sal_inc

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 65bd100..2286e6c 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -27,7 +27,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,sal_generated))
+$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+sal_generated \
+sal_inc \
+))
 
 $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in scp2/source

[Bjoern Michaelsen]

 configure.in  |6 +++---
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit db741827e630518e40006cbf7486bead92820300
Author: Bjoern Michaelsen 
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd222..8e18e8e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1294,6 +1294,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = "images_human.zip";
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 024ec68..2588b5b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -713,6 +713,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit 03351d7d10f06dbf9fb52343c9f1a360c17ef702
Author: Bjoern Michaelsen 
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

Conflicts:

configure.in

diff --git a/configure.in b/configure.in
index 824de63..c66a6c5 100644
--- a/configure.in
+++ b/configure.in
@@ -855,7 +855,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -7992,8 +7992,8 @@ fi
 WITH_THEMES=""
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
-*) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
+*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES="$WITH_THEMES $theme"
 SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[Bjoern Michaelsen]

 configure.in |   16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit a308f9172f86349c324a8cb07979f7b051811321
Author: Bjoern Michaelsen 
Date:   Thu Dec 22 01:05:58 2011 +0100

Revert "Fix gmake detection for MacOSX"

This reverts commit cf33de27eb5e981d8a1fa76f6a9d72ce7174f10d.

This breaks make bug 20033 detection on Linux. If this can not be reliably
detected on OSX, just disable parallelism for GNU make 3.81 on OSX in 
general,
but leave the detection intact for Linux.

diff --git a/configure.in b/configure.in
index 897403a..8ef3cdb 100644
--- a/configure.in
+++ b/configure.in
@@ -2696,19 +2696,7 @@ if test "$_make_longver" -ge "038200" ; then
 elif test "$_make_longver" -ge "038100" ; then
 AC_MSG_RESULT([$GNUMAKE $_make_version])
 AC_MSG_CHECKING([for GNU make bug 20033])
-dnl
-dnl FIXME: mktemp takes different arguments on different platforms:
-dnl http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1
-dnl
-dnl -t means either 'use $TMPDIR' (OK) or 'the following is a template'.
-dnl and without 'the following is a template', a following template
-dnl is allowed, so this *may* work on *most* platforms
-dnl
-TESTGMAKEBUG20033=`mktemp -d -t MakefileXX`
-SHA1SUM=sha1sum
-if test "$_os" = "Darwin"; then
-SHA1SUM=shasum
-fi
+TESTGMAKEBUG20033=`mktemp -d`
 cat > $TESTGMAKEBUG20033/Makefile << EOF
 A := \$(wildcard *.a)
 
@@ -2731,7 +2719,7 @@ define d2
 endef
 
 %.b : %.a
-   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
\$(call d1,\$(CHECKSUM)),\
\$(call d2,\$(CHECKSUM)))
 EOF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - bridges/source

[Bjoern Michaelsen]

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 468fe685e3c58c84bce6d9a48b931dcc21682679
Author: Matthias Klose 
Date:   Mon Dec 19 10:51:43 2011 +0100

fix armhf build in bridges

Signed-off-by: Bjoern Michaelsen 
Signed-off-by: Caolán McNamara 

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 5b02678..9502b87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
 pRegisterReturn[0] = r0;
 break;
 case typelib_TypeClass_FLOAT:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[0] = r0;
 #else
 *(float*)pRegisterReturn = fret;
 #endif
 break;
 case typelib_TypeClass_DOUBLE:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[1] = r1;
 pRegisterReturn[0] = r0;
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bridges/source sdext/source

[Bjoern Michaelsen]

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 ++--
 sdext/source/pdfimport/makefile.mk|5 -
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit f233f3973631c664e0953f04f88a58234390c088
Author: Matthias Klose 
Date:   Mon Dec 19 10:51:43 2011 +0100

fix armhf build in bridges

Signed-off-by: Bjoern Michaelsen 
Signed-off-by: Caolán McNamara 

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 5b02678..9502b87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
 pRegisterReturn[0] = r0;
 break;
 case typelib_TypeClass_FLOAT:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[0] = r0;
 #else
 *(float*)pRegisterReturn = fret;
 #endif
 break;
 case typelib_TypeClass_DOUBLE:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[1] = r1;
 pRegisterReturn[0] = r0;
 #else
commit f2a1882be486986a76682ed51f481595e1cf0d5c
Author: Bjoern Michaelsen 
Date:   Fri Dec 16 19:55:37 2011 +0100

fix racecondition in sdext/source/pdfimport/makefile.mk

diff --git a/sdext/source/pdfimport/makefile.mk 
b/sdext/source/pdfimport/makefile.mk
index 641e90f..d33680f 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
+
+$(MISC)/descriptions : $(DESCRIPTION)
 $(COPY) description-en-US.txt $(EXTENSIONDIR)
 .IF "$(WITH_LANG)" != ""
 $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
 .ENDIF
+$(TOUCH) $@
 
 $(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[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

[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

[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] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild sw/source

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 044d1d6a9586f02c1137ee8f654f89008bd12e39
Author: Winfried Donkers 
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) > MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) > MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
commit f5ac85575ad7066c9490c423cdfeba72df3d78fc
Author: Bjoern Michaelsen 
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 18069824a67602719007673c393ae511c476747e
Author: Bjoern Michaelsen 
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
commit a34ccd2ec9ffaf09162427b198fdc08cc324a3f3
Author: Winfried Donkers 
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) > MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) > MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[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

[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] .: RepositoryModule_ooo.mk

[Bjoern Michaelsen]

 RepositoryModule_ooo.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d432b00bfa05b1bd1413fb0b9afac19de5c1f60b
Author: Bjoern Michaelsen 
Date:   Wed Dec 7 17:07:18 2011 +0100

fix rebase mismatch: automation is gone

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3297d95..f59b2e0 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 animations \
-automation \
 basctl \
 basebmp \
 basegfx \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[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] .: Branch 'feature/gbuildfixes' - solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 700b3bc934538ca26e6d215ff78efb8b75bef6ed
Author: Bjoern Michaelsen 
Date:   Tue Dec 6 17:15:44 2011 +0100

only depend from dev-install on build if it is an explicit goal

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5ce0b3f..5afe595 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "see full error log at $@.log" \
&& echo "to rerun just this failed test without all others, 
run:" \
&& echo && echo "make $@" && echo \
-   && echo "cd into the module dir if you do not want a full 
dev-install run" \
+   && echo "cd into the module dir to run the tests faster" \
&& echo "Or to do interactive debugging, run two shells with 
(Linux only):" \
&& echo \
&& echo "make debugrun" \
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 01dc08a..66bb98a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -100,14 +100,12 @@ gb_MAKETARGET=build
 endif
 endif
 
-gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
 cd $(SRCDIR)/$(1) && unset MAKEFLAGS && export 
gb_SourceEnvAndRecurse_STAGE=gbuild && $(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
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
-   $(call gb_BuildplTarget_command,smoketestoo_native,$(if $(filter 
instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from 
instsetoo_native,--all))
+dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+   $(call gb_BuildplTarget_command,smoketestoo_native,--from 
instsetoo_native)
 
 build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,instsetoo_native,--all)
@@ -154,7 +152,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
 clean: clean-host clean-build
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
+dev-install: $(WORKDIR)/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)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

[Bjoern Michaelsen]

 sal/osl/unx/interlck.c |   45 -
 1 file changed, 45 deletions(-)

New commits:
commit efd750d8433aade624d09f7c9d37516c9e073cda
Author: Bjoern Michaelsen 
Date:   Mon Dec 5 21:56:12 2011 +0100

lp#726529: inline arm assembler is obsolete by now

diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index a32f67c..bf9ff62 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -37,51 +37,6 @@
 #error please use asm/interlck_sparc.s
 #elif defined ( SOLARIS) && defined ( X86 )
 #error please use asm/interlck_x86.s
-#elif defined ( ARM ) && (( __GNUC__ < 4 ) || (( __GNUC__ == 4) && ( 
__GNUC_MINOR__ < 6 ))) && ( __ARM_ARCH__ >= 6)
-// assembler implementation for gcc <4.6 on arm
-// originally contributed by Eric Bachard / OOo4Kids
-// replaced with the asm code generated by Linaro gcc 4.5
-// which includes memory barriers to make it SMP-safe
-// #i117017# and lp#726529
-oslInterlockedCount SAL_CALL 
osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-{
-register oslInterlockedCount nCount __asm__ ("r1");
-int nResult;
-
-__asm__ __volatile__ (
-" dmb\n"
-"1:   ldrex %0, [%3]\n"
-" add %0, %0, #1\n"
-" strex %1, %0, [%3]\n"
-" teq %1, #0\n"
-" bne 1b\n"
-" dmb\n"
-: "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
-: "r" (pCount)
-: "memory");
-
-return nCount;
-}
-
-oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-{
-register oslInterlockedCount nCount __asm__ ("r1");
-int nResult;
-
-__asm__ __volatile__ (
-" dmb\n"
-"0:   ldrex %0, [%3]\n"
-" sub %0, %0, #1\n"
-" strex %1, %0, [%3]\n"
-" teq %1, #0\n"
-" bne 0b\n"
-" dmb\n"
-: "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
-: "r" (pCount)
-: "memory");
-
-return nCount;
-}
 #elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) )
 /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 2462023103660954a93d649a0648453c6fd6aaa8
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 20:16:53 2011 +0100

quoting for CustomTargets

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 88e5f99..0a278d4 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,7 +30,7 @@
 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) \
+   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] .: Branch 'feature/gbuildfixes' - 3 commits - solenv/bin solenv/gbuild

[Bjoern Michaelsen]

 solenv/bin/concat-deps.pl   |   20 +++-
 solenv/gbuild/platform/com_GCC_class.mk |4 ++--
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 71dac00344af6f55265782ab01475d14c8313624
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 19:15:44 2011 +0100

use File::Spec instead of Cwd

diff --git a/solenv/bin/concat-deps.pl b/solenv/bin/concat-deps.pl
index 82910c7..935a50c 100755
--- a/solenv/bin/concat-deps.pl
+++ b/solenv/bin/concat-deps.pl
@@ -2,7 +2,7 @@
 
 # reads a list of dependency files from a file, opens and
 # concatenates them, while eliding duplicate nop rules.
-use Cwd 'fast_abs_path';
+use File::Spec;
 
 sub read_depfiles($)
 {
@@ -33,7 +33,7 @@ sub canonicalize_path($)
 my $path = $2;
 my $post =$3;
 if (length($path) > 0 && index($path,$ENV{SRCDIR}) == 0) {
-$path = Cwd::fast_abs_path($2);
+$path = File::Spec->rel2abs($2);
 $path = "\$(SRCDIR)" . substr($path, length($ENV{SRCDIR}));
 }
 #print "## $pre$path$post";
commit db45ed39ac782341ed66daf9420bb6a0c2aea558
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 18:46:25 2011 +0100

Revert "always compile from SRCDIR"

This reverts commit e4fbca1a513af15fd6c70929e3d5e53c06b93d89.

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 87d9364..61afbc1 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -27,7 +27,7 @@
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -46,7 +46,7 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CXX) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
commit a4bcfb4f646180cdfdc00245b98b8fcde65640ac
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 18:45:31 2011 +0100

use canonical paths in dep-files

diff --git a/solenv/bin/concat-deps.pl b/solenv/bin/concat-deps.pl
index c25df82..82910c7 100755
--- a/solenv/bin/concat-deps.pl
+++ b/solenv/bin/concat-deps.pl
@@ -2,6 +2,7 @@
 
 # reads a list of dependency files from a file, opens and
 # concatenates them, while eliding duplicate nop rules.
+use Cwd 'fast_abs_path';
 
 sub read_depfiles($)
 {
@@ -22,6 +23,22 @@ my @depfiles = read_depfiles (shift @ARGV);
 
 my %rules;
 print "# concatenated, reduced dependencies generated by 
solenv/bin/concat-deps.pl\n";
+print "# generated with \$(SRCDIR) = $ENV{SRCDIR}\n";
+
+sub canonicalize_path($)
+{
+my $line = shift;
+$line =~ /^(\s*)([^\s\n:]*)(.*\n?)$/;
+my $pre = $1;
+my $path = $2;
+my $post =$3;
+if (length($path) > 0 && index($path,$ENV{SRCDIR}) == 0) {
+$path = Cwd::fast_abs_path($2);
+$path = "\$(SRCDIR)" . substr($path, length($ENV{SRCDIR}));
+}
+#print "## $pre$path$post";
+return "$pre$path$post";
+}
 
 for my $fname (@depfiles) {
 my $fileh;
@@ -31,7 +48,8 @@ for my $fname (@depfiles) {
 
 my $last = '';
 while (<$fileh>) {
-   my $line = $_;
+   my $line = canonicalize_path($_);
+#print "# $line";
if ($line eq "\n") {
if ($last =~ /^(.*):\s*$/) {
if (defined $rules{$1}) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 7 commits - i18npool/source Makefile RepositoryModule_ooo.mk solenv/gbuild tools/source

[Bjoern Michaelsen]

 Makefile|   21 -
 RepositoryModule_ooo.mk |6 ++
 i18npool/source/breakiterator/Makefile  |   10 +-
 i18npool/source/collator/Makefile   |4 ++--
 i18npool/source/indexentry/Makefile |4 ++--
 i18npool/source/localedata/Makefile |8 
 i18npool/source/textconversion/Makefile |4 ++--
 solenv/gbuild/CustomTarget.mk   |1 -
 solenv/gbuild/extensions/post_AuxTargets.mk |2 +-
 solenv/gbuild/gbuild.mk |2 +-
 solenv/gbuild/platform/com_GCC_class.mk |4 ++--
 solenv/gbuild/source_and_rerun.mk   |2 +-
 tools/source/reversemap/Makefile|5 +++--
 13 files changed, 37 insertions(+), 36 deletions(-)

New commits:
commit e5ea900b9da28d509f701115150b09b8a1e585a5
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 14:49:29 2011 +0100

silent recurse

diff --git a/solenv/gbuild/source_and_rerun.mk 
b/solenv/gbuild/source_and_rerun.mk
index 46e6d43..a2aaea0 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -20,7 +20,7 @@ gb_SourceEnvAndRecurse_buildpl=$(call 
gb_SourceEnvAndRecurse_recurse,$(MAKECMDGO
 endif
 
 source-env-and-recurse:
-   $(gb_SourceEnvAndRecurse_reconfigure) && \
+   @$(gb_SourceEnvAndRecurse_reconfigure) && \
if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
if test -z "$${SOLARENV}"; then echo "no configuration found and could 
not create one" && exit 1; fi && \
commit e4fbca1a513af15fd6c70929e3d5e53c06b93d89
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 14:49:04 2011 +0100

always compile from SRCDIR

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 61afbc1..87d9364 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -27,7 +27,7 @@
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -46,7 +46,7 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CXX) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
commit 429ab808ee6d897c8af9f86a02c9bbdfbcf96eea
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 14:47:00 2011 +0100

kill gb_MINISOLARENV in favor of stages

diff --git a/Makefile b/Makefile
index d40695c..9f6c897 100644
--- a/Makefile
+++ b/Makefile
@@ -26,23 +26,18 @@
 #
 #*
 
-gb_SOURCEANDRERUN:=
-SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)
-ifeq ($(strip $(SOLARENV)),)
-ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
-gb_SOURCEANDRERUN:=T
-gb_MINISOLARENV:=
-else
-SOLARENV:=$(SRCDIR)/solenv
-gb_MINISOLARENV:=T
+SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)
+
+ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),)
+include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk
 endif
+
+ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure)
+SOLARENV:=$(SRCDIR)/solenv
 endif
 
-ifneq ($(gb_SOURCEANDRERUN),)
-include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/solenv/gbuild/source_and_rerun.mk
-else
+ifneq ($(filter reconfigure gbuild buildpl,$(gb_SourceEnvAndRecurse_STAGE)),)
 include $(SOLARENV)/gbuild/gbuild.mk
 $(eval $(call gb_Module_make_global_targets,$(wildcard 
$(SRCDIR)/RepositoryModule_*.mk)))
 endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index b8a002f..ce4a5cb 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded
 
 # fixme: can we prevent these exports in the first place?
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
-   $(if $(gb_MINISOLARENV),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure 
from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+   $(if $(filter 
reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot 
reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
 
 $(WORKDIR)/bootstrap:
@cd $(SRCDIR)

[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 6 commits - solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/CppunitTest.mk  |8 +---
 solenv/gbuild/CustomTarget.mk |2 +
 solenv/gbuild/Helper.mk   |3 -
 solenv/gbuild/JunitTest.mk|8 +---
 solenv/gbuild/Module.mk   |4 --
 solenv/gbuild/extensions/post_AuxTargets.mk   |2 -
 solenv/gbuild/extensions/post_DisableIosUnitchecks.mk |   34 ++
 solenv/gbuild/gbuild.mk   |6 ---
 8 files changed, 43 insertions(+), 24 deletions(-)

New commits:
commit d095f3ac28f987d6e00270d3c0ca754d5c0f6533
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 01:06:08 2011 +0100

update JunitTest hint

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8f7c6ae..5ce0b3f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "see full error log at $@.log" \
&& echo "to rerun just this failed test without all others, 
run:" \
&& echo && echo "make $@" && echo \
-   && echo "add \"-f $(SRCDIR)/GNUmakefile.mk\" if you are not in 
the module dir" \
+   && echo "cd into the module dir if you do not want a full 
dev-install run" \
&& echo "Or to do interactive debugging, run two shells with 
(Linux only):" \
    && echo \
&& echo "make debugrun" \
commit c7af6c26a06b6117b442268cfe0235264f2e6e27
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 01:02:59 2011 +0100

move platform hacks out of gbuild core

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 55cab3b..b410cfa 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -211,12 +211,10 @@ endef
 # why shouldn't it be.
 
 define gb_Module_add_check_target
-$(if $(filter-out IOS,$(OS)),\
 $(call gb_Module__read_targetfile,$(1),$(2),check target)
 
 $(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-)
 
 endef
 
diff --git a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk 
b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
new file mode 100644
index 000..01914a1
--- /dev/null
+++ b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
@@ -0,0 +1,34 @@
+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+#  
+#   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) 2011 Bjoern Michaelsen  
(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.
+
+# disable check target on IOS
+ifeq ($(OS),IOS)
+gb_Module_add_check_target=
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
commit 2aba32e19281d96a6502fafb20ac5ace61f073c9
Author: Bjoern Michaelsen 
Date:   Fri Dec 2 00:55:04 2011 +0100

build-order only from debugrun for now

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index c061099..55cab3b 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -116,7 +116,7 @@ else
 gb_Module_BUILDHINT=
 gb_Module_DEVINSTALLHINT=
 
-debugrun : build
+debugrun :| build
 endif
 
 all : build unitcheck
commit 661b9b8bd08c5291fdbc84edad57c3420a74e35d
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 15:08:01 2011 +0100

do not globally export gb_Helper_execute gb_Helper_set_ld_path

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 88e5f99..c55e6d8 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)) && \
gb_A

[Libreoffice-commits] Changes to 'feature/gbuildfixes'

[Bjoern Michaelsen]

New branch 'feature/gbuildfixes' available with the following commits:
commit ba894147056bdfe8766432bd60c45efec3702d54
Author: Bjoern Michaelsen 
Date:   Thu Dec 1 17:43:25 2011 +0100

use some macro magic here

commit 9eabbd8f03353fb750194761bffa26204cde5133
Author: Bjoern Michaelsen 
Date:   Thu Dec 1 17:37:36 2011 +0100

some more work on staging buildpl in front of gbuild

commit dca8b6c3d8a2e4ab2d823f3026dfe34de21376a9
Author: Bjoern Michaelsen 
Date:   Thu Dec 1 14:32:47 2011 +0100

introduce staged build

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 solenv/gbuild/Module.mk |6 +-
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1f6be70688a74b9f2ff1f641ef45c6fc5d20cc38
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 22:20:17 2011 +0100

do not even read module dirs when shortcuting

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 2b86a7d..87209c2 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -45,6 +45,7 @@ $(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
+gb_Module_add_moduledir=
 gb_FULLDEPS=
 endif
 
commit f95bf9c68dde00624a9b4134993f9ddf14123d1a
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 22:16:11 2011 +0100

debugrun does not need to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index e3b65b3..2b86a7d 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 distclean 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 
debugrun,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
commit 359dc427b4633b271078fbb80fdf674f54c89c0d
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 22:15:29 2011 +0100

execute debugrun after building

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2efef85..c0f8ffd 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,7 +84,11 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
-debugrun :| build
+
+# execute debugrun at the end
+ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
+debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
+endif
 
 define gb_Module_BUILDHINT
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[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

[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

[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

[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

[Libreoffice-commits] .: solenv/gbuild

[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

[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

[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

[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

[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] .: icc/source

[Bjoern Michaelsen]

 icc/source/create_sRGB_profile/create_sRGB_profile.cpp |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2c4537471c932b65e6f72e41881b505c4bbad12c
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 20:00:55 2011 +0100

dont mindlessly touch the icc-header file on every build

- this little gremlin touches the header file everytime it is run
- as icc is very low level, this causes a lot of pointless rebuild
- everything from vcl up gets relinked
- this slows every empty 'make build' down by more than 40 percent
- would really need to check if the file changed before writing, but as we
  rarely change icc itself, I didnt bother with that

diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp 
b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index cceb0c5..2d6b52f 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -474,6 +474,11 @@ int main(int argc, char* argv[])
 profile.Write(&out);
 out.Close();
 
+if(FILE *headerfile_exists = fopen(hxx_file_name,"r"))
+{
+fclose(headerfile_exists);
+exit(0);
+}
 FILE *headerfile = fopen(hxx_file_name,"w");
 
 //print OpenOffice standard file header
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - automation/packimages automation/source desktop/win32 filter/source i18npool/source solenv/gbuild writerfilter/source

[Bjoern Michaelsen]

 automation/packimages/Makefile  |1 +
 automation/source/testtool/Makefile |2 ++
 desktop/win32/source/setup/Makefile |1 +
 filter/source/svg/Makefile  |1 +
 i18npool/source/breakiterator/Makefile  |1 +
 i18npool/source/indexentry/Makefile |1 +
 i18npool/source/localedata/Makefile |1 +
 i18npool/source/textconversion/Makefile |1 +
 solenv/gbuild/UnoApiTarget.mk   |6 +++---
 writerfilter/source/Makefile|2 ++
 10 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit dd750cf42b308cdbf48ebd54fdd6f4fa0865b91a
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 18:10:55 2011 +0100

with announce letters shalt thou count to three, no more, no less

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 5511ec5..e5415df 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -158,13 +158,13 @@ endef
 
 .PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
 $(call gb_UnoApiOutTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+   $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiOutTarget_get_target,$*)) 
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
 $(call gb_UnoApiTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+   $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*)) 
-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
@@ -213,7 +213,7 @@ $(call gb_UnoApiTarget_get_target,%):
$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call 
gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call 
gb_UnoApiPartTarget_get_target,),$(patsubst 
%.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)
$(if $(UNOAPI_MERGE),$(call 
gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
$(if $(UNOAPI_REFERENCE), \
-   $(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
+   $(call gb_Output_announce,$*,$(true),DBc,4) \
$(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call 
gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call 
gb_Helper_convert_native,$@))
$(if $(gb_UnoApiTarget_IDLFILES_$*), \
$(call gb_Output_announce,$*,$(true),HPP,4) \
commit b1d20f68474d91d8accafdeb403526b16a636220
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 18:04:42 2011 +0100

set gb_PARTIALBUILD in CustomTargets

diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
index 69631bb..a26f117 100644
--- a/automation/packimages/Makefile
+++ b/automation/packimages/Makefile
@@ -23,6 +23,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 BINDIR := $(dir $(GBUILDDIR))bin
diff --git a/automation/source/testtool/Makefile 
b/automation/source/testtool/Makefile
index f0d1d13..9b1e007 100644
--- a/automation/source/testtool/Makefile
+++ b/automation/source/testtool/Makefile
@@ -23,6 +23,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 BASEDIR := $(dir $(firstword $(MAKEFILE_LIST)))
diff --git a/desktop/win32/source/setup/Makefile 
b/desktop/win32/source/setup/Makefile
index c5337ee..004f490 100644
--- a/desktop/win32/source/setup/Makefile
+++ b/desktop/win32/source/setup/Makefile
@@ -23,6 +23,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup
diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index 20ed8f8..31a4244 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -28,6 +28,7 @@
 SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST
 WORKDIR_FILTER := .
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild.mk
 
 filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
diff --git a/i18npool/source/breakiterator/Makefile 
b/i18npool/source/breakiterator/Makefile
index 011dd6f..9f1a6ce 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -28,6 +28,7 @@
 
 all : OpenOffice_dat.c data/dict_ja.cxx data/dict_zh.cxx
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 data:
diff --git a/i18npool/source/indexentry/Makefile 
b/i18npool/source/indexentry/Makefile
index c5335dc..cb0212c 100644
--- a/i18npool/source/indexentry/Makefile
+++ b/i18npool/source/indexentry/Makefile
@@ -28,6 +28,7 @@
 
 all : $(subst .txt,.cxx,$(notdir $(wildcard 
$(SRC_ROOT)/i18npool/source/indexentry/data/*.txt)))
 
+gb_PARTIALBUILD:=T
 include $(GBU

[Libreoffice-commits] .: solenv/gbuild

[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] .: Makefile.in

[Bjoern Michaelsen]

 Makefile.in |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 55da6a0907fe3679dd09de4c9f29ad32cb2a5ab5
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 13:18:15 2011 +0100

these deps are already handled in gbuild

diff --git a/Makefile.in b/Makefile.in
index 1375db4..2df1863 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,6 +102,4 @@ findunusedcode:
@grep ::.*\( unusedcode.all | grep -v ^cppu:: > unusedcode.easy
 
 #as long as we are not completely gbuildified we need to explicitly depend on 
the build/install
-unitcheck: build
-subsequentcheck: dev-install
 #debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: set_soenv.in solenv/gbuild

[Bjoern Michaelsen]

 set_soenv.in|2 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 536bf877b747bb119df911d3025a466efb7b8c82
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 13:15:02 2011 +0100

respect DO_FETCH_TARBALLS again

diff --git a/set_soenv.in b/set_soenv.in
index 10a0937..3011c09 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1484,7 +1484,7 @@ ToFile( "LIBDIR","@LIBDIR@", "e" );
 ToFile( "DATADIR",   "@DATADIR@","e" );
 ToFile( "MANDIR","@MANDIR@", "e" );
 ToFile( "DOCDIR","@DOCDIR@",  "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS", "e" );
+ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
 ToFile( "BUILD_MOZAB",   "@BUILD_MOZAB@","e" );
 ToFile( "PREBUILD_MOZAB",$PREBUILD_MOZAB,"e" );
 ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index c947ee3..fcdf2f4 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -43,7 +43,8 @@ distro-pack-install: install
$(SRCDIR)/bin/distro-install-file-lists
 
 $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-   @$(SRCDIR)/download $(SRCDIR)/ooo.lst && touch $@
+   $(if $(filter YES,$(DO_FETCH_TARBALLS)),@$(SRCDIR)/download 
$(SRCDIR)/ooo.lst)
+   @touch $@
 
 fetch: $(SRCDIR)/src.downloaded
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in |1 -
 solenv/gbuild/extensions/post_BuildplTargets.mk |   13 -
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 367d0be3e77f38604eeef1d9ae8a2a8c848bccbe
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 13:08:15 2011 +0100

remove allcheck cruft from Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b1680f3..1375db4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,5 +104,4 @@ findunusedcode:
 #as long as we are not completely gbuildified we need to explicitly depend on 
the build/install
 unitcheck: build
 subsequentcheck: dev-install
-allcheck : dev-install
 #debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
commit a0732d042f7304abb5c7194adcb8bf1948c96d55
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 13:07:22 2011 +0100

do incemental build from instsetoo_native to smoketest, if both are needed

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 74ce553..592f590 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -52,20 +52,23 @@ gb_MAKETARGET=build
 endif
 endif
 
+gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
-P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
-P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
-   $(call gb_BuildplTarget_command,$@)
+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,$@)
+   $(call gb_BuildplTarget_command,$@,--all)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-   source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@)
+   source $(SRCDIR)/Env.Build.sh && $(call 
gb_BuildplTarget_command,$@,--all)
 
 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

[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

[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

[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] .: Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in |   10 ++
 solenv/gbuild/extensions/post_BuildplTargets.mk |6 +++---
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit cb4dbf934a2095422289723ed73a4d7cacb56afe
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 19:22:48 2011 +0100

some consistent naming cant hurt: cross-build-toolset -> cross_toolset

diff --git a/Makefile.in b/Makefile.in
index b6d06e6..5ae3d96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,13 +2,7 @@
 
 SHELL=/usr/bin/env bash
 
-ifeq (@CROSS_COMPILING@,YES)
-CROSS_TOOLSET_RULE:=cross-build-toolset
-else
-CROSS_TOOLSET_RULE:=
-endif
-
-.PHONY : build dev-install all cross-build-toolset install distro-pack-install 
clean clean-host clean-build distclean findunusedcode bootstrap
+.PHONY : build dev-install all cross_toolset install distro-pack-install clean 
clean-host clean-build distclean findunusedcode bootstrap
 
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST/GNUmakefile.mk \
@@ -50,7 +44,7 @@ build: Makefile
 dev-install: Makefile
@$(call forward_to_gbuild,$@)
 
-cross-build-toolset:
+cross_toolset:
@$(call forward_to_gbuild,$@)
 
 clean:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1fa6a2b..cba5b33 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -55,13 +55,13 @@ endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
$(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] .: 5 commits - Makefile.in solenv/gbuild tail_build/Makefile

[Bjoern Michaelsen]

 Makefile.in |  165 +++-
 solenv/gbuild/Module.mk |   48 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |   77 +++
 solenv/gbuild/extensions/post_BuildplTargets.mk |   76 +++
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   38 +
 solenv/gbuild/gbuild.mk |2 
 tail_build/Makefile |2 
 7 files changed, 281 insertions(+), 127 deletions(-)

New commits:
commit ce33bdce9d3499b7419b9210a2b5117ccda7ea32
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 17:56:11 2011 +0100

targets must be postextension SRCDIR is empty otherwise

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
new file mode 100644
index 000..fff1c10
--- /dev/null
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -0,0 +1,77 @@
+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+#  
+#   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) 2011 Bjoern Michaelsen  
(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.
+
+.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap
+
+id:
+   @create-ids
+
+tags:
+   @create-tags
+
+docs:
+   @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+distro-pack-install: install
+   $(SRCDIR)/bin/distro-install-clean-up
+   $(SRCDIR)/bin/distro-install-desktop-integration
+   $(SRCDIR)/bin/distro-install-sdk
+   $(SRCDIR)/bin/distro-install-file-lists
+
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+   @$(SRCDIR)/download $(SRCDIR)/ooo.lst && touch $@
+
+fetch: $(SRCDIR)/src.downloaded
+
+$(WORKDIR)/bootstrap:
+   @cd $(SRCDIR) && ./bootstrap
+   @mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+
+clean-host:
+   rm -rf $(SRCDIR)/*/$(INPATH)
+   rm -rf install
+
+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)
+
+distclean: clean
+   if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
+   cd $(SRCDIR) && rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun 
autom4te.cache \
+   bin/repo-list build_env config.log config.status configure \
+   desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+   set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
+
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 6c62649..1fa6a2b 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -42,7 +42,34 @@ unitcheck: dev-install
@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
 
 all:
-   
+
+ifeq ($(filter-out build,$(MAKECMDGOALS)),)
+gb_MAKETARGET=build
+else
+gb_MAKETARGET=all
+endif
+
+define gb_BuildplTarget_command
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all 
gb_MAKETARGET=$(gb_MAKETARGET)
+endef
+
+.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
+
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+   $(call gb_BuildplTarget_command,$@)
+
+dev-install: smoketestoo_native
+
+all:

[Libreoffice-commits] .: solenv/gbuild

[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] .: 3 commits - Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in  |   12 ++--
 solenv/gbuild/platform/unxgcc.mk |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f8b7720ca56e16d718593da8fc394dd91362fbf1
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:44:45 2011 +0100

dev-install seems to poison the env

diff --git a/Makefile.in b/Makefile.in
index 78608d7..86acb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,4 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
-debugrun : dev-install
+#debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
commit c036777b4930e5c4ab34f035b8de749a7f80e42a
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:41:28 2011 +0100

gbuild need no env anymore

diff --git a/Makefile.in b/Makefile.in
index 82dca9a..78608d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,16 +56,16 @@ dev-install: build
 fi
 
 debugrun:
-   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/GNUmakefile.mk debugrun
 
 check : allcheck
@true
 
 %check:
-   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
-   $(if @VERBOSE@,,-s) --jobs="$(if \
-  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
-   $(patsubst allcheck,check,$@)
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$)MAKEFILE_LIST/GNUmakefile.mk -r \
+   $(if @VERBOSE@,,-s) --jobs="$(if \
+  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
+   $(patsubst allcheck,check,$@)
 
 cross-build-toolset:
@. ./Env.Build.sh && \
commit faa11fecdbca8cdba62a6cc5610c311fcbe0e607
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:40:02 2011 +0100

fix default junit soffice path

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d34d4a1..9d07c9f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -383,7 +383,7 @@ else
 ifneq ($(gb_JunitTest_DEBUGRUN),)
 gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
 else
-gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice" 
+gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
 endif
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

[Bjoern Michaelsen]

 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 19b5d81f92363f1448dcf41930d973b8b04db11b
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 15:24:49 2011 +0100

move workaround for old build system to other workarounds

diff --git a/Makefile.in b/Makefile.in
index 443305b..82dca9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ dev-install: build
 "@abs_builddir@"; \
 fi
 
-debugrun : dev-install
+debugrun:
@. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
 
 check : allcheck
@@ -173,3 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
+debugrun : dev-install
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 Makefile.in   |7 ++
 solenv/gbuild/JunitTest.mk|   14 +++--
 solenv/gbuild/Module.mk   |   10 +++
 solenv/gbuild/gbuild.mk   |4 +
 solenv/gbuild/platform/unxgcc.mk  |   26 +-
 unotest/source/java/org/openoffice/test/OfficeConnection.java |6 --
 6 files changed, 53 insertions(+), 14 deletions(-)

New commits:
commit bb149de2b4d3458c0db1958edbbb75e79a8a53c4
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 15:14:09 2011 +0100

some hints cleanup

diff --git a/Makefile.in b/Makefile.in
index 9f58d33..443305b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,13 +46,18 @@ dev-install: build
 printf \
 '\nDeveloper installation finished, you can now execute:\n\n' \
 && \
-if test `uname -s` = Darwin; then \
+if test `uname -s` = Linux; then \
+printf 'make debugrun\n'; \
+elif test `uname -s` = Darwin; then \
 printf 'open %s/install/LibreOffice.app\n' "@abs_builddir@"; \
 else \
 printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
 "@abs_builddir@"; \
 fi
 
+debugrun : dev-install
+   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+
 check : allcheck
@true
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 33d068c..ab0d67f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,9 +58,15 @@ $(call gb_JunitTest_get_target,%) :
-e 'at java.lang.reflect.' \
-e 'at sun.reflect.' $@.log \
&& echo "see full error log at $@.log" \
-   && echo "to rerun just this failed test without all others, run 
either:" \
-   && echo "cd \$$MODULE && make $@" \
-   && echo "make -f $(SRCDIR)/GNUmakefile.mk $@" && false)) && \
+   && echo "to rerun just this failed test without all others, 
run:" \
+   && echo && echo "make $@" && echo \
+   && echo "add \"-f $(SRCDIR)/GNUmakefile.mk\" if you are not in 
the module dir" \
+   && echo "Or to do interactive debugging, run two shells with 
(Linux only):" \
+   && echo \
+   && echo "make debugrun" \
+   && echo "make gb_JunitTest_DEBUGRUN=T $@" \
+   && echo \
+   && false)) && \
 rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
 
commit a65b46b71d0f95119b343f4e931a318703889b08
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 14:38:18 2011 +0100

remove debugcommand -- debugrun is superceding it

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java 
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 8f99076..ae2cae0 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -105,12 +105,6 @@ public final class OfficeConnection {
 assertNull(waitForProcess(process, 1000)); // 1 sec
 }
 }
-try {
-ProcessBuilder debugbp = new ProcessBuilder(
-Argument.get("debugcommand").split(" "));
-debugbp.start();
-Thread.sleep(1000);
-} catch(Exception e) {}
 }
 
 /** Shut down the OOo instance.
commit b684a5bb0374719976accaa9cedca44fa3d821ad
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 14:36:18 2011 +0100

create debugrun target, adjust JunitTests to them

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 3003c9d..33d068c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -50,8 +50,6 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
 ($(gb_JunitTest_JAVACOMMAND) \
 -cp "$(CLASSPATH)" \
-$(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
-
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) 2>&1 > $@.log || \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 82da041..582d960 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -112,6 +112,10 @@ chec

[Libreoffice-commits] .: tail_build/Makefile

[Bjoern Michaelsen]

 tail_build/Makefile |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 538b1071531e895a55e2d6799806c3036f9ada49
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 13:02:36 2011 +0100

copy Makefile to everywhere was a bit too much of a shotgun approach

diff --git a/tail_build/Makefile b/tail_build/Makefile
index f9ac01e..625b0cb 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -30,10 +30,9 @@ ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk
 else
 
-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
 
 endif
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 solenv/gbuild/JunitTest.mk|7 +-
 solenv/gbuild/platform/unxgcc_gdbforjunit.sh  |   35 +++---
 unotest/source/java/org/openoffice/test/OfficeConnection.java |   15 
 3 files changed, 45 insertions(+), 12 deletions(-)

New commits:
commit a1b57be652ac532ebddb3e3e53dddc35ae420f31
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 05:27:15 2011 +0100

empty java stacktrace for soffice crashers, they are not interesting anyway

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java 
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 54a412d..8f99076 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -48,7 +48,13 @@ import static org.junit.Assert.*;
 org.openoffice.test.arg system properties.
 */
 
+
 public final class OfficeConnection {
+private final class PostprocessFailedException extends 
java.lang.RuntimeException {
+PostprocessFailedException() {
+super("This likely means that soffice crashed during the test.");
+}
+};
 /** Start up an OOo instance.
 */
 public void setUp() throws Exception {
@@ -159,7 +165,14 @@ public final class OfficeConnection {
 Forward pperrForward = new 
Forward(postprocess.getErrorStream(), System.err);
 pperrForward.start();
 postprocess.waitFor();
-assertEquals(0, postprocess.exitValue());
+if(postprocess.exitValue() != 0)
+{
+// no ugly long java stacktrace needed here
+PostprocessFailedException e = new 
PostprocessFailedException();
+StackTraceElement[] newStackTrace = new 
StackTraceElement[0];
+e.setStackTrace(newStackTrace);
+throw e;
+}
 }
 }
 catch(IOException e) {}
commit 1cec66388eac81af2197da4fbf8fd2b00c56c7a5
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 05:25:16 2011 +0100

dont choke without gdb

diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh 
b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
index ced0444..8520849 100755
--- a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -34,18 +34,33 @@
 OFFICEFILE=${1}
 WORKDIR=${2}
 
-if test -e ${WORKDIR}/core
+if test -n "`which gdb`"
 then
-STORELOCATION=`mktemp --tmpdir=${WORKDIR} core.`
-echo "Found a core dump at ${WORKDIR}, moving it to ${STORELOCATION}"
-mv ${WORKDIR}/core ${STORELOCATION}
-echo "Stacktrace:"
-GDBCOMMANDFILE=`mktemp`
-echo "bt" > ${GDBCOMMANDFILE}
-gdb -x $GDBCOMMANDFILE --batch ${OFFICEFILE}.bin ${STORELOCATION}
-rm ${GDBCOMMANDFILE}
-exit 1
+if test -e ${WORKDIR}/core
+then
+STORELOCATION=`mktemp --tmpdir=${WORKDIR} core.`
+echo
+echo "It seems like soffice.bin crashed during the test excution!"
+echo "Found a core dump at ${WORKDIR}, moving it to ${STORELOCATION}"
+mv ${WORKDIR}/core ${STORELOCATION}
+echo "Stacktrace:"
+GDBCOMMANDFILE=`mktemp`
+echo "bt" > ${GDBCOMMANDFILE}
+gdb -x $GDBCOMMANDFILE --batch ${OFFICEFILE}.bin ${STORELOCATION}
+rm ${GDBCOMMANDFILE}
+echo
+exit 1
+else
+echo
+echo "No core dump at ${WORKDIR}, to create core dumps (and stack 
traces)"
+echo "for crashed soffice instances, enable core dumps with:"
+echo
+echo "   ulimit -c unlimited"
+echo
+exit 0
+fi
 else
+echo "You need gdb in you path to general stacktraces."
 exit 0
 fi
 
commit 279473f1ed6cd3bb6f6d2b8b9c75529b91836e39
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 05:24:23 2011 +0100

cut out noise in junit stacktrace for output, but keep them in log

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 10df1da..dab548a 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -54,7 +54,12 @@ $(call gb_JunitTest_get_target,%) :
 
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
 $(DEFS) \
 org.junit.runner.JUnitCore \
-$(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) && \
+$(CLASSES) 2>&1 > $@.log || \
+   (grep -v -e 'at org.junit.' \
+   -e 'at com.sun.star.lib.uno.' \
+   -e 'at java.lang.reflect.' \
+   -e 'at sun.reflect.' $@.log \
+   &&

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

[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
+t

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|6 
 patches/dev300/system-lpsolve-link-with-colamd.diff |   27 
 patches/dev300/system-lpsolve-rpath.diff|   27 
 3 files changed, 60 deletions(-)

New commits:
commit 2786d0238b25d7bcc1408bb1a45a8f7f4bd1febd
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 18:51:52 2011 +0100

remove system-lpsolve-link-with-colamd.diff and system-lpsolve-rpath.diff, 
already downstreamed to debian

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 73b9c4e..f0e07a1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ soffice-opengl-and-locking-config.diff, mklose
 
 icu-arm.diff, doko
 
-# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include 
it
-system-lpsolve-link-with-colamd.diff, rengelha
 
 [ LocalizeFixes and DebianBaseOnly ]
 # mention openoffice.org-report-builder instead of getting people
@@ -1248,10 +1246,6 @@ SectionOwner => jholesov
 # fix mysqlc to use the SONAME instead of the .so symlink...
 mysqlcppconn-mysqlclient-SONAME.diff
 
-[ DebianSidOnly ]
-# link dynamically with liblpsolve55.so
-system-lpsolve-rpath.diff, rengelha
-
 [ Speed ]
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
diff --git a/patches/dev300/system-lpsolve-link-with-colamd.diff 
b/patches/dev300/system-lpsolve-link-with-colamd.diff
deleted file mode 100644
index 0c3c7c2..000
--- a/patches/dev300/system-lpsolve-link-with-colamd.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure.in b/configure.in
 configure.in
-+++ configure.in
-@@ -5185,6 +5185,7 @@
- # some systems need this. Like Ubuntu
- AC_CHECK_LIB(m, floor)
- AC_CHECK_LIB(dl, dlopen)
-+AC_CHECK_LIB(colamd, colamd)
- AC_CHECK_LIB(lpsolve55, make_lp, ,
- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
- else
-diff --git a/sccomp/source/solver/makefile.mk 
b/sccomp/source/solver/makefile.mk
 sccomp/source/solver/makefile.mk
-+++ sccomp/source/solver/makefile.mk
-@@ -58,6 +58,12 @@
- $(TOOLSLIB) \
- $(LPSOLVELIB)
- 
-+# DebianBaseOnly; we build lp_solve without colamd included but with 
system-colamd
-+# (which is not linked into the .a...) so we need -lcolamd here, too
-+.IF "$(SYSTEM_LPSOLVE)" == "YES"
-+SHL1STDLIBS += -lcolamd
-+.ENDIF
-+
- SHL1DEPN=   makefile.mk
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
- SHL1VERSIONMAP= $(SOLARENV)/src/component.map
diff --git a/patches/dev300/system-lpsolve-rpath.diff 
b/patches/dev300/system-lpsolve-rpath.diff
deleted file mode 100644
index 24c72cc..000
--- a/patches/dev300/system-lpsolve-rpath.diff
+++ /dev/null
@@ -1,27 +0,0 @@
 solenv/inc/libs.mk-old 2008-04-29 12:50:10.0 +0200
-+++ solenv/inc/libs.mk 2008-04-29 12:51:27.0 +0200
-@@ -340,7 +340,13 @@
- MYTHESLIB=-lmythes-1.2
- .ENDIF
- PYUNOLIB=-lpyuno
-+.IF "$(SYSTEM_LPSOLVE)" == "YES"
-+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
-+# /usr/lib gets picked and we get a static link...
-+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
-+.ELSE
- LPSOLVELIB=-llpsolve55
-+.ENDIF
- SOFFICELIB=-lsofficeapp
- UNOPKGAPPLIB=-lunopkgapp
- TESTLIB=-ltest
 configure.in-old   2008-04-29 12:59:49.0 +0200
-+++ configure.in   2008-04-29 13:00:07.0 +0200
-@ -5401,7 +5401,7 @@
- AC_CHECK_LIB(m, floor)
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_LIB(lpsolve55, make_lp, ,
--[ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-+[ AC_MSG_ERROR(lpsolve library not found or too old.)], 
[-L/usr/lib/lp_solve])
- else
- AC_MSG_RESULT([internal])
- SYSTEM_LPSOLVE=NO
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|3 ---
 patches/dev300/open-url-support-iceanimals.diff |   22 --
 patches/dev300/seamonkey-is-iceape.diff |   22 --
 3 files changed, 47 deletions(-)

New commits:
commit e0335749ad65bdb78f4da2315197b6066bb24563
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 18:37:45 2011 +0100

upstream patches/dev300/seamonkey-is-iceape.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f4af29b..73b9c4e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,8 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-seamonkey-is-iceape.diff
-
 # build against xulrunner 1.9.1+
 xulrunner-1.9.1.diff, ccheney
 
diff --git a/patches/dev300/seamonkey-is-iceape.diff 
b/patches/dev300/seamonkey-is-iceape.diff
deleted file mode 100644
index 10fccb6..000
--- a/patches/dev300/seamonkey-is-iceape.diff
+++ /dev/null
@@ -1,22 +0,0 @@
 configure.in-old   2008-05-03 23:27:00.0 +0200
-+++ configure.in   2008-05-03 23:27:37.0 +0200
-@@ -795,7 +795,7 @@
-   components cannot be built against a contemporary
-   mozilla. The flavour used can be specified by
-   --with-system-mozilla=. Supported are:
--  libxul (default), xulrunner, firefox, seamonkey,
-+  libxul (default), xulrunner, firefox, iceape,
-   mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-
-@@ -4134,8 +4134,8 @@
-   MOZ_FLAVOUR=libxul
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"xulrunner"; then
-   MOZ_FLAVOUR=xulrunner
--elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"seamonkey"; then
--  MOZ_FLAVOUR=seamonkey
-+elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"iceape"; then
-+  MOZ_FLAVOUR=iceape
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"firefox"; then
-   MOZ_FLAVOUR=firefox
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"mozilla"; then
commit 4264a8542d6b6da19b548c192662f5d7565c31ca
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 18:36:26 2011 +0100

upstream open-url-support-iceanimals.dif

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ceb0678..f4af29b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,7 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-open-url-support-iceanimals.diff
 seamonkey-is-iceape.diff
 
 # build against xulrunner 1.9.1+
diff --git a/patches/dev300/open-url-support-iceanimals.diff 
b/patches/dev300/open-url-support-iceanimals.diff
deleted file mode 100644
index 3928954..000
--- a/patches/dev300/open-url-support-iceanimals.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: open-url.sh
-===
 shell/source/unix/misc/open-url.sh (Revision 277618)
-+++ shell/source/unix/misc/open-url.sh (Arbeitskopie)
-@@ -58,7 +58,7 @@
- exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in thunderbird mozilla netscape; do
-+  for i in icedove thunderbird iceape mozilla netscape; do
- mailer=`which $i`
- if [ ! -z "$mailer" ]; then
-   run_mozilla "$mailer" "$1"
-@@ -84,7 +84,7 @@
- exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in firefox mozilla netscape; do
-+  for i in iceweasel firefox iceape mozilla netscape; do
- browser=`which $i`
- if [ ! -z "$browser" ]; then
-   run_mozilla "$browser" "$1"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in shell/source

[Bjoern Michaelsen]

 configure.in   |4 +++-
 shell/source/unix/misc/open-url.sh |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit c497ae0ded79422ec54ff8677e8a7c36351a7aef
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 18:32:31 2011 +0100

upstream seamoney-is-iceape.diff from libreoffice/build

diff --git a/configure.in b/configure.in
index 2711e51..ffdb978 100644
--- a/configure.in
+++ b/configure.in
@@ -1346,7 +1346,7 @@ AC_ARG_WITH(system-mozilla,
 [Use Mozilla already on system. Note that some components cannot be 
built
  against a contemporary Mozilla. The flavour used can be specified by
  --with-system-mozilla=. Supported are: libxul (default),
- xulrunner, firefox, seamonkey, mozilla.]),
+ xulrunner, firefox, seamonkey, mozilla, iceape.]),
 WITH_SYSTEM_MOZILLA=$withval ,
 WITH_SYSTEM_MOZILLA=no)
 
@@ -5838,6 +5838,8 @@ if test -n "$with_system_mozilla" && test 
"$with_system_mozilla" != "no"; then
 MOZ_FLAVOUR=xulrunner
 elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"seamonkey"; then
 MOZ_FLAVOUR=seamonkey
+elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"iceape"; then
+MOZ_FLAVOUR=iceape
 elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"firefox"; then
 MOZ_FLAVOUR=firefox
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = 
"mozilla"; then
commit 2d8d1548f285501367db19c68dd0dcef0a4af4df
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 18:29:39 2011 +0100

upstream open-url-support-iceanimals.diff from libreoffice/build

diff --git a/shell/source/unix/misc/open-url.sh 
b/shell/source/unix/misc/open-url.sh
index 0dc22cb..c9007d8 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -58,7 +58,7 @@ if echo $1 | grep '^mailto:' > /dev/null; then
 exit 0
   fi
   # mozilla derivates may need -remote semantics
-  for i in thunderbird mozilla netscape; do
+  for i in thunderbird mozilla netscape icedove iceape; do
 mailer=`which $i`
 if [ ! -z "$mailer" ]; then
   run_mozilla "$mailer" "$1"
@@ -80,7 +80,7 @@ else
 exit 0
   fi
   # mozilla derivates may need -remote semantics
-  for i in chrome seamonkey firefox; do
+  for i in chrome seamonkey firefox iceweasel iceape; do
 browser=`which $i`
 if [ ! -z "$browser" ]; then
   run_mozilla "$browser" "$1"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply |5 ---
 patches/dev300/debian-opt.diff   |   37 ---
 patches/dev300/sensible-browser.diff |   56 ---
 3 files changed, 98 deletions(-)

New commits:
commit 791f3edb68b6cb9f92513ad917ea453794296859
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 17:53:09 2011 +0100

remove sensible-browser.diff, was already downstreamed to 
debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ac7b205..ceb0678 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -350,9 +350,6 @@ oosplash-etc-libreoffice-sofficerc.diff
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
-# build using -O2 on x86 and sparc according to Debian policy.
-debian-opt.diff
-
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
deleted file mode 100644
index 4075123..000
--- a/patches/dev300/debian-opt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: unxlngs.mk
-===
 solenv/inc/unxlngs.mk  (Revision 276754)
-+++ solenv/inc/unxlngs.mk  (Arbeitskopie)
-@@ -33,7 +33,7 @@
- 
- ASM=$(CC)
- AFLAGS=-Wa,-K,PIC -c $(CDEFS)
--CDEFAULTOPT=-Os
-+CDEFAULTOPT=-O2
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DSPARC
-Index: unxlngi.mk
-===
 solenv/inc/unxlngi.mk  (Revision 276754)
-+++ solenv/inc/unxlngi.mk  (Arbeitskopie)
-@@ -30,7 +30,7 @@
- #*
- 
- # mk file for Unix Linux Intel (X86) using GCC, please make generic 
modifications to unxlng.mk
--CDEFAULTOPT=-Os
-+CDEFAULTOPT=-O2
- ARCH_FLAGS*=-mtune=pentiumpro
- .INCLUDE : unxlng.mk
- CDEFS+=-DX86
 solenv/inc/unxlngppc.mk(Revision 277719)
-+++ solenv/inc/unxlngppc.mk(Arbeitskopie)
-@@ -31,7 +31,7 @@
- 
- # mk file for Unix Linux PowerPC using GCC, please make generic modifications 
to unxlng.mk
- 
--DEFAULTOPT=-Os
-+DEFAULTOPT=-O2
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DPOWERPC -DPPC
commit f193e512bd172132da35284845754ed02855e8e0
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 17:52:24 2011 +0100

remove sensible-browser.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fc3f05f..ac7b205 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -353,8 +353,6 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
-sensible-browser.diff
-
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
diff --git a/patches/dev300/sensible-browser.diff 
b/patches/dev300/sensible-browser.diff
deleted file mode 100644
index aeb901f..000
--- a/patches/dev300/sensible-browser.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: shell/source/unix/misc/gnome-open-url.sh
-===
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/gnome-open-url.sh,v
-retrieving revision 1.3
-diff -u -u -r1.3 gnome-open-url.sh
 shell/source/unix/misc/gnome-open-url.sh   13 May 2005 07:31:07 -  
1.3
-+++ shell/source/unix/misc/gnome-open-url.sh   6 Jun 2005 09:43:06 -
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
- # use xdg-open or gnome-open if available
--xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || "$0.bin" $1
-+xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || sensible-browser 
"$1" || "$0.bin" $1
- 
- exit 0
-Index: shell/source/unix/misc/kde-open-url.sh
-===
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/kde-open-url.sh,v
-retrieving revision 1.2
-diff -u -u -r1.2 kde-open-url.sh
 shell/source/unix/misc/kde-open-url.sh 10 May 2004 13:08:06 -  
1.2
-+++ shell/source/unix/misc/kde-open-url.sh 6 Jun 2005 09:43:06 -
-@@ -51,9 +51,13 @@
- 
- # special handling for mailto: uris
- if echo $1 | grep '^mailto:' > /dev/null; then
--  kmailservice "$1" &
-+  if which kde-open; then
-+kde-open "$1" &
-+  else
-+mailservice "$1" &
-+  fi
- else
--  kfmclient openURL "$1" &
-+  sensible-browser "$1" &
- fi
- 
- exit 0
-Index: shell/source/unix/misc/open-url.sh
-===
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/open-url.sh,v
-retrieving revision 1.2
-diff -u -u -r1.2 open-url.sh
 shell/source/unix/misc/open-url.sh 10 May 2004 13:08:30 -  1.2
-+++ shell/source/unix/misc/open-url.sh 6 Jun 2005 09:43:06 -
-@ -79,6 +79,10 @@
- $BROWSER "

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|1 
 patches/dev300/sensible-ooomua.diff |   44 
 2 files changed, 45 deletions(-)

New commits:
commit 9238fa2c3543fc8b41533bc5b1a8fdcc338ec887
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 17:37:46 2011 +0100

remove sensible-ooomua.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c958f4b..fc3f05f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -353,7 +353,6 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
-sensible-ooomua.diff
 sensible-browser.diff
 
 # add JDK paths for MySQL, PostgreSQL, JTDS
diff --git a/patches/dev300/sensible-ooomua.diff 
b/patches/dev300/sensible-ooomua.diff
deleted file mode 100644
index 0023884..000
--- a/patches/dev300/sensible-ooomua.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: Common.xcu
-===
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
-retrieving revision 1.31
-diff -u -u -r1.31 Common.xcu
 officecfg/registry/data/org/openoffice/Office/Common.xcu   23 Mar 2005 
10:53:46 -  1.31
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu   25 May 2005 
23:23:30 -
-@@ -651,8 +651,7 @@
-   
-   
- 
--  
-+  sensible-ooomua
- 
-   
-   
-Index: shell/source/unix/misc/senddoc.sh
-===
-RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v
-retrieving revision 1.8
-diff -u -u -r1.8 senddoc.sh
 shell/source/unix/misc/senddoc.sh  27 Sep 2005 12:55:00 -  1.8
-+++ shell/source/unix/misc/senddoc.sh  16 Feb 2006 00:38:29 -
-@@ -91,6 +91,19 @@
-   shift
- fi
- 
-+case `basename "$MAILER"` in
-+sensible-ooomua)
-+if [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/evolution ]; then
-+MAILER=/usr/bin/evolution
-+elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kmail ]; then
-+MAILER=/usr/bin/kmail
-+elif [ -x /usr/bin/evolution ]; then
-+# default
-+MAILER=/usr/bin/evolution
-+fi
-+;;
-+esac
-+
- # autodetect mail client from executable name
- case `basename "$MAILER" | sed 's/-.*$//'` in
- 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply  |2 --
 patches/dev300/help-msg-add-package-info.diff |   11 ---
 2 files changed, 13 deletions(-)

New commits:
commit 2a81e5d48e60fd9dd2729dbcd2cd1dfd6d6c2bd0
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 17:15:34 2011 +0100

remove help-msg-add-package-info.diff, downstreamed to 
debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9967d1a..c958f4b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ sensible-browser.diff
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
-help-msg-add-package-info.diff
-
 soffice-opengl-and-locking-config.diff, mklose
 
 #configures-explicit-arch.diff
diff --git a/patches/dev300/help-msg-add-package-info.diff 
b/patches/dev300/help-msg-add-package-info.diff
deleted file mode 100644
index 510cf00..000
--- a/patches/dev300/help-msg-add-package-info.diff
+++ /dev/null
@@ -1,11 +0,0 @@
 sfx2/source/appl/sfxhelp.cxx~  2006-02-15 02:53:15.839949000 +0100
-+++ sfx2/source/appl/sfxhelp.cxx   2006-02-15 02:55:01.389949000 +0100
-@@ -151,7 +151,7 @@
- 
- NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
- 
--ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
-+ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) 
).Append(String(DEFINE_CONST_UNICODE(".\nPlease install the 
openoffice.org-help-en-us package or the locale specific help package 
openoffice.org-help-."))) )
- {
- // Error message: "No help available"
- }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|1 
 patches/dev300/mention-java-common-package.diff |   56 
 2 files changed, 57 deletions(-)

New commits:
commit bd4f6ffc37e76996f97368bc73844ce68e63acbe
Author: Bjoern Michaelsen 
Date:   Thu Nov 24 15:51:28 2011 +0100

remove mention-java-common-package.diff, downstreamed to 
debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce5a4d6..9967d1a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -345,7 +345,6 @@ debian-default-cairo-disable.diff
 # read variables from /etc/libreoffice/sofficerc, since 
/usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
-mention-java-common-package.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
diff --git a/patches/dev300/mention-java-common-package.diff 
b/patches/dev300/mention-java-common-package.diff
deleted file mode 100644
index 766d0a0..000
--- a/patches/dev300/mention-java-common-package.diff
+++ /dev/null
@@ -1,56 +0,0 @@
 svtools/source/java/javainteractionhandler.cxx~2008-04-21 
21:43:59.249678235 +0200
-+++ svtools/source/java/javainteractionhandler.cxx 2008-04-21 
22:12:26.615433459 +0200
-@@ -75,9 +75,10 @@
- #include 
- #include 
- 
-+#define DEFINE_CONST_UNICODE(CONSTASCII) 
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::task;
--
- namespace svt
- {
- 
-@@ -184,6 +185,9 @@
- aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
- 
- aWarningBox.SetText( aTitle );
-+String aText = String(aWarningBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE("\nPlease install the 
libreoffice-java-common package for this functionality."));
-+aWarningBox.SetMessText( aText );
- nResult = aWarningBox.Execute();
- 
- }
-@@ -256,6 +260,9 @@
- aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
- 
- aQueryBox.SetText( aTitle );
-+String aText = String(aQueryBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE("\nPlease install the 
libreoffice-java-common package for this functionality."));
-+aQueryBox.SetMessText( aText );
- nResult = aQueryBox.Execute();
- if ( nResult == RET_YES )
- {
-@@ -297,6 +304,9 @@
- aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
- 
- aErrorBox.SetText( aTitle );
-+String aText = String(aErrorBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE("\nPlease install the 
libreoffice-java-common package for this functionality."));
-+aErrorBox.SetMessText( aText );
- nResult = aErrorBox.Execute();
- }
- else
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig  2008-04-11 
05:19:31.0 -0500
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx   2009-03-05 
19:54:38.0 -0600
-@@ -111,6 +111,9 @@
- if (errcode == JFW_E_NO_JAVA_FOUND)
- {
- fprintf(stderr,"javaldx: Could not find a Java Runtime 
Environment! \n");
-+fprintf(stderr,"Please ensure that a JVM and the package 
libreoffice-java-common\n");
-+fprintf(stderr,"is installed.\n");
-+fprintf(stderr,"If it is already installed then try removing 
~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
- return false;
- }
- else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|5 -
 patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff |   47 
--
 2 files changed, 52 deletions(-)

New commits:
commit 6715e1c1572d6b8902d841389ba9fbf162174f66
Author: Bjoern Michaelsen 
Date:   Sun Nov 20 13:59:06 2011 +0100

fdo#43105 related: patch does not help for the supposed testcase

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee2f3d5..37041fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -189,11 +189,6 @@ svx-hacky-htmlselect-control-import.diff, n#523191, 
noelpwer
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 
-# temporary fix. does no harm and gets the job done but its not
-# beautiful. Since the whole section needs to be refactored anyway decided not
-# to waste for time with this fix but to focus on the refactoring
-sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
-
 # FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
 
 # FIXME: 2009-09-11: I wonder when this has been commented out, and
diff --git a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff 
b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
deleted file mode 100644
index 2fe086c..000
--- a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
+++ /dev/null
@@ -1,47 +0,0 @@

- sw/source/filter/ww8/ww8par.cxx |   10 --
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 1101227..e89e330 100644
 sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -2075,6 +2075,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
- nCellLevel = 0 != pPlcxMan->HasParaSprm(0x244B);
- }
- 
-+ mark:
-+
- WW8_TablePos *pTabPos=0;
- WW8_TablePos aTabPos;
- if (nCellLevel && !bVer67)
-@@ -2088,7 +2090,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
- if (const BYTE *pLevel = pPlcxMan->HasParaSprm(0x6649))
- nCellLevel = *pLevel;
- 
--bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
-+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablehttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/filter

[Bjoern Michaelsen]

 binfilter/filter/source/bf_offwrp/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28b2bf8f375fa16587ba32e489480174f510dde1
Author: Bjoern Michaelsen 
Date:   Fri Jul 8 11:04:50 2011 +0200

another fix for --as-needed

diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk 
b/binfilter/filter/source/bf_offwrp/makefile.mk
index d65beed..0545931 100644
--- a/binfilter/filter/source/bf_offwrp/makefile.mk
+++ b/binfilter/filter/source/bf_offwrp/makefile.mk
@@ -52,7 +52,6 @@ SHL1STDLIBS=\
 $(BFSVTOOLLIB) \
 $(BFOFALIB)\
 $(VCLLIB)  \
-$(SOTLIB)  \
 $(SALLIB)  \
 $(TOOLSLIB)\
 $(CPPULIB) \
@@ -64,6 +63,7 @@ SHL1STDLIBS=\
 $(BFSCLIB)  \
 $(BFSVXLIB) \
 $(BFSO3LIB)\
+$(SOTLIB)  \
 $(UNOTOOLSLIB) \
 $(COMPHELPERLIB)   \
 $(LEGACYSMGRLIB)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply|3 ++-
 patches/dev300/vcl-permit-global-shortcuts.diff |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f5c9ac6229d3ec756bda5f49d51168687978
Author: Bjoern Michaelsen 
Date:   Thu Nov 17 14:26:09 2011 +0100

add warning to vcl-permit-global-shortcuts.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 697760c..ee2f3d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -215,7 +215,8 @@ sfx2-privateprotectedpublic.diff
 #optional-outplace-ole.diff, i#98970, thorsten
 # let ctrl- stuff pass dlg keyboard handling, to permit
 # global application-wide shortcuts also in open dialogs
-vcl-permit-global-shortcuts.diff, i#105676, thorsten
+# disabled for now because of sideeffects (see comments in i#105676), would 
need investigation before upstreaming
+#vcl-permit-global-shortcuts.diff, i#105676, thorsten
 
 # unresolved Base64 Java classes
 base64.diff, i#100620, hmth
diff --git a/patches/dev300/vcl-permit-global-shortcuts.diff 
b/patches/dev300/vcl-permit-global-shortcuts.diff
index a34e55f..f970873 100644
--- a/patches/dev300/vcl-permit-global-shortcuts.diff
+++ b/patches/dev300/vcl-permit-global-shortcuts.diff
@@ -1,3 +1,4 @@
+# disabled for now because of sideeffects (see comments in i#105676), would 
need investigation before upstreaming
 ---
  vcl/source/window/dlgctrl.cxx |4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply   |3 --
 patches/dev300/gcj-32bit-runtime-path.diff |   33 -
 2 files changed, 36 deletions(-)

New commits:
commit dd5b3aad28f19f2e2402b1cfebd6ea2ea6afaea6
Author: Bjoern Michaelsen 
Date:   Thu Nov 17 11:25:42 2011 +0100

gcj-32bit-runtime-path.diff is obsolete as per original author (doko)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0af2244..697760c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -173,8 +173,6 @@ desktop-application-octet-stream-mime-type.diff, i#73301, 
flr
 # FIXME: temporarily disabled as this causes a race condition in calc's cell 
format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
 
-# check real help path defined in registry instead of the $(instpath)/help
-sfx-check-real-help-path.diff, i#81139, pmladek
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 
@@ -368,7 +366,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
 SectionOwner => rengelha
 
 debian-default-cairo-disable.diff
-gcj-32bit-runtime-path.diff, i#64888, mklose
 # read variables from /etc/libreoffice/sofficerc, since 
/usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
diff --git a/patches/dev300/gcj-32bit-runtime-path.diff 
b/patches/dev300/gcj-32bit-runtime-path.diff
deleted file mode 100644
index f071092..000
--- a/patches/dev300/gcj-32bit-runtime-path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx~  2006-09-04 
20:24:48.710718000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx   2006-09-04 
20:37:56.620718000 +0200
-@@ -37,6 +37,11 @@
- #include "osl/thread.h"
- #include "gnujre.hxx"
- #include "util.hxx"
-+extern "C"
-+{
-+#include 
-+#include 
-+}
- 
- using namespace rtl;
- using namespace std;
-@@ -153,7 +158,18 @@
- return false;
- 
- if (!m_sJavaHome.getLength())
-+#if defined (__linux__) && defined (__i386__)
-+{
-+   struct utsname uts;
-+   uname(&uts);
-+   if(!strcmp("x86_64",uts.machine))
-+   m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib32"));
-+   else
-+   m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
-+}
-+#else
- m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
-+#endif
- 
- // init m_sRuntimeLibrary
- OSL_ASSERT(m_sHome.getLength());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/sfx-check-real-help-path.diff |   73 ---
 1 file changed, 73 deletions(-)

New commits:
commit e165ab7c2daed295a1d947cd81de1bb65c8dba59
Author: Bjoern Michaelsen 
Date:   Wed Nov 16 18:37:12 2011 +0100

remove patches/dev300/sfx-check-real-help-path.diff, obsolete as per 
original author (pmladek)

diff --git a/patches/dev300/sfx-check-real-help-path.diff 
b/patches/dev300/sfx-check-real-help-path.diff
deleted file mode 100644
index 131b6d2..000
--- a/patches/dev300/sfx-check-real-help-path.diff
+++ /dev/null
@@ -1,73 +0,0 @@

- sfx2/source/appl/sfxhelp.cxx   |   19 +--
- unotools/source/config/pathoptions.cxx |6 +-
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/sfxhelp.cxx
-index d5e6f24..df94b19 100644
 sfx2/source/appl/sfxhelp.cxx
-+++ sfx2/source/appl/sfxhelp.cxx
-@@ -53,10 +53,10 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
--#include 
- #include 
- #include 
- #include 
-@@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString()
- aLocaleStr = aEnglish;
- else
- {
--rtl::OUString aBaseInstallPath;
--// utl::Bootstrap::PathStatus aBaseLocateResult =
--utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
--static const char *szHelpPath = "/help/";
-+String sBaseHelpPathString;
-+::utl::LocalFileHelper::ConvertPhysicalNameToURL( 
SvtPathOptions().GetHelpPath(), sBaseHelpPathString );
-+
-+rtl::OUString sBaseHelpPath( sBaseHelpPathString );
-+sBaseHelpPath += rtl::OUString::createFromAscii("/");
- 
--rtl::OUString sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
-+rtl::OUString sHelpPath = sBaseHelpPath + aLocaleStr;
- osl::DirectoryItem aDirItem;
- 
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == 
osl::FileBase::E_None)
-@@ -143,9 +143,8 @@ rtl::OUString HelpLocaleString()
- if (nSepPos != STRING_NOTFOUND)
- {
- bOk = true;
--sLang = sLang.Copy( 0, nSepPos );
--sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + sLang;
-+sLang = sLang.Copy( 0, nSepPos );
-+sHelpPath = sBaseHelpPath + sLang;
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == 
osl::FileBase::E_None)
- bOk = false;
- }
-diff --git unotools/source/config/pathoptions.cxx 
unotools/source/config/pathoptions.cxx
-index b02f912..f16e68f 100644
 unotools/source/config/pathoptions.cxx
-+++ unotools/source/config/pathoptions.cxx
-@@ -299,7 +299,11 @@ const String& SvtPathOptions_Impl::GetPath( 
SvtPathOptions::Pathes ePath )
- {
- // These office paths have to be converted to system pathes
- utl::LocalFileHelper::ConvertURLToPhysicalName( aPathValue, 
aResult );
--aPathValue = aResult;
-+// FIXME: The initial value (not modified by SetPath) is just a 
path, so the URL-conversion fails.
-+//The best solution is to fix the module xmlhelp to 
accept the URL. Then we could remove
-+//all these ugly conversions.
-+if ( aResult.Len() != 0 )
-+aPathValue = aResult;
- }
- 
- m_aPathArray[ ePath ] = aPathValue;
--- 
-1.7.0.1
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - patches/dev300

[Bjoern Michaelsen]

 patches/dev300/addrbk-datasrc-ordering.diff   |   34 
 patches/dev300/apply  |   30 
 patches/dev300/gcc-HelpLinker.diff|   37 -
 patches/dev300/odf-converter-ignore-writerfilter.diff |  141 ---
 patches/dev300/office-cfg-linux-common-template-dir.diff  |   41 -
 patches/dev300/oox-pptx-export-update-to-ooo320.diff  |  198 -
 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |  355 --
 7 files changed, 1 insertion(+), 835 deletions(-)

New commits:
commit dd851e09a287c75bb894e4b38ea9616e62c7c95a
Author: Bjoern Michaelsen 
Date:   Tue Nov 15 20:07:03 2011 +0100

gcc-HelpLinker.diff should be obsolete

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 37ab886..0af2244 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ 
PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 #  Functional sub-sets 
-Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, 
CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, 
WriterDocComparison, MySQL
+Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Misc, CalcFixes, 
EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, 
MySQL
 
 LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
@@ -147,9 +147,6 @@ warning-return-values-stlport.diff, jholesov
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
-# don't let HelpLinker be miscompiled with g++ 4.3
-gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
-
 # included in dev300 for OOo-3.4
 # add the .archive flag to some instsetoo_native/util/makefile.mk rules
 buildfix-instsetoo_native-archive.diff, i#111617
@@ -496,19 +493,6 @@ win32-prebuilt-writingaids-zip-scp2.diff
 # Optimal Page Wrap should be default for graphics insertion (X#59831)
 writer-default-as-optimal-page-wrap.diff, i#38108, jody
 
-[ Features ]
-# ask user on logout/shutdown to save documents
-# It seems to be better not to use this. It interfers with upstream's
-# handling of the issue. See discussion in bnc#525331. --tml
-# session-management.diff, i#63156, rodo
-
-# embed generic media files inside odf docs, plus various related
-# sound fixes from rodo
-#impressmedia-features.diff, i#83753, n#515553, thorsten
-#slideshow-sound.diff, n#515553, rodo
-
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
 
 [ BuildBits ]
 build-identification.diff, tml
diff --git a/patches/dev300/gcc-HelpLinker.diff 
b/patches/dev300/gcc-HelpLinker.diff
deleted file mode 100644
index 3266a6d..000
--- a/patches/dev300/gcc-HelpLinker.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From e038b9fdc8a8f997d6e85e2194911bb5b742fbe3 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky 
-Date: Fri, 14 May 2010 16:53:24 +0200
-Subject: [PATCH 051/878] gcc-HelpLinker.diff
-

- transex3/source/help/makefile.mk |1 +
- transex3/source/makefile.mk  |1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/transex3/source/help/makefile.mk 
b/transex3/source/help/makefile.mk
-index 3196d23..2841da2 100644
 l10ntools/source/help/makefile.mk
-+++ l10ntools/source/help/makefile.mk
-@@ -36,6 +36,7 @@ TARGETTYPE=CUI
- 
- .INCLUDE : settings.mk
- .INCLUDE : helplinker.pmk
-+CDEFS+= -O0
-  
- .IF "$(SYSTEM_LIBXSLT)" == "YES"
- CFLAGS+= $(LIBXSLT_CFLAGS)
-diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
-index ab54779..e08e0ac 100644
 l10ntools/source/makefile.mk
-+++ l10ntools/source/makefile.mk
-@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE :  settings.mk
- CDEFS+= -DYY_NEVER_INTERACTIVE=1
- #CDEFS+= -pg
-+CDEFS+= -O0
- 
- .IF "$(SYSTEM_EXPAT)" == "YES"
- CFLAGS+=-DSYSTEM_EXPAT
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff 
b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
deleted file mode 100644
index a3c6d27..000
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ /dev/null
@@ -1,355 +0,0 @@

- package/source/xstor/xstorage.cxx |8 +-
- sfx2/source/doc/objstor.cxx   |  257 -
- 2 files changed, 251 insertions(+), 14 deletions(-)
-
-diff --git package/source/xstor/xstorage.cxx package/source/xstor/xstorage.cxx
-index c6cc37f..848c7c6 100644
 package/source/xstor/xstorage.cxx
-+++ package/source/xstor/xstorage.cxx
-@@ -4458,13 +4458,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const 
::rtl::OUString& aName )
- catch ( uno::Exception& aException )
- {
-m_pImpl->AddLog( aException.Message );
--   m_pImpl->AddLog( ::r

[Libreoffice-commits] .: sw/source

[Bjoern Michaelsen]

 sw/source/ui/dbui/dbtree.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03324dbbe2c0973a2f71c77cc72d852314b8da77
Author: Michael Meeks 
Date:   Tue Nov 15 18:02:39 2011 +0100

Address data source ordering x#62860 (part 2)

diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index ec7294e..3804eaa 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -216,7 +216,7 @@ void SwDBTreeList::InitTreeList()
 if(!pImpl->HasContext() && pImpl->GetWrtShell())
 return;
 SetSelectionMode(SINGLE_SELECTION);
-
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
 // don't set font, so that the Control's font is being applied!
 SetSpaceBetweenEntries(0);
 SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Bjoern Michaelsen]

 dbaccess/source/ui/browser/dbtreeview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bfc7f28e6d3454fa90d6c32b36cd9bf898ba933
Author: Michael Meeks 
Date:   Tue Nov 15 17:35:36 2011 +0100

 Address data source ordering x#62860

information from the apply file:
 patchname: addrbk-datasrc-ordering.diff
 issues:
 author: michael
 section: Misc
 comment:
  Address data source ordering x#62860
 sectioncomment:

git log from build repository:
commit bfa619922b90a021e5d856333dd398512389ad67
Author: Jan Holesovsky 
Date:   Mon Jun 21 22:11:19 2010 +0200

Update patches to dev300-m83.

* [...]

commit 256381886a238d80b9ddab795b500576d92404cc
Author: Jan Holesovsky 
Date:   Wed May 19 12:16:00 2010 +0200

Updated patches do dev300-m77.

* [...]

commit df913735fd729978d20f0282fe32d14bf597891f
Author: Jan Holesovsky 
Date:   Mon May 17 01:21:36 2010 +0200

Patches adopted to the tabs -> spaces fixes + trailing whitespace 
cleanup.

* [...]

commit c6847e9b022184e98942391a2b5711c31eb25ba3
Author: Jan Holesovsky 
Date:   Fri May 14 14:32:23 2010 +0200

Convert tabs to spaces in all the code introduced by the patches.

* [...]

commit 09774df8a62bf886c78c0f84d56b2d518ae8107e
Author: Jan Holesovsky 
Date:   Tue Apr 29 14:04:53 2008 +

Src680/

* Some cleaning action: src680/* -> dev300/

* patches/dev300/gstreamer-sd.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/letter-wizard-resource-id.diff: Moved to
patches/gstreamer.

* patches/dev300/mono-build.diff: Moved to patches/mono.

* patches/dev300/sc-hacky-handle-boolean.diff,
patches/dev300/vba-workbook-worksheet-events.diff: Moved to
patches/vba.

* patches/src680/unittesting-*: Moved...
patches/unittesting/*: ...here.

* patches/src680/*: Moved...
patches/dev300/*: ...here.

* patches/dev300/apply,
patches/Makefile.am: Add the unittesting subdir, remove src680.

diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx 
b/dbaccess/source/ui/browser/dbtreeview.cxx
index b69c67b..25fee5b 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -53,7 +53,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< 
XMultiServiceFactory >
 {
 DBG_CTOR(DBTreeView,NULL);
 
-m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT | 
WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True);
+m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES | 
WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
 m_pTreeListBox->EnableCheckButton(NULL);
 m_pTreeListBox->SetDragDropMode( 0 );
 m_pTreeListBox->EnableInplaceEditing( sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

[Bjoern Michaelsen]

 sw/qa/complex/writer/CheckBookmarks.java |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit fe7026d72b1b88f60e009fd4de2f53306e0d1c4e
Author: Bjoern Michaelsen 
Date:   Mon Nov 14 23:03:23 2011 +0100

fdo#40819, i#116193: disable WW8 roundtrip as it breaks on big bookmark 
counts

diff --git a/sw/qa/complex/writer/CheckBookmarks.java 
b/sw/qa/complex/writer/CheckBookmarks.java
index 405ca0d..c922da2 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -107,9 +107,8 @@ public class CheckBookmarks {
 result.m_nDeleteRandomHash = new 
BigInteger("-3ec87e810b46d734677c351ad893bbbf9ea10f55",16);
 result.m_nLinebreakHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
 result.m_nOdfReloadHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
-// MsWord Hash changed from DEV300m41 => behaviour change, possible 
regression?
+// MsWord Hash is unstable over different systems
// result.m_nMsWordReloadHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
-   result.m_nMsWordReloadHash = new 
BigInteger("-53193413016049203700369483764549874348805475606",10);
 return result;
 }
 
@@ -136,14 +135,14 @@ public class CheckBookmarks {
 actualHashes.m_nLinebreakHash = 
BookmarkHashes.getBookmarksHash(m_xDoc);
 m_xOdfReloadedDoc = reloadFrom("StarOffice XML (Writer)", "odf");
 actualHashes.m_nOdfReloadHash = 
BookmarkHashes.getBookmarksHash(m_xOdfReloadedDoc);
-m_xMsWordReloadedDoc = reloadFrom("MS Word 97", "doc");
-actualHashes.m_nMsWordReloadHash = 
BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
+//m_xMsWordReloadedDoc = reloadFrom("MS Word 97", "doc");
+//actualHashes.m_nMsWordReloadHash = 
BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
 }
 
 @After public void tearDownDocuments() {
 util.DesktopTools.closeDoc(m_xDoc);
 util.DesktopTools.closeDoc(m_xOdfReloadedDoc);
-util.DesktopTools.closeDoc(m_xMsWordReloadedDoc);
+//util.DesktopTools.closeDoc(m_xMsWordReloadedDoc);
 }
 
 @BeforeClass public static void setUpConnection() throws Exception {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/JunitTest_sw_complex.mk sw/qa sw/source

[Bjoern Michaelsen]

 sw/JunitTest_sw_complex.mk   |   13 +
 sw/qa/complex/writer/CheckBookmarks.java |8 +---
 sw/source/core/unocore/unocoll.cxx   |   18 +-
 3 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 650592cf0181e219921d5e6bc3ffe007c95dc192
Author: Bjoern Michaelsen 
Date:   Thu Nov 10 11:33:05 2011 +0100

fdo#40819 lp#868229: reenable CheckBookmarks subsequenttest

* MsWord Hash changed from DEV300m41 => behaviour change, possible 
regression?

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 5551577..3c330b6 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_JunitTest_add_jars,sw_complex,\
 
 $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 complex.accessibility.AccessibleRelationSet \
+complex.writer.CheckBookmarks \
 complex.checkColor.CheckChangeColor \
 complex.writer.CheckCrossReferences \
 complex.writer.CheckFlies \
@@ -66,17 +67,5 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 # fd#35657 test disabled - reenable if fixed
 #complex.writer.TextPortionEnumerationTest \
 
-# Currently fails on all platforms, as getBookmarksHash in
-# sw/qa/complex/writer/CheckBookmarks.java obtains from
-# xBookmarks.getElementNames() names like "__UnoMark__1910_1361181355" that
-# cause NoSuchElementException, see
-# <https://bugs.freedesktop.org/show_bug.cgi?id=40819> "CheckBookmarks fails
-# with NoSuchElementException on names __UnoMark__1910_1361181355:"
-# # CheckBookmarks currently fails on windows because the hashes are different:
-# ifneq ($(OS),WNT)
-# $(eval $(call gb_JunitTest_add_classes,sw_complex,\
-# complex.writer.CheckBookmarks \
-# ))
-# endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/complex/writer/CheckBookmarks.java 
b/sw/qa/complex/writer/CheckBookmarks.java
index 84bfe15..405ca0d 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -100,14 +100,16 @@ public class CheckBookmarks {
 private XTextDocument m_xMsWordReloadedDoc = null;
 private final BookmarkHashes actualHashes = new BookmarkHashes();
 
-private BookmarkHashes getDEV300m41Expectations() {
+private BookmarkHashes get2010Expectations() {
 BookmarkHashes result = new BookmarkHashes();
 result.m_nSetupHash = new 
BigInteger("-4b0706744e8452fe1ae9d5e1c28cf70fb6194795",16);
 result.m_nInsertRandomHash = new 
BigInteger("25aa0fad3f4881832dcdfe658ec2efa8a1a02bc5",16);
 result.m_nDeleteRandomHash = new 
BigInteger("-3ec87e810b46d734677c351ad893bbbf9ea10f55",16);
 result.m_nLinebreakHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
 result.m_nOdfReloadHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
-result.m_nMsWordReloadHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
+// MsWord Hash changed from DEV300m41 => behaviour change, possible 
regression?
+   // result.m_nMsWordReloadHash = new 
BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
+   result.m_nMsWordReloadHash = new 
BigInteger("-53193413016049203700369483764549874348805475606",10);
 return result;
 }
 
@@ -116,7 +118,7 @@ public class CheckBookmarks {
 com.sun.star.io.IOException,
 java.security.NoSuchAlgorithmException
 {
-actualHashes.assertExpectation(getDEV300m41Expectations());
+actualHashes.assertExpectation(get2010Expectations());
 }
 
 @Before public void setUpDocuments() throws Exception {
commit 54edd57f21519ab283fc1e0fb85b47b0beb59486
Author: Bjoern Michaelsen 
Date:   Thu Nov 10 11:28:20 2011 +0100

fdo#40819: Revert "field-patch-uno-fix.diff: enhanced fields UNO fix"

This reverts commit 693b095ee8b7406c4aa0fd5b2bd0221bdcab304f.

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index a2e0dbc..38ae22c 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1633,7 +1633,7 @@ sal_Int32 SwXBookmarks::getCount(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()->getIDocumentMarkAccess()->getMarksCount();
+return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount();
 }
 
 uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1643,11 +1643,11 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
 if(!IsValid())
 throw uno::RuntimeException();
 IDocumentMarkAccess* const pMarkAccess = 
GetDoc()->getIDocumentMarkAccess();
-if(nIndex < 0 || nIndex >= pMarkAccess->getMarksCount())
+if(nIndex < 0 || nIndex >= pMarkAccess->getBookmarksCount())
 throw I

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk

[Bjoern Michaelsen]

 desktop/Executable_soffice.bin.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f222b01170f57ca65ef28239dcf20c1f5a533f6c
Author: Bjoern Michaelsen 
Date:   Tue Nov 8 14:19:36 2011 +0100

there is no rule for the manifest, so we need to depend on the lib only
 - or maybe better: have an rule for manifest files on windows, instead of 
creating them as a sideeffect

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index b32a444..776b84f 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -85,8 +85,8 @@ $(call gb_Module_get_target,desktop) : 
$(OUTDIR)/bin/soffice.bin.manifest
 
 $(OUTDIR)/bin/soffice.bin.manifest : $(call 
gb_Executable_get_target,$(sofficebin))
 $(call gb_Executable_get_clean_target,$(sofficebin)) : 
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call 
gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
-   $(call gb_Deliver_deliver,$<,$@)
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin)))
+   $(call gb_Deliver_deliver,$<.manifest,$@)
 
 .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
 $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk

[Bjoern Michaelsen]

 smoketestoo_native/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d1b57b3b1c47b3d2348ca6b37ab0074c728896b
Merge: 0bcda87... 84ae3c9...
Author: Bjoern Michaelsen 
Date:   Tue Nov 1 20:28:21 2011 -0400

Merge ssh://git.freedesktop.org/git/libreoffice/core

commit 0bcda87664af59e01f4e1048991e5cf752547556
Author: Bjoern Michaelsen 
Date:   Tue Nov 1 20:24:57 2011 -0400

fix smoketest linkage

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index cd80184..8c7d811 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -42,7 +42,7 @@ SHL1IMPLIB = i$(SHL1TARGET)
 SHL1TARGET = smoketest
 SHL1OBJS = $(SLO)/smoketest.obj
 SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 2 commits - offapi/UnoApi_offapi.mk offapi/UnoApi_types.mk oovbaapi/UnoApi_oovbaapi.mk solenv/gbuild udkapi/UnoApi_udkapi.mk udkapi/UnoApi_uretypes.m

[Bjoern Michaelsen]

 offapi/UnoApi_offapi.mk  |2 +-
 offapi/UnoApi_types.mk   |2 +-
 oovbaapi/UnoApi_oovbaapi.mk  |2 +-
 solenv/gbuild/UnoApiTarget.mk|5 -
 solenv/gbuild/platform/unxgcc.mk |2 ++
 udkapi/UnoApi_udkapi.mk  |2 +-
 udkapi/UnoApi_uretypes.mk|2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 55bebb553dbbcf69c3b0d5d72033a5146c813fcf
Author: Bjoern Michaelsen 
Date:   Tue Oct 25 14:18:59 2011 +0200

add -Wl,--export-dynamic for executables on unxgcc platforms

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 01421da..ecff556 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -328,6 +328,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+   $(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
@@ -440,6 +441,7 @@ gb_StaticLibrary_StaticLibrary_platform =
 
 # Executable class
 
+gb_Library_TARGETTYPEFLAGS := -Wl,--export-dynamic
 gb_Executable_EXT :=
 
 gb_Executable_LAYER := \
commit 2cffbfab9cd80c44b7b13bbfb56eee721eeadf94
Author: Bjoern Michaelsen 
Date:   Tue Oct 25 02:22:28 2011 +0200

kill multi repo support for UnoApiTarget

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1f3ab32..8ae72cb 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
 udkapi \
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index 02b9953..df0da06 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
 udkapi \
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index c204aa6..340c5d0 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
 udkapi \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 816fb85..e4d1785 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -35,7 +35,6 @@ $(call gb_Package_get_target,$(1)_inc) : $(call 
gb_UnoApiTarget_get_target,$(1))
 
 endef
 
-# TODO: make multi repo safe
 define gb_UnoApiTarget_autopackage_idl
 $$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
 $(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
@@ -47,10 +46,6 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call 
gb_UnoApiTarget_get_ta
mkdir -p $$(dir $$@)
 
 define gb_UnoApiTarget_UnoApiTarget
-$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
- $(error UnoApiTarget: no or invalid repository given; known repositories: \
-  $(gb_Helper_REPOSITORYNAMES)))
-gb_UnoApiTarget_REPO_$(1) := $(2)
 $$(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_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1))
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 1572c13..fb1ac94 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
 
 $(eval $(call gb_UnoApiTarget_set_include,udkapi,\
$$(INCLUDE) \
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index ad5c8f1..d61d079 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
 udkapi \
___
Lib

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 237c5f0290169aa31e10990c05b7ea39d9fc70bd
Author: Bjoern Michaelsen 
Date:   Sat Oct 22 12:36:07 2011 +0200

another fix for 68dd19a368fb4afbf3eba4cb722f56b87f8ea7c1 on OSX

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fc58e4d..3e71c97 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -251,7 +251,7 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm
 # defined by platform
 #  gb_ObjCxxObject__command
 
-$(call gb_ObjCxxObject_get_target,%) : $(call 
gb_ObjCxxObject_get_source,$(1),%)
+$(call gb_ObjCxxObject_get_target,%) : $(call 
gb_ObjCxxObject_get_source,$(SRCDIR),%)
$(call gb_ObjCxxObject__command,$@,$*,$<,$(call 
gb_ObjCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 8c86c64f22b0dfef3cc502f59f509e20c1f5643c
Author: Bjoern Michaelsen 
Date:   Fri Oct 21 23:44:20 2011 +0200

restore accidentally removed line

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 271ce81..fc58e4d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -247,6 +247,7 @@ gb_YACC := bison
 # ObjCxxObject class
 #
 
+gb_ObjCxxObject_get_source = $(1)/$(2).mm
 # defined by platform
 #  gb_ObjCxxObject__command
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 13 commits - GNUmakefile.mk rsc/Executable_rsc.mk solenv/gbuild

[Bjoern Michaelsen]

 GNUmakefile.mk  |2 
 rsc/Executable_rsc.mk   |4 
 solenv/gbuild/AllLangResTarget.mk   |   31 +-
 solenv/gbuild/BuildDirs.mk  |   19 ---
 solenv/gbuild/ComponentTarget.mk|   23 +---
 solenv/gbuild/ExternalLib.mk|6 -
 solenv/gbuild/LinkTarget.mk |  136 +---
 solenv/gbuild/TargetLocations.mk|7 -
 solenv/gbuild/UnoApiTarget.mk   |   12 --
 solenv/gbuild/WinResTarget.mk   |6 -
 solenv/gbuild/extensions/post_SetupLocal.mk |   68 --
 solenv/gbuild/gbuild.mk |8 +
 solenv/gbuild/platform/ios.mk   |4 
 solenv/gbuild/platform/macosx.mk|6 -
 solenv/gbuild/platform/unxgcc.mk|4 
 solenv/gbuild/platform/windows.mk   |4 
 solenv/gbuild/platform/winmingw.mk  |4 
 17 files changed, 100 insertions(+), 244 deletions(-)

New commits:
commit 7bf06ba95d6ba0e673f2aff5b4412dbf08702590
Author: Bjoern Michaelsen 
Date:   Fri Oct 21 21:08:47 2011 +0200

rename YaccObject to YaccTarget

the object is a GenCxxObject just like those from CustomTargets, we only 
need to get the generation right

diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 058dfd7..e1ed345 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-I$(SRCDIR)/rsc/inc/pch \
-   -I$(WORKDIR)/YaccObject/rsc/source/parser \
+   -I$(WORKDIR)/YaccTarget/rsc/source/parser \
 ))
 
 $(eval $(call gb_Executable_add_api,rsc,\
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
 ))
 
-$(call gb_YaccObject_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+$(call gb_YaccTarget_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
 
 $(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bbaa479..271ce81 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -224,25 +224,25 @@ endif
 
 gb_GenCxxObject_GenCxxObject =
 
-# YaccObject class
-gb_YaccObject_get_source = $(1)/$(2).y
+# YaccTarget class
+gb_YaccTarget_get_source = $(1)/$(2).y
 
-.PHONY : $(call gb_YaccObject_get_clean_target,%)
-$(call gb_YaccObject_get_clean_target,%) :
+.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_YaccObject_get_header_target,$*) $(call 
gb_YaccObject_get_target,$*))
+   rm -f $(call gb_YaccTarget_get_header_target,$*) $(call 
gb_YaccTarget_get_target,$*))
 
-$(call gb_YaccObject_get_target,%) : $(call 
gb_YaccObject_get_source,$(SRCDIR),%)
-   $(call gb_YaccObject__command,$<,$*,$@,$(call 
gb_YaccObject_get_header_target,$*))
+$(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%)
+   $(call gb_YaccTarget__command,$<,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*))
 
-gb_YaccObject_YaccObject =
+gb_YaccTarget_YaccTarget =
 
 gb_YACC := bison
 
-# YaccObject class
+# YaccTarget class
 # defined by platform
-# gb_YaccObject__command(grammar-file, stem-for-message, source-target, 
include-target)
+# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, 
include-target)
 
 # ObjCxxObject class
 #
@@ -852,13 +852,13 @@ endef
 # Add a bison grammar to the build.
 # gb_LinkTarget_add_grammar(,)
 define gb_LinkTarget_add_grammar
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccObject/$(2))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccObject_get_clean_target,$(2))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccObject_get_header_target,$(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_YaccObject_YaccObject,$(2))
+#$(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 e602a37..9205d44 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -125,8 +125,8 @@ gb_UnoApiTarget_get_header_target = 
$(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = 
$(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is 

[Libreoffice-commits] .: 3 commits - postprocess/checkdeliver postprocess/prj solenv/gbuild

[Bjoern Michaelsen]

 postprocess/checkdeliver/checkdeliver.pl  |  306 --
 postprocess/checkdeliver/makefile.mk  |   44 
 postprocess/prj/build.lst |1 
 solenv/gbuild/extensions/post_Counters.mk |   41 
 solenv/gbuild/extensions/pre_Counters.mk  |   53 +
 solenv/gbuild/gbuild.mk   |2 
 6 files changed, 96 insertions(+), 351 deletions(-)

New commits:
commit 8ee4e99a78a7a7f16bafa56e08ef9649cc69dbdb
Author: Bjoern Michaelsen 
Date:   Fri Oct 21 11:51:39 2011 +0200

some more work on the make countoutdated target

diff --git a/solenv/gbuild/extensions/post_Counters.mk 
b/solenv/gbuild/extensions/post_Counters.mk
index 3552351..c0efdcc 100644
--- a/solenv/gbuild/extensions/post_Counters.mk
+++ b/solenv/gbuild/extensions/post_Counters.mk
@@ -29,6 +29,13 @@ ifneq ($(filter countoutdated,$(MAKECMDGOALS)),)
 
 gb_SrsTarget_add_template=
 gb_SrsTarget_add_templates=
+gb_Output_announce=
+
+ifneq ($(strip $(filter-out countoutdated,$(MAKECMDGOALS))),)
+countoutdated: $(filter-out countoutdated,$(MAKECMDGOALS))
+else
+countoutdated: $(.DEFAULT_GOAL)
+endif
 
 endif
 # vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/pre_Counters.mk 
b/solenv/gbuild/extensions/pre_Counters.mk
index b0563d0..feebe8c 100644
--- a/solenv/gbuild/extensions/pre_Counters.mk
+++ b/solenv/gbuild/extensions/pre_Counters.mk
@@ -25,23 +25,28 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_CountersOutdated_COUNTER:=
+gb_CountersOutdated_COUNTER_ALL:=
+gb_CountersOutdated_COUNTER_TYPES:=
 
 .PHONY: countoutdated
-countoutdated: $(filter-out countoutdated,$(MAKECMDGOALS))
-   $(info total outdated files: $(words $(gb_CountersOutdated_COUNTER)))
+countoutdated:
+   $(info total outdated files: $(words 
$(gb_CountersOutdated_COUNTER_ALL)))
+   $(info types of outdated files: $(gb_CountersOutdated_TYPES))
+   $(foreach type,$(gb_CountersOutdated_TYPES),$(info $(type): $(words 
$(gb_CountersOutdated_COUNTER_$(type)
@true
 
 ifneq ($(filter countoutdated,$(MAKECMDGOALS)),)
 
+gb_CHECKOBJECTOWNER := $(false)
+
 $(WORKDIR)/%:
-   $(info $* is outdated.)
-   $(eval gb_CountersOutdated_COUNTER+= x)
+   $(eval gb_CountersOutdated_COUNTER_ALL+= x)
+   $(eval gb_CountersOutdated__TYPE=$(firstword $(subst /, ,$*)))
+   $(if $(filter undefined,$(origin 
gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE))),$(eval 
gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE):=) $(eval 
gb_CountersOutdated_TYPES+=$(gb_CountersOutdated__TYPE)))
+   $(eval gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE)+= x)
@true

 $(OUTDIR)/%:
-   $(info $* is outdated (OUTDIR).)
-   $(eval gb_CountersOutdated_COUNTER+= x)
@true
 
 endif
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c91b99f..22b9216 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -126,7 +126,9 @@ else
 gb_FULLDEPS := $(true)
 endif
 
+ifeq ($(origin gb_CHECKOBJECTOWNER),undefined)
 gb_CHECKOBJECTOWNER := $(true)
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
commit 39f3d87152f963510ac71d2f0b346188b9965c2f
Author: Bjoern Michaelsen 
Date:   Fri Oct 21 00:14:43 2011 +0200

remove checkdeliver -- we do not generate deliverlogs anyway

diff --git a/postprocess/checkdeliver/checkdeliver.pl 
b/postprocess/checkdeliver/checkdeliver.pl
deleted file mode 100644
index e6a1e19..000
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ /dev/null
@@ -1,306 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-if 0;
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*
-#
-#
-# checkdeliver.pl - compare delivered files on solver with those on SRC_ROOT
-#
-
-use strict;
-use Getopt::Long;
-use File::stat;
-use IO:

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 04e1536d4e77242a47afa5c573add7ab619e6762
Author: Bjoern Michaelsen 
Date:   Mon Oct 10 11:13:07 2011 +0200

fixing error handling for generated files again

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 19279a4..20cd29a 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -59,8 +59,8 @@ $(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
 gb_CustomTarget_REPO_$(1) := $(2)
 $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
-$(call gb_CustomTarget_get_workdir,$(1))/% : \
-  $(call gb_CustomTarget_get_target,$(1))
+$(call gb_CustomTarget_get_workdir,$(1))/% : $(call 
gb_CustomTarget_get_target,$(1))
+   test -f $@ || (echo "Missing file $@ which should have been generated 
from CustomTarget $(1), but was not." && false)
 endef
 
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dea4aaa..49dd076 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,7 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 #  gb_CObject__command
 
 $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
-   $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file 
$<)))
+   test -f $< || (echo "Missing generated source file $<" && false)
$(call gb_CObject__command,$@,$*,$<,$(call 
gb_GenCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -216,7 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 #  gb_CxxObject__command
 
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
-   $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file 
$<)))
+   test -f $< || (echo "Missing generated source file $<" && false)
$(call gb_CxxObject__command,$@,$*,$<,$(call 
gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

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

New commits:
commit 49861a0246547554e285b4d14f049a28addd4ddc
Author: Bjoern Michaelsen 
Date:   Fri Oct 7 19:05:48 2011 +0200

error on missing generated files too

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 78375bf..dea4aaa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,6 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 #  gb_CObject__command
 
 $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
+   $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file 
$<)))
$(call gb_CObject__command,$@,$*,$<,$(call 
gb_GenCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -215,6 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 #  gb_CxxObject__command
 
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
+   $(if $(wildcard $<),,$(eval $(call gb_Output_error,No such source file 
$<)))
$(call gb_CxxObject__command,$@,$*,$<,$(call 
gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits