[Libreoffice-commits] Changes to 'feature/submodules'
New branch 'feature/submodules' available with the following commits: commit cdaceb73aef45f6867fa013180663f5f63fb1b7c Author: Norbert Thiebaud Date: Tue May 8 20:20:03 2012 -0500 move everything one level up Change-Id: I8c20213b0a96e44363b189af6ff0201207907689 commit f584ee3c6c33b2ae92cf7646b6f7a66528dcf88c Author: Norbert Thiebaud Date: Fri Mar 9 12:59:15 2012 -0600 adjust .gitignore, make the repo own its own attributes ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/submodules'
New branch 'feature/submodules' available with the following commits: commit 309a37d741f01948ec53be7ea21524d8268bad3b Author: Norbert Thiebaud Date: Tue May 8 20:16:00 2012 -0500 move everything up one level Change-Id: I7059dfaf587a9768d83928ea924937d3c0cecfc8 commit 1f395f8f24499c356aa59f5df53d7d4d0ca75270 Author: Norbert Thiebaud Date: Fri Mar 9 13:03:25 2012 -0600 adjust .gitignore own its own attributes irgnoring path related files like .orgi .rej and similar files should not be done globally for eveyone If someone what to hide these instead of cleaning-up their house they should put it in .git/info/exclude or at other user-level customization places. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppu/inc
cppu/inc/com/sun/star/uno/Reference.h | 44 +- 1 file changed, 22 insertions(+), 22 deletions(-) New commits: commit aa28e0e3d47d94e7eb58c125602c6fdecddab0aa Author: Norbert Thiebaud Date: Tue Apr 17 22:10:10 2012 -0500 remove doxygen warnings diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index 50c7b77..326a4fa 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -268,7 +268,7 @@ public: @param pInterface another reference @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()); +inline Reference( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(()); /** Constructor: Sets given interface pointer without acquiring it. Deprecated, please use SAL_NO_ACQUIRE version. @@ -276,26 +276,26 @@ public: @param pInterface another reference @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors */ -inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()); +inline Reference( interface_type * pInterface, UnoReference_NoAcquire dummy ) SAL_THROW(()); /** Constructor: Queries given interface for reference interface type (interface_type). @param rRef another reference @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( const BaseReference & rRef, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). @param pInterface an interface pointer @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( XInterface * pInterface, UnoReference_Query dummy) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). @param rAny an any @param dummy UNO_QUERY to force obvious distinction to other constructors */ -inline Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ); +inline Reference( const Any & rAny, UnoReference_Query dummy) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -304,7 +304,7 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const BaseReference & rRef, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -312,7 +312,7 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( XInterface * pInterface, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -320,25 +320,25 @@ public: @param dummy UNO_QUERY_THROW to force obvious distinction to other constructors */ -inline Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const Any & rAny, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: assigns from the given interface of the same type. Throws a RuntimeException -if the source interface is . +if the source interface is NULL. @param rRef another interface reference of the same type @param dummy UNO_SET_THROW to distinguish from default copy constructor @since UDK 3.2.8 */ -inline Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ); +inline Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow dummy ) SAL_THROW( (RuntimeException) ); /** Constructor: assigns
[Libreoffice-commits] .: Branch 'feature/coretext' - vcl/aqua vcl/inc
vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx | 10 +++---
vcl/inc/aqua/coretext/salcoretextlayout.hxx|4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 1317fed72bef90eda11b2602557b0210a4a37516
Author: Norbert Thiebaud
Date: Sun Apr 15 08:08:23 2012 -0500
fix accidental virtual function overload
diff --git a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
index dce1d09..408f2b2 100644
--- a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
+++ b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
@@ -169,13 +169,14 @@ long CoreTextLayout::FillDXArray( long* pDXArray ) const
return width;
}
-bool CoreTextLayout::GetBoundRect( CGContextRef context, Rectangle& rVCLRect )
const
+bool CoreTextLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect
) const
{
msgs_debug(layout,"-->");
if ( !m_has_bound_rec )
{
-CGRect bound_rect = CTLineGetImageBounds( m_line, context );
+AquaSalGraphics& gr = static_cast(rGraphics);
+CGRect bound_rect = CTLineGetImageBounds( m_line, gr.mrContext );
if ( !CGRectIsNull( bound_rect ) )
{
m_bound_rect = Rectangle(
@@ -300,7 +301,10 @@ long CoreTextLayout::GetTextWidth() const
}
// not needed. CoreText manage fallback directly
-void CoreTextLayout::InitFont() {}
+void CoreTextLayout::InitFont() const
+{
+msgs_debug(layout,"<-->");
+}
bool CoreTextLayout::InitGIA() const
{
diff --git a/vcl/inc/aqua/coretext/salcoretextlayout.hxx
b/vcl/inc/aqua/coretext/salcoretextlayout.hxx
index 51a9532..e427522 100644
--- a/vcl/inc/aqua/coretext/salcoretextlayout.hxx
+++ b/vcl/inc/aqua/coretext/salcoretextlayout.hxx
@@ -20,14 +20,14 @@ public:
virtual void DrawText( SalGraphics& ) const;
virtual void DropGlyph( int nStart );
virtual long FillDXArray( long* pDXArray ) const;
-virtual bool GetBoundRect( CGContextRef, Rectangle& ) const;
+virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const;
virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
virtual bool GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
int&,
sal_Int32* pGlyphAdvances, int* pCharIndexes )
const;
virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor )
const;
virtual long GetTextWidth() const;
-virtual void InitFont();
+virtual void InitFont() const;
virtual bool LayoutText( ImplLayoutArgs& );
virtual void MoveGlyph( int nStart, long nNewXPos );
virtual void Simplify( bool bIsBase );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - codemaker/codemaker.pmk codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/inc codemaker/Makefile codemaker/Module_codemaker.mk codemake
Makefile |4 - Repository.mk| 13 RepositoryModule_ooo.mk |2 codemaker/Executable_cppumaker.mk| 59 + codemaker/Executable_javamaker.mk| 52 +++ codemaker/Makefile |7 ++ codemaker/Module_codemaker.mk| 38 ++ codemaker/Package_inc.mk | 41 +++ codemaker/StaticLibrary_codemaker.mk | 45 codemaker/StaticLibrary_codemaker_cpp.mk | 39 ++ codemaker/StaticLibrary_codemaker_java.mk| 39 ++ codemaker/codemaker.pmk | 49 -- codemaker/inc/makefile.mk| 40 -- codemaker/prj/build.lst | 10 --- codemaker/prj/d.lst | 14 - codemaker/prj/makefile.mk|1 codemaker/source/codemaker/makefile.mk | 49 -- codemaker/source/commoncpp/makefile.mk | 42 --- codemaker/source/commonjava/makefile.mk | 42 --- codemaker/source/cppumaker/makefile.mk | 73 --- codemaker/source/javamaker/makefile.mk | 66 unodevtools/Executable_skeletonmaker.mk | 64 +++ unodevtools/Makefile |7 ++ unodevtools/Module_unodevtools.mk| 33 unodevtools/prj/build.lst|8 -- unodevtools/prj/d.lst|5 - unodevtools/prj/makefile.mk |1 unodevtools/source/skeletonmaker/makefile.mk | 63 --- unodevtools/source/unodevtools/makefile.mk | 52 --- unodevtools/unodevtools.pmk | 55 30 files changed, 447 insertions(+), 566 deletions(-) New commits: commit b60bf1eb625e4d2e94543a90770cea9214352b63 Author: Norbert Thiebaud Date: Sat Apr 14 05:31:32 2012 -0500 rename common* static libs to codemaker_* for clarity + dmake cleanup diff --git a/Repository.mk b/Repository.mk index bc229c9..e46f6b1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -561,8 +561,8 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ basegfx_s \ codemaker \ -commoncpp \ -commonjava \ +codemaker_cpp \ +codemaker_java \ dtobj \ headless \ libeay32 \ diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index f4dbdc6..69293e2 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,cppumaker,\ )) $(eval $(call gb_Executable_use_static_libraries,cppumaker,\ -commoncpp \ +codemaker_cpp \ codemaker \ )) diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index 5633acb..cd5a1aa 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,javamaker,\ )) $(eval $(call gb_Executable_use_static_libraries,javamaker,\ -commonjava \ +codemaker_java \ codemaker \ )) diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk index 2594cc3..d2b6060 100644 --- a/codemaker/Module_codemaker.mk +++ b/codemaker/Module_codemaker.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Module_Module,codemaker)) $(eval $(call gb_Module_add_targets,codemaker,\ Package_inc \ StaticLibrary_codemaker \ -StaticLibrary_commoncpp \ -StaticLibrary_commonjava \ +StaticLibrary_codemaker_cpp \ +StaticLibrary_codemaker_java \ Executable_javamaker \ Executable_cppumaker \ )) diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk new file mode 100644 index 000..3f18114 --- /dev/null +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -0,0 +1,39 @@ +# -*- Mode: makefile; 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 se
[Libreoffice-commits] Changes to 'feature/coretext'
New branch 'feature/coretext' available with the following commits: commit c09adb273cdba4b0d70e2274cd191f16ab09e407 Author: Norbert Thiebaud Date: Mon Apr 2 00:18:09 2012 -0500 export NOCPPUNIT to disable all cppunit test in gbuild. This is convinient when coding/debuging stuff that break unittest downstream, but oen still want to have a fully built product to test commit 9e6564a72aea10f1e910960bb7cb84471039e6e1 Author: Norbert Thiebaud Date: Mon Apr 2 00:15:07 2012 -0500 Initial basic support for CoreText. very partial and highly unstable commit e2a9584968c8329c976bc6518cfcc50cc728970b Author: Norbert Thiebaud Date: Mon Apr 2 00:11:29 2012 -0500 WaE with MAc SDK > 10.4 commit 1f4a9f88d9031b520a034f19c20605a7a647dab7 Author: Norbert Thiebaud Date: Mon Apr 2 00:10:17 2012 -0500 add a configure flag to enable CoreText Support commit 2dd69264eafe50592602a24d8391a0fb15f77db7 Author: Norbert Thiebaud Date: Fri Mar 16 23:58:39 2012 -0500 factorize what we can share for salgdi between CoreText and ATSUI commit 442ab3e0830922bda3f072d3ce6f00edc73c3f9e Author: Norbert Thiebaud Date: Mon Mar 12 01:11:20 2012 -0500 move ATSUI entangled-code into its specific sub-directory This is prep work to make room for a CoreText-based implementation ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit df72f234c296ae7b3d708a435419f93f817f36c6 Author: Norbert Thiebaud Date: Fri Mar 30 01:59:36 2012 -0500 don't force dependecy on shasum when it is not needed shasum is only needed to detect a bug in some version of gnumkae do not burden platform with a non-impacted gnu make with that requirement diff --git a/configure.in b/configure.in index face6c2..e150c89 100644 --- a/configure.in +++ b/configure.in @@ -3614,14 +3614,6 @@ AC_MSG_CHECKING([whether to enable pch feature]) AC_MSG_RESULT([no, obsolete]) dnl === -dnl Search all the common names for sha1sum -dnl === -AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) -if test -z "$SHA1SUM"; then -AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) -fi - -dnl === dnl Search all the common names for GNU make dnl === AC_MSG_CHECKING([for GNU make]) @@ -3653,6 +3645,14 @@ if test "$_make_longver" -ge "038200"; then elif test "$_make_longver" -ge "038100"; then AC_MSG_RESULT([$GNUMAKE $_make_version]) + +dnl === +dnl Search all the common names for sha1sum +dnl === +AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) +if test -z "$SHA1SUM"; then +AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) +fi AC_MSG_CHECKING([for GNU make bug 20033]) TESTGMAKEBUG20033=`mktemp -d tmp.XX` cat > $TESTGMAKEBUG20033/Makefile << EOF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild
config_host.mk.in |2 +- configure.in |2 +- solenv/gbuild/Tempfile.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 5dd7f9e4689b6155f5b646034fc59bf02dcb0941 Author: Norbert Thiebaud Date: Mon Mar 26 14:06:16 2012 -0500 typo in HAVE_GNUMAKE_FILE_FUNC, and var2file must return the filename diff --git a/config_host.mk.in b/config_host.mk.in index c9103f0..ed5f6df 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -188,7 +188,7 @@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@ export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@ export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@ -export HAVE_GNUMAKE_FILE_FUNC@=HAVE_GNUMAKE_FILE_FUNC@ +export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@ export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@ export HAVE_GETOPT=@HAVE_GETOPT@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ diff --git a/configure.in b/configure.in index 8276698..cd8aa6c 100644 --- a/configure.in +++ b/configure.in @@ -3697,7 +3697,7 @@ all: EOF $GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2 if test -f $TESTGMAKEFILEFUNC/test.txt ; then -HAVE_GNUMKAE_FILE_FUNC="YES" +HAVE_GNUMAKE_FILE_FUNC="YES" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk index 87f582b..691abc4 100644 --- a/solenv/gbuild/Tempfile.mk +++ b/solenv/gbuild/Tempfile.mk @@ -2,7 +2,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES) define var2file -$(file >$(1),$(3)) +$(file >$(1),$(3))$(1) endef else # Write string to temporary file by chopping into pieces that ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in solenv/gbuild
config_host.mk.in |1 + configure.in | 22 ++ solenv/gbuild/Tempfile.mk |7 +++ 3 files changed, 30 insertions(+) New commits: commit e00cb3336f3f6ad802173f90fd93a120b8c95b52 Author: Norbert Thiebaud Date: Sun Mar 25 12:45:24 2012 -0500 use $(file in gbuild when available diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk index e7e9279..87f582b 100644 --- a/solenv/gbuild/Tempfile.mk +++ b/solenv/gbuild/Tempfile.mk @@ -1,4 +1,10 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES) +define var2file +$(file >$(1),$(3)) +endef +else # Write string to temporary file by chopping into pieces that # fit the commandline # parameters: filename, maxitems (for one write), string @@ -16,5 +22,6 @@ $(foreach item,$(3),$(eval gb_var2file_curblock += $(item) gb_var2file_curblock := )) endef +endif # vim: set noet sw=4 ts=4: commit fd83e6cb19bf20bee89759ca7d70ed667ccd334e Author: Norbert Thiebaud Date: Sun Mar 25 12:45:04 2012 -0500 detect of gnumake support $(file function $(file is a new function that landed in gnu-make cvs it allow to write a makefile variable directly into a file bypassing the usual command line size limitiation diff --git a/config_host.mk.in b/config_host.mk.in index 945e130..c9103f0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -188,6 +188,7 @@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@ export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@ export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@ +export HAVE_GNUMAKE_FILE_FUNC@=HAVE_GNUMAKE_FILE_FUNC@ export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@ export HAVE_GETOPT=@HAVE_GETOPT@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ diff --git a/configure.in b/configure.in index 065c135..8276698 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,7 @@ else SRC_ROOT=`pwd` x_Cygwin=[\#] fi + AC_SUBST(SRC_ROOT) AC_SUBST(EXEEXT_FOR_BUILD) AC_SUBST(x_Cygwin) @@ -3682,6 +3683,27 @@ EOF else AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed]) fi + +# find if gnumake support file function +AC_MSG_CHECKING([for GNU support for (file function]) +TESTGMAKEFILEFUNC="`mktemp -d -t tst.XX`" +cat > $TESTGMAKEFILEFUNC/Makefile << EOF +\$(file >test.txt,Success ) + +.PHONY: all +all: + @cat test.txt + +EOF +$GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2 +if test -f $TESTGMAKEFILEFUNC/test.txt ; then +HAVE_GNUMKAE_FILE_FUNC="YES" +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +fi +rm -rf $TESTGMAKEFILEFUNC +AC_SUBST(HAVE_GNUMAKE_FILE_FUNC) AC_SUBST(GNUMAKE) _make_ver_check=`$GNUMAKE --version | grep LibreOffice`; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 84 --- 1 file changed, 41 insertions(+), 43 deletions(-) New commits: commit c0a99301f5d854cad8baeaca798549424937598d Author: Norbert Thiebaud Date: Fri Mar 23 02:02:53 2012 -0500 allow for the use of --enable-ccache on Windows diff --git a/configure.in b/configure.in index ef42ca9..3f084e6 100644 --- a/configure.in +++ b/configure.in @@ -2139,7 +2139,7 @@ AC_SUBST(SYSBASE) dnl === dnl Checks if ccache is available dnl === -if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \); then +if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" -a "$build_os" != "cygwin" \); then case "%$CC%$CXX%" in # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some verison number etc), # assume that's good then @@ -2519,31 +2519,6 @@ if test "$GCC" = "yes"; then fi AC_SUBST(COM_GCC_IS_CLANG) -# -# prefix C with ccache if needed -# -if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then -if test "$CCACHE" != ""; then -AC_MSG_CHECKING([whether $CC is already ccached]) - -AC_LANG_PUSH([C]) -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS --ccache-skip -O2" -dnl an empty program will do, we're checking the compiler flags -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) -if test $use_ccache = yes; then -AC_MSG_RESULT([yes]) -else -CC="$CCACHE $CC" -AC_MSG_RESULT([no]) -fi -CFLAGS=$save_CFLAGS -AC_LANG_POP([C]) -fi - -fi - HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes"; then AC_MSG_CHECKING( for -Bsymbolic-functions linker support ) @@ -2798,6 +2773,31 @@ MSPDB_PATH="$formatted_path" AC_SUBST(SHOWINCLUDES_PREFIX) # +# prefix C with ccache if needed +# +if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then +if test "$CCACHE" != ""; then +AC_MSG_CHECKING([whether $CC is already ccached]) + +AC_LANG_PUSH([C]) +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS --ccache-skip -O2" +dnl an empty program will do, we're checking the compiler flags +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) +if test $use_ccache = yes; then +AC_MSG_RESULT([yes]) +else +CC="$CCACHE $CC" +AC_MSG_RESULT([no]) +fi +CFLAGS=$save_CFLAGS +AC_LANG_POP([C]) +fi + +fi + +# # determine CPU, CPUNAME, GUI, GUIBASE, ... # LIB64="lib" @@ -3980,24 +3980,22 @@ fi # # prefx CXX with ccache if needed # -if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then -if test "$CCACHE" != ""; then -AC_MSG_CHECKING([whether $CXX is already ccached]) -AC_LANG_PUSH([C++]) -save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS --ccache-skip -O2" -dnl an empty program will do, we're checking the compiler flags -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) -if test $use_ccache = yes; then -AC_MSG_RESULT([yes]) -else -CXX="$CCACHE $CXX" -AC_MSG_RESULT([no]) -fi -CXXFLAGS=$save_CXXFLAGS -AC_LANG_POP([C++]) +if test "$CCACHE" != ""; then +AC_MSG_CHECKING([whether $CXX is already ccached]) +AC_LANG_PUSH([C++]) +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS --ccache-skip -O2" +dnl an empty program will do, we're checking the compiler flags +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) +if test $use_ccache = yes; then +AC_MSG_RESULT([yes]) +else +CXX="$CCACHE $CXX" +AC_MSG_RESULT([no]) fi +CXXFLAGS=$save_CXXFLAGS +AC_LANG_POP([C++]) fi dnl === ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9d2968d6dd12cda797aa31bc0f0798f835cd073a Author: Norbert Thiebaud Date: Thu Mar 22 23:57:09 2012 -0500 disable gb_FULLDEPS when TINDERBUILD is set _and_ we are really building diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a26f451..d16d33a 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -113,14 +113,14 @@ endif # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) -ifdef TINDERBUILD gb_FULLDEPS := $(false) else +ifdef TINDERBUILD gb_FULLDEPS := $(false) -endif else gb_FULLDEPS := $(true) endif +endif # save user-supplied flags for latter use ifneq ($(strip $(CFLAGS)),) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |4 1 file changed, 4 insertions(+) New commits: commit 7be7f9a7863cbd862dd5a5462c508db03c56c8d1 Author: Norbert Thiebaud Date: Thu Mar 22 17:26:11 2012 -0500 gbuild: allow the tinderboxes to bypass the dependencies generations diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 119f6e5..5ad2378 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -113,8 +113,12 @@ endif # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) +ifdef TINDERBUILD gb_FULLDEPS := $(false) else +gb_FULLDEPS := $(false) +endif +else gb_FULLDEPS := $(true) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/WW8TableInfo.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 0184afc2738ed506f3848723ef1ac0c86822957b
Author: Arnaud Versini
Date: Sun Mar 18 19:59:55 2012 +0100
Check iterator end WW8TableCellGrid
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 6171430..72993ba 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1171,9 +1171,11 @@ void WW8TableCellGrid::addShadowCells()
}
++aCellIt;
-
-bBeginningOfCell = (aRect.Left() != aCellIt->left());
-aRect = aCellIt->getRect();
+if (aCellIt != aCellEndIt)
+{
+bBeginningOfCell = (aRect.Left() != aCellIt->left());
+aRect = aCellIt->getRect();
+}
}
WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: build_env
build_env | 11 --- 1 file changed, 11 deletions(-) New commits: commit befc846e1be3ca117b25e972ca2fa1529dce9935 Author: Norbert Thiebaud Date: Sun Mar 11 11:51:10 2012 -0500 remove accidental re-add of obsolete build_env diff --git a/build_env b/build_env deleted file mode 100644 index eb6a75a..000 --- a/build_env +++ /dev/null @@ -1,11 +0,0 @@ - -if hash lo_proxy_start 2>&- ; then -base_alias="lo_proxy_start" -else - base_alias="/home/frootzowrath/lo-apply/code/core/solenv/bin/lo_proxy_start" -fi - -alias build="$base_alias build" -alias deliver="$base_alias deliver" - -unset base_alias ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - .gitmodules
.gitmodules |3 --- 1 file changed, 3 deletions(-) New commits: commit eda3cf7979b3f55ae150680dd965b248f5a4d369 Author: Norbert Thiebaud Date: Fri Mar 9 19:43:41 2012 -0600 Revert "have the submodules rebase by default" This reverts commit acc0ca81477408dbeadcb121bc25e8e134b665b9. diff --git a/.gitmodules b/.gitmodules index c963415..8cdf2d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ [submodule "binfilter"] path = binfilter url = git://anongit.freedesktop.org/libreoffice/binfilter.git - update=rebase [submodule "dictionaries"] path = dictionaries url = git://anongit.freedesktop.org/libreoffice/dictionaries - update=rebase [submodule "helpcontent2"] path = helpcontent2 url = git://anongit.freedesktop.org/libreoffice/help - update=rebase ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - .gitmodules
.gitmodules |3 +++ 1 file changed, 3 insertions(+) New commits: commit acc0ca81477408dbeadcb121bc25e8e134b665b9 Author: Norbert Thiebaud Date: Fri Mar 9 19:00:11 2012 -0600 have the submodules rebase by default diff --git a/.gitmodules b/.gitmodules index 8cdf2d4..c963415 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,12 @@ [submodule "binfilter"] path = binfilter url = git://anongit.freedesktop.org/libreoffice/binfilter.git + update=rebase [submodule "dictionaries"] path = dictionaries url = git://anongit.freedesktop.org/libreoffice/dictionaries + update=rebase [submodule "helpcontent2"] path = helpcontent2 url = git://anongit.freedesktop.org/libreoffice/help + update=rebase ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - 2 commits - binfilter dictionaries .gitignore .gitmodules helpcontent2
.gitignore | 14 +- .gitmodules |3 --- binfilter|2 +- dictionaries |2 +- helpcontent2 |2 +- 5 files changed, 4 insertions(+), 19 deletions(-) New commits: commit 7e49b6d37476f33803df1d12da90b3cb47b12810 Author: Norbert Thiebaud Date: Fri Mar 9 13:05:51 2012 -0600 adjust .gitignore If you want to hide your mess instead of cleaning-up your tree please do that in your .git/info/exclude or similar local places, and not in the shared/delivered settings diff --git a/.gitignore b/.gitignore index 65b2631..0b8463b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,14 +4,10 @@ \#* .DS_Store -# StGit -.stgit-edit.txt - # python generated file *.pyc # where the 'subrepos' and downloads are located -/clone /src # the build directories @@ -102,6 +98,7 @@ TAGS # other repositories /translations +/clone # compiled python objects for gdb pretty printers /solenv/gdb/libreoffice/*.py[co] @@ -111,18 +108,9 @@ TAGS /solenv/bin/concat-deps /solenv/bin/concat-deps.exe -# test output files -test/user-template/user/psprint/pspfontcache - # MSVC debug information /*/vc90.pdb -# libxslt debug memdump -.memdump - # LibreOffice lock files .~lock.*# -# Somepeople love debugging -gdbtrace.log -valgrind.log diff --git a/binfilter b/binfilter index 08ef890..22d181f 16 --- a/binfilter +++ b/binfilter @@ -1 +1 @@ -Subproject commit 08ef890439805f5fdf21b05d60e6a28f63cb9eb3 +Subproject commit 22d181f13854ea5fbb5eb685e50848a9edefdac1 diff --git a/dictionaries b/dictionaries index 2a71819..d5c8bc9 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 2a71819109ce2947340241d67ab0c248a746a6a5 +Subproject commit d5c8bc9c9bb578fdc2abc0888b611ff9ec80e36b diff --git a/helpcontent2 b/helpcontent2 index d35c02f..3dedc91 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d35c02fb9d6a031c6374ed00f34f20f91ff921a7 +Subproject commit 3dedc91ca1f0bea001daac761265e9a1170079e4 commit e6eef06172e7d69bf3651b289ebd479974b80395 Author: Norbert Thiebaud Date: Fri Mar 9 12:51:13 2012 -0600 clean-up .gitmodule. remove erroneous entry diff --git a/.gitmodules b/.gitmodules index 4696d63..8cdf2d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "dictionaries"] path = dictionaries url = git://anongit.freedesktop.org/libreoffice/dictionaries -[submodule "helcontent2"] - path = helcontent2 - url = git://anongit.freedesktop.org/libreoffice/help [submodule "helpcontent2"] path = helpcontent2 url = git://anongit.freedesktop.org/libreoffice/help ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - .gitattributes .gitignore
.gitattributes |2 ++ .gitignore | 44 ++-- 2 files changed, 24 insertions(+), 22 deletions(-) New commits: commit d5c8bc9c9bb578fdc2abc0888b611ff9ec80e36b Author: Norbert Thiebaud Date: Fri Mar 9 12:59:15 2012 -0600 adjust .gitignore, make the repo own its own attributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..416fa8c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.doc binary +*.sdw binary diff --git a/.gitignore b/.gitignore index eb75b8c..1dc8424 100644 --- a/.gitignore +++ b/.gitignore @@ -30,26 +30,26 @@ *~ # Build directories: -/dictionaries/unxlng?? -/dictionaries/unxlng??.pro -/dictionaries/unxlng??? -/dictionaries/unxlng???.pro -/dictionaries/wntmsc??? -/dictionaries/wntmsc???.pro -/dictionaries/wntgcc? -/dictionaries/wntgcc?.pro -/dictionaries/unxmac?? -/dictionaries/unxmac??.pro -/dictionaries/unx?bsd?? -/dictionaries/unx?bsd??.pro -/dictionaries/unxdfly?? -/dictionaries/unxdfly??.pro -/dictionaries/unxso??? -/dictionaries/unxso???.pro -/dictionaries/unxaig?? -/dictionaries/unxaig??.pro -/dictionaries/unxios? -/dictionaries/unxios?.pro -/dictionaries/unxand? -/dictionaries/unxand?.pro +/unxlng?? +/unxlng??.pro +/unxlng??? +/unxlng???.pro +/wntmsc??? +/wntmsc???.pro +/wntgcc? +/wntgcc?.pro +/unxmac?? +/unxmac??.pro +/unx?bsd?? +/unx?bsd??.pro +/unxdfly?? +/unxdfly??.pro +/unxso??? +/unxso???.pro +/unxaig?? +/unxaig??.pro +/unxios? +/unxios?.pro +/unxand? +/unxand?.pro ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - .gitattributes .gitignore
.gitattributes |2 ++ .gitignore | 57 ++--- 2 files changed, 24 insertions(+), 35 deletions(-) New commits: commit 22d181f13854ea5fbb5eb685e50848a9edefdac1 Author: Norbert Thiebaud Date: Fri Mar 9 13:03:25 2012 -0600 adjust .gitignore own its own attributes irgnoring path related files like .orgi .rej and similar files should not be done globally for eveyone If someone what to hide these instead of cleaning-up their house they should put it in .git/info/exclude or at other user-level customization places. diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..416fa8c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.doc binary +*.sdw binary diff --git a/.gitignore b/.gitignore index 0613205..cd48618 100644 --- a/.gitignore +++ b/.gitignore @@ -29,46 +29,33 @@ # Backup files: *~ .*sw? -\#* .DS_Store -# StGit -.stgit-edit.txt # Build directories: -/binfilter/unxlng?? -/binfilter/unxlng??.pro -/binfilter/unxlng??? -/binfilter/unxlng???.pro -/binfilter/wntmsc??? -/binfilter/wntmsc???.pro -/binfilter/wntgcc? -/binfilter/wntgcc?.pro -/binfilter/unxmac?? -/binfilter/unxmac??.pro -/binfilter/unx?bsd?? -/binfilter/unx?bsd??.pro -/binfilter/unxdfly?? -/binfilter/unxdfly??.pro -/binfilter/unxso??? -/binfilter/unxso???.pro -/binfilter/unxaig?? -/binfilter/unxaig??.pro -/binfilter/unxios? -/binfilter/unxios?.pro -/binfilter/unxand? -/binfilter/unxand?.pro - -# libxslt debug memdump -.memdump +/unxlng?? +/unxlng??.pro +/unxlng??? +/unxlng???.pro +/wntmsc??? +/wntmsc???.pro +/wntgcc? +/wntgcc?.pro +/unxmac?? +/unxmac??.pro +/unx?bsd?? +/unx?bsd??.pro +/unxdfly?? +/unxdfly??.pro +/unxso??? +/unxso???.pro +/unxaig?? +/unxaig??.pro +/unxios? +/unxios?.pro +/unxand? +/unxand?.pro # LibreOffice lock files .~lock.*# -# Everyone loves patching -*.orig -*.rej - -# Somepeople love debugging -gdbtrace.log -valgrind.log ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/submodules'
New branch 'feature/submodules' available with the following commits: commit e90993d4ee799a7e69ca84604e22472bb3a9734f Author: Norbert Thiebaud Date: Fri Mar 9 12:44:58 2012 -0600 submodule: convert help binfilter dictionaries. move translations ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/submodules'
New branch 'feature/submodules' available with the following commits: commit 2a71819109ce2947340241d67ab0c248a746a6a5 Author: Norbert Thiebaud Date: Fri Mar 9 10:12:36 2012 -0600 submodule: move all files one directory up ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/submodules'
New branch 'feature/submodules' available with the following commits: commit 08ef890439805f5fdf21b05d60e6a28f63cb9eb3 Author: Norbert Thiebaud Date: Fri Mar 9 10:11:38 2012 -0600 submodules: move all files one directory up ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: git-hooks/commit-msg
git-hooks/commit-msg |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 04b2736ac9da3421a7999489dc0c8752c36e775c
Author: Norbert Thiebaud
Date: Tue Mar 6 04:12:01 2012 -0600
call the gerrit commit-msg hook if present
This a a prep-work for if and when we use gerrit
it is very important to call gerrit's commit-msg hook
and the sooner we teach our own hook to play nice with it
the less likely we will have issue during migration
diff --git a/git-hooks/commit-msg b/git-hooks/commit-msg
index 6257213..378acfa 100755
--- a/git-hooks/commit-msg
+++ b/git-hooks/commit-msg
@@ -14,6 +14,8 @@
# This example catches duplicate Signed-off-by lines.
+base_dir=$(dirname $0)
+
abort() {
cp $1 $1.save
cat >&2 <http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/sallayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cecbf715396b5297a99d72e36526de5c24b927b4
Author: Norbert Thiebaud
Date: Mon Mar 5 04:08:28 2012 -0600
iterator are not ordered
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 781cb03..f7c2f15 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -841,7 +841,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32*
pCharWidths ) const
// calculate right x-position for this glyph cluster
// break if no more glyphs in layout
// break at next glyph cluster start
-while( (pG+1 < end) && !pG[1].IsClusterStart() )
+while( (pG+1 != end) && !pG[1].IsClusterStart() )
{
// advance to next glyph in cluster
++pG;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/sallayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 330461ffa3871e125bce16e0c26f45b034289d8f
Author: Norbert Thiebaud
Date: Sun Mar 4 21:36:15 2012 -0600
iterator end should be tested with != not <
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 3ca646d..781cb03 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -863,7 +863,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32*
pCharWidths ) const
// rightmost cluster edge is the leftmost edge of next cluster
// for clusters that do not have x-sorted glyphs
// TODO: avoid recalculation of left bound in next cluster iteration
-for( GlyphVector::const_iterator pN = pG; ++pN < end; )
+for( GlyphVector::const_iterator pN = pG; ++pN != end; )
{
if( pN->IsClusterStart() )
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in vcl/generic vcl/inc vcl/source
configure.in |8 -
vcl/generic/glyphs/gcach_layout.cxx |4
vcl/generic/print/genpspgraphics.cxx |3
vcl/inc/sallayout.hxx|5
vcl/source/gdi/pdfwriter_impl.cxx|1
vcl/source/gdi/sallayout.cxx | 267 ++-
6 files changed, 125 insertions(+), 163 deletions(-)
New commits:
commit 2ea4964b2e81a25125eec7ce3eb0b06b3883edf0
Author: Norbert Thiebaud
Date: Sun Mar 4 19:30:04 2012 -0600
help GlyphItems vector to be sized correctly up-front
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index 5f92f48..ef03aa3 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -106,6 +106,8 @@ bool ServerFontLayoutEngine::operator()( ServerFontLayout&
rLayout, ImplLayoutAr
int nGlyphWidth = 0;
GlyphItem aPrevItem;
bool bRightToLeft;
+
+rLayout.Reserve(rArgs.mnLength);
for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); )
{
sal_UCS4 cChar = rArgs.mpStr[ nCharPos ];
@@ -409,6 +411,8 @@ bool IcuLayoutEngine::operator()( ServerFontLayout&
rLayout, ImplLayoutArgs& rAr
// allocate temporary arrays, note: round to even
int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos ) | 15)
+ 1;
+rLayout.Reserve(nGlyphCapacity);
+
struct IcuPosition{ float fX, fY; };
const int nAllocSize = sizeof(LEGlyphID) + sizeof(le_int32) +
sizeof(IcuPosition);
LEGlyphID* pIcuGlyphs = (LEGlyphID*)alloca( (nGlyphCapacity * nAllocSize)
+ sizeof(IcuPosition) );
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index b806c1d..29c0610 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -616,6 +616,9 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
Point aNewPos( 0, 0 );
GlyphItem aPrevItem;
rtl_TextEncoding aFontEnc = mrPrinterGfx.GetFontMgr().getFontEncoding(
mnFontID );
+
+Reserve(rArgs.mnLength);
+
for(;;)
{
bool bRightToLeft;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a9a30d0..85c04f0 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -345,6 +345,7 @@ class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout
public:
// used by layout engines
voidAppendGlyph( const GlyphItem& );
+voidReserve(int size) { m_GlyphItems.reserve(size + 1); }
virtual voidAdjustLayout( ImplLayoutArgs& );
virtual voidApplyDXArray( ImplLayoutArgs& );
virtual voidJustify( long nNewWidth );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 3820d81..603104f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2364,6 +2364,7 @@ bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs )
Point aNewPos( 0, 0 );
bool bRightToLeft;
+Reserve(rArgs.mnLength);
for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRightToLeft ); )
{
// TODO: handle unicode surrogates
commit 6bb68cae7c31918eff8386d5b52be0759386bb60
Author: Norbert Thiebaud
Date: Sun Mar 4 07:34:14 2012 -0600
GenericSalLayout: manage the collection of GlyphItem with a vector.
There was a TODO to replace a manually managed array of Glyphs
to use std::list
a GlyphItem is 36 bytes long. the colleciton of GlyphItems is
mostly used in a sequential access. random insert/delete are fairly rare.
using std::list would increase the size by at least 8 to 16 bytes per
element (depending on the size of void*) (25 to 50% overhead)
and would greatly degrade data locality for most iterations loops.
so std::vector seems more appropriate here.
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 51a6415..a9a30d0 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -374,9 +374,7 @@ protected:
boolGetCharWidths( sal_Int32* pCharWidths ) const;
private:
-GlyphItem* mpGlyphItems; // TODO: change to GlyphList
-int mnGlyphCount;
-int mnGlyphCapacity;
+GlyphVector m_GlyphItems;
mutable Point maBasePoint;
// enforce proper copy semantic
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 95118bf..3ca646d 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -797,37 +797,18 @@ const ImplFontData* SalLayout::GetFallbackFontData(
sal_GlyphId /*nGlyphId*/ ) c
// ===
GenericSalLayout::GenericSalLayout()
-: mpGlyphItems(0),
-mnGlyphCount(0),
-mnGlyphCapacity(0)
{}
// ---
GenericSalLayout::~
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/docnode/ndtbl1.cxx | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 4f8094d0489d31563f18fb31bad366be2c19046f
Author: Ivan Timofeev
Date: Sun Feb 26 19:09:54 2012 +0400
fdo#46144: "Distributy Columns Evenly" does not work with the selected
columns
regression from f7303fcac779f99931bfba48e8bfcf9c081af67f:
-SvUShorts aWish( nTmp, nTmp ),
+std::vector aWish( nTmp, nTmp ),
aMins( nTmp, nTmp );
Signed-off-by: Norbert Thiebaud
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 817b1ac..4524a58 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1469,16 +1469,11 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor,
sal_Bool bBalance )
if ( ! aTabCols.Count() )
return;
-const sal_uInt8 nTmp = (sal_uInt8)Max( sal_uInt16(255),
sal_uInt16(aTabCols.Count() + 1) );
-std::vector aWish( nTmp, nTmp ),
- aMins( nTmp, nTmp );
+std::vector aWish(aTabCols.Count() + 1);
+std::vector aMins(aTabCols.Count() + 1);
+
sal_uInt16 i;
-for ( i = 0; i <= aTabCols.Count(); ++i )
-{
-aWish.push_back( 0 );
-aMins.push_back( 0 );
-}
::lcl_CalcColValues( aWish, aTabCols, pStart, pEnd, sal_True );
//Es ist Robuster wenn wir die Min-Werte fuer die ganze Tabelle berechnen.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeMacOSX.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 39f7bbb201adefa0ad593f5a0a9b2d33facd68bd Author: Thorsten Behrens Date: Fri Feb 24 10:47:53 2012 +0100 Use internal libxml for Mac release builds. Following up from 49843f0f9788e01805d8d0d27428fe5e6a4cc530, actually use internal libxml for release builds. Signed-off-by: Norbert Thiebaud diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 9366a04..1a1fd09 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -1,6 +1,7 @@ --with-vendor=The Document Foundation --enable-epm --enable-binfilter +--without-system-libxml --disable-cairo-canvas --with-java-target-version=1.5 --enable-ext-presenter-minimizer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - libcroco/makefile.mk libxml2/prj libxslt/prj solenv/bin
libcroco/makefile.mk | 11 +-- libxml2/prj/d.lst |2 ++ libxslt/prj/d.lst |5 + solenv/bin/macosx-change-install-names.pl |1 + 4 files changed, 17 insertions(+), 2 deletions(-) New commits: commit ad08d139e09adf78227a20c3f67d6cea56e52cae Author: Stephan Bergmann Date: Thu Feb 23 16:26:23 2012 +0100 Tentative libcroco fix for Mac OS X --without-system-libxml diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d405f95..28c588b 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,14 +51,21 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" +.IF "$(SYSTEM_LIBXML)" == "YES" +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +.ENDIF CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ - LIBXML2_LIBS="$(LIBXML_LIBS)" + LIBXML2_CFLAGS='$(my_libxml2_cflags)' \ + LIBXML2_LIBS='$(my_libxml2_libs)' .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) commit e3e4ac30c82893ccac1a3de1919401363a8117c3 Author: Stephan Bergmann Date: Thu Feb 23 12:43:25 2012 +0100 Add shl/LOADER/URELIB to make --without-sytem-libxml work on Mac OS X I doubt that the "LOADER" token is needed at all, but will investigate that later. diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 57f4e79..290a488 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -42,6 +42,7 @@ sub action($$$) 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', 'shl/OOO/OOO' => '@loader_path', 'shl/LOADER/LOADER' => '@loader_path', + 'shl/LOADER/URELIB' => '@loader_path/../ure-link/lib', 'shl/OXT/URELIB' => '@executable_path/urelibs', 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__', commit ec66f8076d8e4a7bef8384914e29988724fabd3d Author: Petr Mladek Date: Thu Feb 23 11:10:53 2012 +0100 set back rpath to ure/lib for libxml on MAC The library is installed in ure/lib. Thanks Stefan Bergman for the pointer. diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index d39b8a5..1d125c1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -137,7 +137,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" -EXTRPATH=LOADER +EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config commit 3528f212934f92e66b55edf7dfd59ed448b54027 Author: Norbert Thiebaud Date: Wed Feb 22 15:58:19 2012 -0600 support using for libxml2 internal on MacOSX diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 1d125c1..d39b8a5 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -137,7 +137,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" -EXTRPATH=URELIB +EXTRPATH=LOADER OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index 6e7bbb4..d5e98d4 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -2,6 +2,8 @@ mkdir: %_DEST%\inc\external\libxml ..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so +..\%__SRC%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.2.dylib +symlink: %_DEST%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.dylib ..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so ..\%__SRC%\lib\*.lib %_DEST%\lib ..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index 0627cc1..f3613b0 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst
[Libreoffice-commits] .: 2 commits - libxml2/makefile.mk libxml2/prj libxslt/prj sc/source
libxml2/makefile.mk |2 +-
libxml2/prj/d.lst|2 ++
libxslt/prj/d.lst|5 +
sc/source/core/data/dpobject.cxx |2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 23dace36e79aba275592d611298abe524d4adbbf
Author: Norbert Thiebaud
Date: Wed Feb 22 15:58:53 2012 -0600
WaE unitialized variable
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4d3ff60..5d4e8bc 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1795,7 +1795,7 @@ void lcl_FillOldFields(
{
uno::Any aOrigAny = xDimProp->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
-sal_Int32 nTmp;
+sal_Int32 nTmp = 0;
if (aOrigAny >>= nTmp)
nDupSource = static_cast(nTmp);
}
commit 49843f0f9788e01805d8d0d27428fe5e6a4cc530
Author: Norbert Thiebaud
Date: Wed Feb 22 15:58:19 2012 -0600
support using for libxml2 internal on MacOSX
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 78c4c3e..b9f6db4 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -146,7 +146,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)
OUTDIR2INC=include$/libxml
.IF "$(OS)"=="MACOSX"
-EXTRPATH=URELIB
+EXTRPATH=LOADER
OUT2LIB+=.libs$/libxml2.*.dylib
OUT2BIN+=.libs$/xmllint
OUT2BIN+=xml2-config
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index 6e7bbb4..d5e98d4 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -2,6 +2,8 @@ mkdir: %_DEST%\inc\external\libxml
..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h
..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
+..\%__SRC%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.2.dylib
+symlink: %_DEST%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.dylib
..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so
..\%__SRC%\lib\*.lib %_DEST%\lib
..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
index 0627cc1..f3613b0 100644
--- a/libxslt/prj/d.lst
+++ b/libxslt/prj/d.lst
@@ -1,10 +1,15 @@
mkdir: %_DEST%\inc\external\libxslt
..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h
+..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib
+symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib
+...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1
symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so
..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so
..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0
symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so
+..\%__SRC%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.0.dylib
+symlink: %_DEST%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.dylib
..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.*
..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild_mkdir'
New branch 'feature/gbuild_mkdir' available with the following commits: commit d44a3e291cb8c4b3ec5ce1775edd527b475ebca4 Author: Norbert Thiebaud Date: Sun Feb 19 23:46:42 2012 -0600 avoid calling mkdir for each and every command gbuild tend to call mkdir -p systematically before running any command to make sure the target directory is created. On cygwin, where fortk() is insanely expensive this is quite costly This patch use order-only rules to make sure the needed directory are created. And avoid the call to mkdir for C[++]/ObjC[++]/Yacc/GenC[++]/Link commit a8fd16804c56ad86fe97e7c9ead7c4e45cd20466 Author: Norbert Thiebaud Date: Sun Feb 19 23:42:41 2012 -0600 eol spaces clean-up ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/Module_officecfg.mk
officecfg/Module_officecfg.mk | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit e69b8a758061c695b4daa9029f58a1cd7f715ef6 Author: Norbert Thiebaud Date: Sun Feb 19 15:36:07 2012 -0600 disabled officecfg unittest due to dependencies problems diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index 382992e..4a0dc8d 100644 --- a/officecfg/Module_officecfg.mk +++ b/officecfg/Module_officecfg.mk @@ -26,9 +26,13 @@ $(eval $(call gb_Module_add_targets,officecfg,\ Configuration_officecfg \ )) +# this does not work, subsequenttest s a runtime dep, that is it postpone the run of the unittest, not the build of it +# and that test need a bunch of include that are not there and there is no rule to teach make about the +# dependency of these generated headers +# disabled for now # The cppheader test depends on comphelper so can only be a subsequentcheck: -$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ -CppunitTest_officecfg_cppheader_test \ -)) +#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ +#CppunitTest_officecfg_cppheader_test \ +#)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - build_env.in configure.in .gitignore solenv/bin
.gitignore |5 -
build_env.in| 11 ---
configure.in|3 +--
solenv/bin/lo_find_src_root | 23 ---
solenv/bin/lo_proxy_start | 31 ---
5 files changed, 1 insertion(+), 72 deletions(-)
New commits:
commit fb301909112b310ac1a626a4a65f2942fccb2f7a
Author: Norbert Thiebaud
Date: Sat Feb 18 18:40:42 2012 -0600
do not hide patch-related file (.orig .rej)
If you want to hide them, add the rule in you local git set-up.
see git config --global core.excludesfiles fo more info
diff --git a/.gitignore b/.gitignore
index 47fca4e..441e4bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,6 @@
/aclocal.m4
/autom4te.cache
/autogen.lastrun
-/build_env
/ChangeLog
/config.guess
/config.log
@@ -127,10 +126,6 @@ test/user-template/user/psprint/pspfontcache
# LibreOffice lock files
.~lock.*#
-# Everyone loves patching
-*.orig
-*.rej
-
# Somepeople love debugging
gdbtrace.log
valgrind.log
commit 4d0a05e93902f9bb14418cc36e046131580b46d0
Author: Norbert Thiebaud
Date: Sat Feb 18 18:37:13 2012 -0600
build_env is obsolete now
diff --git a/build_env.in b/build_env.in
deleted file mode 100755
index bf1ace6..000
--- a/build_env.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-if hash lo_proxy_start 2>&- ; then
-base_alias="lo_proxy_start"
-else
-base_alias="@SRC_ROOT@/solenv/bin/lo_proxy_start"
-fi
-
-alias build="$base_alias build"
-alias deliver="$base_alias deliver"
-
-unset base_alias
diff --git a/configure.in b/configure.in
index 413dec0..5d408ff 100644
--- a/configure.in
+++ b/configure.in
@@ -3160,7 +3160,6 @@ if test "$cross_compiling" = "yes"; then
mkdir CONF-FOR-BUILD
tar cf - \
bin/repo-list.in \
-build_env.in \
android/Bootstrap/local.properties.in \
android/qa/sc/local.properties.in \
android/qa/desktop/local.properties.in \
@@ -10963,7 +10962,7 @@ else
echo > config_host.mk.last
fi
-AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list build_env
android/Bootstrap/local.properties android/qa/sc/local.properties
android/qa/desktop/local.properties])
+AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list
android/Bootstrap/local.properties android/qa/sc/local.properties
android/qa/desktop/local.properties])
AC_OUTPUT
# touch the config timestamp file set_soenv.stamp
diff --git a/solenv/bin/lo_find_src_root b/solenv/bin/lo_find_src_root
deleted file mode 100755
index a91c847..000
--- a/solenv/bin/lo_find_src_root
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# (c) 2011 Norbert Thiebaud. License : GPLv3
-#
-# try to locate the SRC_ROOT based on the working directory
-# we search for first Repository.mk
-# in the current directoyr or its parent, all teh way to /
-# Ths is a heuristic. it works 'most of the times
-# but it could give false positive if you try hard enough
-#
-
-current=$(pwd)
-
-while [ "${current}" != "/" ] ; do
-if [ -f ${current}/.src_root ] ; then
-echo "${current}"
-exit 0;
-fi
-current=$(dirname "${current}")
-done
-
-echo "Error cannot determine SRC_ROOT" 1>&2
-exit 1;
diff --git a/solenv/bin/lo_proxy_start b/solenv/bin/lo_proxy_start
deleted file mode 100755
index 8aabf28..000
--- a/solenv/bin/lo_proxy_start
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-bin_dir=$(dirname $0)
-action=$(basename $0)
-
-if [ "$action" = "lo_proxy_start" ] ; then
-action=$1
-shift
-fi
-
-if [ -z "$SRC_ROOT" ] ; then
- SRC_ROOT=$($bin_dir/lo_find_src_root) || exit 1
-fi
-if [ -z "$SOLARINC" ] ; then
-if [ -e "$SRC_ROOT/config_host.mk" ] ; then
-. "$SRC_ROOT/config_host.mk"
-fi
-if [ -e "$SRC_ROOT/Env.Host.sh" ] ; then
-. "$SRC_ROOT/Env.Host.sh"
-fi
-fi
-
-if [ -e $SRC_ROOT/solenv/bin/$action.pl ] ; then
- $SRC_ROOT/solenv/bin/$action.pl "$@"
-elif [ -e $SRC_ROOT/solenv/bin/$action.sh ] ; then
- $SRC_ROOT/solenv/bin/$action.sh "$@"
-else
- echo "$action.[pl|sh] not found" 2>&1
- exit 1
-fi
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 178a30236e763051fa1e52f0b4de4d9540753df2
Author: Norbert Thiebaud
Date: Thu Feb 16 23:15:26 2012 -0600
use bzip2 compression for dmg
On MacOSX the installable packages (dmg), can use diverse format and
diverse compression method.
Since 10.4 a new format is supported that use bzip2 as a compression
back-end. The result if a reduction of ~30MB of the main dmg.
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 8c0e9ee..8bd8bda 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -535,7 +535,7 @@ sub create_package
chdir $localfrom;
}
-$systemcall = "cd $localtempdir && hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o
$installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o
$archive && ";
+$systemcall = "cd $localtempdir && hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o
$installdir/tmp && hdiutil convert -ov -format UDBZ $installdir/tmp.dmg -o
$archive && ";
if (( $ref ne "" ) && ( $$ref ne "" )) {
$systemcall .= "hdiutil unflatten $archive && Rez -a $$ref -o
$archive && hdiutil flatten $archive &&";
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk
Repository.mk | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit 6996d7c2ebcf9320cda713e512e200bcbead4c6c Author: Norbert Thiebaud Date: Fri Feb 10 17:02:37 2012 -0600 Revert "Repository.mk: move test libraries to PLAINLIBS_NONE" This reverts commit 6396ab80dbb0fd60536c42e9c66b568f1e31418a. per the author's request diff --git a/Repository.mk b/Repository.mk index de2a1eb..5adc794 100644 --- a/Repository.mk +++ b/Repository.mk @@ -314,13 +314,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ -subsequenttest \ -test \ -unoexceptionprotector \ -unotest \ -)) - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ sal_textenc \ xmlreader \ @@ -351,6 +344,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ sofficeapp \ srtrs1 \ store \ +subsequenttest \ +test \ textconv_dict \ ucb1 \ ucpdav1 \ @@ -358,7 +353,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ucpftp1 \ ucphier1 \ ucppkg1 \ +unoexceptionprotector \ unopkgapp \ +unotest \ unsafe_uno \ updchk \ xmlsecurity \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 05bb5df2c520b41aba76fcf05097fd19d9550626 Author: Norbert Thiebaud Date: Fri Feb 10 16:05:22 2012 -0600 add slowcheck target and make build a pre-req of check diff --git a/Makefile b/Makefile index 04c4c8e..815959f 100644 --- a/Makefile +++ b/Makefile @@ -438,13 +438,21 @@ findunusedcode: | grep -v ^salhelper:: \ > unusedcode.easy -check: subsequentcheck +check: subsequentcheck_after_build + +subsequentcheck_after_build: build dev-install-link + @cd smoketestoo_native && unset MAKEFLAGS && \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck subsequentcheck: smoketestoo_native $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck debugrun: - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun + +slowcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile slowcheck endif # not clean or distclean ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) New commits: commit 90d1c9ff829c41c8384d66dfd2f6e90660517088 Author: Norbert Thiebaud Date: Fri Feb 10 10:17:54 2012 -0600 the PATH must be set properly, even with java disabled ... diff --git a/configure.in b/configure.in index a744fa8..927326e 100644 --- a/configure.in +++ b/configure.in @@ -10859,18 +10859,18 @@ else ;; cygwin*) +pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before" +pathmunge "$ASM_HOME" "before" +pathmunge "$WINDOWS_SDK_HOME/bin" "before" +pathmunge "$CSC_PATH" "before" +pathmunge "$MIDL_PATH" "before" +pathmunge "$MSPDB_PATH" "before" +if test "$CL_X64" = "TRUE" ; then +pathmunge "$COMPATH/bin/amd64" "before" +else +pathmunge "$COMPATH/bin" "before" +fi if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then -pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before" -pathmunge "$ASM_HOME" "before" -pathmunge "$WINDOWS_SDK_HOME/bin" "before" -pathmunge "$CSC_PATH" "before" -pathmunge "$MIDL_PATH" "before" -pathmunge "$MSPDB_PATH" "before" -if test "$CL_X64" = "TRUE" ; then -pathmunge "$COMPATH/bin/amd64" "before" -else -pathmunge "$COMPATH/bin" "before" -fi if test -d "$JAVA_HOME/jre/bin/client" ; then pathmunge "$JAVA_HOME/jre/bin/client" "before" fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - i18nutil/inc i18nutil/source unusedcode.easy vcl/inc vcl/source
i18nutil/inc/i18nutil/unicode.hxx |4 --
i18nutil/source/utility/unicode.cxx | 67
unusedcode.easy |4 --
vcl/inc/vcl/i18nhelp.hxx|1
vcl/source/app/i18nhelp.cxx |7 ---
5 files changed, 83 deletions(-)
New commits:
commit 737a584d9a1cc29d2688871bdebbb0a7175c542c
Author: Greg Kroah-Hartman
Date: Wed Feb 8 08:57:45 2012 -0800
vcl: I18nHelper: delete unused GetDate() method
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index a83afa4..32f9e16 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -86,7 +86,6 @@ public:
sal_BoolMatchString( const String& rStr1, const String& rStr2 ) const;
sal_BoolMatchMnemonic( const String& rString, sal_Unicode
cMnemonicChar ) const;
-String GetDate( const Date& rDate ) const;
String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool
bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const;
static String filterFormattingChars( const String& );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f8967b2..0c1c3fa 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -175,13 +175,6 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String&
rString, sal_Unicode cMne
}
-String vcl::I18nHelper::GetDate( const Date& rDate ) const
-{
-::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
-
-return ImplGetLocaleDataWrapper().getDate( rDate );
-}
-
String vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool
bUseThousandSep, sal_Bool bTrailingZeros ) const
{
return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals,
bUseThousandSep, bTrailingZeros );
commit d857f0938b8acd491f297d104889588bb986aa66
Author: Greg Kroah-Hartman
Date: Wed Feb 8 08:57:41 2012 -0800
unicode: delete unused unicode:getCharType() method
diff --git a/i18nutil/inc/i18nutil/unicode.hxx
b/i18nutil/inc/i18nutil/unicode.hxx
index 7fce041..f9ff6e1 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -48,7 +48,6 @@ public:
static sal_Unicode SAL_CALL
getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
static sal_Unicode SAL_CALL
getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
-static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
index 056e78a..dcc5b36 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -425,70 +425,6 @@ sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode
ch) {
return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) &
(CONTROLSPACE)));
}
-sal_Int32 SAL_CALL unicode::getCharType( const sal_Unicode ch )
-{
-using namespace ::com::sun::star::i18n::KCharacterType;
-
-switch ( getUnicodeType( ch ) ) {
-// Upper
-case UnicodeType::UPPERCASE_LETTER :
-return UPPER|LETTER|PRINTABLE|BASE_FORM;
-
-// Lower
-case UnicodeType::LOWERCASE_LETTER :
-return LOWER|LETTER|PRINTABLE|BASE_FORM;
-
-// Title
-case UnicodeType::TITLECASE_LETTER :
-return TITLE_CASE|LETTER|PRINTABLE|BASE_FORM;
-
-// Letter
-case UnicodeType::MODIFIER_LETTER :
-case UnicodeType::OTHER_LETTER :
-return LETTER|PRINTABLE|BASE_FORM;
-
-// Digit
-case UnicodeType::DECIMAL_DIGIT_NUMBER:
-case UnicodeType::LETTER_NUMBER:
-case UnicodeType::OTHER_NUMBER:
-return DIGIT|PRINTABLE|BASE_FORM;
-
-// Base
-case UnicodeType::NON_SPACING_MARK:
-case UnicodeType::ENCLOSING_MARK:
-case UnicodeType::COMBINING_SPACING_MARK:
-return BASE_FORM|PRINTABLE;
-
-// Print
-case UnicodeType::SPACE_SEPARATOR:
-
-case UnicodeType::DASH_PUNCTUATION:
-case UnicodeType::INITIAL_PUNCTUATION:
-case UnicodeType::FINAL_PUNCTUATION:
-case UnicodeType::CONNECTOR_PUNCTUATION:
-case UnicodeType::OTHER_PUNCTUATION:
-
-case UnicodeType::MATH_SYMBOL:
-case UnicodeType::CURRENCY_SYMBOL:
-case UnicodeType::MODIFIER_SYMBOL:
-case UnicodeType::OTHER_SYMBOL:
-return PRINTABLE;
-
-// Control
-case UnicodeType::CONTROL:
-case UnicodeType::FORMAT:
-return CONTROL;
-
-case UnicodeType::LINE_SEPARATOR:
-case UnicodeType::PARAGRAPH_SEPARATOR:
-return CONTROL|PRINTABLE;
-
-// for all others
-default:
-return 0;
-}
-}
-
sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
{
//See unicode/uscript.h
diff --git a/unusedcode.e
[Libreoffice-commits] .: Makefile solenv/gbuild
Makefile |9 solenv/gbuild/gbuild.help.txt | 76 +++ solenv/gbuild/gbuild.mk | 81 -- 3 files changed, 86 insertions(+), 80 deletions(-) New commits: commit d85a108a1b37b9dbaf151d4141e21674ab53f569 Author: Norbert Thiebaud Date: Wed Feb 8 10:16:23 2012 -0600 re-enable make help from the top-level make diff --git a/Makefile b/Makefile index 45b7053..24b2a5b 100644 --- a/Makefile +++ b/Makefile @@ -440,4 +440,13 @@ debugrun: endif # not clean or distclean +# +# help +# +.PHONY: help +help: + @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt + @true + + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt new file mode 100644 index 000..d93285f --- /dev/null +++ b/solenv/gbuild/gbuild.help.txt @@ -0,0 +1,76 @@ +NAME + gbuild - GNU make based build system for LibreOffice + +SYNOPSIS + make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ... + +IMPORTANT OPTIONS + -s Silent operation; do not print the commands as they are executed. + + -n Print the commands that would be executed, but do not execute them. + -k Continue as much as possible after an error. + + -j Specifies the number of jobs (commands) to run simultaneously. + -l Specifies that no new jobs (commands) should be started if there are + others jobs running and the load average is at least load. + + -t Touch files (mark them up to date without really changing them) + instead of running their commands. + -W Pretend that the target file has just been modified. + -o Do not remake the file file even if it is older than its + dependencies, and do not remake anything on account of changes in file. + + -p Print the data base (rules and variable values) that results from + reading the makefiles. + --debug=b debug make run, see GNU make man page for details + + (descriptions from GNU make man page) + +AVAILABLE TARGETS + all build product and run unit tests (default goal) + buildbuild product + unitcheckrun unit tests + subsequentcheck run system tests (requires full installation) + checkrun unit tests and if in toplevel subsequentcheck + cleanremove all generated files + showdeliverables show the targets delivered to OUTDIR and their source + debugrun starts the dev-install instance and allows tests to be run +against it +build the named module + .clean clean the named module + .all for dmake modules only, build the named module and +the pre-requisite modules for this module + .deliver for dmake modules only, deliver the named module + cmd execute the command contained in the variable cmd="" +in a shell with config_host.mk or config_build.mk +environement set. (see gb_SIDE) + +INTERACTIVE VARIABLES: + DEBUG / debug If not empty, build with DBGLEVEL=1 (see below). + ENABLE_SYMBOLS / enable_symbols + If not empty, build with debug symbols. Automatically + enabled by DEBUG/debug. + DBGLEVEL / dbglevel + If not empty, force the debug level to the specified value. The + debug level is passed to the source code through OSL_DEBUG_LEVEL + macro. + 0 = no debug + 1 = symbols + no optimizations + 2 = symbols + no optimizations + extra debug output. OSL_TRACE + starts being active on this level. + 3... = symbols + no optimizations + extra debug output (usually + extremely verbose). Levels > 2 are not used very much. + + YACCFLAGS Add as flags for YACC parser generator invocation. + CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ compilation. + CFLAGS Add as compiler flags for plain C compilation. + CXXFLAGSAdd as compiler flags for C++ compilation. + OBJCFLAGS Add as compiler flags for Objective C compilation. + OBJCXXFLAGS Add as compiler flags for Objective C++ compilation. + LDFLAGS Add as linker flags. + gb_FULLDEPS Generate and use dependencies (on by default, handle with care). + gb_COLORUse ASCII color output. + gb_TITLES Show progress in terminal title. + gb_Side Either "host" of "build" (default to "host"). + determine if config_host.mk or config_build.mk is use
[Libreoffice-commits] .: Makefile
Makefile |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 463f9ff03424a1de5b3d4616202f315adea7f2cd Author: Norbert Thiebaud Date: Wed Feb 8 08:10:44 2012 -0600 support make .all even for gbuild modules diff --git a/Makefile b/Makefile index c5c8589..45b7053 100644 --- a/Makefile +++ b/Makefile @@ -240,11 +240,15 @@ xsltml\ zlib\ define gbuild_module_rules -.PHONY: $(1) $(1).clean $(1).deliver +.PHONY: $(1) $(1).all $(1).clean $(1).deliver $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T +$(1).all: bootstrap fetch + cd $(1) && unset MAKEFLAGS && \ +$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(1).clean: cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |8 +++- solenv/bin/create-tags | 11 +-- 2 files changed, 16 insertions(+), 3 deletions(-) New commits: commit 51a3d9c07c73f86455505a074fa01b88fb802852 Author: Norbert Thiebaud Date: Tue Feb 7 12:03:44 2012 -0600 adapt create-tags/create-ids to the absence of set_soenv.in diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 4561fb8..e4d3147 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,13 @@ # create ID file for the whole LibO tree. run it in toplevel dir -. ./config_host.mk +if [ -z "$INPATH" ] ; then + INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/INPATH=//") +fi +if [ -z "$INPATH" ] ; then +echo "could not determine INPATH" >&2 +exit 1 +fi # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ "$1" = "--with-outpath" ]; then diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index a2f640c..a61c5b6 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,13 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash + +if [ -z "$INPATH" ] ; then + INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/INPATH=//") +fi +if [ -z "$INPATH" ] ; then +echo "could not determine INPATH" >&2 +exit 1 +fi -. ./config_host.mk omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: post.Makefile
post.Makefile |7 +++ 1 file changed, 7 insertions(+) New commits: commit 5ed6b310c6721c001293f2dd058cdfaec09e8024 Author: Norbert Thiebaud Date: Tue Feb 7 09:07:32 2012 -0600 oops forgot a file diff --git a/post.Makefile b/post.Makefile new file mode 100644 index 000..bfa8b34 --- /dev/null +++ b/post.Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk +$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile solenv/gbuild tail_build/Makefile
Makefile| 82 +- solenv/gbuild/CustomTarget.mk |1 solenv/gbuild/extensions/post_BuildplTargets.mk | 187 solenv/gbuild/gbuild.mk |4 solenv/gbuild/partial_build.mk |9 - solenv/gbuild/source_and_rerun.mk | 34 tail_build/Makefile |7 7 files changed, 44 insertions(+), 280 deletions(-) New commits: commit 2bf1a98da8a5bf0e8a0f28c0f2d8846dc17970d4 Author: Norbert Thiebaud Date: Mon Feb 6 19:07:47 2012 -0600 have make check working again. clean-up the whole STAGE stuff diff --git a/Makefile b/Makefile index c73d5fb..3eeb510 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -.PHONY : all autogen bootstrap fetch build clean clean-build clean-host +.PHONY : all autogen bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -17,7 +17,7 @@ endif include $(SRCDIR)/config_$(gb_Side).mk -ifneq ($(verbose),) +ifeq ($(verbose),) GMAKE_OPTIONS:=-rs else GMAKE_OPTIONS:=-r @@ -29,6 +29,7 @@ Mesa\ UnoControls\ accessibility\ animations\ +apple_remote\ avmedia\ basctl\ basebmp\ @@ -124,7 +125,6 @@ xmlsecurity\ dmake_modules:=\ afms\ apache-commons\ -apple_remote\ autodoc\ beanshell\ berkeleydb\ @@ -218,6 +218,7 @@ sdext\ setup_native\ shell\ smoketest\ +smoketestoo_native\ solenv\ soltools\ stax\ @@ -238,13 +239,16 @@ xsltml\ zlib\ define gbuild_module_rules -.PHONY: $(1) $(1).clean +.PHONY: $(1) $(1).clean $(1).deliver $(1): bootstrap fetch - cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) + cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T $(1).clean: - cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean + cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T + +$(1).deliver: + @true endef @@ -263,7 +267,7 @@ $(1).all: bootstrap fetch cd $(1) && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -$(1).deliver: bootstrap fetch +$(1).deliver: cd $(1) && $(SOLARENV)/bin/deliver.pl $(1).clean: @@ -276,16 +280,6 @@ $(foreach m,$(1),$(call dmake_module_rules,$(m))) endef # -# Build -# -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - cd instsetoo_native && unset MAKEFLAGS && \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) - -cross-toolset: - cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) - -# # Partial Build # $(eval $(call gbuild_modules_rules,$(gbuild_modules))) @@ -350,6 +344,18 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto ./autogen.sh # +# Fetch +# +fetch: src.downloaded + +src.downloaded : autogen ooo.lst download +ifeq ($(DO_FETCH_TARBALLS),YES) + @./download $(SRCDIR)/ooo.lst && touch $@ +else + @echo "Automatic fetching of external tarballs is disabled." +endif + +# # Bootstap # $(WORKDIR)/bootstrap: @@ -359,16 +365,15 @@ $(WORKDIR)/bootstrap: bootstrap: $(WORKDIR)/bootstrap # -# Fetch +# Build # -fetch: src.downloaded +build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) + cd instsetoo_native && unset MAKEFLAGS && \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + +cross-toolset: bootstrap fetch + cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -src.downloaded : autogen ooo.lst download -ifeq ($(DO_FETCH_TARBALLS),YES) - @./download $(SRCDIR)/ooo.lst && touch $@ -else - @echo "Automatic fetching of external tarballs is disabled." -endif # # Install @@ -381,14 +386,13 @@ install: echo "Installation finished, you can now execute:" && \ echo "$(INSTALLDIR)/program/soffice" -#dev-install: $(WORKDIR)/bootstrap \ -#$(ROOT_SRC)/src.downloaded \ -#$(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \ -# | $(filter build,$(MAKECMDGOALS)) \ -#$(if $(filter check,$(MAKECMDGOALS)),build) -# @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install -# cd smoketestoo_native && \ -# $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +dev-install-link: + @rm -f $(SRCDIR)/install &
[Libreoffice-commits] .: cross_toolset/Makefile solenv/gbuild
cross_toolset/Makefile |9 - solenv/gbuild/extensions/post_BuildplTargets.mk |2 +- 2 files changed, 1 insertion(+), 10 deletions(-) New commits: commit 96ae2271ebc8fafd5a2454705c128725070ca7c3 Author: Norbert Thiebaud Date: Mon Feb 6 03:58:55 2012 -0600 fix mingw build, still bootstrap issues. diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile index 5b80d7b..2448493 100644 --- a/cross_toolset/Makefile +++ b/cross_toolset/Makefile @@ -6,15 +6,6 @@ SHELL=/usr/bin/env bash include ../config_build.mk -# -# Bootstap -# -$(WORKDIR)/bootstrap: - @cd $(SRC_ROOT) && ./bootstrap - @mkdir -p $(dir $@) && touch $@ - -bootstrap: $(WORKDIR)/bootstrap - .PHONY : build build: diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 58f12e8..1aba6f2 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -177,7 +177,7 @@ dev-install: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD build: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) -cross_toolset: bootstrap $(SRCDIR)/src.downloaded +cross_toolset: $(SRCDIR)/src.downloaded findunusedcode: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cross_toolset/Makefile
cross_toolset/Makefile |8 1 file changed, 8 insertions(+) New commits: commit fcc56e8a894dfeb8885f663f33f364becec5d176 Author: Norbert Thiebaud Date: Mon Feb 6 02:42:38 2012 -0600 again with bootstrap, but for cross-compile this time diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile index 271c83a..5b80d7b 100644 --- a/cross_toolset/Makefile +++ b/cross_toolset/Makefile @@ -6,6 +6,14 @@ SHELL=/usr/bin/env bash include ../config_build.mk +# +# Bootstap +# +$(WORKDIR)/bootstrap: + @cd $(SRC_ROOT) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap .PHONY : build ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 015713cd664b905b7090816db0e67b1b17df183e Author: Norbert Thiebaud Date: Mon Feb 6 00:37:01 2012 -0600 typo in the export of WIN_* variables diff --git a/configure.in b/configure.in index 8341d6c..a44f2d7 100644 --- a/configure.in +++ b/configure.in @@ -10753,10 +10753,10 @@ AC_SUBST(ATL_INCLUDE) AC_SUBST(ATL_LIB) AC_SUBST(MFC_INCLUDE) AC_SUBST(MFC_LIB) -AC_SUBST(WIND_FIND) -AC_SUBST(WIND_GREP) -AC_SUBST(WIND_LS) -AC_SUBST(WIND_TOUCH) +AC_SUBST(WIN_FIND) +AC_SUBST(WIN_GREP) +AC_SUBST(WIN_LS) +AC_SUBST(WIN_TOUCH) AC_SUBST(BUILD_TYPE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild tail_build/Makefile
solenv/gbuild/extensions/post_BuildplTargets.mk |4 ++-- solenv/gbuild/partial_build.mk |2 +- tail_build/Makefile |6 ++ 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 8d488bafe5d1aac82018e7b12e5ecaab5ede5342 Author: Norbert Thiebaud Date: Sun Feb 5 22:54:18 2012 -0600 another tweak to bootstrap handling diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 2c632d6..58f12e8 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -173,9 +173,9 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) -dev-install: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) +dev-install: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) -build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) +build: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) cross_toolset: bootstrap $(SRCDIR)/src.downloaded diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index 2059514..e95a0a6 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -11,7 +11,7 @@ include $(module_directory)/../config_$(gb_Side).mk endif $(WORKDIR)/bootstrap: - @cd $(SRCDIR) && ./bootstrap + @cd $(SRC_ROOT) && ./bootstrap @mkdir -p $(dir $@) && touch $@ bootstrap: $(WORKDIR)/bootstrap diff --git a/tail_build/Makefile b/tail_build/Makefile index 4ee91d8..d89204e 100644 --- a/tail_build/Makefile +++ b/tail_build/Makefile @@ -31,6 +31,12 @@ ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST/../config_host.mk endif +$(WORKDIR)/bootstrap: + @cd $(SRC_ROOT) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap + gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile solenv/gbuild
Makefile|7 +-- solenv/gbuild/extensions/post_BuildplTargets.mk | 12 solenv/gbuild/partial_build.mk |8 3 files changed, 17 insertions(+), 10 deletions(-) New commits: commit 8b212711cf09492e07d05b62360d7960d3b0178c Author: Norbert Thiebaud Date: Sun Feb 5 22:00:39 2012 -0600 darn! finally bootstrap target (seems to) works on windows... and other diff --git a/Makefile b/Makefile index a701b50..8d0f18c 100644 --- a/Makefile +++ b/Makefile @@ -352,8 +352,11 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # # Bootstap # +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ -bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap +bootstrap: $(WORKDIR)/bootstrap # # Fetch @@ -362,7 +365,7 @@ fetch: src.downloaded src.downloaded : autogen ooo.lst download ifeq ($(DO_FETCH_TARBALLS),YES) - ./download $(SRCDIR)/ooo.lst && touch $@ + @./download $(SRCDIR)/ooo.lst && touch $@ else @echo "Automatic fetching of external tarballs is disabled." endif diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 8bd3151..2c632d6 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -27,10 +27,6 @@ .PHONY: cross-build-toolset dev-install build findunusedcode -$(SRCDIR)/workdir/$(INPATH)/bootstrap: - @cd $(SRCDIR) && ./bootstrap - @mkdir -p $(dir $@) && touch $@ - ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) .DEFAULT_GOAL=all @@ -110,7 +106,7 @@ endef # the build order dependencies are rather ugly... dev-install: \ - $(SRCDIR)/workdir/$(INPATH)/bootstrap \ + bootstrap \ $(SRCDIR)/src.downloaded \ $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \ | $(filter build,$(MAKECMDGOALS)) \ @@ -177,11 +173,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) -dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) +dev-install: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) -build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) +build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) -cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded +cross_toolset: bootstrap $(SRCDIR)/src.downloaded findunusedcode: diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index 808917b..2059514 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -1,4 +1,6 @@ +.PHONY : bootstrap + gb_PARTIALBUILD := T ifeq ($(SOLARENV),) @@ -8,6 +10,12 @@ endif include $(module_directory)/../config_$(gb_Side).mk endif +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap + gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/extensions/post_BuildplTargets.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 81e9525305cfe2b9455dadceeda0710e0176448c Author: Norbert Thiebaud Date: Sun Feb 5 21:00:54 2012 -0600 still invalid use of WORKDIR in top level Makefile diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 1ba2ffb..8bd3151 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -110,7 +110,7 @@ endef # the build order dependencies are rather ugly... dev-install: \ - $(WORKDIR)/bootstrap \ + $(SRCDIR)/workdir/$(INPATH)/bootstrap \ $(SRCDIR)/src.downloaded \ $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \ | $(filter build,$(MAKECMDGOALS)) \ @@ -177,11 +177,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) -dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) +dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) -build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) +build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) -cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded +cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded findunusedcode: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 993cdce1f0194433cfa5bfa1a88d38b52e8a9240 Author: Norbert Thiebaud Date: Sun Feb 5 20:43:10 2012 -0600 again do not use WORKDIR prematurely due to windows diff --git a/Makefile b/Makefile index 3cab806..a701b50 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # Bootstap # -bootstrap: $(WORKDIR)/bootstrap +bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap # # Fetch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/extensions/post_BuildplTargets.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a08ed74f4da656f94eae1cc293073faaa937a89 Author: Norbert Thiebaud Date: Sun Feb 5 20:35:07 2012 -0600 we can't use WORKDIR directly, on windows this is windows path diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 332e0d4..1ba2ffb 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -27,7 +27,7 @@ .PHONY: cross-build-toolset dev-install build findunusedcode -$(WORKDIR)/bootstrap: +$(SRCDIR)/workdir/$(INPATH)/bootstrap: @cd $(SRCDIR) && ./bootstrap @mkdir -p $(dir $@) && touch $@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: animations/README rhino/README sc/README sd/README sfx2/README slideshow/README starmath/README sw/README
animations/README |1 + rhino/README |2 +- sc/README |1 + sd/README |3 +++ sfx2/README |3 ++- slideshow/README |1 + starmath/README |1 + sw/README |1 + 8 files changed, 11 insertions(+), 2 deletions(-) New commits: commit 904d59fab93eb2fe855f0a46d9d6d64e62df0228 Author: Josh Heidenreich Date: Sat Feb 4 09:25:42 2012 -0600 add missing README to animation, sc, sd, slideshow, starmath, sw diff --git a/animations/README b/animations/README new file mode 100644 index 000..0076995 --- /dev/null +++ b/animations/README @@ -0,0 +1 @@ +Contains containers for the css::animation UNO API, used in [[slideshow]] and [[sd]]. diff --git a/rhino/README b/rhino/README index f8f47a1..ae212c9 100644 --- a/rhino/README +++ b/rhino/README @@ -1,5 +1,5 @@ The Scripting Framework makes use of the Rhino (http://www.mozilla.org/rhino/) -JavaScript interpreter, available under the Mozilla Public License +JavaScript interpreter, available under the Mozilla Public License (http://www.mozilla.org/MPL/MPL-1.1.html). In addition, to support the debugging of scripts contained in OpenOffice.org diff --git a/sc/README b/sc/README new file mode 100644 index 000..fb918b9 --- /dev/null +++ b/sc/README @@ -0,0 +1 @@ +Spreadsheet application code. diff --git a/sd/README b/sd/README new file mode 100644 index 000..963e7bd --- /dev/null +++ b/sd/README @@ -0,0 +1,3 @@ +The core directory for the impress/draw applications. + +Think of impress as a hack on top of draw. diff --git a/sfx2/README b/sfx2/README index 3b160a2..1182cc2 100755 --- a/sfx2/README +++ b/sfx2/README @@ -1,3 +1,4 @@ This is the gui code, much of which is now deprecated. List of documents open would be traceked, -raw C__ code; gutsy core of document management and loading. +raw C__ code; gutsy core of document management and loading. + diff --git a/slideshow/README b/slideshow/README new file mode 100644 index 000..54a1994 --- /dev/null +++ b/slideshow/README @@ -0,0 +1 @@ +Contains the new impress slideshow engine introduced in OO.o 2.0 diff --git a/starmath/README b/starmath/README new file mode 100644 index 000..a5a0a4e --- /dev/null +++ b/starmath/README @@ -0,0 +1 @@ +Formula editor code for writer ([[sw]]). diff --git a/sw/README b/sw/README new file mode 100644 index 000..dc844a6 --- /dev/null +++ b/sw/README @@ -0,0 +1 @@ +Writer application code. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fontconfig/prj
fontconfig/prj/build.lst |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 27bd5ff1fd49ea8b98da18b2544793251103d8cf Author: Norbert Thiebaud Date: Mon Jan 30 18:44:25 2012 -0600 keep the module name consistent in build.lst diff --git a/fontconfig/prj/build.lst b/fontconfig/prj/build.lst index 43891b4..3033261 100644 --- a/fontconfig/prj/build.lst +++ b/fontconfig/prj/build.lst @@ -1,3 +1,3 @@ -fc libfontconfig : FREETYPE:freetype EXPAT:expat NULL -fc libfontconfig usr1- u fc_mkout NULL -fc libfontconfig nmake - u fc_libfontconfig NULL +fc fontconfig : FREETYPE:freetype EXPAT:expat NULL +fc fontconfig usr1- u fc_mkout NULL +fc fontconfig nmake - u fc_libfontconfig NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: freetype/prj libexttextcat/prj
freetype/prj/build.lst |6 +++--- libexttextcat/prj/build.lst |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 9f18cc75a2ed2a9316966f863ff9a8b157179474 Author: Norbert Thiebaud Date: Mon Jan 30 18:40:13 2012 -0600 keep the module name consistent in build.lst diff --git a/freetype/prj/build.lst b/freetype/prj/build.lst index 8e3134d..5d58fed 100644 --- a/freetype/prj/build.lst +++ b/freetype/prj/build.lst @@ -1,3 +1,3 @@ -ft libfreetype : NULL -ft libfreetype usr1- u ft_mkout NULL -ft libfreetype nmake - u ft_libfreetype NULL +ft freetype : NULL +ft freetype usr1- u ft_mkout NULL +ft freetype nmake - u ft_libfreetype NULL diff --git a/libexttextcat/prj/build.lst b/libexttextcat/prj/build.lst index 8516375..133bcb7 100644 --- a/libexttextcat/prj/build.lst +++ b/libexttextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : soltools solenv NULL -ltc libtextcat usr1- all ltc_mkout NULL -ltc libtextcat nmake - all ltc_libtextcat NULL +ltc libexttextcat : soltools solenv NULL +ltc libexttextcat usr1- all ltc_mkout NULL +ltc libexttextcat nmake - all ltc_libtextcat NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: commit f1121e4d78a0b106fe7a7d1bcde57adec6d49154 Author: Norbert Thiebaud Date: Sat Jan 28 18:10:31 2012 -0600 gbuildify apple_remote commit 71172716d6bd98c0ded1df04398352bb5ae154ec Author: Norbert Thiebaud Date: Thu Jan 26 16:29:26 2012 -0600 autogen properly on default target.. and do not autogen on clean/distclean commit 73121366335b2bb2d1983549ecf1d005ea6f3eb7 Author: Norbert Thiebaud Date: Thu Jan 26 14:26:49 2012 -0600 autogen when necessary and restart the make.. commit f8ed77a59a6b712fce7cad2000ce1c7731892fda Author: Norbert Thiebaud Date: Thu Jan 26 02:32:45 2012 -0600 gb_WinResTarget__command never has 3 parameters commit 88f31d9d78e0b616797a26d34d288514b962a55a Author: Norbert Thiebaud Date: Thu Jan 26 02:31:08 2012 -0600 gb_Helper_convert_native should not introduce superflous spaces that broke a case where we had -DMISC=$(call gb_Helper_conver_native,...) which transformed in to -DMISC= d:/foo/bar and broke the build commit a5b07cdf370e73719734f98c8cd88cba9f194ea0 Author: Norbert Thiebaud Date: Thu Jan 26 02:28:45 2012 -0600 REPODIR could be a drive i.e D:/ in that case we want to strip the '/' otherwise we construct file like d://libo/... which break stuf commit f99c91c019d373a4cd3a19a68b9424e29ae79aa3 Author: Norbert Thiebaud Date: Wed Jan 25 17:24:04 2012 -0600 adjust gbuild doc commit b2c3edd891d93ed6a56a22861b883fda658ffc9d Author: Norbert Thiebaud Date: Wed Jan 25 17:23:51 2012 -0600 fixes for windows build for config_host.mk based build commit d0088d00f45c954d02165e9a5483c3c8a65e18f6 Author: Norbert Thiebaud Date: Wed Jan 25 17:22:58 2012 -0600 add cmd target to deal with corner case operations commit e915242798196b523ac2ef34cdd898b096a20832 Author: Norbert Thiebaud Date: Wed Jan 25 07:25:16 2012 -0600 dmake-invoked gnumake may need implicite rules... avoid impacting theem commit a9d9c19499c8a51265846867cf266ea948baca3d Author: Norbert Thiebaud Date: Tue Jan 24 15:48:30 2012 -0600 switch to include-based build rather than sourced-based build commit 53c349e9e3c268782d2d13ae41b8172feeaa2cd8 Author: Norbert Thiebaud Date: Sat Jan 21 19:40:28 2012 -0600 coup de grace for Env.Host.sh and associated files commit 0d66b71ec487e08990bf536afd222a090964c3e2 Author: Norbert Thiebaud Date: Fri Jan 20 20:15:51 2012 -0600 remove everything possible but PATH from set_soenv only PATH and SOLARENV which is used as a trigger to call Env.Host.sh are left... commit 44d7f41a512548bd48191a9add0728c4f13a7e2b Author: Norbert Thiebaud Date: Fri Jan 20 18:59:24 2012 -0600 windows fix. some path need to be 'formatted' appropriately commit 074da05e8bce95954df4e1700502e3c83e84fb5c Author: Norbert Thiebaud Date: Fri Jan 20 18:58:48 2012 -0600 remove the export unused JAVAHOME variable JAVAHOME is used in an obscure test module in moz, that does not seems to be run anyway... other than that, no trace of it so no need to export it. commit e5933f3cc64c1ac2afdb1be4228efd1579419cf0 Author: Norbert Thiebaud Date: Thu Jan 19 02:00:03 2012 -0600 migrate a bunch of mostly windows related variables + clean-up in set_soenv commit d8a04bf845c15038f8b0cfb759140bcd086ddb9b Author: Norbert Thiebaud Date: Thu Jan 19 01:58:22 2012 -0600 ENABLE_RPATH and LINKFLAGSRUNPATH are not used commit 3aaf3307a3c12356b4708d5e6a95a684b931dc9f Author: Norbert Thiebaud Date: Thu Jan 19 01:55:59 2012 -0600 migrate TARFILE_LOCATION out of set_soenv commit 7dd4b19db50388eac1b855614062f8e6ac568587 Author: Norbert Thiebaud Date: Thu Jan 19 01:53:39 2012 -0600 avoid exporting un-necessary symbol/alias for stable scripts commit 96b20d656e71285dc147c7faa3ad60238dcd9b09 Author: Norbert Thiebaud Date: Thu Jan 19 01:52:10 2012 -0600 migrate WITH_POOR_HELP_LOCALIZATIONS out of set_soenv commit d54eb28abebc7ec9ea994caac5a89dc3eb3297f9 Author: Norbert Thiebaud Date: Thu Jan 19 01:48:41 2012 -0600 migrate ENABLE_DEBUG out of set_soenv commit d6d87343dbef33ff35c2317b5fcfcb85fd00095f Author: Norbert Thiebaud Date: Thu Jan 19 01:46:38 2012 -0600 WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info commit 985cb2df2ffc1dee66c92faad742ac9e2c9c3cb8 Author: Norbert Thiebaud Date: Thu Jan 19 01:44:29 2012 -0600 migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv commit 7ea5c7993f5b113e1adfce7c7fa15ea3d89ba1bf Author: Norbert Thiebaud Date: Thu Jan 19 01:34:37 2012 -0600 migrate SYSBASE out of set_soenv commit a186a581d4f97fe55867cc180ae0404cb4bcf70f Author: Norbert Thiebaud Date: Thu Jan 19 01:31:21 2012 -0600 migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv commit d85585c1bb3abc5bcd4eb97ca2fa953994b7af5d Author: Norbert Thiebaud Date: Thu Jan 19 01:28:32 2012 -0600 replace SO
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 2 commits - sal/osl set_soenv.in
sal/osl/unx/system.c |4 ++-- set_soenv.in |3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e4b21face9d9b62c7ab2a8e9237dad01f39cc645 Author: François Tigeot Date: Wed Jan 25 19:43:17 2012 +0100 NetBSD also needs the internal gethostbyname_r() implementation Reported by: Thomas Klausner (cherry picked from commit 5f32a5558e8672ed56d5d393228aefacc632846c) Conflicts: sal/osl/unx/system.c Signed-off-by: Stephan Bergmann Signed-off-by: Norbert Thiebaud diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index bf8607d..ba782f6 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -33,7 +33,7 @@ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; /* struct passwd differs on some platforms */ -#if defined(MACOSX) || defined(IOS) +#if defined(MACOSX) || defined(IOS) || defined(NETBSD) extern int h_errno; @@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result, return res; } -#endif // OSX || IOS +#endif // OSX || IOS || NETBSD #if defined(MACOSX) /* commit 675206498ec023ffe74d14cf4b364b40b0e26767 Author: François Tigeot Date: Wed Jan 25 18:50:35 2012 +0100 Ensure Env.Host.sh always return a zero exit code * On some NetBSD systems, the last unset command returns a non-zero exit code * This made the make(1) processes terminate immediately in source-env-and-recurse, breaking the build. Reported by: Thomas Klausner (cherry picked from commit a79889083b25d69ae6b801ed8cee90b5dd9199c4) Signed-off-by: Stephan Bergmann Signed-off-by: Norbert Thiebaud diff --git a/set_soenv.in b/set_soenv.in index afaac53..817693e 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2063,6 +2063,9 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" ); # print OUT "export $exportvars$newline"; print OUT "unset $unsetvars$newline"; +# unset may return a non-zero value and make the initial +# make(1) processes terminate with an error +print OUT "true $newline"; # #--- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/soenv2' - 6 commits - configure.in Makefile solenv/gbuild
Makefile|8 ++
configure.in| 30 ++--
solenv/gbuild/extensions/post_BuildplTargets.mk |2 -
solenv/gbuild/gbuild.mk | 12 -
solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 ++--
5 files changed, 40 insertions(+), 18 deletions(-)
New commits:
commit 4a17f9e1bc9bc1871bce66d9a25bef7f4b3d3405
Author: Norbert Thiebaud
Date: Thu Jan 26 02:32:45 2012 -0600
gb_WinResTarget__command never has 3 parameters
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6781672..dce6227 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -673,7 +673,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_RC) \
$(DEFS) $(FLAGS) \
- -I$(dir $(3)) \
$(INCLUDE) \
-Fo$(1) \
$(RCFILE) )
commit a5209d8760295b9ed8dbaed3f04e9ea95581fbaf
Author: Norbert Thiebaud
Date: Thu Jan 26 02:31:08 2012 -0600
gb_Helper_convert_native should not introduce superflous spaces
that broke a case where we had -DMISC=$(call gb_Helper_conver_native,...)
which transformed in to -DMISC= d:/foo/bar
and broke the build
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index ada5df8..6781672 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -251,6 +251,7 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
# slashes after file: in a file: URL from being unduplicated by the
# // -> / substitution.
define gb_Helper_convert_native
+$(strip \
$(subst file:!!!,file:///, \
$(subst //,/, \
$(subst file:///,file:!!!, \
@@ -258,7 +259,7 @@ $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1
+$(1)
endef
# YaccTarget class
commit b5278f1155bd111e43417dfed7af3efba0adf65b
Author: Norbert Thiebaud
Date: Thu Jan 26 02:28:45 2012 -0600
REPODIR could be a drive i.e D:/ in that case we want to strip the '/'
otherwise we construct file like d://libo/... which break stuf
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 7552f09..ada5df8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -239,7 +239,7 @@ endif
gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{
print tolower(substr($$0,1,1)) substr($$0,2) }')
gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{
print tolower(substr($$0,1,1)) substr($$0,2) }')
gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{
print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{
print tolower(substr($$0,1,1)) substr($$0,2) }')
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{
print tolower(substr($$0,1,1)) substr($$0,2) }' | sed -e 's,\:/$$,:,')
gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
commit a6ecc6f8e660735262382e14084ef09efa7fbfa7
Author: Norbert Thiebaud
Date: Wed Jan 25 17:24:04 2012 -0600
adjust gbuild doc
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1633bd9..8b4c162 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -373,6 +373,14 @@ AVAILABLE TARGETS
showdeliverables show the targets delivered to OUTDIR and their source
debugrun starts the dev-install instance and allows tests to be
run
against it
+build the named module
+ .clean clean the named module
+ .all for dmake modules only, build the named module and
+the pre-requisite modules for this module
+ .deliver for dmake modules only, deliver the named module
+ cmd execute the command contained in the variable cmd=""
+in a shell with config_host.mk or config_build.mk
+environement set. (see gb_SIDE)
INTERACTIVE VARIABLES:
DEBUG / debug If not empty, build with DBGLEVEL=1 (see below).
@@ -400,7 +408,9 @@ INTERACTIVE VARIABLES:
gb_FULLDEPS Generate and use dependencies (on by default, handle
with care).
gb_COLORUse ASCII color output.
gb_TITLES Show progress in terminal title.
-
+ gb_Side Either "host" of "build" (default to "host").
+
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/filter/xml/XMLStylesExportHelper.cxx | 87 +
1 file changed, 74 insertions(+), 13 deletions(-)
New commits:
commit 0a646ae118e0a376481fc3cbc945031702b26c1a
Author: Eike Rathke
Date: Sat Jan 21 01:15:02 2012 +0100
Resolves fdo#43725 crash on saving a file
+ Checks out-of-bounds accesses in
ScFormatRangeStyles::GetStyleNameIndex() and
ScRowFormatRanges::AddRange() and prevents crashes.
- The real cause seems to be some style row/repeat miscalculation
elsewhere, further investigation would be necessary.
Signed-off-by: Norbert Thiebaud
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5ae0485..38d1523 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -680,10 +680,35 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange&
rFormatRange,
const sal_Int32 nRow)
{
DBG_ASSERT(pRowDefaults, "no row defaults");
+if (!pRowDefaults)
+return;
DBG_ASSERT(pColDefaults, "no column defaults");
+if (!pColDefaults)
+return;
+sal_Int32 nPrevIndex;
+bool bPrevAutoStyle;
+OSL_ENSURE( static_cast(nRow) < pRowDefaults->size(), "nRow out of
bounds");
+if (!(static_cast(nRow) < pRowDefaults->size()))
+{
+/* This is only to prevent out-of-bounds accesses, once reached here
+ * there's something else going wrong, so FIXME there! */
+if (pRowDefaults->empty())
+{
+nPrevIndex = -1;
+bPrevAutoStyle = false;
+}
+else
+{
+nPrevIndex = (*pRowDefaults)[pRowDefaults->size()-1].nIndex;
+bPrevAutoStyle =
(*pRowDefaults)[pRowDefaults->size()-1].bIsAutoStyle;
+}
+}
+else
+{
+nPrevIndex = (*pRowDefaults)[nRow].nIndex;
+bPrevAutoStyle = (*pRowDefaults)[nRow].bIsAutoStyle;
+}
sal_uInt32 nEnd (rFormatRange.nRepeatRows + nRow - 1);
-sal_Int32 nPrevIndex((*pRowDefaults)[nRow].nIndex);
-sal_Bool bPrevAutoStyle((*pRowDefaults)[nRow].bIsAutoStyle);
sal_uInt32 i(nRow + 1);
sal_Bool bReady(false);
while ((i < nEnd) && !bReady && (i < pRowDefaults->size()))
@@ -700,12 +725,34 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange&
rFormatRange,
rFormatRange.nRepeatRows = i - nRow + 1;
if (nPrevIndex == -1)
{
-nPrevIndex = (*pColDefaults)[rFormatRange.nStartColumn].nIndex;
-bPrevAutoStyle =
(*pColDefaults)[rFormatRange.nStartColumn].bIsAutoStyle;
sal_uInt32 nPrevStartCol(rFormatRange.nStartColumn);
-sal_uInt32 nRepeat((*pColDefaults)[rFormatRange.nStartColumn].nRepeat);
-nEnd = rFormatRange.nStartColumn + rFormatRange.nRepeatColumns;
-for(i = nPrevStartCol + nRepeat; i < nEnd; i +=
(*pColDefaults)[i].nRepeat)
+OSL_ENSURE( static_cast(nPrevStartCol) < pColDefaults->size(),
"nPrevStartCol out of bounds");
+sal_uInt32 nRepeat;
+if (static_cast(nPrevStartCol) < pColDefaults->size())
+{
+nRepeat = (*pColDefaults)[nPrevStartCol].nRepeat;
+nPrevIndex = (*pColDefaults)[nPrevStartCol].nIndex;
+bPrevAutoStyle = (*pColDefaults)[nPrevStartCol].bIsAutoStyle;
+}
+else
+{
+/* Again, this is to prevent out-of-bounds accesses, so FIXME
+ * elsewhere! */
+if (pColDefaults->empty())
+{
+nRepeat = 1;
+nPrevIndex = -1;
+bPrevAutoStyle = false;
+}
+else
+{
+nRepeat = (*pColDefaults)[pColDefaults->size()-1].nRepeat;
+nPrevIndex = (*pColDefaults)[pColDefaults->size()-1].nIndex;
+bPrevAutoStyle =
(*pColDefaults)[pColDefaults->size()-1].bIsAutoStyle;
+}
+}
+nEnd = nPrevStartCol + rFormatRange.nRepeatColumns;
+for(i = nPrevStartCol + nRepeat; i < nEnd && i < pColDefaults->size();
i += (*pColDefaults)[i].nRepeat)
{
DBG_ASSERT(sal_uInt32(nPrevStartCol + nRepeat) <= nEnd, "something
wents wrong");
if ((nPrevIndex != (*pColDefaults)[i].nIndex) ||
@@ -924,6 +971,8 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const
sal_Int32 nTable,
const sal_Int32 nColumn, const sal_Int32 nRow, sal_Bool& bIsAutoStyle)
const
{
DBG_ASSERT(static_cast(nTable) < aTables.size(), "wrong table");
+if (!(static_cast(nTable) < aTables.size()))
+return -1;
ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]);
ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin());
ScMyFormatRangeAddresses::iterator aEndItr(pFormatRanges
[Libreoffice-commits] .: registry/inc sal/inc
registry/inc/registry/reader.h |2 +- registry/inc/registry/registry.h |4 ++-- sal/inc/osl/process.h| 12 ++-- sal/inc/osl/socket.h |2 +- sal/inc/rtl/locale.h |6 +++--- sal/inc/rtl/logfile.h|2 +- sal/inc/rtl/random.h | 12 ++-- sal/inc/rtl/strbuf.h |4 ++-- sal/inc/rtl/string.h |4 ++-- sal/inc/rtl/tencinfo.h |2 +- sal/inc/rtl/unload.h |2 +- sal/inc/rtl/ustrbuf.h|2 +- sal/inc/rtl/ustring.h|6 +++--- sal/inc/sal/log.hxx |2 +- sal/inc/sal/types.h |2 +- 15 files changed, 32 insertions(+), 32 deletions(-) New commits: commit 53358305d8620f703d14df3c37a9b65e29a20cb4 Author: Norbert Thiebaud Date: Fri Jan 20 17:16:19 2012 -0600 kill some doxygen warnings diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h index e455d0a..cdbd0ba 100644 --- a/registry/inc/registry/reader.h +++ b/registry/inc/registry/reader.h @@ -318,7 +318,7 @@ void SAL_CALL typereg_reader_getFieldTypeName( @param type an out-parameter obtaining the field value's type; must not be null - @param result an out-parameter obtaining the field value's value; must not be + @param value an out-parameter obtaining the field value's value; must not be null @return false iff an out-of-memory condition occurred, in which case diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h index a35c9df..5374d65 100644 --- a/registry/inc/registry/registry.h +++ b/registry/inc/registry/registry.h @@ -58,7 +58,7 @@ RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, @param hKey identifies a currently open key. The key which will be opened by this function is a subkey of the key identified by hKey @param keyName points to a null terminated string specifying the name of a key. -@param phNewKey points to a variable that receives the handle of the opened key. +@param phOpenKey points to a variable that receives the handle of the opened key. The memory to store this variable will be allocated and will be freed by the function reg_closeKey. If the function fails, phNewKey is NULL. @return REG_NO_ERROR if succeeds else an error code. @@ -415,7 +415,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, /** This function returns the name of a registry. -@param hReg identifies a currently open registry whose name will be returned. +@param hRegistry identifies a currently open registry whose name will be returned. @param pName returns the name of the registry if the function succeeds otherwise an empty string. @return REG_NO_ERROR if succeeds else an error code. */ diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h index 2eb2954..bd8c2c4 100644 --- a/sal/inc/osl/process.h +++ b/sal/inc/osl/process.h @@ -146,7 +146,7 @@ typedef void* oslProcess; is undefined. If this parameter is NULL or the caller provides an empty string the new process will have the same current working directory as the calling process. -@param ustrEnviroments +@param ustrEnvironments [in] An array of strings describing environment variables that should be merged into the environment of the new process. Each string has to be in the form "variable=value". This parameter can be NULL in which case the new process gets the same environment @@ -190,7 +190,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess( /** Execute a process and redirect child process standard IO. -@param ustrImageName +@param strImageName [in] The file URL of the executable to be started. Can be NULL in this case the file URL of the executable must be the first element in ustrArguments. @@ -216,7 +216,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess( is undefined. If this parameter is NULL or the caller provides an empty string the new process will have the same current working directory as the calling process. -@param ustrEnviroments +@param ustrEnvironments [in] An array of strings describing environment variables that should be merged into the environment of the new process. Each string has to be in the form "variable=value". This parameter can be NULL in which case the new process gets the same environment @@ -333,14 +333,14 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_joinProcessWithTimeout( oslProcess Process, const TimeValue* pTimeout); /** Retrieves information about a Process -@param Process [in] the process handle of the process -@param Field [in] the information which is to be retrieved +@param[in] Process the process handle of the process +@param[in] Fiel
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: commit 6eb80737c333ed6cb706c391305ecb98fe838e6f Author: Norbert Thiebaud Date: Thu Jan 19 02:00:03 2012 -0600 migrate a bunch of mostly windows related variables + clean-up in set_soenv commit b1e46eddd16431e0123d44d178ce8be4e320eba9 Author: Norbert Thiebaud Date: Thu Jan 19 01:58:22 2012 -0600 ENABLE_RPATH and LINKFLAGSRUNPATH are not used commit 5c56f8f36fdc2785ed66ba45d3daae12402a1687 Author: Norbert Thiebaud Date: Thu Jan 19 01:55:59 2012 -0600 migrate TARFILE_LOCATION out of set_soenv commit e37d68a8f6c9c42cc5210118bd80bf20746b4515 Author: Norbert Thiebaud Date: Thu Jan 19 01:53:39 2012 -0600 avoid exporting un-necessary symbol/alias for stable scripts commit 46cf2d208ffbab0c38c6b07f3360c0dacc9886b9 Author: Norbert Thiebaud Date: Thu Jan 19 01:52:10 2012 -0600 migrate WITH_POOR_HELP_LOCALIZATIONS out of set_soenv commit f6ef15066aaa8fd87d71d480505de79e60c4a57c Author: Norbert Thiebaud Date: Thu Jan 19 01:48:41 2012 -0600 migrate ENABLE_DEBUG out of set_soenv commit 2aedab1a289f7dc604c4f540cabf5a5dac1babb0 Author: Norbert Thiebaud Date: Thu Jan 19 01:46:38 2012 -0600 WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info commit ecb71ab22d9ca071578d899b012ec153b36511ac Author: Norbert Thiebaud Date: Thu Jan 19 01:44:29 2012 -0600 migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv commit 61dd97373ba3865797ab53f1fc1fd04d096730b1 Author: Norbert Thiebaud Date: Thu Jan 19 01:34:37 2012 -0600 migrate SYSBASE out of set_soenv commit 5b6ccfda960bd31760633dac1316fb1c9175879f Author: Norbert Thiebaud Date: Thu Jan 19 01:31:21 2012 -0600 migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv commit 62e1774c2a5c66ce6f274da2d9015ae370b48233 Author: Norbert Thiebaud Date: Thu Jan 19 01:28:32 2012 -0600 replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses commit 15b1bc5e02cdd46b7d1a7eb4c8fbea9fd99ae1b3 Author: Norbert Thiebaud Date: Thu Jan 19 01:23:33 2012 -0600 remove unused CC_X64_BINARY commit fbe3af0b7dfc5828807e8b9c2fd3cba26a54df33 Author: Norbert Thiebaud Date: Wed Jan 18 15:54:03 2012 -0600 Eliminate un-used DIRECTX5 commit d327f2e3f3aff5c1b6214a523751e187ed4d877a Author: Norbert Thiebaud Date: Wed Jan 18 15:38:42 2012 -0600 migrate SYNAMIC_CRT and use_shl_version commit d1bc6eee75865673b8474f1687b7fb8ccf905bef Author: Norbert Thiebaud Date: Wed Jan 18 15:35:37 2012 -0600 move SunOS compiler detection up so that COMPATH is settled earlier commit 2ae30b3edda449a5bda89827d2bca4d8fc31a02f Author: Norbert Thiebaud Date: Wed Jan 18 15:34:39 2012 -0600 add api in configure.in to deal with PATH manipulations... prep-work for the migration of PATH handling from set_soenv... commit eef73f24e99f42e1804ec0c44c42f6239c723295 Author: Norbert Thiebaud Date: Wed Jan 18 15:33:30 2012 -0600 export a flag-variable to deal with cygwin only export commit a4c1a2b55fd39ece3179b1ad0a1e56e9bf28c974 Author: Norbert Thiebaud Date: Wed Jan 18 15:32:46 2012 -0600 add function to deal with native windows path variables commit 40db56839103147c24080f4f5c262ce4ac069eac Author: Norbert Thiebaud Date: Mon Jan 9 19:50:53 2012 -0600 move WORK_STAMP out of set_soenv.in commit 51b3918cdaa7fd4d8dcfa461d377408114e7b2a5 Author: Norbert Thiebaud Date: Mon Jan 9 19:09:14 2012 -0600 Move MACOS related variable out of set_soenv.in commit 8bba4adeb9d180a143f0fecc7f5af7c52cb7ec5f Author: Norbert Thiebaud Date: Tue Jan 3 13:02:04 2012 -0600 move COMPATH,EPM_FLAGS and connex variables out of set_soenv.in ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/inc sal/inc
cppuhelper/inc/cppuhelper/weak.hxx |6 +++---
sal/inc/osl/file.hxx | 13 +
sal/inc/osl/pipe_decl.hxx |4 ++--
sal/inc/osl/profile.hxx|9 -
sal/inc/osl/security_decl.hxx | 22 +-
sal/inc/osl/socket_decl.hxx|8
sal/inc/rtl/logfile.hxx|2 +-
sal/inc/rtl/string.hxx |2 +-
sal/inc/rtl/ustrbuf.hxx|6 +++---
9 files changed, 32 insertions(+), 40 deletions(-)
New commits:
commit 6ac30d8be976d60f56783327984b263fb1307e2a
Author: Norbert Thiebaud
Date: Thu Jan 19 20:18:48 2012 -0600
clean-up Doxygen warnings
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx
b/cppuhelper/inc/cppuhelper/weak.hxx
index b8b9ddd..ceddbda 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -130,8 +130,8 @@ public:
SAL_THROW( () )
{ return *this; }
-/** Basic queryInterface() implementation supporting
::com::sun::star::uno::XWeak and
-::com::sun::star::uno::XInterface.
+/** Basic queryInterface() implementation supporting
\::com::sun::star::uno::XWeak and
+\::com::sun::star::uno::XInterface.
@param rType demanded type
@return demanded type or empty any
@@ -150,7 +150,7 @@ public:
/** XWeak::queryAdapter() implementation
-@return a ::com::sun::star::uno::XAdapter reference
+@return a \::com::sun::star::uno::XAdapter reference
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter
> SAL_CALL queryAdapter()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 85393f5..d63126b 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -120,7 +120,7 @@ public:
@param ustrRequestedURL [in]
Requested name of a file or directory.
-@param pustrValidURL [out]
+@param ustrValidURL [out]
On success receives a name which is unused and valid on the actual
Operating System and
File System.
@@ -251,7 +251,7 @@ public:
/** Retrieves the file URL of the system's temporary directory path.
-@param ustrTempDirURL[out]
+@param[out] ustrTempDirURL
On success receives the URL of system's temporary directory path.
@return
@@ -1529,16 +1529,13 @@ public:
return (RC) osl_getFileStatus( _pData, &rStatus._aStatus,
rStatus._nMask );
}
-/** Determine if two directory items point the the same underlying file
+/** Determine if a directory item point the the same underlying file
The comparison is done first by URL, and then by resolving links to
find the target, and finally by comparing inodes on unix.
-@param pItemA [in]
-A directory handle to compare with another handle
-
-@param pItemB [in]
-A directory handle to compare with pItemA
+@param[in] pOther
+A directory handle to compare with the underlying object's item
@return
sal_True: if the items point to an identical resource
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index 54ccb93..b361440 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -59,7 +59,7 @@ public:
/** Creates a secure pipe that access depends on the umask settings.
@param strName
@param Options
-@param Security
+@param rSecurity
*/
inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const
Security & rSecurity);
@@ -87,7 +87,7 @@ public:
If the pipe was already created, the old one will be discarded.
@param strName
@param Options
-@param Security
+@param rSec
@return True if socket was successfully created.
*/
inline sal_Bool create( const ::rtl::OUString & strName,
diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index 88476e0..e372285 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -62,7 +62,6 @@ namespace osl {
/** Close the opened profile an flush all data to the disk.
-@param Profile handle to a opened profile.
*/
~Profile()
{
@@ -143,8 +142,9 @@ namespace osl {
return bRet;
}
-/** Acquire the mutex, block if already acquired by another thread.
-@param Profile handle to a opened profile.
+/** Remove an entry from a section.
+@param rSection Name of the section.
+@param rEntry Name of the entry to remove.
@return False if section or entry could not be found.
*/
sal_Bool removeEntry(const rtl::OString& rSection, const rtl::OString&
rEntry)
@@ -153,7 +153,7 @@ namespace osl {
}
/** Get all entries belonging to the specified section.
-
[Libreoffice-commits] .: binfilter/bf_basic
binfilter/bf_basic/source/sbx/sbxvalue.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 65731b5747c2753a046e02be2a1fc81a4cfacda8
Author: Norbert Thiebaud
Date: Thu Jan 19 18:04:47 2012 -0600
fix SvStream:;operator>> problem
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index 44a7849..2da46d3 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -1550,7 +1550,11 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
if( n > SAL_TYPES_SIZEOFINT )
r >> aData.nLong, aData.eType = SbxLONG;
else
-r >> aData.nInt;
+{
+sal_Int32 nInt;
+r >> nInt;
+aData.nInt = nInt;
+}
break;
}
case SbxUINT:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/StaticLibrary_salcpprt.mk
sal/StaticLibrary_salcpprt.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit a56cf2216105065b7576ff695cf376bc58b12346 Author: Norbert Thiebaud Date: Mon Jan 16 17:11:05 2012 -0600 try to solve tml_'s detected dependencies issue with salcpprt diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk index 79583a6..65bd100 100644 --- a/sal/StaticLibrary_salcpprt.mk +++ b/sal/StaticLibrary_salcpprt.mk @@ -33,6 +33,12 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \ $(LFS_CFLAGS) \ )) +$(eval $(call gb_StaticLibrary_set_include,salcpprt,\ +$$(INCLUDE) \ +-I$(realpath $(SRCDIR)/sal/inc) \ +)) + + $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \ sal/cpprt/operators_new_delete \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/osl/security.h |2 - sal/inc/osl/semaphor.h |2 - sal/inc/osl/socket.h | 80 - sal/inc/osl/time.h | 16 - 4 files changed, 50 insertions(+), 50 deletions(-) New commits: commit 1b8b6ecf5fdf753bd787748d54aaa61964199465 Author: Norbert Thiebaud Date: Fri Jan 13 02:30:20 2012 -0600 suppress doxygen warning in osl diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h index ed9d9b5..85e8abd 100644 --- a/sal/inc/osl/security.h +++ b/sal/inc/osl/security.h @@ -61,7 +61,7 @@ SAL_DLLPUBLIC oslSecurity SAL_CALL osl_getCurrentSecurity(void); /** Deprecated API Create a security handle for the denoted user. Try to log in the user on the local system. -@param[in] strzUserName denotes the name of the user to logg in. +@param[in] strUserName denotes the name of the user to logg in. @param[in] strPasswd the password for this user. @param[out] pSecurity returns the security handle if user could be logged in. @return osl_Security_E_None if user could be logged in, otherwise an error-code. diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h index 0a10a37..fb0cc71 100644 --- a/sal/inc/osl/semaphor.h +++ b/sal/inc/osl/semaphor.h @@ -42,7 +42,7 @@ typedef void* oslSemaphore; @deprecated Must not be used, as unnamed semaphores are not supported on Mac OS X. -@param InitialCount denotes the starting value the semaphore. If you set it to +@param initialCount denotes the starting value the semaphore. If you set it to zero, the first acquire() blocks. Otherwise InitialCount acquire()s are immedeatly successfull. @return 0 if the semaphore could not be created, otherwise a handle to the sem. diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h index 87df672..19554e6 100644 --- a/sal/inc/osl/socket.h +++ b/sal/inc/osl/socket.h @@ -229,7 +229,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isEqualSocketAddr( oslSocketAddr Addr1, oslSocketAddr Addr2); /** Uses the systems name-service interface to find an address for strHostname. -@param strHostname [in] The name for which you search for an address. +@param[in] strHostname The name for which you search for an address. @return The desired address if one could be found, otherwise 0. Don't forget to destroy the address if you don't need it any longer. */ @@ -241,8 +241,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_resolveHostname( in dotted decimal notation as first argument. @seeosl_sendToSocket() @seeoslSocketAddr -@param strDottedAddr [in] dotted decimal internet address, may be 0. -@param Port [in] port number in host byte order. +@param[in] strDottedAddr dotted decimal internet address, may be 0. +@param[in] Port port number in host byte order. @return 0 if address could not be created. */ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( @@ -292,7 +292,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr( /** Sets the Port of Addr. -@param Port [in] is expected in host byte-order. +@param[in] Port is expected in host byte-order. @return sal_False if Addr is not an inet-addr. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setInetPortOfSocketAddr( @@ -337,8 +337,8 @@ typedef struct oslHostAddrImpl * oslHostAddr; /** Create an oslHostAddr from given hostname and socket address. -@param strHostname [in] The hostname to be stored. -@param Addr [in] The socket address to be stored. +@param[in] strHostname The hostname to be stored. +@param[in] Addr The socket address to be stored. @return The created address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddr( @@ -349,7 +349,7 @@ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddr( Successful name resolution should result in the fully qualified domain name (FQDN) and it's address as hostname and socket address members of the resulting oslHostAddr. -@param strHostname [in] The hostname to be resolved. +@param[in] strHostname The hostname to be resolved. @return The resulting address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHostname); @@ -359,7 +359,7 @@ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHost Successful name resolution should result in the fully qualified domain name (FQDN) and it's address as hostname and socket address members of the resulting oslHostAddr. -@param Addr [in] The socket address to be reverse resolved. +@param[in] Addr The socket address to be reverse resolved. @return The resulting address or 0 upon failure. */ SAL_DLLPUBLIC oslHostAddr SAL_CALL osl_createHostAddrByAddr(const oslSocketAddr Addr); @@ -447,8 +447,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_getLocalAddrOfSoc
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 --- desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 39cfc4d8ad77700aefabaedde430693448a5f76f Author: Norbert Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name diff --git a/Repository.mk b/Repository.mk index 3cc7a38..0724e43 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ +crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ +unopkg_bin \ +unopkg_com \ unopkgio \ )) else -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Helper_register_executables,OOO,\ - soffice_bin \ -unopkg_bin \ -)) -else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) -endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 456171d..8815432 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 464824f..c635c2b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk
Repository.mk | 364 +- 1 file changed, 182 insertions(+), 182 deletions(-) New commits: commit c48bac19685d3a66a9abeba8477e1b763a6b13bf Author: Norbert Thiebaud Date: Tue Jan 10 16:11:20 2012 -0600 cosmetic: clean-up tab/space mix. diff --git a/Repository.mk b/Repository.mk index 419ff4f..3cc7a38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -79,25 +79,25 @@ else ifeq ($(OS_FOR_BUILD),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ soffice_bin \ - unopkg_bin \ +unopkg_bin \ )) else $(eval $(call gb_Helper_register_executables,OOO,\ - soffice.bin \ - unopkg.bin \ +soffice.bin \ +unopkg.bin \ )) endif ifeq ($(OS),MACOSX) $(eval $(call gb_Helper_register_executables,OOO,\ - officeloader \ +officeloader \ )) else $(eval $(call gb_Helper_register_executables,OOO,\ - oosplash \ +oosplash \ )) endif @@ -107,10 +107,10 @@ endif ifneq ($(WITH_MOZILLA),NO) $(eval $(call gb_Helper_register_executables,OOO,\ nsplugin \ - pluginapp.bin \ +pluginapp.bin \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pl \ +pl \ )) endif # WITH_MOZILLA @@ -124,31 +124,31 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - PptImporter \ - abp \ - adabas \ - adabasui \ - acc \ - agg \ - analysis \ - animcore \ - basctl \ - basebmp \ - bib \ - canvastools \ - communi \ - date \ - evtatt \ - forui \ - odbc \ - odbcbase \ - officebean \ - oox \ - ooxml \ - sdbc \ +PptImporter \ +abp \ +adabas \ +adabasui \ +acc \ +agg \ +analysis \ +animcore \ +basctl \ +basebmp \ +bib \ +canvastools \ +communi \ +date \ +evtatt \ +forui \ +odbc \ +odbcbase \ +officebean \ +oox \ +ooxml \ +sdbc \ AppleRemote \ avmedia \ - avmediaQuickTime \ +avmediaQuickTime \ basegfx \ chartcontroller \ chartmodel \ @@ -160,7 +160,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dba \ dbaxml \ dbmm \ - dbp \ +dbp \ dbtools \ dbu \ deploymentmisc \ @@ -168,19 +168,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ doctok \ drawinglayer \ editeng \ - egi \ - eme \ - epb \ - epg \ - epp \ - eps \ - ept \ - era \ - eti \ - exp \ - filterconfig \ - filtertracer \ - flash \ +egi \ +eme \ +epb \ +epg \ +epp \ +eps \ +ept \ +era \ +eti \ +exp \ +filterconfig \ +filtertracer \ +flash \ for \ frm \ fwe \ @@ -188,46 +188,46 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ - guesslang \ +guesslang \ helplinker \ hwp \ - hyphen \ +hyphen \ i18npaper \ i18nregexp \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ +icd \ +icg \ +idx \ +ime \ +ipb \ +ipd \ +ips \ +ipt \ +ipx \ +ira \ +itg \ +iti \ lng \ - lnth \ - log \ +lnth \ +log \ lwpft \ - MacOSXSpell \ +MacOSXSpell \ merged \ msfilter \ msword \ - msworks \ - odfflatxml \ +msworks \ +odfflatxml \ offacc \ - pcr \ - pdffilter \ - placeware \ - protocolhandler \ +pcr \ +pdffilter \ +placeware \ +protocolhandler \ qstart_gtk \ - res \ +res \ resourcemodel \ rpt \ rptui \ rptxml \ - rtftok \ +rtftok \ sax \ sb \ sc \ @@ -244,13 +244,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ simplecm \ sm \ smd \ - solver \ +solver \ sot \ spa \ - spell \ +spell \ spl \ sts \ - svgfilter \ +svgfilter \ svl \ svt \ svx \ @@ -258,7 +258,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sw \ swd \ swui \ - t602filter \ +t602filter \ textconversiondlgs \ tk \ tl \ @@ -266,7 +266,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ unoxml \ updatecheckui \ utl \ - uui \ +uui \ vbahelper \ vcl \ vclplug_gen \ @@ -275,19 +275,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ vclplug_kde \ vclplug_kde4 \ vclplug_svp \ - cdrimport \ - visioimport \ - wpft \ - wpgimport \ +cdrimport \ +visioimport \ +wpft \ +wpgimport \ writerfilter
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/cellsuno.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a5e6ef23f8e0040b2e8543c838abea54072f2497
Author: Norbert Thiebaud
Date: Thu Jan 5 05:18:04 2012 -0600
use the docshell to change tab attributes. don't do it directly
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 6be0239..7e75ea8 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8509,8 +8509,11 @@ void ScTableSheetObj::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pEn
sal_Int32 nColor = COL_AUTO;
if (aValue >>= nColor)
{
-if (static_cast(nColor) != COL_AUTO)
-pDoc->SetTabBgColor(nTab,
Color(static_cast(nColor)));
+const Color aColor(static_cast(nColor));
+if (aColor != pDoc->GetTabBgColor(nTab))
+{
+aFunc.SetTabBgColor(nTab, aColor, true, true);
+}
}
}
else if ( pEntry->nWID == SC_WID_UNO_CODENAME )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/bitmap3.cxx | 76 +++--
1 file changed, 39 insertions(+), 37 deletions(-)
New commits:
commit bb0438f010893b6bc083aac6c1037f9a80ae8add
Author: Norbert Thiebaud
Date: Thu Jan 5 03:24:16 2012 -0600
potential null pointer dereference
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 19f5f25..a2b8587 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -949,63 +949,65 @@ sal_Bool Bitmap::ImplScaleFast( const double& rScaleX,
const double& rScaleY )
const Size aSizePix( GetSizePixel() );
const long nNewWidth = FRound( aSizePix.Width() * rScaleX );
const long nNewHeight = FRound( aSizePix.Height() * rScaleY );
-sal_BoolbRet = sal_False;
+sal_BoolbRet = sal_False;
if( nNewWidth && nNewHeight )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
-Bitmap aNewBmp( Size( nNewWidth, nNewHeight ),
GetBitCount(), &pReadAcc->GetPalette() );
-BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
-if( pReadAcc && pWriteAcc )
+if(pReadAcc)
{
-const long nScanlineSize = pWriteAcc->GetScanlineSize();
-const long nNewWidth1 = nNewWidth - 1L;
-const long nNewHeight1 = nNewHeight - 1L;
-const long nWidth = pReadAcc->Width();
-const long nHeight = pReadAcc->Height();
-long* pLutX = new long[ nNewWidth ];
-long* pLutY = new long[ nNewHeight ];
-
-if( nNewWidth1 && nNewHeight1 )
-{
-longnX, nY, nMapY, nActY = 0L;
-
-for( nX = 0L; nX < nNewWidth; nX++ )
-pLutX[ nX ] = nX * nWidth / nNewWidth;
-
-for( nY = 0L; nY < nNewHeight; nY++ )
-pLutY[ nY ] = nY * nHeight / nNewHeight;
+Bitmap aNewBmp( Size( nNewWidth, nNewHeight ),
GetBitCount(), &pReadAcc->GetPalette() );
+BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
-while( nActY < nNewHeight )
+if( pWriteAcc )
+{
+const long nScanlineSize = pWriteAcc->GetScanlineSize();
+const long nNewWidth1 = nNewWidth - 1L;
+const long nNewHeight1 = nNewHeight - 1L;
+const long nWidth = pReadAcc->Width();
+const long nHeight = pReadAcc->Height();
+long* pLutX = new long[ nNewWidth ];
+long* pLutY = new long[ nNewHeight ];
+
+if( nNewWidth1 && nNewHeight1 )
{
-nMapY = pLutY[ nActY ];
+longnX, nY, nMapY, nActY = 0L;
for( nX = 0L; nX < nNewWidth; nX++ )
-pWriteAcc->SetPixel( nActY, nX, pReadAcc->GetPixel(
nMapY , pLutX[ nX ] ) );
+pLutX[ nX ] = nX * nWidth / nNewWidth;
+
+for( nY = 0L; nY < nNewHeight; nY++ )
+pLutY[ nY ] = nY * nHeight / nNewHeight;
-while( ( nActY < nNewHeight1 ) && ( pLutY[ nActY + 1 ] ==
nMapY ) )
+while( nActY < nNewHeight )
{
-memcpy( pWriteAcc->GetScanline( nActY + 1L ),
- pWriteAcc->GetScanline( nActY ),
nScanlineSize );
+nMapY = pLutY[ nActY ];
+
+for( nX = 0L; nX < nNewWidth; nX++ )
+pWriteAcc->SetPixel( nActY, nX,
pReadAcc->GetPixel( nMapY , pLutX[ nX ] ) );
+
+while( ( nActY < nNewHeight1 ) && ( pLutY[ nActY + 1 ]
== nMapY ) )
+{
+memcpy( pWriteAcc->GetScanline( nActY + 1L ),
+pWriteAcc->GetScanline( nActY ),
nScanlineSize );
+nActY++;
+}
nActY++;
}
-nActY++;
+bRet = sal_True;
+aNewBmp.ReleaseAccess( pWriteAcc );
}
-bRet = sal_True;
+delete[] pLutX;
+delete[] pLutY;
}
+ReleaseAccess( pReadAcc );
-delete[] pLutX;
-delete[] pLutY;
+if( bRet )
+ImplAssignWithSize( aNewBmp );
}
-
-ReleaseAccess( pReadAcc );
-aNewBmp.ReleaseAccess( pWriteAcc );
-
-if( bRet )
-ImplAssignWithSize( aNewBmp );
}
return bRet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 5 commits - basctl/AllLangResTarget_basctl.mk dbaccess/AllLangResTarget_dbui.mk dbaccess/AllLangResTarget_dbu.mk extensions/AllLangResTarg
basctl/AllLangResTarget_basctl.mk |2 - dbaccess/AllLangResTarget_dbu.mk |2 - dbaccess/AllLangResTarget_dbui.mk |2 - extensions/AllLangResTarget_san.mk | 44 -- extensions/AllLangResTarget_scn.mk | 49 + extensions/Library_OOoSpotlightImporter.mk |3 + extensions/Module_extensions.mk|2 - reportdesign/AllLangResTarget_rpt.mk |2 - reportdesign/AllLangResTarget_rptui.mk |2 - sc/AllLangResTarget_sc.mk |2 - scp2/source/ooo/file_resource_ooo.scp |2 - sd/AllLangResTarget_sd.mk |2 - solenv/gbuild/platform/macosx.mk |1 starmath/AllLangResTarget_sm.mk|2 - sw/AllLangResTarget_sw.mk |2 - tail_build/prj/build.lst |2 - 16 files changed, 64 insertions(+), 57 deletions(-) New commits: commit 381bed81e43d7fdd541115e0ab4213b0609e7ac0 Author: Norbert Thiebaud Date: Wed Jan 4 01:50:57 2012 -0600 Hack to get OOoSpotlightImporter building: FIXME this is prolly not correct diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk index 639b381..f8a4c3c 100644 --- a/extensions/Library_OOoSpotlightImporter.mk +++ b/extensions/Library_OOoSpotlightImporter.mk @@ -44,8 +44,9 @@ $(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\ -framework CoreFoundation \ -framework Foundation \ -framework CoreServices \ - -bundle \ )) +# -bundle \ + $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib)) commit ca6959e676984befb58b5510e9bdccc6d5fc4a7e Author: Norbert Thiebaud Date: Wed Jan 4 01:33:58 2012 -0600 add PLAINLIBS_NONE in the LAYER diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ef82a82..bd92908 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -284,6 +284,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ commit 1c6f4e6ff73034cf312662c4bda31bccd36c966b Author: Norbert Thiebaud Date: Wed Jan 4 01:48:49 2012 -0600 fix dep to svx/globlmn.hrc inside of tail_build diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 7e588d1..fee9fc0 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -54,6 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) -$(call gb_SrsTarget_get_target,basctl/res) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 15b6806..177bfa3 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -90,6 +90,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk index 7478fc2..f17c96c 100644 --- a/dbaccess/AllLangResTarget_dbui.mk +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -92,6 +92,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index 76baa19..71e2116 100644 --- a/reportdesign/AllLangResTarget_rpt.mk +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -45,6 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ reportdesign/source/core/resource/strings.src \ )) -$(call gb_SrsTarget_get_target,reportdesign/res) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,reportdesign/res) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index 23edf34..18674e0 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in set_soenv.in
config_host.mk.in | 23 ++-- configure.in | 240 +++- set_soenv.in | 294 -- 3 files changed, 252 insertions(+), 305 deletions(-) New commits: commit 7eea90d66dd1bd570723ab4d981880ecfbad265c Author: Norbert Thiebaud Date: Mon Jan 2 19:07:36 2012 -0600 migrate JAVALIB out of set_soenv.in diff --git a/config_host.mk.in b/config_host.mk.in index 75cce05..a6d7c84 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -165,6 +165,7 @@ export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@" export INSTALLDIR="@INSTALLDIR@" export INSTALLDIRNAME="@INSTALLDIRNAME@" export INTRO_BIPMAP="@INTRO_BITMAP@" +@x_JAVALIB@ export JAVALIB="@JAVALIB@" export JFREEREPORT_JAR="@JFREEREPORT_JAR@" export KDE4_CFLAGS="@KDE4_CFLAGS@" export KDE4_LIBS="@KDE4_LIBS@" diff --git a/configure.in b/configure.in index cc40ed9..b7b255a 100644 --- a/configure.in +++ b/configure.in @@ -2537,8 +2537,10 @@ AC_SUBST(MSPDB_PATH) AC_SUBST(SHOWINCLUDES_PREFIX) # -# determine CPI, CPUNAME, GUI, GUIBASE, ... +# determine CPU, CPUNAME, GUI, GUIBASE, ... # +LIB64="lib" + case "$host_os" in aix*) @@ -2564,6 +2566,7 @@ cygwin*) if test "$CL_X64" != ""; then CPU=X CPUNAME=X86_64 +LIB64="lib/x64" OUTPATH=wntmscx$COMEX else CPU=I @@ -2713,6 +2716,7 @@ linux-gnu*) powerpc64) CPU=P CPUNAME=POWERPC64 +LIB64="lib64" OUTPATH=unxlngppc64 ;; sparc) @@ -2728,11 +2732,13 @@ linux-gnu*) s390x) CPU=3 CPUNAME=S390x +LIB64="lib64" OUTPATH=unxlngs390x ;; x86_64) CPU=X CPUNAME=X86_64 +LIB64="lib64" OUTPATH=unxlngx6 ;; *) @@ -4726,6 +4732,236 @@ if test "$SOLAR_JAVA" != ""; then AC_SUBST(AWTLIB) fi +# +# Determine JAVALIB +# If your platform follow the common pattern +# just define JAVA_ARCH and JAVA_TOOLKIT for it +# if not, leave JAVA_ARCH empty and define JAVALIB manually +# if you don't want JAVALIB to be exported at all +# define x_JAVALIB=[\#] +# +JAVA_ARCH= +JAVA_TOOLKIT= +x_JAVALIB= + +case "$host_os" in + +aix*) +JAVA_ARCH="ppc" +JAVA_TOOLKIT="classic" +;; + +cygwin*|darwin*) +x_JAVALIB=[\#] +;; + +dragonfly*) +case "$host_cpu" in +i*86) +JAVA_ARCH="i386" +JAVA_TOOLKIT="client" +;; +x86_64) +JAVA_ARCH="amd64" +JAVA_TOOLKIT="server" +;; +esac +;; + +freebsd*) +case "$host_cpu" in +i*86) +JAVA_ARCH="i386" +JAVA_TOOLKIT="client" +;; +x86_64) +if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux" ; then +JAVA_ARCH="i386" +JAVA_TOOLKIT="client" +else +JAVA_ARCH="amd64" +JAVA_TOOLKIT="server" +fi +;; +esac +;; + +k*bsd*-gnu*) +case "$host_cpu" in +i*86) +JAVA_ARCH="i386" +JAVA_TOOLKIT="client" +;; +x86_64) +JAVA_ARCH="amd64" +JAVA_TOOLKIT="server" +;; +esac +;; + +linux-gnu*) + +case "$host_cpu" in + +alpha) +JAVA_ARCH="alpha" +JAVA_TOOLKIT="server" +;; +arm) +JAVA_ARCH="arm" +JAVA_TOOLKIT="server" +;; +hppa) +JAVA_ARCH="hppa" +JAVA_TOOLKIT="server" +;; +i*86) +JAVA_ARCH="i386" +case "$JDK" in +[Ii][Bb][Mm]*) +JAVA_ARCH= +JRE_BASE_DIR="$JAVA_HOME/jre/bin" +JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/classic -L $JRE_BASE_DIR/native_thread" +;; +[Bb][Ee][Aa]*) +JAVA_TOOLKIT="jrockit"; +;; +*) +JAVA_TOOLKIT="client"; +;; +esac +;; +ia64) +JAVA_ARCH="ia64" +JAVA_TOOLKIT="server" +;; +m68k) +JAVA_ARCH="mk68" +JAVA_TOOLKIT="server" +;; +mips|mips64|mipsel|mips64el) +JAVA_ARCH="$host_cpu" +JAVA_TOOLKIT="server" +;; +mips32) +JAVA_ARCH="$host_cpu" +JAVA_TOOLKIT="client" +;; +powerpc) +JAVA_ARCH="ppc" +
[Libreoffice-commits] .: config_host.mk.in configure.in icu/icuversion.mk set_soenv.in
config_host.mk.in | 19 ++-- configure.in | 239 +++--- icu/icuversion.mk |6 - set_soenv.in | 70 --- 4 files changed, 155 insertions(+), 179 deletions(-) New commits: commit 9bbb628e1b1b8b3fa97b37679157ce4267089172 Author: Norbert Thiebaud Date: Mon Jan 2 09:42:44 2012 -0600 oops use == not = in dmake conditional diff --git a/config_host.mk.in b/config_host.mk.in index 061a07d..b53794f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -17,7 +17,7 @@ export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@" export BSH_JAR="@BSH_JAR@" export BUILD_DMAKE="@BUILD_DMAKE@" export BUILD_EPM="@BUILD_EPM@" -export BUILD_MOZAB="@BUILD_MOZAB@" +@x_MOZ@ export BUILD_MOZAB="@BUILD_MOZAB@" export BUILD_NCPUS="@BUILD_NCPUS@" export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@" export BUILD_STAX="@BUILD_STAX@" @@ -51,6 +51,7 @@ export DBUS_CFLAGS="@DBUS_CFLAGS@" export DBUS_LIBS="@DBUS_LIBS@" export DB_CPPLIB="@DB_CPPLIB@" export DB_LIB="@DB_LIB@" +@x_MOZ@ export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@" export DEFAULT_TO_ENGLISH_FOR_PACKING="yes" export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@" export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@" @@ -205,13 +206,14 @@ export MKDEPENDSOLVER="TRUE" export ML_EXE="@ML_EXE@" export MOC4="@MOC4@" export MOC="@MOC@" -export MOZILLABUILD="@MOZILLABUILD@" -export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@" -export MOZ_FLAVOUR="@MOZ_FLAVOUR@" -export MOZ_INC="@MOZ_INC@" -export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@" -export MOZ_LIB="@MOZ_LIB@" -export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@" +@x_MOZ@ export MOZILLABUILD="@MOZILLABUILD@" +@x_MOZ@ export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@" +@x_MOZ@ export MOZILLA_VERSION="@MOZILLA_VERSION@" +@x_MOZ@ export MOZ_FLAVOUR="@MOZ_FLAVOUR@" +@x_MOZ@ export MOZ_INC="@MOZ_INC@" +@x_MOZ@ export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@" +@x_MOZ@ export MOZ_LIB="@MOZ_LIB@" +@x_MOZ@ export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@" export MYSQL_DEFINES="@MYSQL_DEFINES@" export MYSQL_INC="@MYSQL_INC@" export MYSQL_LIB="@MYSQL_LIB@" @@ -248,6 +250,7 @@ export POPPLER_CFLAGS="@POPPLER_CFLAGS@" export POPPLER_LIBS="@POPPLER_LIBS@" export POSTGRESQL_INC="@POSTGRESQL_INC@" export POSTGRESQL_LIB="@POSTGRESQL_LIB@" +@x_MOZ@ export PREBUILD_MOZAB="@PREBUILD_MOZAB@" export PREFIXDIR="@PREFIXDIR@" export PRODUCT="@PRODUCT@" export PRODUCTNAME="@PRODUCTNAME@" diff --git a/configure.in b/configure.in index efb7ca0..fab7cfc 100644 --- a/configure.in +++ b/configure.in @@ -6308,6 +6308,7 @@ AC_SUBST(WITH_OPENLDAP) dnl === dnl Check for system mozilla dnl === + AC_MSG_CHECKING([which Mozilla to use]) if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then AC_MSG_RESULT([external]) @@ -6370,138 +6371,174 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.]) elif test "$enable_mozilla" = "no"; then AC_MSG_RESULT([none]) +x_MOZ=[\#] WITH_MOZILLA=NO else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" -if test -z "$with_mozilla_version"; then -MOZILLA_VERSION= -else -AC_MSG_CHECKING([which Mozilla version to build]) -MOZILLA_VERSION=$with_mozilla_version -enable_build_mozilla=1 -AC_MSG_RESULT([$MOZILLA_VERSION]) -fi +if test -z "$with_mozilla_version"; then +MOZILLA_VERSION= +else +AC_MSG_CHECKING([which Mozilla version to build]) +MOZILLA_VERSION=$with_mozilla_version +enable_build_mozilla=1 +AC_MSG_RESULT([$MOZILLA_VERSION]) +fi -AC_SUBST(MOZILLA_VERSION) +AC_SUBST(MOZILLA_VERSION) -AC_MSG_CHECKING([for toolkit Mozilla should use]) -if test -z "$with_mozilla_toolkit"; then -if test "$_os" != "WINNT" ; then -if test "$_os" = "Darwin" ; then -MOZILLA_TOOLKIT=mac -AC_MSG_RESULT([mac]) -else -MOZILLA_TOOLKIT=gtk2 -AC_MSG_RESULT([gtk2]) +AC_MSG_CHECKING([for toolkit Mozilla should use]) +if test -z "$with_mozilla_toolkit"; then +if test "$_os" != "WINNT" ; then +if test "$_os" = "Darwin" ; then +
[Libreoffice-commits] .: config_host.mk.in configure.in icu/icuversion.mk
config_host.mk.in |6 +++--- configure.in |5 + icu/icuversion.mk | 19 --- 3 files changed, 16 insertions(+), 14 deletions(-) New commits: commit 77b7bd9b3604970fb3ef396edd27a35f2e4690ae Author: Norbert Thiebaud Date: Mon Jan 2 06:19:50 2012 -0600 ICU relying on undef is not viable in cross-compile scenario diff --git a/config_host.mk.in b/config_host.mk.in index 7c5ada7..061a07d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -155,9 +155,9 @@ export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@" export HUNSPELL_LIBS="@HUNSPELL_LIBS@" export HYPHEN_LIB="@HYPHEN_LIB@" export HYPH_SYSTEM_DIR="@HYPH_SYSTEM_DIR@" -@x_ICU@ export ICU_MAJOR="@ICU_MAJOR@" -@x_ICU@ export ICU_MICRO="@ICU_MICRO@" -@x_ICU@ export ICU_MINOR="@ICU_MINOR@" +export ICU_MAJOR="@ICU_MAJOR@" +export ICU_MICRO="@ICU_MICRO@" +export ICU_MINOR="@ICU_MINOR@" export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@" export INPATH="@INPATH@" export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@" diff --git a/configure.in b/configure.in index 146dc4c..ba05eae 100644 --- a/configure.in +++ b/configure.in @@ -6598,8 +6598,7 @@ dnl === SYSTEM_GENBRK= SYSTEM_GENCCODE= SYSTEM_GENCMN= -# x_ICU us used to comment-out ICU_MAJOR/MINOR/MICRO in config_host.mk -x_ICU= + ICU_MAJOR= ICU_MINOR= ICU_MICRO= @@ -6654,13 +6653,11 @@ if test "$with_system_icu" = "yes"; then MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll" else AC_MSG_RESULT([internal]) -x_ICU=[\#] SYSTEM_ICU="NO" ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" BUILD_TYPE="$BUILD_TYPE ICU" fi -AC_SUBST(x_ICU) AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) diff --git a/icu/icuversion.mk b/icu/icuversion.mk index b0e5769..dbadbd0 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -24,10 +24,15 @@ # for a copy of the LGPLv3 License. # #* -# major -ICU_MAJOR*=4 -# minor -ICU_MINOR*=4 -# micro -ICU_MICRO*=2 - +# 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-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in
config_host.mk.in |8 configure.in |2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit fdd753d1a9fb4e8fa3ab00afbb2c0b1d5315da41 Author: Norbert Thiebaud Date: Sun Jan 1 18:38:31 2012 -0600 GNUCOPY is one of these var that are defined-sensitive. diff --git a/config_host.mk.in b/config_host.mk.in index 8077384..7c5ada7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -4,9 +4,6 @@ # export SRC_ROOT="@SRC_ROOT@" -@x_ICU@ export ICU_MAJOR="@ICU_MAJOR@" -@x_ICU@ export ICU_MICRO="@ICU_MICRO@" -@x_ICU@ export ICU_MINOR="@ICU_MINOR@" export ABOUT_BITMAP="@ABOUT_BITMAP@" export ALIGNOF_DOUBLE="@ALIGNOF_DOUBLE@" export ALIGNOF_INT="@ALIGNOF_INT@" @@ -117,7 +114,7 @@ export GIT_LINK_SRC="@GIT_LINK_SRC@" export GIT_REPO_NAMES="@GIT_REPO_NAMES@" export GMAKE_MODULE_PARALLELISM="@GMAKE_MODULE_PARALLELISM@" export GMAKE_PARALLELISM="@GMAKE_PARALLELISM@" -export GNUCOPY="@GNUCP@" +@x_GNUCP@ export GNUCOPY="@GNUCP@" export GNUMAKE="@GNUMAKE@" export GNUTAR="@GNUTAR@" export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@" @@ -158,6 +155,9 @@ export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@" export HUNSPELL_LIBS="@HUNSPELL_LIBS@" export HYPHEN_LIB="@HYPHEN_LIB@" export HYPH_SYSTEM_DIR="@HYPH_SYSTEM_DIR@" +@x_ICU@ export ICU_MAJOR="@ICU_MAJOR@" +@x_ICU@ export ICU_MICRO="@ICU_MICRO@" +@x_ICU@ export ICU_MINOR="@ICU_MINOR@" export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@" export INPATH="@INPATH@" export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@" diff --git a/configure.in b/configure.in index 71b5eb0..146dc4c 100644 --- a/configure.in +++ b/configure.in @@ -7340,6 +7340,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; else case "$build_os" in darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) +x_GNUCP=[\#] GNUCP='' AC_MSG_RESULT([no gnucp found - using the system's cp command]) ;; @@ -7351,6 +7352,7 @@ fi AC_SUBST(GNUPATCH) AC_SUBST(GNUCP) +AC_SUBST(x_GNUCP) dnl *** dnl testing assembler path ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - config_host.mk.in configure.in desktop/branding set_soenv.in solenv/bin solenv/inc
config_host.mk.in | 203 --
configure.in |5 +
desktop/branding/Makefile |4
set_soenv.in | 197
solenv/bin/linkoo | 29 --
solenv/inc/unitools.mk|6 -
6 files changed, 212 insertions(+), 232 deletions(-)
New commits:
commit ea5d18a1c7c5916be0f97db1ecba07db5b9cb5cd
Author: Norbert Thiebaud
Date: Sun Jan 1 16:05:16 2012 -0600
move UDP and fix linkoo to look for INPATH and UPD in config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index b17207d..8077384 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -360,6 +360,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
+export UPD="@UPD@"
export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
export USE_XINERAMA="@USE_XINERAMA@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
diff --git a/set_soenv.in b/set_soenv.in
index 4276058..fafc9ed 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1327,7 +1327,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
ToFile( "WITH_VC_REDIST", "TRUE", "e" );
}
ToFile( "PERL", $PERL, "e" );
-ToFile( "UPD", $UPD, "e" );
ToFile( "WORK_STAMP",$WORK_STAMP,"e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index ade1ee7..06a103d 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -141,35 +141,10 @@ my @known_duplicates = ( 'db.jar', 'libi18n',
'libnssckbi', 'libnssdbm', 'libsql
sub sniff_target($)
{
my $build_dir = shift;
-my ($dirhandle, $fname);
my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); #
defaults
-opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
-while ($fname = readdir ($dirhandle)) {
-if ($fname =~ /Host.sh$/) {
-my $file;
-open ($file, "$build_dir/$fname") || die "Can't open
$build_dir/$fname";
-while (<$file>) {
-/\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
-if ($1 eq 'UPD') {
-$libver = $2;
-}
-}
-close ($file);
-} elsif ($fname =~ /host.mk$/) {
-my $file;
-open ($file, "$build_dir/$fname") || die "Can't open
$build_dir/$fname";
-while (<$file>) {
-/\s*export\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
-if ($1 eq 'INPATH') {
-$target = $2;
- }
- }
-close ($file);
-}
-}
-
-closedir ($dirhandle);
+chomp($target=`cat $build_dir/config_host.mk | grep INPATH= | sed -e
's/.*=//' | sed -e 's/"//g'`);
+chomp($libver=`cat $build_dir/config_host.mk | grep UPD= | sed -e
's/.*=//' | sed -e 's/"//g'`);
print "Sniffed target: $target, $libver\n";
commit 49319b288f40ba13b24799136caa97863d523e39
Author: Norbert Thiebaud
Date: Sun Jan 1 02:43:30 2012 -0600
migrate non-conditional straight from configure.in var out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index ebd3d46..b17207d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,14 +4,33 @@
#
export SRC_ROOT="@SRC_ROOT@"
+@x_ICU@ export ICU_MAJOR="@ICU_MAJOR@"
+@x_ICU@ export ICU_MICRO="@ICU_MICRO@"
+@x_ICU@ export ICU_MINOR="@ICU_MINOR@"
export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export ALIGNOF_DOUBLE="@ALIGNOF_DOUBLE@"
+export ALIGNOF_INT="@ALIGNOF_INT@"
+export ALIGNOF_LONG="@ALIGNOF_LONG@"
+export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
+export ALLOC="@ALLOC@"
export ANCIENT_BISON="@ANCIENT_BISON@"
export AR="@AR@"
+export AWTLIB='@AWTLIB@'
+export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
export BSH_JAR="@BSH_JAR@"
+export BUILD_DMAKE="@BUILD_DMAKE@"
+export BUILD_EPM="@BUILD_EPM@"
+export BUILD_MOZAB="@BUILD_MOZAB@"
+export BUILD_NCPUS="@BUILD_NCPUS@"
+export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
+export BUILD_STAX="@BUILD_STAX@"
+export BUILD_UNOWINREG="@BUILD_UNOWINREG@"
+export BUILD_VER_STRING="@B
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f1c44b848f77bb4de8a19059e0d514bfb75da90b Author: Norbert Thiebaud Date: Sat Dec 31 14:18:06 2011 -0600 argh, OS_FOR_BUILD was not set properly, killing X-compile diff --git a/config_host.mk.in b/config_host.mk.in index 35632b6..1776165 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -120,7 +120,7 @@ export NSS_LIBS="@NSS_LIBS@" export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@" export OPENSSL_LIBS="@OPENSSL_LIBS@" export OS="@OS@" -export OS_FOR_BUILD="@OS@" +export OS_FOR_BUILD="@OS_FOR_BUILD@" export OUTPATH="@OUTPATH@" export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@" export PATH_SEPERATOR="@P_SEP@" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9034973de5b7f62121a62c56757bf20e490de654
Author: Norbert Thiebaud
Date: Sat Dec 31 10:39:55 2011 -0600
fix PathFormat, use build_os not host_os
diff --git a/configure.in b/configure.in
index 1f8c5d0..ab10538 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ MINGW_EXTERNAL_DLLS=""
PathFormat()
{
formatted_path="$1"
-if test "$host_os" = "cygwin" ; then
+if test "$build_os" = "cygwin" ; then
pf_part1=
pf_conv_to_dos=
for pf_part in $formatted_path ; do
@@ -29,8 +29,8 @@ PathFormat()
if test "$pf_conv_to_dos" = "yes" ; then
formatted_path=`cygpath -d "$formatted_path"`
fi
-fp_count_colon=`cat "$formatted_path" | grep -c "[:]"`
-fp_count_slash=`cat "$formatted_path" | grep -c "[/]"`
+fp_count_colon=`echo "$formatted_path" | grep -c "[:]"`
+fp_count_slash=`echo "$formatted_path" | grep -c "[/]"`
if test "$fp_count_slash$fp_count_colon" != "00" ; then
if test "$fp_count_colon" = "0" ; then
formatted_path=`realpath "$formatted_path"`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |1 + 1 file changed, 1 insertion(+) New commits: commit d64bdc0f1ebfa864598709f23fd14f528955bbc3 Author: Norbert Thiebaud Date: Sat Dec 31 09:18:33 2011 -0600 missed COM_FOR_BUILD in config_host.mk.in diff --git a/config_host.mk.in b/config_host.mk.in index de607c3..35632b6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -9,6 +9,7 @@ export CAIRO_LIBS="@CAIRO_LIBS@" export CDR_CFLAGS="@CDR_CFLAGS@" export CDR_LIBS="@CDR_LIBS@" export COM="@COM@" +export COM_FOR_BUILD="@COM_FOR_BUILD@" export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@" export CPPUNIT_LIBS="@CPPUNIT_LIBS@" export CPU="@CPU@" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d1a26ef6542a68854d61aa62156e3aab61e0e68b Author: Norbert Thiebaud Date: Sat Dec 31 07:41:31 2011 -0600 fix 64 bits build detection for cygwin diff --git a/configure.in b/configure.in index 6d3d3aa..b26aa2c 100644 --- a/configure.in +++ b/configure.in @@ -2561,7 +2561,7 @@ cygwin*) case "$host_cpu" in i*86|x86_64) -if test "$CL_X64" = ""; then +if test "$CL_X64" != ""; then CPU=X CPUNAME=X86_64 OUTPATH=wntmscx$COMEX @@ -2770,7 +2770,7 @@ mingw*) case "$host_cpu" in i*86|x86_64) -if test "$CL_X64" = ""; then +if test "$CL_X64" != ""; then CPU=X CPUNAME=X86_64 OUTPATH=wntgccx$COMEX ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
New commits:
commit cd1b89a23a3c0c8ee8cdc7f36d23255a642e46a2
Author: Norbert Thiebaud
Date: Sat Dec 31 06:59:29 2011 -0600
Path format issue with cygwin... try to restore the original behavior
diff --git a/configure.in b/configure.in
index 8263c66..6d3d3aa 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,33 @@ SCPDEFS=""
GIT_REPO_NAMES=""
MINGW_EXTERNAL_DLLS=""
+PathFormat()
+{
+formatted_path="$1"
+if test "$host_os" = "cygwin" ; then
+pf_part1=
+pf_conv_to_dos=
+for pf_part in $formated_path ; do
+if test -z "$pf_part1" ; then
+pf_part1="$pf_part"
+else
+pf_conv_to_dos="yes"
+fi
+done
+if test "$pf_conv_to_dos" = "yes" ; then
+formatted_path=`cygpath -d "$formatted_path"`
+fi
+fp_count_colon=`cat "$formattted_path" | grep -c "[:]"`
+fp_count_slash=`cat "$formattted_path" | grep -c "[/]"`
+if test "$fp_count_slash$fp_count_colon" != "00" ; then
+if test "$fp_count_colon" = "0" ; then
+formatted_path=`realpath "$formatted_path"`
+fi
+formatted_path=`cygpath -m "$formatted_path"`
+fi
+fi
+}
+
if test -n "$SOLARENV" ; then
AC_MSG_ERROR([You have sourced Env.Host.sh in this shell. This may lead
to trouble, please run in a fresh (login) shell.])
fi
@@ -41,8 +68,8 @@ AC_SUBST(CROSS_COMPILING)
if test "$build_os" = "cygwin"; then
EXEEXT_FOR_BUILD=.exe
SRC_ROOT=`pwd`
-SRC_ROOT=`cygpath -d "$SRC_ROOT"`
-SRC_ROOT=`cygpath -u "$SRC_ROOT"`
+PathFormat "$SRC_ROOT"
+SRC_ROOT="$formatted_path"
else
EXEEXT_FOR_BUILD=
SRC_ROOT=`pwd`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 36ff143909a1c5297080371cf0cb1a701e6c7f50 Author: Norbert Thiebaud Date: Fri Dec 30 22:02:49 2011 -0600 type in COMEX handling diff --git a/configure.in b/configure.in index 1675108..8263c66 100644 --- a/configure.in +++ b/configure.in @@ -2537,11 +2537,11 @@ cygwin*) if test "$CL_X64" = ""; then CPU=X CPUNAME=X86_64 -OUTPATH=wntmscx$(COMEX) +OUTPATH=wntmscx$COMEX else CPU=I CPUNAME=INTEL -OUTPATH=wntmsci$(COMEX) +OUTPATH=wntmsci$COMEX fi ;; *) @@ -2746,11 +2746,11 @@ mingw*) if test "$CL_X64" = ""; then CPU=X CPUNAME=X86_64 -OUTPATH=wntgccx$(COMEX) +OUTPATH=wntgccx$COMEX else CPU=I CPUNAME=INTEL -OUTPATH=wntgcci$(COMEX) +OUTPATH=wntgcci$COMEX fi ;; *) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in connectivity/qa set_soenv.in
config_host.mk.in | 88 +
configure.in | 81 +++
connectivity/qa/connectivity/tools/makefile.mk |7 +
connectivity/qa/makefile.mk|6 +
set_soenv.in | 88 -
5 files changed, 142 insertions(+), 128 deletions(-)
New commits:
commit 665386630cebe26c2e8667e359bebc7b499f4bf5
Author: Norbert Thiebaud
Date: Fri Dec 30 16:01:03 2011 -0600
move PRODUCT and PROEXT determination earlier in configure.
the is a prep work to migrate IN/OUTPATH out of set_soenv.in
diff --git a/configure.in b/configure.in
index 6842771..27f5373 100644
--- a/configure.in
+++ b/configure.in
@@ -2219,6 +2219,47 @@ printf ("hello world\n");
fi
AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+dnl Set the ENABLE_DBGUTIL variable
+dnl ===
+AC_MSG_CHECKING([whether to build with additional debug utilities])
+if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
+PROEXT=""
+PRODUCT=""
+
+AC_MSG_RESULT([yes])
+# cppunit and graphite expose STL in public headers
+if test "$with_system_cppunit" = "yes"; then
+AC_MSG_ERROR([--with-system-cppunit conflicts with DBG_UTIL build])
+else
+with_system_cppunit=no
+fi
+if test "$with_system_graphite" = "yes"; then
+AC_MSG_ERROR([--with-system-graphite conflicts with DBG_UTIL build])
+else
+with_system_graphite=no
+fi
+if test "$with_system_mysql_cppconn" = "yes"; then
+AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with DBG_UTIL
build])
+else
+with_system_mysql_cppconn=no
+fi
+if test $_os = WINNT -a \
+\( "$enable_mozilla" != no -o \
+ "$enable_build_mozilla" != no \); then
+# We can't build against the Mozilla stuff if using _DEBUG, will get
linking errors
+# See connectivity/drivers/mozab
+AC_MSG_WARN([Also disabling Mozilla stuff then])
+enable_mozilla=no
+enable_build_mozilla=no
+fi
+else
+PRODUCT="full"
+PROEXT=".pro"
+AC_MSG_RESULT([no, full product build])
+fi
+AC_SUBST(PRODUCT)
+AC_SUBST(PROEXT)
+
dnl ===
dnl Set up a different compiler to produce tools to run on the build
dnl machine when doing cross-compilation
@@ -2427,46 +2468,6 @@ else
fi
AC_SUBST(ENABLE_DEBUG)
-dnl Set the ENABLE_DBGUTIL variable
-dnl ===
-AC_MSG_CHECKING([whether to build with additional debug utilities])
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
-PROEXT=""
-PRODUCT=""
-
-AC_MSG_RESULT([yes])
-# cppunit and graphite expose STL in public headers
-if test "$with_system_cppunit" = "yes"; then
-AC_MSG_ERROR([--with-system-cppunit conflicts with DBG_UTIL build])
-else
-with_system_cppunit=no
-fi
-if test "$with_system_graphite" = "yes"; then
-AC_MSG_ERROR([--with-system-graphite conflicts with DBG_UTIL build])
-else
-with_system_graphite=no
-fi
-if test "$with_system_mysql_cppconn" = "yes"; then
-AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with DBG_UTIL
build])
-else
-with_system_mysql_cppconn=no
-fi
-if test $_os = WINNT -a \
-\( "$enable_mozilla" != no -o \
- "$enable_build_mozilla" != no \); then
-# We can't build against the Mozilla stuff if using _DEBUG, will get
linking errors
-# See connectivity/drivers/mozab
-AC_MSG_WARN([Also disabling Mozilla stuff then])
-enable_mozilla=no
-enable_build_mozilla=no
-fi
-else
-PRODUCT="full"
-PROEXT=".pro"
-AC_MSG_RESULT([no, full product build])
-fi
-AC_SUBST(PRODUCT)
-AC_SUBST(PROEXT)
dnl Determine whether to use linkoo for the smoketest installation
dnl ===
commit e5bbb4ea87c36e14128bb920c7c81e1de6f58d88
Author: Norbert Thiebaud
Date: Fri Dec 30 15:45:55 2011 -0600
move *_CFLAGS and *_LIBS to config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index 7d33cb8..b80abce 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,6 +4,19 @@
#
export SRC_ROOT="@SRC_ROOT@"
+export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
+export CAIRO_LIBS="@CAIRO_LIBS@"
+export CDR_CFLAGS="@CDR_CFLAGS@"
+export CDR
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8efd3f8f43b7ecaeee545fc20e8eb0765d4c77d7 Author: Norbert Thiebaud Date: Tue Dec 27 15:02:31 2011 -0600 typos in config_host.mk.in diff --git a/config_host.mk.in b/config_host.mk.in index 49678d3..494ed92 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -25,11 +25,11 @@ export ENABLE_LOCKDOWN="@ENABLE_LOCKDOWN@" export ENABLE_LOMENUBAR="@ENABLE_LOMENUBAR@" export ENABLE_LTO="@ENABLE_LTO@" export ENABLE_MEDIAWIKI="@ENABLE_MEDIAWIKI@" -export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@@" +export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@" export ENABLE_MYSQLC="@ENABLE_MYSQLC@" export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@" export ENABLE_ONLINE_UPDATE="@ENABLE_ONLINE_UPDATE@" -export ENABLE_OPENGL="@ENABLE_OPENGL@@" +export ENABLE_OPENGL="@ENABLE_OPENGL@" export ENABLE_OXYGENOFFICE="@ENABLE_OXYGENOFFICE@" export ENABLE_PDFIMPORT="@ENABLE_PDFIMPORT@" export ENABLE_PRESENTER_SCREEN="@ENABLE_PRESENTER_SCREEN@" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - fpicker/Library_fps_aqua.mk fpicker/source
fpicker/Library_fps_aqua.mk |5 ++
fpicker/source/aqua/AquaFilePickerDelegate.mm |4 +
fpicker/source/aqua/CFStringUtilities.hxx | 58 +-
3 files changed, 48 insertions(+), 19 deletions(-)
New commits:
commit 7e2f0a0f92e592cb7374ec41d516eca32a8e5c33
Author: Norbert Thiebaud
Date: Tue Dec 27 07:37:16 2011 -0600
add the needed -framework for fps_aqua
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index ca39922..a2575d0 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -34,6 +34,11 @@ $(eval $(call gb_Library_add_api,fps_aqua,\
udkapi \
))
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+-framework Cocoa \
+-framework CoreFoundation \
+))
+
$(eval $(call gb_Library_add_linked_libs,fps_aqua,\
cppu \
cppuhelper \
commit daadc82a1d511998228e198802f0a06420f6bcee
Author: Norbert Thiebaud
Date: Tue Dec 27 07:36:52 2011 -0600
WaE unused variables
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm
b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 2fef707..8482f69 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -59,6 +59,7 @@
- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
{
+(void)sender;
if( filterHelper == NULL )
return true;
if( filename == nil )
@@ -68,6 +69,7 @@
- (void)panelSelectionDidChange:(id)sender
{
+(void)sender;
if (filePicker != NULL) {
::com::sun::star::ui::dialogs::FilePickerEvent evt;
filePicker->fileSelectionChanged(evt);
@@ -76,6 +78,8 @@
- (void)panel:(id)sender directoryDidChange:(NSString *)path
{
+(void)sender;
+(void)path;
if (filePicker != NULL) {
::com::sun::star::ui::dialogs::FilePickerEvent evt;
filePicker->directoryChanged(evt);
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx
b/fpicker/source/aqua/CFStringUtilities.hxx
index 6974899..7dc53a4 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -67,23 +67,32 @@ inline void DBG_PRINT_ENTRY(const char * classname, const
char * methodname, con
OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER,
param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
}
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef value1) {
-OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
#if OSL_DEBUG_LEVEL > 1
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef value1)
+{
+OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
CFShow(value1);
+
+}
#else
-(void)value1;
-#endif
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef /* value1 */)
+{
+OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
}
+#endif
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* value1) {
-OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
#if OSL_DEBUG_LEVEL > 1
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* value1)
+{
+OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
NSLog(value1);
+}
#else
-(void)value1;
-#endif
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* /* value1 */)
+{
+OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
}
+#endif
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1) {
OSL_TRACE(">>> %s::%s%s%s = %d", classname, methodname, PARAMFILLER,
param1, value1);
@@ -105,20 +114,23 @@ inline void DBG_PRINT_ENTRY(const char * classname, const
char * methodname, con
OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %s", classname, methodname,
PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
}
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1, const char* param2, const CFStringRef
value2) {
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1, const char* param2, const CFStringRef
value2)
+{
OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER,
param1, value1, PARAMFILLER, param2, value2);
#if OSL_DEBUG_LEVEL > 1
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3678d3ec5af47ed3797e5c983dacb9b6722011b0 Author: Norbert Thiebaud Date: Tue Dec 27 06:21:06 2011 -0600 typo in ENABLE_NSPLUGIN migration diff --git a/config_host.mk.in b/config_host.mk.in index 383118a..49678d3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -27,7 +27,7 @@ export ENABLE_LTO="@ENABLE_LTO@" export ENABLE_MEDIAWIKI="@ENABLE_MEDIAWIKI@" export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@@" export ENABLE_MYSQLC="@ENABLE_MYSQLC@" -export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@@" +export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@" export ENABLE_ONLINE_UPDATE="@ENABLE_ONLINE_UPDATE@" export ENABLE_OPENGL="@ENABLE_OPENGL@@" export ENABLE_OXYGENOFFICE="@ENABLE_OXYGENOFFICE@" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in set_soenv.in
config_host.mk.in | 44
set_soenv.in | 43 ---
2 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 52ec70499e337aac43d9ddfd564c1bfc6fe98301
Author: Norbert Thiebaud
Date: Tue Dec 27 04:04:06 2011 -0600
move ENABLE_* variables from set_soenv.in to config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index 4a5b7ac..383118a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -3,6 +3,50 @@
# or to be sourced in a shell session
#
export SRC_ROOT="@SRC_ROOT@"
+
+export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
+export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
+export ENABLE_DBUS="@ENABLE_DBUS@"
+export ENABLE_DIRECTX="@ENABLE_DIRECTX@"
+export ENABLE_EVOAB2="@ENABLE_EVOAB2@"
+export ENABLE_GCONF="@ENABLE_GCONF@"
+export ENABLE_GIO="@ENABLE_GIO@"
+export ENABLE_GNOMEVFS="@ENABLE_GNOMEVFS@"
+export ENABLE_GRAPHITE="@ENABLE_GRAPHITE@"
+export ENABLE_GSTREAMER="@ENABLE_GSTREAMER@"
+export ENABLE_GTK3="@ENABLE_GTK3@"
+export ENABLE_GTK="@ENABLE_GTK@"
+export ENABLE_GTK_PRINT="@ENABLE_GTK_PRINT@"
+export ENABLE_KAB="@ENABLE_KAB@"
+export ENABLE_KDE4="@ENABLE_KDE4@"
+export ENABLE_KDE="@ENABLE_KDE@"
+export ENABLE_LIBRSVG="@ENABLE_LIBRSVG@"
+export ENABLE_LOCKDOWN="@ENABLE_LOCKDOWN@"
+export ENABLE_LOMENUBAR="@ENABLE_LOMENUBAR@"
+export ENABLE_LTO="@ENABLE_LTO@"
+export ENABLE_MEDIAWIKI="@ENABLE_MEDIAWIKI@"
+export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@@"
+export ENABLE_MYSQLC="@ENABLE_MYSQLC@"
+export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@@"
+export ENABLE_ONLINE_UPDATE="@ENABLE_ONLINE_UPDATE@"
+export ENABLE_OPENGL="@ENABLE_OPENGL@@"
+export ENABLE_OXYGENOFFICE="@ENABLE_OXYGENOFFICE@"
+export ENABLE_PDFIMPORT="@ENABLE_PDFIMPORT@"
+export ENABLE_PRESENTER_SCREEN="@ENABLE_PRESENTER_SCREEN@"
+export ENABLE_QUICKSTART_LIBPNG="@ENABLE_QUICKSTART_LIBPNG@"
+export ENABLE_RANDR="@ENABLE_RANDR@"
+export ENABLE_RELEASE_BUILD="@ENABLE_RELEASE_BUILD@"
+export ENABLE_REPORTBUILDER="@ENABLE_REPORTBUILDER@"
+export ENABLE_SCRIPTING_BEANSHELL="@ENABLE_SCRIPTING_BEANSHELL@"
+export ENABLE_SCRIPTING_JAVASCRIPT="@ENABLE_SCRIPTING_JAVASCRIPT@"
+export ENABLE_SCRIPTING_PYTHON="@ENABLE_SCRIPTING_PYTHON@"
+export ENABLE_SILENT_MSI="@ENABLE_SILENT_MSI@"
+export ENABLE_SYMBOLS="@ENABLE_SYMBOLS@"
+export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
+export ENABLE_UGLY="@ENABLE_UGLY@"
+export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
+export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export SAL_ENABLE_FILE_LOCKING="1"
export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
export SYSTEM_BOOST="@SYSTEM_BOOST@"
export SYSTEM_BSH="@SYSTEM_BSH@"
diff --git a/set_soenv.in b/set_soenv.in
index ab1cdae..9dd385b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1404,28 +1404,14 @@ if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-ToFile( "ENABLE_GTK","@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS","@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
-ToFile( "ENABLE_GTK3", "@ENABLE_GTK3@", "e" );
ToFile( "GTK3_CFLAGS", "@GTK3_CFLAGS@", "e" );
ToFile( "GTK3_LIBS", "@GTK3_LIBS@","e" );
ToFile( "GTHREAD_CFLAGS","@GTHREAD_CFLAGS@", "e" );
ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
-ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
-ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
-ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@","e" );
-ToFile( "ENABLE_NSPLUGIN", "@ENABLE_NSPLUGIN@","e" );
-ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
-ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
-ToFile( "ENABLE_PRESENTE
[Libreoffice-commits] .: solenv/bin
dev/null |binary 1 file changed New commits: commit ecbda593ef71de8eb27b19ad8e421f87f7b2adf5 Author: Norbert Thiebaud Date: Mon Dec 26 12:51:40 2011 -0600 remove apparentely accidental addition of a linux binary module for make diff --git a/solenv/bin/make b/solenv/bin/make deleted file mode 100755 index 18a5855..000 Binary files a/solenv/bin/make and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/prj
postprocess/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a8626c6cc52125d15cfbc59de74cf937a24de0a Author: Norbert Thiebaud Date: Sun Dec 25 01:56:16 2011 -0600 remove pre-req from postprocess that are already pulled by tail_build diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index a372450..435c1c3 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools UnoControls wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
