Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
Hi Tor, On Tue, 2012-02-14 at 19:23 +0200, Tor Lillqvist wrote: In the feature/android branch I have added the fw[eiklm], sfx, sb, svt and tk libraries to libmerged. Working on verifying that the last addition didn't break anything; I found a nice direct reference to the name tk in http://opengrok.libreoffice.org/xref/core/vcl/source/app/svapp.cxx#1541 :-) right; one of those beautiful things the toolkit does. ... Still haven't been able to get a master MSVC build with --enable-mergelibs and an enlarged merging to complete, but unsure whether merging is something we want on Windows or not anyway, there seems to be differing opinons... Ok. I also merged sal and sal_textenc (in the --enable-mergelibs case). Hmm - I think we did this to death already. I guess we want a one library case, that does the things like this that will only ever make sense on iOS (in the one big library) world. It brings only slowness for everything else. Anyhow - thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
Hi Matus, On Wed, 2012-02-15 at 01:05 +0100, Matúš Kukan wrote: It's going quite well. With tml's patch [1] we can add more. He is doing great job, mostly in the android branch as he already said. Cool :-) yep, I saw. Current tail_build blocker is connectivity/. Peter was working on it [2] but I don't know what's the status now. Of course there are also lot more. Ah - ok, good to know. Well, I think there is already (or will be in the near future) quite much. What do you intend to do with libmerged ? You are asking on the status quite often. What's your next move ? :) Well, I'm building and running with it myself on Linux; so far it seems that libmergedlo.so is only 5.1Mb - which surprises me, since my libsvx* are both rather huge. As/when we have really a lot of code in there, I was going to poke Jan H. again to see if we could borrow some more of his cycles wrt. LTO on it - but for that I'd like to have something impressive ;-) world's biggest shared library is nearly that (perhaps). Anyhow - that was my plan ;-) Thoughts ? Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 14 February 2012 19:23, Tor Lillqvist t...@iki.fi wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). Hmm, I experimented with this but apparently didn't commit and then did a git reset and lost the changes, or something. Will have a look again if I still have the stuff in Emacs buffers... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 15 February 2012 13:35, Tor Lillqvist t...@iki.fi wrote: On 14 February 2012 19:23, Tor Lillqvist t...@iki.fi wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). Hmm, I experimented with this but apparently didn't commit and then did a git reset and lost the changes, or something. Will have a look again if I still have the stuff in Emacs buffers... It was something more than this: ? http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/androidid=4866737a489d66fc2dc2153641390b609e1d5905 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
It was something more than this: ? Umm, no, that was it. Now I am confused, why don't I see that in my master checkout after merging the branch to master? Git is a mystery. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/14/2012 06:23 PM, Tor Lillqvist wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). I'm not sure this is not counter-productive. For Android and iOS it might be vital to get sal_textenc merged, to reduce the overall number of dynamic libraries. But for other platforms, it was a deliberate move to break sal_textenc out of sal to reduce start up time. As it stands, sal_textenc requires lots of relocations in data segments that have to be done by loaders upfront at load time. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/15/2012 03:11 PM, Tor Lillqvist wrote: I'm not sure this is not counter-productive. For Android and iOS it might be vital to get sal_textenc merged, Well, --enable-mergelibs is probably actually intended for Android only, I think? I wasn't sure about the status of --enable-mergelibs, whether it is only something Android-specific or whether it is also used to enable that general merge/LTO endeavor. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
I wasn't sure about the status of --enable-mergelibs, whether it is only something Android-specific or whether it is also used to enable that general merge/LTO endeavor. I don't know either, really. But anyway, I will make the sal_textenc+sal merge Android-specific and not mergelibs-specific;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/13/2012 11:21 PM, Matúš Kukan wrote: On 12 February 2012 23:51, Matúš Kukanmatus.ku...@gmail.com wrote: Do not push them without improvement, make check fails for me. Attached diff solves one problem but still there is something wrong. Well, I was fooled by smoketest/com/sun/star/comp/smoketest/makefile.mk There is javamaker involved, but the produced .class file does not end up in TestExtension.jar So the call to javamaker it's pointless ..whatever. Then I also tried to remove TestExtension.rdb from TestExtension.oxt and make check was also successful. So, can I remove TestExtension.idl file ? Anybody has opinion about this ? The TestExtension.rdb type library and the TestExtension.idl new-style service definition should indeed be unnecessary. The only use of the corresponding service is via BASIC createUnoService. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On Mon, 2012-02-13 at 23:21 +0100, Matúš Kukan wrote: I'd like to push attached patch. Hopefully it will work also for others and there is nothing wrong with removing TestExtension.rdb from TestExtension.oxt. Nice ;-) I was wondering - how are we doing wrt. getting more of the libraries into tail_build and libmerged ? :-) I wonder could we get 'basic' into that ? svtools ? some of the 'helper' libraries ? :-) Presumably there are other choke-point modules blocking others from being introduced into tail_build too ? Anyhow - it's great to see your work there, Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
I was wondering - how are we doing wrt. getting more of the libraries into tail_build and libmerged ? In the feature/android branch I have added the fw[eiklm], sfx, sb, svt and tk libraries to libmerged. Working on verifying that the last addition didn't break anything; I found a nice direct reference to the name tk in http://opengrok.libreoffice.org/xref/core/vcl/source/app/svapp.cxx#1541 ... Still haven't been able to get a master MSVC build with --enable-mergelibs and an enlarged merging to complete, but unsure whether merging is something we want on Windows or not anyway, there seems to be differing opinons... I also merged sal and sal_textenc (in the --enable-mergelibs case). --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 14 February 2012 18:12, Michael Meeks michael.me...@suse.com wrote: Nice ;-) I was wondering - how are we doing wrt. getting more of the libraries into tail_build and libmerged ? :-) I wonder could we get 'basic' into that ? svtools ? some of the 'helper' libraries ? :-) It's going quite well. With tml's patch [1] we can add more. He is doing great job, mostly in the android branch as he already said. [1] http://cgit.freedesktop.org/libreoffice/core/diff/sfx2/source/appl/appbas.cxx?id=25f8330004409edf8007df0cc80ef540c03d18da 'Helper' libraries would have to wait for more patches. Presumably there are other choke-point modules blocking others from being introduced into tail_build too ? Current tail_build blocker is connectivity/. Peter was working on it [2] but I don't know what's the status now. Of course there are also lot more. [2] http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/gbuild_conversions Well, I think there is already (or will be in the near future) quite much. What do you intend to do with libmerged ? You are asking on the status quite often. What's your next move ? :) Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 12 February 2012 23:51, Matúš Kukan matus.ku...@gmail.com wrote: Do not push them without improvement, make check fails for me. Attached diff solves one problem but still there is something wrong. Well, I was fooled by smoketest/com/sun/star/comp/smoketest/makefile.mk There is javamaker involved, but the produced .class file does not end up in TestExtension.jar So the call to javamaker it's pointless ..whatever. Then I also tried to remove TestExtension.rdb from TestExtension.oxt and make check was also successful. So, can I remove TestExtension.idl file ? Anybody has opinion about this ? I'd like to push attached patch. Hopefully it will work also for others and there is nothing wrong with removing TestExtension.rdb from TestExtension.oxt. (I will push myself with others if it is ok) Matus From cec413519035eaee1ed6a18460c37fd27b1ac050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= matus.ku...@gmail.com Date: Sun, 12 Feb 2012 13:39:52 +0100 Subject: [PATCH] smoketest: convert to gbuild --- Makefile |2 +- Repository.mk |1 + RepositoryModule_ooo.mk|1 + smoketest/Jar_TestExtension.mk | 52 smoketest/Library_smoketest.mk | 50 +++ smoketest/Makefile |7 ++ smoketest/Module_smoketest.mk | 43 ++ smoketest/Package_losmoketest.mk | 32 +++ smoketest/Zip_TestExtension.mk | 48 +++ smoketest/Zip_smoketestdoc.mk | 69 +++ .../com/sun/star/comp/smoketest/TestExtension.idl | 40 - smoketest/com/sun/star/comp/smoketest/delzip |1 - smoketest/com/sun/star/comp/smoketest/makefile.mk | 88 smoketest/com/sun/star/comp/smoketest/manifest.xml |1 - smoketest/data/makefile.mk | 70 smoketest/makefile.mk | 49 --- smoketest/prj/build.lst|4 +- smoketest/prj/d.lst|4 - smoketest/prj/makefile.mk |1 + 19 files changed, 306 insertions(+), 257 deletions(-) create mode 100644 smoketest/Jar_TestExtension.mk create mode 100644 smoketest/Library_smoketest.mk create mode 100644 smoketest/Makefile create mode 100644 smoketest/Module_smoketest.mk create mode 100644 smoketest/Package_losmoketest.mk create mode 100644 smoketest/Zip_TestExtension.mk create mode 100644 smoketest/Zip_smoketestdoc.mk delete mode 100644 smoketest/com/sun/star/comp/smoketest/TestExtension.idl delete mode 100755 smoketest/com/sun/star/comp/smoketest/delzip delete mode 100755 smoketest/com/sun/star/comp/smoketest/makefile.mk delete mode 100644 smoketest/data/makefile.mk delete mode 100755 smoketest/makefile.mk create mode 100644 smoketest/prj/makefile.mk diff --git a/Makefile b/Makefile index 815959f..597a359 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,7 @@ scripting\ sd\ sfx2\ slideshow\ +smoketest\ sot\ starmath\ svl\ @@ -218,7 +219,6 @@ scp2\ sdext\ setup_native\ shell\ -smoketest\ smoketestoo_native\ solenv\ soltools\ diff --git a/Repository.mk b/Repository.mk index 5adc794..1bc6fd8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -341,6 +341,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ package2 \ reg \ scriptframe \ +smoketest \ sofficeapp \ srtrs1 \ store \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 8020878..6d724c1 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -93,6 +93,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sd \ sfx2 \ slideshow \ +smoketest \ sot \ starmath \ svl \ diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk new file mode 100644 index 000..8276cc5 --- /dev/null +++ b/smoketest/Jar_TestExtension.mk @@ -0,0 +1,52 @@ +# -*- 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 Matúš Kukan matus.ku...@gmail.com (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of
