feature/gbuild_scp2 is ready for review

2012-05-19 Thread David Tardon 
Hi all,

I have finished conversion of module scp2 to gbuild. For the
uninitiated: scp2 contains configuration for the installer (or the
biggest part of it, at least, because one configuration format is just
not enough...), i.e., it defines what dirs, files and whatnot are part
of the installation sets. I tested it with several configurations on
Linux and MinGw, but I would appreciate if people tried it with their
configurations.

http://dtardon.fedorapeople.org/libreoffice/test-conversion.sh is a
script that can be used for verification that the install scripts
created by the old and new way are equivalent (if they are, it is quite
probable they will create the same installation :-). The easiest way to
use it is

./autogen.sh 
./test-conversion.sh -b

This will do everything: check out a commit just before the conversion,
build everything up to scp2, check out head of the branch, build scp2
and compare the results.

Note that it is probable that setup_osl.ins (or .inf on Windows) scripts
will differ slightly. In that case you should use the suggested diff
line to check that the difference is only in reordering of items in a list.

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

[Libreoffice-commits] .: Branch 'feature/gbuild_scp2' - icu/icuversion.mk

2012-05-19 Thread David Tardon 
 icu/icuversion.mk |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 14fde1c10609b2d82bd15bba22e5b8008a90252e
Author: David Tardon 
Date:   Mon May 14 17:16:34 2012 +0200

these are only set by configure for system icu

Change-Id: Ia597b0a1a4f04494739227cbeadb506e69eaa50b

diff --git a/icu/icuversion.mk b/icu/icuversion.mk
index fbadd74..8f82d8e 100755
--- a/icu/icuversion.mk
+++ b/icu/icuversion.mk
@@ -24,15 +24,6 @@
 # for a copy of the LGPLv3 License.
 #
 #*
-# major
-.IF "$(ICU_MAJOR)" == ""
 ICU_MAJOR=4
-.ENDIF
-# minor
-.IF "$(ICU_MINOR)" == ""
 ICU_MINOR=4
-.ENDIF
-# micro
-.IF "$(ICU_MICRO)" == ""
 ICU_MICRO=2
-.ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross

2012-05-19 Thread Norbert Thiebaud 
On Fri, May 18, 2012 at 4:39 AM, David Tardon  wrote:
> On Fri, May 18, 2012 at 11:59:40AM +0300, Tor Lillqvist wrote:
>> > Why not? Changing the inner configure call to
>> >
>> > ./configure `cat configure.lastrun.build`
>>
>> Sure, but then there would be a discrepancy with how autogen.lastrun
>> works. Or should we realize already that autogen.lastrun isn't
>> actually valued by developers as a "backup copy" of their last
>> autogen.sh parameters, but it is seen as a precious input file, edited
>> and certainly not intended to get over-written... and remove the code
>> to (re)write it from autogen.sh?
>
> TBH, I already forgot it _is_ overwritten :-/ I cannot even remember the
> last time I run autogen.sh with options... So I am all for treating it
> as input file unchangeable by autogen.sh.
>
>> Anyway, I am not opposed to this
>> idea. I would perhaps call it configure.args.build (and
>> configure.args.host, if we remove the "backup copy" aspect)?
>
> I like that.

Advance notice would be appreciated so that I can find a way to adapt
tinderbuild2

Right know I use autogen.lastrun to set each profile autogen.sh
variable by copying a reference file into autogen.lastrun,
before running autogen.sh

iow: I need a way to detect, before autogen.sh, that autogen.lastrun
is not used anymore and add the code to deal with whatever the
replacement is, in tinbuild2, before the change is committed,
otherwise that will break most tinderboxes...

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

lo-commit-stat: why lowercase the first letter?

2012-05-19 Thread Korrawit Pruegsanusak 
Hello Petr, all,

Seeing a fix in wiki [1], IIUC this is generated by lo-commit-stat,
which is intended to lowercase the first letter [2].

By git annotate, this part of code is there since the start, so I
would like to ask:
* why lowercase the first letter?
* could this behavior be removed? If yes, I can push the patch to master.

Sorry if this mail sounds offensive, it is not intended, of course :-)

[1] 
http://wiki.documentfoundation.org/index.php?title=Releases/3.5.3/RC1&diff=47782&oldid=47775
[2] http://opengrok.libreoffice.org/xref/core/bin/lo-commit-stat#64

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Licensing

2012-05-19 Thread Ed Dean 
Sorry if this is noise, but Michael Meeks asked for it!  Blame him! :-P

All of my past/existing contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.


Hate to use future tense since that requires predictive skill which
I'm horrible at.  Hope that at least sets things straight.  All I did
was remove dead code I think, so it probably wont matter in any case.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to get values for rtlbootstrap.mk in configure?

2012-05-19 Thread Matúš Kukan 
On 18 May 2012 12:24, David Tardon  wrote:
> On Fri, May 11, 2012 at 10:40:19PM +0200, Matúš Kukan wrote:
>> There is a comment that the variables (RTL_OS RTL_ARCH) should be set
>> by configure
>> http://cgit.freedesktop.org/libreoffice/core/tree/sdext/platform.mk#n28
>
> Yeah, that comment was written by me. Because the obvious next step
> would be to set platform ID for extensions in configure too (platform ID
> is $(RTL_OS)_$(RTL_ARCH) converted to lower case. There is no handy
> function for lower case conversion of a string in GNU make).
>
>>
>> How could I do that ?
>> Well, it's easy to get the values for my platform but how to do it for all ?
>
> The values are determined by sal/source/rtl/macro.hxx . So what is
> needed is to map the possible configurations from here on the platform
> specific settings in configure.in at line 2975.
>
>> Somebody wants to do it as an easy hack ;-) ?
>
> I wanted to create one at that time, but then I was too lazy to check
> what it would involve :-)

