Re: [Libreoffice] small utility script to handle ../bin/g and similar commands
Just one small nit: As we have members in the community whose platform doesn't normally have a /bin/bash, please make sure any new shell script introduced works with a plain non-bash POSIX shell, and use /bin/sh on the hashbang line. (Just my personal opinion, of course.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] ixion breakage in sw
Hi, 3.2.99.1 was fine here, but now that I updated to latest git (I already tried a clean build), I get the followings when I 'build' in sw: Entering /home/vmiklos/git/libreoffice/build/libreoffice-3.2.99.1/sw/util Making:libswli.so ../unxlngi6.pro/slo/cellfml.o: In function `lcl_ConvertWWFormula(String const&)': /home/vmiklos/git/libreoffice/build/libreoffice-3.2.99.1/sw/source/core/fields/cellfml.cxx:711: undefined reference to `ixion::formula_lexer::swap_tokens(boost::ptr_vector >&)' /home/vmiklos/git/libreoffice/build/libreoffice-3.2.99.1/sw/source/core/fields/cellfml.cxx:716: undefined reference to `ixion::formula_parser::formula_parser(boost::ptr_vector > const&, boost::ptr_map<_STL::basic_string, _STL::allocator >, ixion::base_cell, _STL::less<_STL::basic_string, _STL::allocator > >, boost::heap_clone_allocator, _STL::allocator<_STL::pair<_STL::basic_string, _STL::allocator > const, void*> > >*, bool)' collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxlngi6.pro/lib/libswli.so' Looks like some '-lixion' is missing from ldflags or so. Do you have an idea what's going on? :) Thanks! pgpXehslAidWt.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] small utility script to handle ../bin/g and similar commands
On Fri, Oct 08, 2010 at 08:58:26PM -0500, Norbert Thiebaud
wrote:
> # go up the chain until you find a .git
> while [ ${current_dir} != "/" -a -d "${current_dir}" -a ! -d
> "${current_dir}/.git" ] ;
> do
> current_dir=$(dirname "${current_dir}")
> done
do you know 'git rev-parse --show-cdup'? :)
pgpGKnDfBRIbq.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] small utility script to handle ../bin/g and similar commands
I found myself weary of typing ./ or ../ or ../../ etc to get to ./bin/g
an immediate solution is to make an alias with the full path
alias g='/home/me/git/oo/build/bin/g'
but that imply that you have only one git clone... and I have 2 (one
to work in, the other one to build pristine git pull while I mess with
the first view
so:
I created find-lo-bin, which I put in a directory in my PATH
#!/bin/bash
current_dir=`pwd`
# go up the chain until you find a .git
while [ ${current_dir} != "/" -a -d "${current_dir}" -a ! -d
"${current_dir}/.git" ] ;
do
current_dir=$(dirname "${current_dir}")
done
# if you are in a git repo under clone, go 2 more steps up
if [ $(basename $(dirname ${current_dir})) = "clone" ] ; then
current_dir=$(dirname $(dirname "${current_dir}"))
fi
echo "${current_dir}/bin"
unset current_dir
---
and then
I added in my .bashrc
alias g='$(find-lo-bin)/g'
The other thing that I find myself repeatedly doing is to run the same
git command on
the root repo and on all the others via ./bin/g
'ga' is a little script take care of that:
#!/bin/bash
cd $(find-lo-bin)/..
if [ "$1" = "-f" ] ; then
shift
git "$@"
./bin/g -f "$@"
else
git "$@" && ./bin/g "$@"
fi
cd -
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove redundant #ifndef & #ifdef directives
A patch to remove some unused directives. Graeme From d82df8d1770a623b0d1943583e1cc070918ac54f Mon Sep 17 00:00:00 2001 From: J. Graeme Lingard Date: Fri, 8 Oct 2010 23:49:34 +0100 Subject: [PATCH] Remove redundant #ifndef & #ifdef directives This change removes multiple unused #ifndef & #ifdef directives, plus some unnecessary comments. --- .../source/processfactory/componentfactory.cxx |4 svl/source/items/aeitem.cxx|2 -- svl/source/items/itemiter.cxx |3 --- svl/source/items/itempool.cxx |2 -- svl/source/items/itemset.cxx |3 --- svl/source/items/macitem.cxx |3 --- svl/source/items/poolcach.cxx |3 --- svl/source/items/poolio.cxx|3 --- svl/source/items/sitem.cxx |4 svl/source/items/whiter.cxx|3 --- svl/source/misc/PasswordHelper.cxx |3 --- svl/source/notify/brdcst.cxx |2 -- svl/source/notify/broadcast.cxx|2 -- svl/source/notify/hint.cxx |2 -- svl/source/notify/isethint.cxx |3 --- svl/source/notify/listener.cxx |2 -- svl/source/notify/listenerbase.cxx |2 -- svl/source/notify/listeneriter.cxx |2 -- svl/source/notify/lstner.cxx |2 -- svl/source/notify/smplhint.cxx |2 -- svl/source/numbers/numfmuno.cxx|2 -- svl/source/numbers/numhead.cxx |2 -- svl/source/numbers/numuno.cxx |2 -- svl/source/numbers/zforlist.cxx|2 -- svl/source/numbers/zforscan.cxx|2 -- svtools/source/brwbox/brwbox2.cxx |2 -- svtools/source/brwbox/brwhead.cxx |3 --- svtools/source/brwbox/datwin.cxx |3 --- svtools/source/config/menuoptions.cxx |6 -- svtools/source/contnr/ivctrl.cxx |3 --- svtools/source/contnr/svicnvw.cxx |3 --- svtools/source/contnr/svtreebx.cxx |2 -- svtools/source/contnr/treelist.cxx |8 svtools/source/control/filectrl.cxx|3 --- svtools/source/dialogs/colrdlg.cxx |2 -- svtools/source/dialogs/prnsetup.cxx|3 --- svtools/source/dialogs/property.cxx|4 svtools/source/misc/ehdl.cxx |3 --- svtools/source/urlobj/inetimg.cxx |3 --- unotools/source/config/accelcfg.cxx|3 +-- unotools/source/config/cacheoptions.cxx|6 -- unotools/source/config/dynamicmenuoptions.cxx |6 -- unotools/source/config/fontoptions.cxx |6 -- unotools/source/config/historyoptions.cxx |6 -- unotools/source/config/internaloptions.cxx |6 -- unotools/source/config/javaoptions.cxx |2 -- unotools/source/config/localisationoptions.cxx |6 -- unotools/source/config/moduleoptions.cxx |6 -- unotools/source/config/pathoptions.cxx |2 -- unotools/source/config/printwarningoptions.cxx |6 -- unotools/source/config/saveopt.cxx |3 --- unotools/source/config/securityoptions.cxx |6 -- unotools/source/config/startoptions.cxx|6 -- unotools/source/config/workingsetoptions.cxx |6 -- unotools/source/misc/syslocale.cxx |2 -- 55 files changed, 1 insertions(+), 187 deletions(-) diff --git a/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx index f0f5606..db32df8 100644 --- a/comphelper/source/processfactory/componentfactory.cxx +++ b/comphelper/source/processfactory/componentfactory.cxx @@ -35,10 +35,6 @@ #include -#ifndef GCC -#endif - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 2095cf6..5288843 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -27,8 +27,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef GCC -#endif #include diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx index ae50822..c736f69 100644 --- a/svl/source/items/itemiter.cxx +++ b/svl/source/items/itemiter.cxx @@ -28,9 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef GCC -#endif - #include
Re: [Libreoffice] Building error : Hunk #1 FAILED at 58
Le 08/10/2010 23:10, Christian Lohmaier a écrit : Hi Julien, *, On Fri, Oct 8, 2010 at 10:54 PM, julien wrote: [...] whereas i don't have a mac. is there a doc with the different options for with-distro ? (i've got a Debian in testing 32 bits) No, it was a stupid mistake on my part, pull again I don't know if you made a mistake but now i put all the commands in a 1 line to be sure : git pull -r && bin/g pull -r && ./autogen.sh --with-git --disable-kde --disable-kde4 && ./download && make And no more mac error : configure: error: To build LibreOffice on the Mac, you need to have the 10.4u-SDK installed (rerun XCode installer) Thanks to both of you ! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building error : Hunk #1 FAILED at 58
Hi Julien, *, On Fri, Oct 8, 2010 at 10:54 PM, julien wrote: > [...] > whereas i don't have a mac. > is there a doc with the different options for with-distro ? (i've got a > Debian in testing 32 bits) No, it was a stupid mistake on my part, pull again ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building error : Hunk #1 FAILED at 58
Le 08/10/2010 11:20, Michael Meeks a écrit : Hi Julien, On Thu, 2010-10-07 at 21:41 +0200, julien wrote: I've just done these steps : git pull -r ./autogen.sh --with-git --disable-kde --disable-kde4 ./download You prolly want a: $ bin/g pull -r here - which will update the repositories in clone/ It was just before my eyes and i found this command "bin/g" quite weird so i had never done it. make Fascinating. If you don't configure --with-distro= it should default to LibreOfficeLinuxDevel - which should apply zero patches. In fact, i read the page http://www.documentfoundation.org/develop/ and never thought about adding with-distro and now i've got this : checking for MINIMUM_REQS... yes not met configure: error: To build LibreOffice on the Mac, you need to have the 10.4u-SDK installed (rerun XCode installer) make: *** [config.status] Erreur 1 whereas i don't have a mac. is there a doc with the different options for with-distro ? (i've got a Debian in testing 32 bits) ... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Translation of comments from German to English (no. 9)
On Fri, 2010-10-08 at 20:42 +0200, Andreas Mantke wrote: > Hi, > > I used my spare time to translate some more comments from German to English. Pushed. Thanks much! Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Translation of comments from German to English (no. 9)
Hi,
I used my spare time to translate some more comments from German to English.
Regards,
Andreas
--
## Content Developer OpenOffice.org: lang/DE
## Freie Office-Suite für Linux, Mac, Windows, Solaris
## http://de.openoffice.org
## OpenOffice.org Portable: http://oooportable.org
## OOoPDFConverter: http://ooopdfconverter.sourceforge.net
## Meine Seite: http://www.amantke.de
From 60a45e4fe92e1bd010c8bdf79debdb4a7b1302d9 Mon Sep 17 00:00:00 2001
From: Andreas Mantke
Date: Fri, 8 Oct 2010 20:38:48 +0200
Subject: [PATCH] translation of comments to English
---
basic/source/sbx/sbxcoll.cxx | 10 +++---
basic/source/sbx/sbxconv.hxx |2 +-
basic/source/sbx/sbxcurr.cxx |8 ++--
basic/source/sbx/sbxdate.cxx | 16 +-
basic/source/sbx/sbxdbl.cxx |4 +-
basic/source/sbx/sbxdec.cxx |6 ++--
basic/source/sbx/sbxexec.cxx | 70 +-
7 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index a8f1fc9..4ae25f5 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -60,7 +60,7 @@ SbxCollection::SbxCollection( const XubString& rClass )
nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemove ) );
}
Initialize();
-// Fuer Zugriffe auf sich selbst
+// For Access on itself
StartListening( GetBroadcaster(), TRUE );
}
@@ -159,7 +159,7 @@ void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
}
-// Default: Argument ist Objekt
+// Default: argument is object
void SbxCollection::CollAdd( SbxArray* pPar_ )
{
@@ -175,7 +175,7 @@ void SbxCollection::CollAdd( SbxArray* pPar_ )
}
}
-// Default: Index ab 1 oder der Objektname
+// Default: index from 1 or object name
void SbxCollection::CollItem( SbxArray* pPar_ )
{
@@ -199,7 +199,7 @@ void SbxCollection::CollItem( SbxArray* pPar_ )
}
}
-// Default: Index ab 1
+// Default: index from 1
void SbxCollection::CollRemove( SbxArray* pPar_ )
{
@@ -250,7 +250,7 @@ SbxStdCollection& SbxStdCollection::operator=( const SbxStdCollection& r )
SbxStdCollection::~SbxStdCollection()
{}
-// Default: Fehler, wenn falsches Objekt
+// Default: Error, if wrong object
void SbxStdCollection::Insert( SbxVariable* p )
{
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 83e1a8d..06b8166 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -38,7 +38,7 @@ extern SbxError ImpScan
( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, USHORT* pLen,
BOOL bAllowIntntl=FALSE, BOOL bOnlyIntntl=FALSE );
-// mit erweiterter Auswertung (International, "TRUE"/"FALSE")
+// with advanced evaluation (International, "TRUE"/"FALSE")
extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
// SBXINT.CXX
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 9ca7f8e..b8a83ba 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -151,7 +151,7 @@ start:
case SbxBYREF | SbxCURRENCY:
nRes = *p->pLong64; break;
-// ab hier muss getestet werden
+// from here on had to be tested
case SbxBYREF | SbxLONG:
aTmp.nLong = *p->pLong; goto ref;
case SbxBYREF | SbxULONG:
@@ -182,7 +182,7 @@ void ImpPutCurrency( SbxValues* p, const SbxINT64 &r )
start:
switch( +p->eType )
{
-// Hier sind Tests notwendig
+// Here are tests necessary
case SbxCHAR:
aTmp.pChar = &p->nChar; goto direct;
case SbxBYTE:
@@ -201,7 +201,7 @@ start:
aTmp.eType = SbxDataType( p->eType | SbxBYREF );
p = &aTmp; goto start;
-// ab hier nicht mehr
+// from here no longer
case SbxSINGLE:
p->nSingle = (float)dVal; break;
case SbxDATE:
@@ -317,7 +317,7 @@ start:
}
}
-// Hilfs-Funktionen zur Wandlung
+// help functions for the conversion
static ::rtl::OUString ImpCurrencyToString( const SbxINT64 &r )
{
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 31d4a27..d060d7d 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -102,13 +102,13 @@ double ImpGetDate( const SbxValues* p )
xub_StrLen nCheckPos = 0;
short nType = 127;
-// Standard-Vorlagen des Formatters haben nur zweistellige
-// Jahreszahl. Deshalb eigenes Format registrieren
+// Default templates of the formatter have only two-digit
+// date. Therefore register an own format.
-// HACK, da der Numberformatter in PutandConvertEntry die Platzhalter
-// fuer Monat, Tag, Jahr nicht entsprechend der Systemeinstellung
-// austauscht. Problem: Print Ye
Re: [Libreoffice] Compile fails on Ubuntu Lucid
Hello Jim, Thank you for trying to get started on LibreOffice build and development! On Fri, 2010-10-08 at 14:02 +, jim bobs wrote: > ERROR: Product OpenOffice not defined in openoffice.lst > in function: getproductblock > > when running bin/ooinstall > -l /home/user/Desktop/libreoffice/git/build/scratch/ You should run git pull -r and bin/g pull -r: these have been fixed recently. Regards, -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Minutes of LibreOffice technical group call
Present:Thorsten, Caolan, Rene, Michael Invited:Petr, Fridrich, David, Kendy * previous actions + all completed * adding emacs/vi formatting comments to files + agreed; at top of header AA: + add to easy-hacks list & do in a week if not done (Thorsten) * enable --maintainer-mode AA: + yes, but only for autogen.sh (Michael) * MySQL client license awfulness (FOSS exception) + problems mostly with poorly licensed extension => not bundle it ? * gtk3 work + gtk+ undergoing massive changes still, new themeing system etc. AA: + drop it in a feature branch to keep an eye on (Caolan) AA: + add how-to for feature branch creation/merge to wiki (Kendy) AA: + poke gtk+ team on main-loop / mutex integration (Michael) + decided to continue merging patches until 30th October * master open for commits feedback + Rene - happy enough, despite teething troubles with patches + Fridrich - impressed with improvements in buildability + continue as-is until end October * next beta builds + Petr tagging / up-loading source + build over weekend / due early next week + Fridrich - working on Mac / PPC machine setup + Thorsten - will get to Mac / Intel builds * should we intensively test -Beta- binaries before releasing + preferably testtool usage is continuous process on master + decision to release early, and if problems, release again, etc. * tinderboxen + couple of prototypes in-place + Kendy's already mailing people on breakage AA: + mails should CC every committer in interval + mails should report the interval helpfully. + more tinderboxes appreciated * pending patches + some nice-to-have pending chunks: + Linux quick starter (Kendy) + LWP filter (Michael) + better Evolution addressbook (Caolan) + VBA fixes (from Noel) + valgrind-alloc - tweaked (Michael) + Netbook / small-screen fixes ? (Rodo) + only seven RedHat patches left. * coding style + no huge cleanups planned + incrementally build good guidelines for new code + punt further thought until next year -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
Hi *, On Fri, Oct 8, 2010 at 7:35 AM, Eric Hoch wrote: > [external (non-XCode-provided) dependencies when building on Mac] > > In this case yes :-) I didn't know that there are so many libs and > binaries needed at the moment. [...] > > Is this because of a new build process that LibO uses compared to > the one OOo uses? Yes - but not because the stuff is really required, but just because nobody did care about it. Or to put it otherwise: The wrapper-tools around builidng that originated from go-oo introduce those requirement, not the code of the actual Office. > Plus, I wonder were all the cleanup work done by Christian Lohmaier > is gone. He did a great job in making OOo build on an > out-of-the-box with XCode installed. They are still there, just those cleanups need now be applied to the framework (that I personally dislike the way it is designed, I hope that the duplication will be removed, at least after the first release) > Btw: Are there any up to date build instructions for Mac OS X? I > only found Linux instructions or can I use them on the mac as > well? It doesn't build out-of-the box without either installing the deps or patching it locally, still some work to do to get it nicely as OOo. > [] > Btw does your build run on 32bit machines as well? I remember that > the project working on the "native VLC" for Mac OS X adopted 64bit > but during this process lost the ability to run their builds on > 32bit machines. The office is, like OOo built against the 10.4u SDK and works on 32bit as well (in fact, it is only a 32bit version, no matter that it has been compiled on a 64bit system) (The MacIntel buildbot is a 10.6.x Server (and thus even "more" 64bit than the regular desktop OS) for example) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Compile fails on Ubuntu Lucid
ERROR: Product OpenOffice not defined in openoffice.lst in function: getproductblock when running bin/ooinstall -l /home/user/Desktop/libreoffice/git/build/scratch/ full text of log file below Any1 have any ideas please, thanks = Already existing directory, did not create: /tmp/ooopackaging Created directory: /tmp/ooopackaging/i_77061286433965 Created directory: /tmp/ooopackaging/i_77061286433965/unxlngi6.pro create_directories: Using /home/user/Desktop/libreoffice/git/build/build/libreoffice-3.2.99.1/instsetoo_native/util/ for logging ! Created directory: /home/user/Desktop/libreoffice/git/build/build/libreoffice-3.2.99.1/instsetoo_native/util/OpenOffice/ Already existing directory, did not create: /home/user/Desktop/libreoffice/git/build/build/libreoffice-3.2.99.1/instsetoo_native/util/OpenOffice// Created directory: /home/user/Desktop/libreoffice/git/build/build/libreoffice-3.2.99.1/instsetoo_native/util/OpenOffice//logging/ Removing directory /tmp/ooopackaging/i_77061286433965 Thu Oct 7 09:46:05 2010 (00:00 min.) Command line arguments: -f openoffice.lst -l en-US -p OpenOffice -buildid 1 -simple /home/user/Desktop/libreoffice/git/build/scratch/ Separator: / make_installer.pl, version 1.0 Product list file: openoffice.lst Taking setup script from solver Unpackpath: /home/user/Desktop/libreoffice/git/build/build/libreoffice-3.2.99.1/instsetoo_native/util Compiler: unxlngi6 Product: OpenOffice BuildID: 1 Build: OOO330 No minor set Product version Installpath: /home/user/Desktop/libreoffice/git/build/scratch/ Package format: native Not calling epm No file stripping Unzip ARCHIVE files services.rdb can be created Languages: en-US Environment variable UPDATER set Environment variable CWS_WORK_STAMP not set Environment variable SHIPDRIVE not set: No updatepack No updatepack Thu Oct 7 09:46:05 2010 (00:00 min.) zip list file: openoffice.lst *** ERROR: Product OpenOffice not defined in openoffice.lst in function: getproductblock *** ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] FASTBOOL is dead ...
Hi Norbert,
On Wed, 2010-10-06 at 03:03 -0500, Norbert Thiebaud wrote:
> The patches are attached to Bug 30642
> https://bugs.freedesktop.org/show_bug.cgi?id=30642
Soo - I did some more spot review of the patches, and I liked what I
saw :-) things like this:
-sal_uInt16 nColor = 0, nColCount = 16;
+sal_uInt16 nColor = 0;
static ColorData aColAry[] = {
..
-while ( !bFound && nColor < nColCount )
+while ( nColor < sizeof(aColAry)/sizeof(ColorData) &&
+aColAry[nColor] != nColData )
Are great cleanups in passing :-) - though they remind me of the need
for a SAL_N_ELEMENTS macro [ which I just added ], and a new
super-EasyHack to add to the wiki.
The problem we saw in calc was down to this wonderfully unclear use of
FASTBOOL as a loop counter; this patch fixed it:
// erst Atomaren-Items und dann die Sets schreiben (wichtig beim Laden)
-for ( pImp->bInSetItem = FALSE; pImp->bInSetItem <= TRUE &&
!rStream.GetError(); ++pImp->bInSetItem )
+for (int ft = 0 ; ft < 2 && !rStream.GetError(); ft++)
{
+pImp->bInSetItem = ft != 0;
> All FASTBOOL are converted into bool, except a couple of API that are
> left as int
I saw you also fixed a few APIs that returned int instead of bool to
use bool instead: nice work.
Phew - well, the binfilter still builds nicely for me - so I've pushed
it. Down to (mostly) three boolean types :-)
Great work here,
ATB,
Michael.
--
michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Release and feature branches in the repos
On Fri, 2010-10-08 at 14:18 +0100, Caolán McNamara wrote: > On Fri, 2010-10-08 at 14:43 +0200, Jan Holesovsky wrote: > > > Nevertheless, there was agreement on the IRC that we will allow feature > > branches even in the main repos; but in that case, they have to be > > prefixed with 'feature/' prefix. Also, the creator of the branch is > > supposed to remove it when it is merged into master (or into a release > > branch). Release branches have no prefix. > > git foo hurts my head, I at least could do with a step by step example > of a recommended way to set up and pushing to a feature branch +1 here. I *love* git to death, but I too could use step-by-step instructions of how to set up a feature branch, perhaps followed by the longer explanation (like the one you gave). Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Release and feature branches in the repos
On Fri, 2010-10-08 at 14:43 +0200, Jan Holesovsky wrote: > Nevertheless, there was agreement on the IRC that we will allow feature > branches even in the main repos; but in that case, they have to be > prefixed with 'feature/' prefix. Also, the creator of the branch is > supposed to remove it when it is merged into master (or into a release > branch). Release branches have no prefix. git foo hurts my head, I at least could do with a step by step example of a recommended way to set up and pushing to a feature branch C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
On Oct 8, 2010, at 2:42 AM, Michael Meeks wrote: > Hi Eric, > > On Fri, 2010-10-08 at 07:35 +0200, Eric Hoch wrote: >> Looking at this list now it reminds me of the building the X11 OOo >> on the mac :-) > > Wow - we don't want to be that bad - obviously. > >> Is this because of a new build process that LibO uses compared to >> the one OOo uses? > > Perhaps; not sure - the dependency list does seem over-long (to me), > perhaps cloph can advise us on where to go here. > >> Plus, I wonder were all the cleanup work done by Christian Lohmaier >> is gone. He did a great job in making OOo build on an >> out-of-the-box with XCode installed. > > Quite - we need to get back to that place. > >> Btw: Are there any up to date build instructions for Mac OS X? I >> only found Linux instructions or can I use them on the mac as >> well? > > And indeed, a wiki page outlining this would be a great thing to work > on - once all the deps are hammered down, we can focus on shrinking > them; I guess Thorsten is a good contact there. I have a free disk partition so I'll try installing Mac OS 10.6 & xCode and see what happens this week-end. I can then generate a better dependance list. I've played with building other big programs (GCC, wget, & LLVM) on my current partition so I'm not really base. I should also generate a document showing how to set everything up. (my current work on the wiki suggests MacPorts; which I think is a little broken). Most of my MacPorts issues are caused by my box being 64bit and it's issues with installing anything except 64bit versions. LO is hard-coded somewhere to only build in 32bit mode; which means that I need ether a 32bit version of the libraries or a fat version (I don't want 32bit only; because, I may want to do other work and thus, I may need the 64bit version). > HTH, > > Michael. > > -- > michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot > > Joe P. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Release and feature branches in the repos
Hi, This is a proposal how to handle the feature and release branches in the LibreOffice git repos. Terms - "Release branch" - branch that is used for a release of a version, like when we start stabilizing 3.3, we'll create libreoffice-3-3 branch, and only fixes targeting 3.3 are supposed to go there. "Feature branch" - branch used for development of a larger feature, rework, or a bugfix, that needs a stable repo for a while, and not tons of commits floating in every few minutes. Layout -- Release branches are trivial - they must be in the main repo. The feature branches (in principle) do not have to be - they can be handled in 'personal repositories' on freedesktop, see http://www.freedesktop.org/wiki/Infrastructure/git/RepositoryAdmin Nevertheless, there was agreement on the IRC that we will allow feature branches even in the main repos; but in that case, they have to be prefixed with 'feature/' prefix. Also, the creator of the branch is supposed to remove it when it is merged into master (or into a release branch). Release branches have no prefix. So, the list of the branches could look like the following: feature/comments-rework ... feature/something-removal feature/supermegafeature libreoffice-3-3 libreoffice-4 master Merging a feature branch When you want to merge a feature branch into the master, you have 2 possibilities - either rebase it over the current master, or merge it. The former gets us a nicer history (less merges), but more work on your side. On the other hand, the latter is safer (and easier) when the feature branch was open for quite some time, and lots of work has been done there. So, after having done a 'g checkout master', you want to do: bin/g rebase master feature/yourbranch or bin/g merge feature/yourbranch Note: When you decide for merge, and your push fails, you _have_to_ use bin/g pull --no-rebase to get the latest changes, because with 'g pull -r' you'd fallback to the former possibility - rebase. Even though we encourage 'git pull -r' policy for single commits, merge of the feature branches is the recommended way; we have to do full merges in case of the integrating the OOo milestones anyway. Removal of the feature branch - When integrated, you remove the feature branch by bin/g -f push :feature/yourbranch [The -f is not necessary if the branch is present in all the repos.] I hope this works for everyone :-) - please comment if not. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Libs-gui - Remove redundant #include directives & comments
On 8 October 2010 01:59, Kohei Yoshida wrote: > Ok. These 5 patches you've sent all look identical. So I just assume > these have been sent in error. Not sure what's happened here. This week I have sent 6 patches with the same commit message, doing the same thing but for different repositories, however they were all unique, sent once and all have been applied. If I should be doing things differently just let me know as I'm new to this, Graeme ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build Error: Mac OS X
On Fri, 2010-10-08 at 10:48 +0100, Michael Meeks wrote: > just - rm -Rf sdext/mac*.pro [ assuming mac*.pro matches the output > directory - for that target ]. rm -rf sdext/unxmac*.pro FWIW, that "OUTPATH" is set by set_soenv[.in] C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build Error: Mac OS X
Hi Joseph, On Thu, 2010-10-07 at 20:56 -0700, Joseph Powers wrote: > Ok, it looks like someone changed the way text strings are handled... Right - this file is no longer compiled it seems, it is not there in master (bin/g pull -r) - I suspect the problem is related to a stale build directory; so just - rm -Rf sdext/mac*.pro [ assuming mac*.pro matches the output directory - for that target ]. > PS: I did a quick grep of all *.hxx and *.cxx files and these is the > only reference in all the source to these tags. Yes - sorry, you got bitten by some busted dependency issue I suspect. Thanks, Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Using gnu-cp on Mac OS X for building LibreOffice
Hi Eric, On 2010-10-08 at 11:02 +0200, Eric Hoch wrote: > Once I'm familiar with git, currently it looks like git is winning, > and have current LibO sources I think I will try to build OOo, > acting like I just have to download the sources and do a configure, > make, make install. I hope that this will be the case in the next > few days, the earlier the better. Great - thanks! The best would be to appear on the #libreoffice IRC channel on irc.freenode.net (if you are not there yet), so that we can help you with the potential trouble much faster :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
Hi Eric, On Fri, 2010-10-08 at 07:35 +0200, Eric Hoch wrote: > Looking at this list now it reminds me of the building the X11 OOo > on the mac :-) Wow - we don't want to be that bad - obviously. > Is this because of a new build process that LibO uses compared to > the one OOo uses? Perhaps; not sure - the dependency list does seem over-long (to me), perhaps cloph can advise us on where to go here. > Plus, I wonder were all the cleanup work done by Christian Lohmaier > is gone. He did a great job in making OOo build on an > out-of-the-box with XCode installed. Quite - we need to get back to that place. > Btw: Are there any up to date build instructions for Mac OS X? I > only found Linux instructions or can I use them on the mac as > well? And indeed, a wiki page outlining this would be a great thing to work on - once all the deps are hammered down, we can focus on shrinking them; I guess Thorsten is a good contact there. HTH, Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building error : Hunk #1 FAILED at 58
Hi Julien, On Thu, 2010-10-07 at 21:41 +0200, julien wrote: > I've just done these steps : > git pull -r > ./autogen.sh --with-git --disable-kde --disable-kde4 > ./download You prolly want a: $ bin/g pull -r here - which will update the repositories in clone/ > make Fascinating. If you don't configure --with-distro= it should default to LibreOfficeLinuxDevel - which should apply zero patches. > And here are the error logs : If you could whack the whole error log in a bug somewhere, we can pour over it in more detail. It really looks like there is a malingering --with-distro=DebianSomething in there, which you don't really want as of now. Anyhow - great to have you building, sorry there was an issue - if you drop into IRC, we can prolly help debug it quickly. Also - out of interest, what do you want to hack on ? :-) ATB, Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Using gnu-cp on Mac OS X for building LibreOffice
Hi, Am Fri, 08 Oct 2010 10:35:27 +0200 schrieb Jan Holesovsky: > Hi Thomas, > > On 2010-10-08 at 01:04 +0200, Thomas Klausner wrote: > >>> From what I read, the BSD cp has very annoying behavior wrt. recursive >>> copying of directories, so I understand why GNU cp is preferred ;-) >> >> Where did you read that, or can you explain directly what the problem >> is? > > Eg. here (even though this is not the location where I saw it for the > first time): > > http://www.unix.com/shell-programming-scripting/97509-cp-r-behaviour.html > > Basically, if you cp -R, the behavior differs between BSD and GNU when > you add a '/' at the end of the source dir - I suppose there might be > cases where the authors of the scripts/makefiles do not care if they > have a slash at the end of the source dir, or not, because for the GNU > cp, it does not matter. Understood. > I'll welcome a patch that cleans it up if this really is the issue :-) - The only issue I see are the ones with macports. I once had a patch that used cp instead of gnu-cp but it looks like I deleted it once Christian did the clean-up in the main OOo sources. Arrgs. And currently I honestly don't know were to look at this in the code. > we definitely want to make the build easier, not harder. Once I'm familiar with git, currently it looks like git is winning, and have current LibO sources I think I will try to build OOo, acting like I just have to download the sources and do a configure, make, make install. I hope that this will be the case in the next few days, the earlier the better. Eric -- ## de.OpenOffice.org - Office für MacOS X, Linux, Solaris & Windows ## Openoffice.org - ich steck mit drin! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
Hi Tor, Am Fri, 08 Oct 2010 02:20:42 -0600 schrieb Tor Lillqvist: >>> On my 10.6.4 machine, I had to install the following to get >>> things to build: > [ a long list of packages ] > > That is presumably using a git checkout, intending to start with > running ./autogen.sh then? > >> I just remember that the last time I >> build a pre OOo 3.2.0 I was able to checkout the sources and build >> it without ccache being the only additional software I installed. > > While that was possibly from a tarball, or at least using a > pre-generated configure script, so no autoconf at least was > needed? > > So you are comparing somewhat dissimilar situations here. Could be that I compare somewhat dissimilar situations here. I'm just a simple end-user that ought to build OOo on the Mac and took care that the OS X build instructions weren't totally out of date, which over the past year or so, sort of happened but it was due to a lack of time on my site and now I'm trying to catch up again. In no ways I'm a coder. For OOo I installed the then most recent XCode, which includes a compiler, developer tools for GUI and various other related stuff, installed Mecury (or was it svn) and cache, both not coming with Mac OS X nor XCode, did a hg checkout of the most current milestone OOO320_m16, ran a ./configure and no complaints about missing a library or binary occurred. So yes no autoconf was needed. If I'm not wrong OS X comes with autoconf, which imo should be used unless it's like in the case of gnu-cp vs cp were (mac/bsd-)cp uses the -R in a different manner to the -r in gnu-cp. Eric -- ## de.OpenOffice.org - Office für MacOS X, Linux, Solaris & Windows ## Openoffice.org - ich steck mit drin! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Using gnu-cp on Mac OS X for building LibreOffice
Hi Thomas, On 2010-10-08 at 01:04 +0200, Thomas Klausner wrote: > > From what I read, the BSD cp has very annoying behavior wrt. recursive > > copying of directories, so I understand why GNU cp is preferred ;-) > > Where did you read that, or can you explain directly what the problem > is? Eg. here (even though this is not the location where I saw it for the first time): http://www.unix.com/shell-programming-scripting/97509-cp-r-behaviour.html Basically, if you cp -R, the behavior differs between BSD and GNU when you add a '/' at the end of the source dir - I suppose there might be cases where the authors of the scripts/makefiles do not care if they have a slash at the end of the source dir, or not, because for the GNU cp, it does not matter. I'll welcome a patch that cleans it up if this really is the issue :-) - we definitely want to make the build easier, not harder. Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mac OS X Build
>> On my 10.6.4 machine, I had to install the following to get things to build: [ a long list of packages ] That is presumably using a git checkout, intending to start with running ./autogen.sh then? > I just remember that the last time I > build a pre OOo 3.2.0 I was able to checkout the sources and build > it without ccache being the only additional software I installed. While that was possibly from a tarball, or at least using a pre-generated configure script, so no autoconf at least was needed? So you are comparing somewhat dissimilar situations here. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Makefile.am wildcard typo
Hi Goran, On 2010-10-07 at 23:56 +0200, Goran Rakic wrote: > -lo-build-*.po: lo-build.pot /usr/bin/pot2po > +lo-build-%.po: lo-build.pot /usr/bin/pot2po Oh, thank you! Pushed :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