So, are you going to create one now ? :-)
Since Tor's fix f5ea2b5fa85660844daf092e84db45a759bf126d
I am not really interested in doing this.

Thanks,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/inc testtools/prj testtools/source

2012-05-19 Thread David Ostrovsky 
 testtools/inc/makefile.mk   |   39 
 testtools/prj/build.lst |9 -
 testtools/source/bridgetest/cli/makefile.mk |  202 ---
 testtools/source/bridgetest/idl/makefile.mk |   73 
 testtools/source/bridgetest/makefile.mk |  238 
 5 files changed, 2 insertions(+), 559 deletions(-)

New commits:
commit 89715825116bba84c572767c89f031956e44e7ea
Author: David Ostrovsky 
Date:   Sat May 19 22:29:46 2012 +0200

cleaning up dmake stuff

Change-Id: I85d1ffef06028f8781a0406ea6e43b0e0406413c

diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
deleted file mode 100644
index 26dc958..000
--- a/testtools/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-PRJ=..
-
-PRJNAME=testtools
-TARGET=inc
-
-# --- Settings -
-
-.INCLUDE :  settings.mk
-
-# --- Files 
-# --- Targets ---
-
-.INCLUDE :  target.mk
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 0b8f340..76da8aa 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,8 +1,3 @@
 tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno 
cli_ure offapi ure LIBXSLT:libxslt NULL
-tt testtools\inc nmake - all tt_inc NULL
-tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl 
tt_inc NULL
-tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest 
tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL
-tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs 
tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest tt_inc 
NULL
-tt testtools\source\cliversioning nmake - all tt_cliver NULL
+tt testtoolsusr1   
 -   alltt_mkout NULL
+tt testtools\prjnmake   -  
 alltt_prj NULL
diff --git a/testtools/source/bridgetest/cli/makefile.mk 
b/testtools/source/bridgetest/cli/makefile.mk
deleted file mode 100644
index 8965f1d..000
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ /dev/null
@@ -1,202 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-PRJ=..$/..$/..
-
-PRJNAME=testtools
-TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# disable caching to avoid stale objects
-# on version changes
-CCACHE_DISABLE=TRUE
-.EXPORT : CCACHE_DISABLE
-
-# --- Settings -
-

[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - Repository.mk testtools/Library_bridgetest.mk testtools/Library_constructors.mk testtools/Library_cppobj.mk testtools/StaticLibrary_bridget

2012-05-19 Thread David Ostrovsky 
 Repository.mk |8 
 testtools/Library_bridgetest.mk   |   18 +-
 testtools/Library_constructors.mk |   14 +++---
 testtools/Library_cppobj.mk   |   18 +-
 testtools/StaticLibrary_bridgetest.mk |   13 -
 5 files changed, 33 insertions(+), 38 deletions(-)

New commits:
commit c40a1fe0bcadee60de84d6bba6a1b2a1d5be212c
Author: David Ostrovsky 
Date:   Sat May 19 22:10:41 2012 +0200

prefix testtools libraries with testtools_ in Repository.mk

Change-Id: I0894b073b5263a45c9026ec55049ebeaf0770535

diff --git a/Repository.mk b/Repository.mk
index 72efae3..d3b198c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -540,9 +540,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 endif
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
-cppobj \
-bridgetest \
-constructors \
 acceptor \
 binaryurp \
 bootstrap \
@@ -557,6 +554,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 reflection \
 stocservices \
 streams \
+testtools_cppobj \
+testtools_bridgetest \
+testtools_constructors \
 textinstream \
 textoutstream \
 ))
@@ -591,7 +591,7 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 ooopathutils \
 sample \
 salcpprt \
-testtools_bridgetest \
+testtools_bridgetest_s \
 transex \
 ulingu \
 vclmain \
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index b2765f6..a8f8fa5 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -24,34 +24,34 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Library_Library,bridgetest))
+$(eval $(call gb_Library_Library,testtools_bridgetest))
 
-$(eval $(call 
gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest))
+$(eval $(call 
gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
 
-$(eval $(call gb_Executable_set_include,bridgetest,\
+$(eval $(call gb_Executable_set_include,testtools_bridgetest,\
 -I$(SRCDIR)/testtools/source/bridgetest \
 $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_internal_api,bridgetest,\
+$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
 bridgetest \
 ))
 
-$(eval $(call gb_Library_use_api,bridgetest,\
+$(eval $(call gb_Library_use_api,testtools_bridgetest,\
 udkapi \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,bridgetest,\
-testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\
+testtools_bridgetest_s \
 ))
 
-$(eval $(call gb_Library_use_libraries,bridgetest,\
+$(eval $(call gb_Library_use_libraries,testtools_bridgetest,\
 cppu \
 cppuhelper \
 sal \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,bridgetest,\
+$(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\
 testtools/source/bridgetest/bridgetest \
 ))
 
diff --git a/testtools/Library_constructors.mk 
b/testtools/Library_constructors.mk
index abf273b..3de7008 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -24,30 +24,30 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Library_Library,constructors))
+$(eval $(call gb_Library_Library,testtools_constructors))
 
-$(eval $(call 
gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors))
+$(eval $(call 
gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors))
 
-$(eval $(call gb_Executable_set_include,constructors,\
+$(eval $(call gb_Executable_set_include,testtools_constructors,\
 -I$(SRCDIR)/testtools/source/bridgetest \
 $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_internal_api,constructors,\
+$(eval $(call gb_Library_use_internal_api,testtools_constructors,\
 bridgetest \
 ))
 
-$(eval $(call gb_Library_use_api,constructors,\
+$(eval $(call gb_Library_use_api,testtools_constructors,\
 udkapi \
 ))
 
-$(eval $(call gb_Library_use_libraries,constructors,\
+$(eval $(call gb_Library_use_libraries,testtools_constructors,\
 cppu \
 cppuhelper \
 sal \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,constructors,\
+$(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
 testtools/source/bridgetest/constructors \
 ))
 
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 649f71a..0bbdf23 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -24,34 +24,34 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Library_Library,cppobj))
+$(eval $(call gb_Library_Library,testtools_cppobj))
 
-$(eval $(call 
gb_Library_set_componentfile,

Re: [PUSHED][REVIEW-3-5] Fixed ThreadPool (and dependent ORequestThread) life cycle

2012-05-19 Thread Caolán McNamara 
On Fri, 2012-05-18 at 23:04 +0200, Stephan Bergmann wrote:
> I'd like to get this reviewed and backported to libreoffice-3-5.  As
> the commit message explains, only part of it is strictly necessary to
> fix the bug, so 

fair enough, won't pretend to understand area fully, but pushed anyway.
I do recall there was some semi-reproducible crash/hang scenario in the
past which could be replicated by effectively
for (i = 0; i < 1; ++i) unopkg add XXX, unopkg remove XXX;

> I would also be fine if reviewers insisted on only
> backporting the two parts that are really necessary and leaving out the
> two cleanup topics. 

sounds like *way* too much effort :-)

C.

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

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

2012-05-19 Thread Caolán McNamara 
 binaryurp/source/bridge.cxx   |   46 ++
 binaryurp/source/bridge.hxx   |4 +-
 cppu/source/threadpool/threadpool.cxx |   24 -
 cppu/source/threadpool/threadpool.hxx |4 +-
 4 files changed, 52 insertions(+), 26 deletions(-)

New commits:
commit c4b4ab993b93e57de816d2ca47b0e1be8e24eaab
Author: Stephan Bergmann 
Date:   Wed May 16 22:09:21 2012 +0200

Fixed ThreadPool (and dependent ORequestThread) life cycle

At least with sw_complex test under load, it happened that an ORequestThread
could still process a remote release request while the main thread was 
already
in exit(3).  This was because (a) ThreadPool never joined with the spawned
worker threads (which has been rectified by calling 
uno_threadpool_dispose(0)
from the final uno_threadpool_destroy), and (b) binaryurp::Bridge called
uno_threadpool_destroy only from its destructor (which could go as late as
exit(3)) instead of from terminate.

Additional clean up:
* Access to Bridge's threadPool_ is now cleanly controlled by mutex_ (even
  though that might not be necessary in every case).
* ThreadPool's stopDisposing got renamed to destroy, to make meaning 
clearer.

(cherry picked from commit d015384e1d98fe77fd59339044f58efb1ab9fb25)

Conflicts:

binaryurp/source/bridge.cxx

Change-Id: I45fa76e80e790a11065e7bf8ac9d92af2e62f262

Signed-off-by: Caolán McNamara 

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index b491a2a..f591fe0 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -234,16 +234,28 @@ Bridge::Bridge(
 }
 
 void Bridge::start() {
-assert(threadPool_ == 0 && !writer_.is() && !reader_.is());
-threadPool_ = uno_threadpool_create();
-assert(threadPool_ != 0);
-writer_.set(new Writer(this));
-writer_->create();
-reader_.set(new Reader(this));
-reader_->create();
+rtl::Reference< Reader > r(new Reader(this));
+rtl::Reference< Writer > w(new Writer(this));
+{
+osl::MutexGuard g(mutex_);
+assert(threadPool_ == 0 && !writer_.is() && !reader_.is());
+threadPool_ = uno_threadpool_create();
+assert(threadPool_ != 0);
+reader_ = r;
+writer_ = w;
+}
+// It is important to call reader_->create() last here; both
+// Writer::execute and Reader::execute can call Bridge::terminate, but
+// Writer::execute is initially blocked in unblocked_.wait() until
+// Reader::execute has called bridge_->sendRequestChangeRequest(), so
+// effectively only reader_->create() can lead to an early call to
+// Bridge::terminate
+w->create();
+r->create();
 }
 
 void Bridge::terminate() {
+uno_ThreadPool tp;
 rtl::Reference< Reader > r;
 rtl::Reference< Writer > w;
 Listeners ls;
@@ -252,6 +264,7 @@ void Bridge::terminate() {
 if (terminated_) {
 return;
 }
+tp = threadPool_;
 std::swap(reader_, r);
 std::swap(writer_, w);
 ls.swap(listeners_);
@@ -266,8 +279,8 @@ void Bridge::terminate() {
 w->stop();
 joinThread(r.get());
 joinThread(w.get());
-assert(threadPool_ != 0);
-uno_threadpool_dispose(threadPool_);
+assert(tp != 0);
+uno_threadpool_dispose(tp);
 Stubs s;
 {
 osl::MutexGuard g(mutex_);
@@ -294,6 +307,7 @@ void Bridge::terminate() {
 "binaryurp", "caught runtime exception '" << e.Message << 
'\'');
 }
 }
+uno_threadpool_destroy(tp);
 }
 
 css::uno::Reference< css::connection::XConnection > Bridge::getConnection()
@@ -323,7 +337,8 @@ BinaryAny Bridge::mapCppToBinaryAny(css::uno::Any const & 
cppAny) {
 return out;
 }
 
-uno_ThreadPool Bridge::getThreadPool() const {
+uno_ThreadPool Bridge::getThreadPool() {
+osl::MutexGuard g(mutex_);
 assert(threadPool_ != 0);
 return threadPool_;
 }
@@ -564,7 +579,8 @@ bool Bridge::makeCall(
 {
 std::auto_ptr< IncomingReply > resp;
 {
-AttachThread att(threadPool_);
+uno_ThreadPool tp = getThreadPool();
+AttachThread att(tp);
 PopOutgoingRequest pop(
 outgoingRequests_, att.getTid(),
 OutgoingRequest(OutgoingRequest::KIND_NORMAL, member, setter));
@@ -575,7 +591,7 @@ bool Bridge::makeCall(
 incrementCalls(true);
 incrementActiveCalls();
 void * job;
-uno_threadpool_enter(threadPool_, &job);
+uno_threadpool_enter(tp, &job);
 resp.reset(static_cast< IncomingReply * >(job));
 decrementActiveCalls();
 decrementCalls();
@@ -806,8 +822,8 @@ bool Bridge::isCurrentContextMode() {
 }
 
 Bridge::~Bridge() {
-if (threadPool_ != 0) {
-uno_threadpool_destroy(threadPool_);
+if (getThreadPool() != 0) {
+terminate();
 }
 }
 
@@ -934,7 +950,7 @@ void Bridge::sendProtPropRequest(
 void Bridge::m

Re: [PUSHED][REVIEW-3-5] Revert fix for "#i86306# prepare against really broken CUPS installations..."

2012-05-19 Thread Caolán McNamara 
On Fri, 2012-05-18 at 23:08 +0200, Stephan Bergmann wrote:
> Please review the below master fix for backporting to libreoffice-3-5. 
> (I actually first encountered the problem on the LO 3.5 codeline.)
> 
> The below master commit will not cleanly apply to libreoffice-3-5 (at 
> least not to libreoffice-3-5-4, where I tried it), so find attached an 
> adapted 0001-Revert-fix-for-i86306-prepare-against-really-broken-.patch.

ah good, that code always really bugged me and it bit me recently in its
ability to make a simple crash complicated if it happens while the cups
printer discovery is underway so I'd planned to remove it myself.
Pushed.

C.

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

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

2012-05-19 Thread Caolán McNamara 
 vcl/unx/generic/printer/cupsmgr.cxx |   76 +++-
 1 file changed, 15 insertions(+), 61 deletions(-)

New commits:
commit 14f078cd52b1471811871bd61cdb0b3ab4f26e1a
Author: Stephan Bergmann 
Date:   Fri May 18 20:52:15 2012 +0200

Revert fix for "#i86306# prepare against really broken CUPS 
installations..."

...from 8046a87ecc879651ee9cf344211cdd198a419cab.  At least sometimes in
sw_complex test (with various bundled Java extensions enabled) under load, 
this
code reports "Signal 11 during cups initialization called, ignoring cups" 
and
in-process JVM aborts in panic.  Looks like a legitimate SIGSEGV (to be
translated into java.lang.NullPointerException) from JVM code is erroneously
caught by the temporary lcl_signal_action in cupsmgr.cxx instead.  As there 
is
no non-cooperative way to have different signal handlers for different 
threads
(at least under POSIX), and
 "office crashes at 
startup
on Solaris Intel" suggests this signal-catching business is only there to 
work
around a completely broken machine, I think it is best to simply remove it
again.

(cherry picked from commit ef48b58387fdc04050c3362440ffe3ca0037d8d0)

Conflicts:

vcl/unx/generic/printer/cupsmgr.cxx

Change-Id: I55b95a71d622f83c975989a4ffb1d95ef5737075

Signed-off-by: Caolán McNamara 

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index 381478d..3278d3d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -43,8 +43,6 @@
 #include "rtl/ustrbuf.hxx"
 
 #include 
-#include 
-#include 
 
 #define CUPS_LIB_NAME "libcups.so.2"
 
@@ -442,17 +440,6 @@ void CUPSManager::runDestThread( void* pThis )
 ((CUPSManager*)pThis)->runDests();
 }
 
-static sigjmp_buf aViolationBuffer;
-
-extern "C"
-{
-static void lcl_signal_action(int nSignal)
-{
-fprintf( stderr, "Signal %d during cups initialization called, 
ignoring cups\n", nSignal );
-siglongjmp( aViolationBuffer, 1 );
-}
-}
-
 void CUPSManager::runDests()
 {
 #if OSL_DEBUG_LEVEL > 1
@@ -460,62 +447,29 @@ void CUPSManager::runDests()
 #endif
 cups_dest_t* pDests = NULL;
 
-// #i86306# prepare against really broken CUPS installations / missing 
servers
-
-// install signal handler for SEGV, BUS and ABRT
-struct sigaction act;
-struct sigaction oact[3];
-
-act.sa_handler = lcl_signal_action;
-act.sa_flags   = 0;
-sigemptyset(&(act.sa_mask));
-
-int nSegvSignalInstalled = sigaction(SIGSEGV, &act, &oact[0]);
-int nBusSignalInstalled = sigaction(SIGBUS, &act, &oact[1]);
-int nAbortSignalInstalled = sigaction(SIGABRT, &act, &oact[2]);
-
-// prepare against a signal during FcInit or FcConfigGetCurrent
-if( sigsetjmp( aViolationBuffer, ~0 ) == 0 )
+// n#722902 - do a fast-failing check for cups working *at all* first
+http_t* p_http;
+if( (p_http=m_pCUPSWrapper->httpConnectEncrypt(
+ m_pCUPSWrapper->cupsServer(),
+ m_pCUPSWrapper->ippPort(),
+ m_pCUPSWrapper->cupsEncryption())) != NULL )
 {
-// n#722902 - do a fast-failing check for cups working *at
-// all* first
-http_t* p_http;
-if( (p_http=m_pCUPSWrapper->httpConnectEncrypt(
- m_pCUPSWrapper->cupsServer(), 
- m_pCUPSWrapper->ippPort(),
- m_pCUPSWrapper->cupsEncryption())) != NULL )
-{
-// neat, cups is up, clean up the canary
-m_pCUPSWrapper->httpClose(p_http);
+// neat, cups is up, clean up the canary
+m_pCUPSWrapper->httpClose(p_http);
 
-int nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
+int nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "came out of cupsGetDests\n" );
+fprintf( stderr, "came out of cupsGetDests\n" );
 #endif
 
-osl::MutexGuard aGuard( m_aCUPSMutex );
-m_nDests = nDests;
-m_pDests = pDests;
-m_bNewDests = true;
+osl::MutexGuard aGuard( m_aCUPSMutex );
+m_nDests = nDests;
+m_pDests = pDests;
+m_bNewDests = true;
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "finished cupsGetDests\n" );
+fprintf( stderr, "finished cupsGetDests\n" );
 #endif
-}
 }
-else
-{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "cupsGetDests crashed, not using CUPS\n" );
-#endif
-}
-
-// restore old signal handlers
-if( nSegvSignalInstalled == 0 )
-sigaction( SIGSEGV, &oact[0], NULL );
-if( nBusSignalInstalled == 0 )
-sigaction( SIGBUS, &oact[1], NULL );
-if( nAbortSignalInstalled == 0 )
-sigaction( SIGABRT, &oact[2], NULL );
 }
 
 void CUPSManager::initialize()
___

Blanket License Statement

2012-05-19 Thread jgraeme 
All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

J. Graeme Lingard
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-05-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

Korrawit Pruegsanusak  changed:

   What|Removed |Added

 Depends on||49806, 48243

--- Comment #9 from Korrawit Pruegsanusak  
2012-05-19 07:29:47 PDT ---
Adding:
* bug 49806 as it is a pptx import regression in windows
* bug 48243 as it is a regression - sdext/ extensions not work in windows

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-05-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

Korrawit Pruegsanusak  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #8 from Korrawit Pruegsanusak  
2012-05-19 07:22:00 PDT ---
CC'ing dev list as it seems to be missing

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sc/source sd/source svx/source sw/source vbahelper/source xmloff/source

2012-05-19 Thread Julien Nabet 
 sc/source/core/data/dpdimsave.cxx |2 +-
 sc/source/core/data/dpgroup.cxx   |   18 +-
 sd/source/core/CustomAnimationEffect.cxx  |   18 +-
 sd/source/core/CustomAnimationPreset.cxx  |2 +-
 sd/source/core/shapelist.cxx  |2 +-
 sd/source/core/stlpool.cxx|8 
 sd/source/ui/animations/CustomAnimationPane.cxx   |2 +-
 sd/source/ui/slideshow/slideshowimpl.cxx  |5 -
 sd/source/ui/slideshow/slideshowviewimpl.cxx  |2 +-
 sd/source/ui/view/ViewShellManager.cxx|2 +-
 sd/source/ui/view/viewshel.cxx|2 +-
 svx/source/sdr/overlay/overlaymanager.cxx |8 
 svx/source/sdr/overlay/overlayobjectlist.cxx  |6 +++---
 sw/source/core/doc/acmplwrd.cxx   |2 +-
 vbahelper/source/vbahelper/vbaapplicationbase.cxx |2 +-
 xmloff/source/chart/SchXMLExport.cxx  |2 +-
 xmloff/source/table/XMLTableImport.cxx|4 ++--
 xmloff/source/text/txtimp.cxx |2 +-
 18 files changed, 42 insertions(+), 47 deletions(-)

New commits:
commit 2b657f5844f9362660c253322e4c4059d5875062
Author: Julien Nabet 
Date:   Sat May 19 15:09:08 2012 +0200

Fix Prefer prefix ++/-- operators for non-primitive types

Change-Id: I4ebb1027151c3bc34f81fb1e13de6c4c5cfed54d

diff --git a/sc/source/core/data/dpdimsave.cxx 
b/sc/source/core/data/dpdimsave.cxx
index 80257be..b9ce099 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -185,7 +185,7 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const 
rtl::OUString& rPref
 
 // look for existing groups
 for ( ScDPSaveGroupItemVec::const_iterator aIter(aGroups.begin());
-aIter != aGroups.end() && !bExists; 
aIter++ )
+aIter != aGroups.end() && !bExists; 
++aIter )
 if (aIter->GetGroupName().equals(aGroupName)) //! ignore 
case
 bExists = true;
 
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index a0bb5d9..9b5bf9b 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -298,7 +298,7 @@ void ScDPGroupItem::AddElement( const ScDPItemData& rName )
 
 bool ScDPGroupItem::HasElement( const ScDPItemData& rData ) const
 {
-for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != 
aElements.end(); aIter++ )
+for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != 
aElements.end(); ++aIter )
 if ( aIter->IsCaseInsEqual( rData ) )
 return true;
 
@@ -307,7 +307,7 @@ bool ScDPGroupItem::HasElement( const ScDPItemData& rData ) 
const
 
 bool ScDPGroupItem::HasCommonElement( const ScDPGroupItem& rOther ) const
 {
-for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != 
aElements.end(); aIter++ )
+for ( ScDPItemDataVec::const_iterator aIter(aElements.begin()); aIter != 
aElements.end(); ++aIter )
 if ( rOther.HasElement( *aIter ) )
 return true;
 
@@ -388,7 +388,7 @@ const ScDPGroupItem* ScDPGroupDimension::GetGroupForData( 
const ScDPItemData& rD
 
 const ScDPGroupItem* ScDPGroupDimension::GetGroupForName( const ScDPItemData& 
rName ) const
 {
-for ( ScDPGroupItemVec::const_iterator aIter(aItems.begin()); aIter != 
aItems.end(); aIter++ )
+for ( ScDPGroupItemVec::const_iterator aIter(aItems.begin()); aIter != 
aItems.end(); ++aIter )
 if ( aIter->GetName().IsCaseInsEqual( rName ) )
 return &*aIter;
 
@@ -609,7 +609,7 @@ sal_uLong ScDPGroupTableData::GetNumberFormat(long nDim)
 
 void ScDPGroupTableData::DisposeData()
 {
-for ( ScDPGroupDimensionVec::iterator aIter(aGroups.begin()); aIter != 
aGroups.end(); aIter++ )
+for ( ScDPGroupDimensionVec::iterator aIter(aGroups.begin()); aIter != 
aGroups.end(); ++aIter )
 aIter->DisposeData();
 
 for ( long i=0; i& 
rItems, const vectorGetGroupDim() == nFirstIndex )
diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index ab20da4..16756a5 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2284,7 +2284,7 @@ CustomAnimationEffectPtr 
EffectSequenceHelper::findEffect( const ::com::sun::sta
 CustomAnimationEffectPtr pEffect;
 
 EffectSequence::const_iterator aIter( maEffects.begin() );
-for( ; aIter != maEffects.end(); aIter++ )
+for( ; aIter != maEffects.end(); ++aIter )
 {
 if( (*aIter)->getNode() == xNode )
 {
@@ -2303,7 +2303,7 @@ sal_Int32 EffectSequenceHelper::getOffsetFromEffect( 
const CustomAnimationEffect
 sal_Int32 nOffset = 0;
 
 EffectSequence::const_iterator aIter( maEffects.begin() );
-for( ; aIter != maEffects.end(); aIter++, nOffset++ )
+

"5729da1 fdo#42865: privatized unique empty string symbol" - change of addsym.awk breaks the build on Mac/PPC

2012-05-19 Thread Christian Lohmaier 
Hi *,

The change
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5729da18a1852d842bd7de05d9d7fdcbec1e9ad5

or more precise this part of it:
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 4c18bdc..a9e64fb 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,6 +43,7 @@ END {
 print "GLIBCXX_3.4 {"
 print "global:"
 print "_ZGVNSt7num_put*; _ZNSt7num_put*;"
+print "_ZNSs4_Rep20_S_empty_rep_storageE;"
 print "};"
 }
 state == 2 {


breaks the build on Mac/PPC at least in neon, bridges, remotebridges.
Or in other words probably everywhere where a map-file is used.
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1337397004.20611#14916
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1337397004.20611#28529
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1337397004.20611#28653

just the neon one pasted here as it is the same for all:
ld: symbols names listed in -exported_symbols_list:
../../../../../unxmacxp.pro/misc/exports_neon.map not in linked
objects
__ZNSs4_Rep20_S_empty_rep_storageE

I don't know why it is necessary to have that added to addsym.awk,
when it is already added to the individual mapfiles.

Even if it is necessary, from the issue it seems to me that (at least
at the moment) only the mysql connector is affected, and furthermore
only in debug mode. Mac/PPC uses probably won't use either of those,
so I guess it is fine to just omit it for Mac/PPC and keep it for the
other systems..

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-5] fdo#47035: Fix loading & saving of jpeg files on Mac/PPC

2012-05-19 Thread Christian Lohmaier 
Hi *,

please review and pick for 3.5 & 3.5.4 if possible. It is Mac PPC
only, and no change of the logic of the code, but just reordering to
avoid padding of elements in two structs in libjpeg.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=47035

changes:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=a27a3990b8bbfa8924d2b55c38ceab7c9049ea6d

and

http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8ecb8801f4330c2d2da88b992e2039e020d4fa4

The padding is the cause of a regression compared to LO 3.4.x that
makes it impossible to open/insert and jpeg images.

When trying to open/save a jpeg on Mac/PPC one gets a "Graphic filter
not found" message

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: jpeg/struct_alignment.patch

2012-05-19 Thread Christian Lohmaier 
 jpeg/struct_alignment.patch |   34 --
 1 file changed, 32 insertions(+), 2 deletions(-)

New commits:
commit a8ecb8801f4330c2d2da88b992e2039e020d4fa4
Author: Christian Lohmaier 
Date:   Sat May 19 14:05:10 2012 +0200

fdo#47035: Fix saving of jpeg files on Mac/PPC

jpeg_compress_struct gets padded with the same effect as the
jpeg_decompress_struct, so needs some reordering as well to make Mac/PPC
happy (a27a399)

diff --git a/jpeg/struct_alignment.patch b/jpeg/struct_alignment.patch
index 2eb41bf..09966c3 100644
--- a/jpeg/struct_alignment.patch
+++ b/jpeg/struct_alignment.patch
@@ -1,8 +1,38 @@
-without this patch, the jpeg_decompress_struct will be padded, this in turn
+without this patch, the jpeg_decompress_struct & jpec_compress_struct will be 
padded, this in turn
 results in a mismatch when the jpeg filter in svtools is built, where no
 padding is assumed. Only affects Mac/PPC apparenlty, see fdo#47035
 --- misc/jpeg-8c/jpeglib.h 2010-11-17 22:01:56.0 +0100
-+++ misc/build/jpeg-8c/jpeglib.h   2012-05-19 03:38:44.0 +0200
 misc/build/jpeg-8c/jpeglib.h   2012-05-19 13:58:31.0 +0200
+@@ -288,9 +288,9 @@
+   JDIMENSION image_width; /* input image width */
+   JDIMENSION image_height;/* input image height */
+   int input_components;   /* # of color components in input image 
*/
+-  J_COLOR_SPACE in_color_space;   /* colorspace of input image */
+ 
+   double input_gamma; /* image gamma of input image */
++  J_COLOR_SPACE in_color_space;   /* colorspace of input image */
+ 
+   /* Compression parameters --- these fields must be set before calling
+* jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
+@@ -359,16 +359,16 @@
+   /* Parameters controlling emission of special markers. */
+ 
+   boolean write_JFIF_header;  /* should a JFIF marker be written? */
++  boolean write_Adobe_marker; /* should an Adobe marker be written? */
+   UINT8 JFIF_major_version;   /* What to write for the JFIF version number */
+   UINT8 JFIF_minor_version;
+   /* These three values are not used by the JPEG code, merely copied */
+   /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
+   /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
+   /* ratio is defined by X_density/Y_density even when density_unit=0. */
+-  UINT8 density_unit; /* JFIF code for pixel size units */
+   UINT16 X_density;   /* Horizontal pixel density */
+   UINT16 Y_density;   /* Vertical pixel density */
+-  boolean write_Adobe_marker; /* should an Adobe marker be written? */
++  UINT8 density_unit; /* JFIF code for pixel size units */
+   
+   /* State variable: index of next scanline to be written to
+* jpeg_write_scanlines().  Application may use this to control its
 @@ -583,11 +583,11 @@
/* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
UINT8 JFIF_major_version;   /* JFIF version number */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - 7 commits - testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_testComponent.mk testtools/CustomTarget_uno_tes

2012-05-19 Thread David Tardon 
 testtools/CustomTarget_bridgetest_climaker.mk  |2 -
 testtools/CustomTarget_bridgetest_testComponent.mk |   42 -
 testtools/CustomTarget_uno_test.mk |1 
 testtools/InternalUnoApi_bridgetest.mk |5 --
 testtools/Jar_testComponent.mk |2 +
 testtools/Library_bridgetest.mk|1 
 testtools/Library_constructors.mk  |1 
 testtools/Library_cppobj.mk|1 
 testtools/Module_testtools.mk  |   14 +--
 testtools/StaticLibrary_bridgetest.mk  |1 
 10 files changed, 15 insertions(+), 55 deletions(-)

New commits:
commit 585f68a8d212d700cd6c21a4df104614a62bdb23
Author: David Tardon 
Date:   Sat May 19 13:34:22 2012 +0200

do not run bridgetest on macosx/ppc

Change-Id: I6df6c061b09674370a99c2b5e69927500af8d1e5

diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index f24ac0a..7f422f2 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -51,9 +51,13 @@ $(eval $(call gb_Module_add_targets,testtools,\
 endif
 
 ifneq ($(CROSS_COMPILING),YES)
+# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge.
+# (is it still relevant?)
+ifneq ($(COM)$(OS)$(CPU),GCCMACOSXP)
 $(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
 ))
 endif
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
commit e52fe01beaec472361690c9c105914feee372738
Author: David Tardon 
Date:   Sat May 19 13:33:01 2012 +0200

do not run bridgetest on cross-compilation

Change-Id: I59addd16d4bd6720164c71dae3bd03e5d91afa40

diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 948d79a..f24ac0a 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -50,8 +50,10 @@ $(eval $(call gb_Module_add_targets,testtools,\
 ))
 endif
 
+ifneq ($(CROSS_COMPILING),YES)
 $(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
 ))
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 41a4a9a19117f75e73171b8a3d079ef6db609530
Author: David Tardon 
Date:   Sat May 19 12:09:18 2012 +0200

use gb_Jar_set_componentfile

Change-Id: Ie2ee3387537d1ab968ca685d7b30aa59d28734db

diff --git a/testtools/CustomTarget_bridgetest_testComponent.mk 
b/testtools/CustomTarget_bridgetest_testComponent.mk
deleted file mode 100644
index 49e6d1f..000
--- a/testtools/CustomTarget_bridgetest_testComponent.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_testComponent))
-
-testComponent_DIR := $(call 
gb_CustomTarget_get_workdir,testtools/bridgetest_testComponent)
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest_testComponent) : 
$(testComponent_DIR)/done
-
-$(testComponent_DIR)/done : $(gb_XSLTPROCTARGET) \
-   $(SRCDIR)/testtools/source/bridgetest/testComponent.component | 
$(testComponent_DIR)/.dir 
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMP,1)
-   $(call gb_Helper_abbreviate_dirs_native, \
-   $(gb_XSLTPROC) --nonet --stringparam uri \
-   'vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/testComponent.jar' 
\
-   -o 
$(OUTDIR)/xml/component/testtools/source/bridgetest/testComponent.component \
-   $(gb_ComponentTarget_XSLTCOMMANDFILE) 
$(SRCDIR)/testtools/source/bridgetest/testComponent.component && touch $@)
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 6cba308..12dfe3f 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval

Re: Branch 'feature/gbuild_testtools' - review request

2012-05-19 Thread David Ostrovsky 

Hi Stephan,

thank you for review!

On 18.05.2012 12:59, Stephan Bergmann wrote:

On 05/17/2012 11:43 PM, David Ostrovsky wrote:

source/bridgetest/* is up and running now (except pyuno).
The creation of some batch files is skipped, because they wasn't used
anyway.


Historically, testtools only created test scripts that were not 
executed during build.  Later on, the most fundamental of those test 
scripts (bridgetest_inprocess: run C++ test implementation in a single 
process) was modified to instead be run during build.


However, the other test scripts (bridgetest_inprocess_java: run Java 
test implementation in a single process; bridgetest_server: run C++ 
test implementation against additional bridgetest_client process; 
bridgetest_javaserver: run Java test implementation against additional 
bridgetest_client process) are still useful for manual testing, and I 
occasionally still use them.  I guess it is fine to leave them alone 
for now, and I can see to get them up and running again (maybe even 
automatically during the build) later, after gbuild_testtools is 
integrated into master.




Then of course we have to preserve them!
I just pushed another iteration. With new CustomTarget_bridgetest.mk all 
those batch file are generated now and run without error, magic ;-)


I need a decision here: to merge it in this state to master or try to 
clean it a little bit more and may be take care of pyuno directory first?


Thanks
David

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

[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest.mk

2012-05-19 Thread David Ostrovsky 
 testtools/CustomTarget_bridgetest.mk |   28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 8826be6e60c3e324571934f2837321f091b02402
Author: David Ostrovsky 
Date:   Sat May 19 11:39:19 2012 +0200

batch scripts are working now

Change-Id: Ia58bee4b4d5322cc6c31b24a7c43367d6fd301fc

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index 32d877b..c1f4317 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -43,7 +43,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
 
-# which other prerequisits do we need here?
+# which other prerequisites do we need here?
 $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | 
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
@@ -52,18 +52,23 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
-   "-s com.sun.star.test.bridge.BridgeTest" \
+   "-s com.sun.star.test.bridge.CppTestObject" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" > $@)
$(GIVE_EXEC_RIGHTS) $@
 
-# which other prerequisits do we need here?
+ifneq ($(SOLAR_JAVA),)
+
+# how to do it more elegantly?
+MY_CLASSPATH := $(call 
gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call 
gb_Helper_native_path,$(OUTDIR)/bin/java_uno.jar)$(gb_CLASSPATHSEP)$(call 
gb_Helper_native_path,$(OUTDIR)/bin/jurt.jar)$(gb_CLASSPATHSEP)$(call 
gb_Helper_native_path,$(OUTDIR)/bin/juh.jar)
+
+# which other prerequisites do we need here?
 $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | 
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
echo "java" \
-   "-classpath $(OUTDIR)/bin/testComponent.jar" \
+   "-classpath 
$(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \

\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
"singleaccept"> $@)
@@ -74,27 +79,32 @@ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : 
\
$(SRCDIR)/testtools/source/bridgetest/*.component | 
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
-   echo "JAVA_HOME=$(JAVA_HOME) $(UNO_EXE)" \
+   echo "JAVA_HOME=$(JAVA_HOME)" \
+   "LD_LIBRARY_PATH=$(OUTDIR)/lib" \
+   "$(UNO_EXE)" \
+   "-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.BridgeTest" \
-   "-env:URE_INTERNAL_JAVA_DIR=$(OUTDIR)/bin" \
-   "-env:URE_INTERNAL_LIB_DIR=$(OUTDIR)/lib" \
+   "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
+   "-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@)
$(GIVE_EXEC_RIGHTS) $@
+endif
 
-# which other prerequisits do we need here?
+# which other prerequisites do we need here?
 $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | 
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
echo "$(UNO_EXE)" \
+   "-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
-   "-s com.sun.star.test.bridge.BridgeTest" \
+   "-s com.sun.star.test.bridge.BridgeTest --" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
> $@)
$(GIVE_EXEC_RIGHTS) $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits