[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf
configure.ac |3 +++ distro-configs/LibreOfficeAndroid.conf|3 --- distro-configs/LibreOfficeAndroidAarch64.conf |3 --- distro-configs/LibreOfficeAndroidX86.conf |3 --- 4 files changed, 3 insertions(+), 9 deletions(-) New commits: commit 6f2b0b5de3a99b029b61079bd9a9c313305d0e12 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 17:27:34 2016 -0500 disable options by default on android Some options aren't supported on android, so disable them by default to avoid errors. Change-Id: Ifef2f5ff55d3bd7d7da1f53d1345be3c5ef11f45 Reviewed-on: https://gerrit.libreoffice.org/21590 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index 75d6b70..fed2b42 100644 --- a/configure.ac +++ b/configure.ac @@ -811,6 +811,9 @@ linux-android*) enable_coinmp=yes enable_lpsolve=no enable_report_builder=no +enable_odk=no +enable_postgresql_sdbc=no +enable_python=no with_theme="tango" test_cups=no test_dbus=no diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 6fd32fa..9db6a72 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -3,9 +3,6 @@ --disable-cups --disable-gstreamer-0-10 --disable-gstreamer-1-0 ---disable-odk ---disable-postgresql-sdbc ---disable-python --disable-randr --disable-randr-link --disable-systray diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf index a673c95..ca93713 100644 --- a/distro-configs/LibreOfficeAndroidAarch64.conf +++ b/distro-configs/LibreOfficeAndroidAarch64.conf @@ -3,9 +3,6 @@ --disable-cups --disable-gstreamer-0-10 --disable-gstreamer-1-0 ---disable-odk ---disable-postgresql-sdbc ---disable-python --disable-randr --disable-randr-link --disable-systray diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index e79a2c4..e5589e8 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -3,9 +3,6 @@ --disable-cups --disable-gstreamer-0-10 --disable-gstreamer-1-0 ---disable-odk ---disable-postgresql-sdbc ---disable-python --disable-randr --disable-randr-link --disable-systray ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/cairo external/expat external/lcms2 external/redland
external/cairo/ExternalProject_cairo.mk |3 ++- external/cairo/ExternalProject_pixman.mk|3 ++- external/expat/ExternalProject_expat.mk |3 ++- external/lcms2/ExternalProject_lcms2.mk |3 ++- external/redland/ExternalProject_raptor.mk |3 ++- external/redland/ExternalProject_rasqal.mk |3 ++- external/redland/ExternalProject_redland.mk |3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) New commits: commit 2c5f8927349cf0e643e0bfebf4d9aa5b726b0f89 Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 19:22:51 2016 -0500 Android autoconf fixes Change-Id: I3429f6a80dd7e080e8f2634ca744d1dac5ea1865 Reviewed-on: https://gerrit.libreoffice.org/21558 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index ca54bfc..e74f5f0 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : --disable-valgrind \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no ax_cv_c_float_words_bigendian=no)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index bbb4081..083b0b6 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : ./configure \ $(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ && $(MAKE) \ ) diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk index 0cc1eaa..1a638ee 100644 --- a/external/expat/ExternalProject_expat.mk +++ b/external/expat/ExternalProject_expat.mk @@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\ $(call gb_ExternalProject_get_state_target,expat,configure) : $(call gb_ExternalProject_run,configure,\ ./configure \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ ,,expat_configure.log) # vim: set noet sw=4 ts=4: diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 7b9f7a4..6bf69b3 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -26,7 +26,8 @@ else $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ ./configure --without-jpeg --without-tiff --with-pic \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ CPPFLAGS=" $(SOLARINC)" \ CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index f083609..51efb1a 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -45,7 +45,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build): --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ --without-xslt-config \ -
[Libreoffice-commits] core.git: android/source
android/source/build.gradle |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f2f530435c848bf69f5aa035a57d6d6a4152bf6 Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 14:28:48 2016 -0500 Bump build tools version to account for sdk updates Change-Id: Ibb15ac269ddfc61153d204079b070f7a5efbcbad Reviewed-on: https://gerrit.libreoffice.org/21550 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/android/source/build.gradle b/android/source/build.gradle index 4bb1442..67751b8 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -30,7 +30,7 @@ dependencies { android { compileSdkVersion 23 -buildToolsVersion "23.0.1" +buildToolsVersion "23.0.2" compileOptions { // silence some java-language features hints sourceCompatibility 6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 13ebef097dbbf1e8663bcb3649daba4ee8295a40 Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 22 11:47:43 2016 -0500 improve distclean for cross-compile Change-Id: I2af71d5039d330518ea115e6a95af1f15c376538 Reviewed-on: https://gerrit.libreoffice.org/21722 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Matúš Kukan <ma...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/Makefile.in b/Makefile.in index aec7ea6..33f3963 100644 --- a/Makefile.in +++ b/Makefile.in @@ -175,6 +175,8 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/config.Build.log \ $(BUILDDIR)/config.status \ $(BUILDDIR)/config_build.mk \ +$(BUILDDIR)/config_build_lang.mk \ +$(BUILDDIR)/config_build/*.h \ $(BUILDDIR)/config_host.mk \ $(BUILDDIR)/config_host.mk.stamp \ $(BUILDDIR)/config_host_lang.mk \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/module-deps.pl
bin/module-deps.pl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0ce412f309b551d72f80e12f6fc8a64b429ef339 Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 15 23:35:28 2016 -0500 modules-deps.pl cleanup Change-Id: Ic450869c18991b9ed715bb31052dfb911fe3c789 Reviewed-on: https://gerrit.libreoffice.org/21508 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Matúš Kukan <ma...@libreoffice.org> diff --git a/bin/module-deps.pl b/bin/module-deps.pl index 8134dff..c742b71 100755 --- a/bin/module-deps.pl +++ b/bin/module-deps.pl @@ -222,7 +222,7 @@ sub collapse_lib_to_module($) my %unknown_libs; for my $lib_name (sort keys %{$tree}) { my $result = $tree->{$lib_name}; -$unknown_libs{$lib_name} = 1 && next if (!grep {/$lib_name/} keys $l2m); +$unknown_libs{$lib_name} = 1 && next if (!grep {/$lib_name/} keys %$l2m); # new collapsed name. my $name = $l2m->{$lib_name}; @@ -295,7 +295,7 @@ sub prune_leaves($) sub annotate_mergelibs($) { my $tree = shift; -print STDERR "annotating mergelibs"; +print STDERR "annotating mergelibs\n"; for my $name (keys %{$tree}) { if (defined $merged_libs{$name}) { $tree->{$name}->{merged} = 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: clew/Library_clew.mk
clew/Library_clew.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8c63bdc873fe549ea8d58ec2e31a95b309158f5a Author: Peter Foley <pefol...@pefoley.com> Date: Tue Jan 19 10:06:45 2016 -0500 Fix module-deps with clew Change-Id: Idb266e906915182d12f56a11feb21e11bdc95f76 Reviewed-on: https://gerrit.libreoffice.org/21607 Tested-by: Jenkins <c...@libreoffice.org> Tested-by: Michael Stahl <mst...@redhat.com> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/clew/Library_clew.mk b/clew/Library_clew.mk index 014027c..91f4bce 100644 --- a/clew/Library_clew.mk +++ b/clew/Library_clew.mk @@ -30,4 +30,7 @@ $(eval $(call gb_Library_add_cobjects,clew,\ clew/source/clew \ )) +# This is required for module-deps.pl to produce correct dependencies. +$(eval $(call gb_Library_use_libraries,clew,)) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit acd3ebefccd0b4570100c426574d83cfa9464f20 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 15:26:59 2016 -0500 detailed warnings for invalid pch files Change-Id: I28e55bbcae6d16af4ef230d1ec263ab356e1049f Reviewed-on: https://gerrit.libreoffice.org/21586 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index ef7dbea..9d88dfc 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -114,8 +114,8 @@ endif ifeq ($(ENABLE_PCH),TRUE) ifneq ($(COM_IS_CLANG),TRUE) -gb_CFLAGS_COMMON += -fpch-preprocess -gb_CXXFLAGS_COMMON += -fpch-preprocess +gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch +gb_CXXFLAGS_COMMON += -fpch-preprocess -Winvalid-pch endif endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit d86a3ae100c5a9ad2895baec9a564e570a0a7d93 Author: Peter Foley <pefol...@pefoley.com> Date: Sat Jan 16 16:01:39 2016 -0500 Make ccache work properly with GCC PCH Change-Id: I2cbf3fc3ba2df7131ce9328de8bada701ecb3b65 Reviewed-on: https://gerrit.libreoffice.org/21524 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 877f502..ef7dbea 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -112,6 +112,13 @@ gb_CXXFLAGS_COMMON += -fstack-protector-strong gb_LinkTarget_LDFLAGS += -fstack-protector-strong endif +ifeq ($(ENABLE_PCH),TRUE) +ifneq ($(COM_IS_CLANG),TRUE) +gb_CFLAGS_COMMON += -fpch-preprocess +gb_CXXFLAGS_COMMON += -fpch-preprocess +endif +endif + gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror) # This is the default in non-C++11 mode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit af2548f0003acba63204d2bc752aebb1a2f45ec3 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 16:28:54 2016 -0500 Don't pollute cross-compilation environment with host pkg-config Revised to prevent undefined macro errors with older pkg-config. Change-Id: Ia588525e5537d7cf758b5351c0a4c5f48b28a200 Reviewed-on: https://gerrit.libreoffice.org/21595 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index 0f9fa82..75d6b70 100644 --- a/configure.ac +++ b/configure.ac @@ -490,6 +490,7 @@ if test -n "$with_android_ndk"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}" +export PKG_CONFIG_LIBDIR="$ANDROID_BINUTILS_PREBUILT_ROOT/lib/pkgconfig" if test -n "$ANDROID_USING_CLANG"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -Qunused-arguments" @@ -4592,6 +4593,7 @@ dnl machine when doing cross-compilation dnl === m4_pattern_allow([PKG_CONFIG_FOR_BUILD]) +m4_pattern_allow([PKG_CONFIG_LIBDIR]) if test "$cross_compiling" = "yes"; then AC_MSG_CHECKING([for BUILD platform configuration]) echo @@ -4621,7 +4623,7 @@ if test "$cross_compiling" = "yes"; then unset CC CXX SYSBASE CFLAGS unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP unset CPPUNIT_CFLAGS CPPUNIT_LIBS -unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC +unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC PKG_CONFIG_LIBDIR test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD" test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD" test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glew external/openssl
external/glew/ExternalProject_glew.mk |2 +- external/glew/UnpackedTarball_glew.mk |1 + external/glew/glew-ar-lto.patch.1 | 28 external/openssl/ExternalProject_openssl.mk |1 + 4 files changed, 31 insertions(+), 1 deletion(-) New commits: commit 1c1b788f38da07aed268be3c515a096594a107dc Author: Peter Foley <pefol...@pefoley.com> Date: Tue Jan 19 14:48:49 2016 -0500 More LTO fixes for android Change-Id: Id9b4873b8213d9913d54b3821ba0be6ffa7ac188 Reviewed-on: https://gerrit.libreoffice.org/21612 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index bb78dce..a26a0c6 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -27,7 +27,7 @@ else $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,glew,\ - $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" \ + $(if $(ENABLE_DEBUG),STRIP=) LD="$(CC)" AR_FLAGS="$(AR_FLAGS)" \ $(MAKE) STRIP= glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(ENABLE_DEBUG),debug)) \ ) diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 3b1a5a1..4911178 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -38,6 +38,7 @@ endif ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,glew,\ external/glew/glew-static-only.patch.1 \ + external/glew/glew-ar-lto.patch.1 \ )) endif diff --git a/external/glew/glew-ar-lto.patch.1 b/external/glew/glew-ar-lto.patch.1 new file mode 100644 index 000..36af0a0f --- /dev/null +++ b/external/glew/glew-ar-lto.patch.1 @@ -0,0 +1,28 @@ +--- a/Makefile.orig2016-01-19 14:38:00.124312444 -0500 b/Makefile 2016-01-19 14:39:00.728011296 -0500 +@@ -67,6 +67,7 @@ + # - use LN= on gmake command-line + + AR ?= ar ++AR_FLAGS ?= cr + INSTALL ?= install + STRIP ?= strip + RM ?= rm -f +@@ -106,7 +107,7 @@ + mkdir lib + + lib/$(LIB.STATIC): $(LIB.OBJS) +- $(AR) cr $@ $^ ++ $(AR) $(AR_FLAGS) $@ $^ + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif +@@ -150,7 +151,7 @@ + glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc + + lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX) +- $(AR) cr $@ $^ ++ $(AR) $(AR_FLAGS) $@ $^ + + lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) + $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index c22ec7b..43384aa 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -87,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ && $(MAKE) build_libs \ + AR="$(AR) $(AR_FLAGS)" \ CC="$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden))" \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap
android/Bootstrap/Makefile.shared |1 + 1 file changed, 1 insertion(+) New commits: commit 2879dceaf56df81734bf36e1d20c973de0a5aa29 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 17:08:47 2016 -0500 improve android build status reporting Change-Id: I29f404dc5aee27b592eac7585c5142b91060fe5c Reviewed-on: https://gerrit.libreoffice.org/21589 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 2edf7c3..e265305 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -44,6 +44,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS) + @echo "Linking $@" mkdir -p $(OBJLOCAL) $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f78de4441508fc81b1e013b907903df9ac4fe664 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 14:40:59 2016 -0500 Fix visibility check for lto on android Change-Id: I5eea41feca7d5ab8b9d104e8356dce8831883a48 Reviewed-on: https://gerrit.libreoffice.org/21585 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index d5ae425..0f9fa82 100644 --- a/configure.ac +++ b/configure.ac @@ -6513,7 +6513,7 @@ __attribute__ ((visibility ("default"))) void TestFunc() { TestStruct::Init(); } _ACEOF -if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then +if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx; then gccvisbroken=yes else case "$host_cpu" in @@ -6521,7 +6521,7 @@ _ACEOF if test "$_os" = "Darwin" -o "$WITH_MINGW" = "yes"; then gccvisbroken=no else -if $EGREP -q '@PLT|@GOT' visibility.s; then +if $EGREP -q '@PLT|@GOT' visibility.s || test "$ENABLE_LTO" = "TRUE"; then gccvisbroken=no else gccvisbroken=yes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac solenv/gbuild
configure.ac | 13 ++--- solenv/gbuild/platform/com_GCC_defs.mk |1 + solenv/gbuild/platform/unxgcc.mk |4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) New commits: commit 0533b155354f086aa8dc1de06c7db92d3f3be4f5 Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 15 11:34:20 2016 -0500 Wrappers for LTO When building with GCC, the gcc-ar, gcc-ranlib, and gcc-nm wrappers must be used for the linker to properly resolve symbols from static libraries containing LTO objects. Likewise, clang requires the llvm-ar, llvm-ranlib, and llvm-nm wrappers. Change-Id: I539017b6da7732f998a49820dc01d0e6b302952a Reviewed-on: https://gerrit.libreoffice.org/21502 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/configure.ac b/configure.ac index 39f61c1..3750beb 100644 --- a/configure.ac +++ b/configure.ac @@ -5163,10 +5163,17 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then # /path/to/compiler/foo-gcc" you need to set the AR etc env vars # explicitly. Or put /path/to/compiler in PATH yourself. -AC_CHECK_TOOL(AR,ar) -AC_CHECK_TOOL(NM,nm) +# Use wrappers for LTO +if test "$ENABLE_LTO" == "TRUE" -a "$COM_IS_CLANG" != "TRUE"; then +AC_CHECK_TOOL(AR,gcc-ar) +AC_CHECK_TOOL(NM,gcc-nm) +AC_CHECK_TOOL(RANLIB,gcc-ranlib) +else +AC_CHECK_TOOL(AR,ar) +AC_CHECK_TOOL(NM,nm) +AC_CHECK_TOOL(RANLIB,ranlib) +fi AC_CHECK_TOOL(OBJDUMP,objdump) -AC_CHECK_TOOL(RANLIB,ranlib) AC_CHECK_TOOL(READELF,readelf) AC_CHECK_TOOL(STRIP,strip) if test "$_os" = "WINNT"; then diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 3f79605..877f502 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -130,6 +130,7 @@ gb_CFLAGS_COMMON += -std=gnu89 ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_IS_CLANG),TRUE) gb_LTOFLAGS := -flto +gb_LTOPLUGINFLAGS := --plugin LLVMgold.so else gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 endif diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 6cd206c..7e43ce3 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -145,7 +145,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET))) $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\ $(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \ - $(NM) --dynamic --extern-only --defined-only --format=posix $(1) \ + $(NM) $(gb_LTOPLUGINFLAGS) --dynamic --extern-only --defined-only --format=posix $(1) \ | cut -d' ' -f1-2 \ >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp, \ @@ -155,7 +155,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) && \ - $(gb_AR) -rsu $(1) \ + $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \ $(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source xmloff/source
sw/source/core/text/inftxt.hxx |2 +- xmloff/source/core/xmltoken.cxx |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8633e6b3f5882508f23ed4dba2b3651ef7a4e524 Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 14:28:29 2016 -0500 Convert NULL/0 to nullptr Change-Id: Iee6bb0867afd8aebe36e62b507f1332e3a581838 Reviewed-on: https://gerrit.libreoffice.org/21549 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 3753bbd..c463bd3 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -385,7 +385,7 @@ protected: #ifdef DBG_UTIL , pBrushItem(reinterpret_cast<SvxBrushItem*>(-1)) #else -, pBrushItem(0) +, pBrushItem(nullptr) #endif , nSpaceIdx(0) {} diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 1570301..d3af42f 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -45,7 +45,7 @@ namespace xmloff { namespace token { #if OSL_DEBUG_LEVEL > 0 #define TOKEN( s, e ) { sizeof(s)-1, s, nullptr, e } #else -#define TOKEN( s, e ) { sizeof(s)-1, s, NULL } +#define TOKEN( s, e ) { sizeof(s)-1, s, nullptr } #endif struct XMLTokenEntry aTokenList[] = @@ -53,7 +53,7 @@ namespace xmloff { namespace token { #if OSL_DEBUG_LEVEL > 0 { 0, nullptr, nullptr, XML_TOKEN_START }, #else -{ 0, NULL, NULL },// XML_TOKEN_START +{ 0, nullptr, nullptr },// XML_TOKEN_START #endif // common XML @@ -3260,7 +3260,7 @@ namespace xmloff { namespace token { #if OSL_DEBUG_LEVEL > 0 { 0, nullptr, nullptr, XML_TOKEN_END } #else -{ 0, NULL, NULL /* XML_TOKEN_END */ } +{ 0, nullptr, nullptr /* XML_TOKEN_END */ } #endif }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib
bin/gen-iwyu-dummy-lib |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bee5797feb1b663fe308c18b4d5d6c16b05cda1b Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 09:40:47 2016 -0500 iwyu fixes Change-Id: I2dc9218ae8c4ea51fea5f710664520a598e7c4a3 Reviewed-on: https://gerrit.libreoffice.org/21536 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib index 92ec408..1d47f04 100755 --- a/bin/gen-iwyu-dummy-lib +++ b/bin/gen-iwyu-dummy-lib @@ -23,7 +23,7 @@ iwyu_INCLUDES=$(grep -h -r ":$" ${BUILDDIR}/workdir/Dep/*Object* \ iwyu_INCLUDEDIRS=$(echo "${iwyu_INCLUDES}" | sed -e "s,/[^/]*$,," | grep -v "^include" | sort -u) iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \ -| xargs awk -f bin/gen-iwyu-dummy-lib.awk \ +| xargs awk -f ${SRCDIR}/bin/gen-iwyu-dummy-lib.awk \ | grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf') mkdir -p ${BUILDDIR}/iwyudummy @@ -62,7 +62,7 @@ for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ /\n/g" | uniq) ${iwyu_I echo "-I${SRCDIR}/${dir} \\"; done >> ${iwyu_LIB} # it fails to find stddef.h? -echo '-I/usr/lib/clang/3.6/include \' >> ${iwyu_LIB} +echo "-I/usr/lib/clang/$(llvm-config --version)/include \\" >> ${iwyu_LIB} echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB} echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> ${iwyu_LIB} ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit af6a39120f590a49088d58c14d46f206abe3e4c2 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 16:28:54 2016 -0500 don't pollute cross-compilation environment with host pkg-config Change-Id: I37a9a801c6bc885bdc5e0cbb9cd4ed527095acf8 Reviewed-on: https://gerrit.libreoffice.org/21587 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index 7bdea6f..daeb3cc 100644 --- a/configure.ac +++ b/configure.ac @@ -490,6 +490,7 @@ if test -n "$with_android_ndk"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}" +export PKG_CONFIG_LIBDIR="$ANDROID_BINUTILS_PREBUILT_ROOT/lib/pkgconfig" if test -n "$ANDROID_USING_CLANG"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -Qunused-arguments" @@ -4626,7 +4627,7 @@ if test "$cross_compiling" = "yes"; then unset CC CXX SYSBASE CFLAGS unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP unset CPPUNIT_CFLAGS CPPUNIT_LIBS -unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC +unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC PKG_CONFIG_LIBDIR test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD" test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD" test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 817cd83cb76582cda848da0370d3e1b68f5bbb01 Author: Peter Foley <pefol...@pefoley.com> Date: Mon Jan 18 14:19:51 2016 -0500 Improve LTO flags on Android Change-Id: Idd8a86710b9b93b317b28e092b5bee971645c346 Reviewed-on: https://gerrit.libreoffice.org/21583 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index 3e9e1c0..7bdea6f 100644 --- a/configure.ac +++ b/configure.ac @@ -514,9 +514,13 @@ if test -n "$with_android_ndk"; then esac if test "$ENABLE_LTO" = TRUE; then -# -flto comes from com_GCC_degs.mk, too, but we need to make sure it gets passed as part of +# -flto comes from com_GCC_defs.mk, too, but we need to make sure it gets passed as part of # $CC and $CXX when building external libraries -ANDROIDCFLAGS="$ANDROIDCFLAGS -flto" + if test "$COM_IS_CLANG" = TRUE; then +ANDROIDCFLAGS="$ANDROIDCFLAGS -flto" +else +ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2" +fi fi # gdbserver can be in different locations ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libxml2 solenv/gbuild
external/libxml2/ExternalProject_xml2.mk |1 + solenv/gbuild/platform/android.mk|6 ++ 2 files changed, 7 insertions(+) New commits: commit 6aaf1ec5a781b50ceda6d0d288a43dba435be2ce Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 18:13:25 2016 -0500 LTO fixes for android Change-Id: I2d4cedac4081260c5147d8c11904d042c765e3a6 Reviewed-on: https://gerrit.libreoffice.org/21557 Tested-by: Jenkins <c...@libreoffice.org> Tested-by: Tor Lillqvist <t...@collabora.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index f19cb52..6d4822f 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__URELIB) \ LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \ CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \ + AR_FLAGS="$(AR_FLAGS)" \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ ) diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index ae1a9ea..55b6c5c 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -20,6 +20,12 @@ gb_STDLIBS := \ endif +ifeq ($(ENABLE_LTO),TRUE) + gb_LTOPLUGINFLAGS := --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so) + AR_FLAGS := rcs --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so) + RANLIB := $(RANLIB) --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so) +endif + # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac sc/source
configure.ac |4 ++-- sc/source/core/tool/rangenam.cxx |5 - 2 files changed, 2 insertions(+), 7 deletions(-) New commits: commit 3a079aec09d2050ee9283262e932efe6aff504cf Author: Peter Foley <pefol...@pefoley.com> Date: Sat Jan 16 14:04:12 2016 -0500 improve scp2 stamp messages Change-Id: I62fcad499601ad4870d4fa875b29d01618236925 Reviewed-on: https://gerrit.libreoffice.org/21523 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index c8cefd4..d814673 100644 --- a/configure.ac +++ b/configure.ac @@ -12943,7 +12943,7 @@ fi if test ! -f config_host.mk.stamp; then echo > config_host.mk.stamp elif test "$config_md5" = `$MD5SUM config_host.mk | sed "s/ .*//"`; then -echo "Configuration unchanged - avoiding scp2 stamp update" +echo "Host Configuration unchanged - avoiding scp2 stamp update" else echo > config_host.mk.stamp fi @@ -12952,7 +12952,7 @@ fi if test ! -f config_host_lang.mk.stamp; then echo > config_host_lang.mk.stamp elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`; then -echo "Configuration unchanged - avoiding scp2 stamp update" +echo "Language Configuration unchanged - avoiding scp2 stamp update" else echo > config_host_lang.mk.stamp fi commit 93d6aef1779e8b82a2a551b9e454a5d2aed5ce37 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Jan 18 08:28:54 2016 +0100 loplugin:unreffun Change-Id: I1008a51abb3834a65aabfdf05370d9515a18c1e2 diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index a1e25ee..aa81602 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -653,11 +653,6 @@ int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) (*static_cast(p2))->GetName() ); } -bool operator<(const ScRangeData& left, const ScRangeData& right) -{ -return left.GetName() < right.GetName(); -} - namespace { /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 178 +++ 1 file changed, 84 insertions(+), 94 deletions(-) New commits: commit b09b496b9f1713581d1a54e88e6cfd6565c43a2b Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 16:06:14 2016 -0500 Use built-in autoconf cross-compile support. Change-Id: If3f1de5a7b94bce799dc044be602a14d03dff357 Reviewed-on: https://gerrit.libreoffice.org/21555 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index 47980c5..8ed1ab8 100644 --- a/configure.ac +++ b/configure.ac @@ -6337,45 +6337,40 @@ if test "$cxx11_ref_qualifier" = yes; then fi AC_MSG_CHECKING([whether $CXX supports C++14 sized deallocation]) -if test "$CROSS_COMPILING" = TRUE; then -cxx14_sized_deallocation=no -AC_MSG_RESULT([$cxx14_sized_deallocation (assumed; cross compiling)]) -else -dnl At least Clang -fsanitize=address causes "multiple definition of -dnl `operator delete(void*, unsigned long)'" also defined in -dnl projects/compiler-rt/lib/asan/asan_new_delete.cc: -save_CXX=$CXX -if test "$COM_IS_CLANG" = TRUE; then -my_CXX= -for i in $CXX; do -case $i in --fsanitize=address) -;; -*) -my_CXX="$my_CXX $i" -;; -esac -done -CXX=$my_CXX -fi -save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" -AC_LANG_PUSH([C++]) -AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -void operator delete(void *) throw () { std::exit(1); } -void operator delete(void *, std::size_t) throw () { std::exit(0); } -struct S { S() { throw 0; } }; -]],[[ -try { new S; } catch (...) {} -return 1; -]])], [cxx14_sized_deallocation=yes], [cxx14_sized_deallocation=no]) -AC_LANG_POP([C++]) -CXX=$save_CXX -CXXFLAGS=$save_CXXFLAGS -AC_MSG_RESULT([$cxx14_sized_deallocation]) +dnl At least Clang -fsanitize=address causes "multiple definition of +dnl `operator delete(void*, unsigned long)'" also defined in +dnl projects/compiler-rt/lib/asan/asan_new_delete.cc: +save_CXX=$CXX +if test "$COM_IS_CLANG" = TRUE; then +my_CXX= +for i in $CXX; do +case $i in +-fsanitize=address) +;; +*) +my_CXX="$my_CXX $i" +;; +esac +done +CXX=$my_CXX fi +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" +AC_LANG_PUSH([C++]) +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include +#include +void operator delete(void *) throw () { std::exit(1); } +void operator delete(void *, std::size_t) throw () { std::exit(0); } +struct S { S() { throw 0; } }; +]],[[ +try { new S; } catch (...) {} +return 1; +]])], [cxx14_sized_deallocation=yes], [cxx14_sized_deallocation=no], [cxx14_sized_deallocation=no]) +AC_LANG_POP([C++]) +CXX=$save_CXX +CXXFLAGS=$save_CXXFLAGS +AC_MSG_RESULT([$cxx14_sized_deallocation]) if test "$cxx14_sized_deallocation" = yes; then AC_DEFINE([HAVE_CXX14_SIZED_DEALLOCATION]) fi @@ -8126,32 +8121,30 @@ case $enable_python in system) SYSTEM_PYTHON=TRUE -if test "$CROSS_COMPILING" != TRUE; then -dnl Check if the headers really work -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" -AC_CHECK_HEADER(Python.h, [], - [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])], - []) -CPPFLAGS="$save_CPPFLAGS" - -AC_LANG_PUSH(C) -CFLAGS="$CFLAGS $PYTHON_CFLAGS" -AC_MSG_CHECKING([for correct python library version]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ +dnl Check if the headers really work +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" +AC_CHECK_HEADER(Python.h, [], + [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])], + []) +CPPFLAGS="$save_CPPFLAGS" + +AC_LANG_PUSH(C) +CFLAGS="$CFLAGS $PYTHON_CFLAGS" +AC_MSG_CHECKING([for correct python library version]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include int main(int argc, char **argv) { - if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || - (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0; - else return 1; + if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || + (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0; +
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7228e5dc9776e033b1cfb590ecde0be5ef5ff2b7 Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 14:26:28 2016 -0500 Fix cross-compilation with in-tree ndk/sdk The build configure run tries to use the ndk as well. Prevent this by only auto-detecting the ndk when cross-compiling. Change-Id: I0c098a7ae3f34cd6210f1b6b14121f62ed892b13 Reviewed-on: https://gerrit.libreoffice.org/21547 Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index d814673..47980c5 100644 --- a/configure.ac +++ b/configure.ac @@ -340,7 +340,7 @@ AC_ARG_WITH(android-sdk, ,) ANDROID_NDK_HOME= -if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk"; then +if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk" -a "$build" != "$host"; then with_android_ndk="$SRC_ROOT/external/android-ndk" fi if test -n "$with_android_ndk"; then @@ -568,7 +568,7 @@ dnl === dnl --with-android-sdk dnl === ANDROID_SDK_HOME= -if test -z "$with_android_sdk" -a -e "$SRC_ROOT/external/android-sdk-linux"; then +if test -z "$with_android_sdk" -a -e "$SRC_ROOT/external/android-sdk-linux" -a "$build" != "$host"; then with_android_sdk="$SRC_ROOT/external/android-sdk-linux" fi if test -n "$with_android_sdk"; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitignore
.gitignore |2 ++ 1 file changed, 2 insertions(+) New commits: commit 20a4b3a081494535e5cb44832cdc9824532dc76c Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 14:27:44 2016 -0500 Properly ignore in-tree sdk and ndk Change-Id: If8aa9647def6741ba01bd47c02d386c43abaf452 Reviewed-on: https://gerrit.libreoffice.org/21548 Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/.gitignore b/.gitignore index 9a56535..2370081 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ # default location for external downloads /external/tarballs +/external/android-ndk +/external/android-sdk-linux # autoconf generated stuff /aclocal.m4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 251 ++- 1 file changed, 111 insertions(+), 140 deletions(-) New commits: commit 19167ea31383cb91c1563ba2d4bb7708eea8afc1 Author: Peter Foley <pefol...@pefoley.com> Date: Sun Jan 17 18:12:39 2016 -0500 Use test -f rather then cross-compilation unfriendly AC_CHECK_FILE Change-Id: I3ea0f56606e75254bc8998238af76d31315f77e0 Reviewed-on: https://gerrit.libreoffice.org/21556 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> diff --git a/configure.ac b/configure.ac index 8ed1ab8..39f61c1 100644 --- a/configure.ac +++ b/configure.ac @@ -8351,8 +8351,9 @@ if test "$with_java" != "no"; then if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi -AC_CHECK_FILE($HSQLDB_JAR, [], - [AC_MSG_ERROR(hsqldb.jar not found.)], []) +if ! test -f $HSQLDB_JAR; then + AC_MSG_ERROR(hsqldb.jar not found.)] +fi AC_MSG_CHECKING([whether hsqldb is 1.8.0.x]) export HSQLDB_JAR if $PERL -e \ @@ -10562,157 +10563,128 @@ if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi -AC_CHECK_FILE($SAC_JAR, [], - [AC_MSG_ERROR(sac.jar not found.)], []) +if ! test -f $SAC_JAR; then + AC_MSG_ERROR(sac.jar not found.) +fi if test -z $LIBXML_JAR; then -AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar, -[ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ], -[ -AC_CHECK_FILE(/usr/share/java/libxml.jar, - [ LIBXML_JAR=/usr/share/java/libxml.jar ], - [AC_MSG_ERROR(libxml.jar replacement not found.)] -) -] -) -else -AC_CHECK_FILE($LIBXML_JAR, [], - [AC_MSG_ERROR(libxml.jar not found.)], []) +if test -f /usr/share/java/libxml-1.0.0.jar; then +LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar +elif test -f /usr/share/java/libxml.jar; then +LIBXML_JAR=/usr/share/java/libxml.jar +else +AC_MSG_ERROR(libxml.jar replacement not found.) +fi +elif ! test -f $LIBXML_JAR; then +AC_MSG_ERROR(libxml.jar not found.) fi if test -z $FLUTE_JAR; then -AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar, -[ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ], -[ -AC_CHECK_FILE(/usr/share/java/flute.jar, -[ FLUTE_JAR=/usr/share/java/flute.jar ], -[ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)] -) -] -) -else -AC_CHECK_FILE($FLUTE_JAR, [], - [AC_MSG_ERROR(flute-1.3.0.jar not found.)], []) +if test -f/usr/share/java/flute-1.3.0.jar; then +FLUTE_JAR=/usr/share/java/flute-1.3.0.jar +elif test -f /usr/share/java/flute.jar; then +FLUTE_JAR=/usr/share/java/flute.jar +else +AC_MSG_ERROR(flute-1.3.0.jar replacement not found.) +fi +elif ! test -f $FLUTE_JAR; then +AC_MSG_ERROR(flute-1.3.0.jar not found.) fi if test -z $JFREEREPORT_JAR; then -AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar, -[ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ], -[ -AC_CHECK_FILE(/usr/share/java/flow-engine.jar, -[ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ], -[AC_MSG_ERROR(jfreereport.jar replacement not found.)] -) -] -) -else -AC_CHECK_FILE($JFREEREPORT_JAR, [], - [AC_MSG_ERROR(jfreereport.jar not found.)], []) +if test -f /usr/share/java/flow-engine-0.9.2.jar; then +JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar +elif test -f /usr/share/java/flow-engine.jar; then +JFREEREPORT_JAR=/usr/share/java/flow-engine.jar +else +AC_MSG_ERROR(jfreereport.jar replacement not found.) +fi +elif ! test -f $JFREEREPORT_JAR; then +AC_MSG_ERROR(jfreereport.jar not found.) fi if test -z $LIBLAYOUT_JAR; then -AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar, -[ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ], -[ -AC_CHECK_FILE(/usr/share/java/liblayo
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slideshow/slideshowimpl.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6240b6b17682784182c0b8dbf9eb2341309d2b6f Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 15 22:30:37 2016 -0500 Fix ODR Violations under LTO /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: warning: type âstruct SlideshowImplâ violates one definition rule [-Wodr] class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: a different type is defined in another translation unit class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:334:28: note: the first difference of corresponding definitions is field âmpShowWindowâ VclPtr mpShowWindow; ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:334:28: note: a field of same name but different type is defined in another translation unit VclPtr mpShowWindow; ^ /home/peter/libreoffice/include/vcl/vclptr.hxx:75:7: note: type name âVclPtrâ should match type name âVclPtrâ class VclPtr ^ /home/peter/libreoffice/include/vcl/vclptr.hxx:75:7: note: the incompatible type is defined here class VclPtr ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:166:7: warning: type âstruct SlideShowViewâ violates one definition rule [-Wodr] class SlideShowView : public ::comphelper::OBaseMutex, ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:166:7: note: a different type is defined in another translation unit class SlideShowView : public ::comphelper::OBaseMutex, ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:232:45: note: the first difference of corresponding definitions is field âmpSlideShowâ SlideshowImpl* mpSlideShow; ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowviewimpl.hxx:232:45: note: a field of same name but different type is defined in another translation unit SlideshowImpl* mpSlideShow; ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: type âstruct SlideshowImplâ should match type âstruct SlideshowImplâ that itself violate one definition rule class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase ^ /home/peter/libreoffice/sd/source/ui/slideshow/slideshowimpl.hxx:162:7: note: the incompatible type is defined here class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase ^ Change-Id: Ibbb7fb6f35f7e2771aef78a38fc4b6adef131845 Reviewed-on: https://gerrit.libreoffice.org/21503 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 88666d4..28de15a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -80,13 +80,13 @@ class SfxViewFrame; class SfxRequest; -class ShowWindow; namespace sd { class SlideShowView; class AnimationSlideController; class PaneHider; +class ShowWindow; struct PresentationSettingsEx : public PresentationSettings { @@ -331,7 +331,7 @@ private: SdDrawDocument* mpDoc; VclPtrmpParentWindow; -VclPtr mpShowWindow; +VclPtr mpShowWindow; VclPtr mpTimeButton; std::shared_ptr< AnimationSlideController > mpSlideController; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/srclex.l |2 -- 1 file changed, 2 deletions(-) New commits: commit a7bdc9daa802ea67e41e0f93bdd8f0e64b00f8d9 Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 15 22:34:38 2016 -0500 Fix set but unused variable warning Change-Id: I23fb9abf2b9462c939d4d9caf699e48ffded3bb4 Reviewed-on: https://gerrit.libreoffice.org/21505 Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 1cdef41..9caf044 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -234,10 +234,8 @@ void yyerror( const char *s ) } SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { -int e; yyin = init(argc, argv); yylex(); -e = GetError(); Close(); return EXIT_SUCCESS; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/controller/slidelayoutcontroller.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 659526a33619a74730843a06158b22592ae06a0b Author: Peter Foley <pefol...@pefoley.com> Date: Fri Jan 15 22:32:39 2016 -0500 Fix ODR violations when compiling with LTO /home/peter/libreoffice/sd/source/ui/controller/slidelayoutcontroller.cxx:84:8: warning: type âstruct snewfoil_value_infoâ violates one definition rule [-Wodr] struct snewfoil_value_info ^ /home/peter/libreoffice/sd/source/ui/controller/displaymodecontroller.cxx:71:8: note: a different type is defined in another translation unit struct snewfoil_value_info ^ /home/peter/libreoffice/sd/source/ui/controller/slidelayoutcontroller.cxx:86:16: note: the first difference of corresponding definitions is field âmnBmpResIdâ sal_uInt16 mnBmpResId; ^ /home/peter/libreoffice/sd/source/ui/controller/displaymodecontroller.cxx:73:17: note: a field with different name is defined in another translation unit sal_uInt16 mnId; ^ Change-Id: Ic5f5354424188a0889e842e80cb70dd90ecaeff3 Reviewed-on: https://gerrit.libreoffice.org/21504 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index efe545b..15742ef 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -81,20 +81,20 @@ private: VclPtr mpLayoutSet2; }; -struct snewfoil_value_info +struct snewfoil_value_info_layout { sal_uInt16 mnBmpResId; sal_uInt16 mnStrResId; AutoLayout maAutoLayout; }; -static const snewfoil_value_info notes[] = +static const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, {0, 0, AUTOLAYOUT_NONE}, }; -static const snewfoil_value_info handout[] = +static const snewfoil_value_info_layout handout[] = { {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1}, {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2}, @@ -105,7 +105,7 @@ static const snewfoil_value_info handout[] = {0, 0, AUTOLAYOUT_NONE}, }; -static const snewfoil_value_info standard[] = +static const snewfoil_value_info_layout standard[] = { {BMP_LAYOUT_EMPTY,STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE }, {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE}, @@ -122,7 +122,7 @@ static const snewfoil_value_info standard[] = {0, 0, AUTOLAYOUT_NONE} }; -static const snewfoil_value_info v_standard[] = +static const snewfoil_value_info_layout v_standard[] = { // vertical {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART }, @@ -132,7 +132,7 @@ static const snewfoil_value_info v_standard[] = {0, 0, AUTOLAYOUT_NONE} }; -static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo ) +static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; for( ; pInfo->mnBmpResId; pInfo++ ) @@ -186,7 +186,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const mpLayoutSet1 = createEmptyValueSetControl(); mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) ); -const snewfoil_value_info* pInfo = nullptr; +const snewfoil_value_info_layout* pInfo = nullptr; sal_Int16 nColCount = 4; switch( eMode ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/gbuild-to-ide
bin/gbuild-to-ide | 315 +++--- 1 file changed, 159 insertions(+), 156 deletions(-) New commits: commit 83ef294dddf3b1ab5cd5f91a792a7d9413a08f1f Author: Peter Foley <pefol...@pefoley.com> Date: Sat Sep 19 16:59:45 2015 -0400 Avoid creating duplicates in the Visual Studio IDE integration When running make vs2013-ide-integration on windows, the manifest targets cause duplicate library/executable entries to be output in the Visual Studio solution files, causing errors. Change-Id: I6b0ce38a3ba84f7f54741e4974264e2c4c7b201a Reviewed-on: https://gerrit.libreoffice.org/18719 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index de0a060..953747e 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -117,19 +117,21 @@ class GbuildParser: libmatch = GbuildParser.libpattern.match(line) if libmatch: libname = self.libnames.get(state.ilib, None) -self.libs.append( -GbuildLib(libmatch.group(2), libname, libmatch.group(1), - state.include, state.include_sys, state.defs, state.cxxobjects, - state.cxxflags, state.linked_libs)) +if state.cxxobjects: +self.libs.append( +GbuildLib(libmatch.group(2), libname, libmatch.group(1), + state.include, state.include_sys, state.defs, state.cxxobjects, + state.cxxflags, state.linked_libs)) state = GbuildParserState() return state exematch = GbuildParser.exepattern.match(line) if exematch: exename = self.exenames.get(state.target, None) -self.exes.append( -GbuildExe(exematch.group(2), exename, exematch.group(1), - state.include, state.include_sys, state.defs, state.cxxobjects, - state.cxxflags, state.linked_libs)) +if state.cxxobjects: +self.exes.append( +GbuildExe(exematch.group(2), exename, exematch.group(1), + state.include, state.include_sys, state.defs, state.cxxobjects, + state.cxxflags, state.linked_libs)) state = GbuildParserState() return state if line.find('# INCLUDE :=') == 0: commit 2d48830dcbe14c9c2789707d1032876c45409799 Author: Peter Foley <pefol...@pefoley.com> Date: Sat Sep 19 16:53:04 2015 -0400 minor pep8 formatting improvments to gbuild-to-ide Change-Id: Ifa060f4ab6ebe7b525a991cc54564e9584d032f7 Reviewed-on: https://gerrit.libreoffice.org/18720 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 8d822e5..de0a060 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -20,6 +20,7 @@ import xml.etree.ElementTree as ET import xml.dom.minidom as minidom import traceback + class GbuildParserState: def __init__(self): @@ -242,7 +243,9 @@ class IdeIntegrationGenerator: def emit(self): pass + class EclipseCDTIntegrationGenerator(IdeIntegrationGenerator): + def __init__(self, gbuildparser, ide): IdeIntegrationGenerator.__init__(self, gbuildparser, ide) self.oe_cdt = 'org.eclipse.cdt' @@ -260,13 +263,13 @@ class EclipseCDTIntegrationGenerator(IdeIntegrationGenerator): -"""+ self.cdt_mb +""".genmakebuilder +""" + self.cdt_mb + """.genmakebuilder clean,full,incremental, -"""+ self.cdt_mb +""".ScannerConfigBuilder +""" + self.cdt_mb + """.ScannerConfigBuilder full,incremental, @@ -281,7 +284,8 @@ class EclipseCDTIntegrationGenerator(IdeIntegrationGenerator): """ -return projectfiletemplate % {'name': name, 'comment': comment, 'xmlversion': xmlversion, 'encoding':encoding} +return projectfiletemplate % {'name': name, 'comment': comment, 'xmlversion': xmlversion, 'encoding': encoding} + class DebugIntegrationGenerator(IdeIntegrationGenerator): @@ -485,7 +489,6 @@ VersionControl=kdevgit def __init__(self, gbuildparser, ide): IdeIntegrationGenerator.__init__(self, gbuildparser, ide) - def emit(self): for path in self.gbuildparser.target_by_path: self.write_incl
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1 configure.ac | 51 +++-- solenv/gbuild/JunitTest.mk |3 +- 3 files changed, 48 insertions(+), 7 deletions(-) New commits: commit dea6266b22a3e7a7af4623fb655c4279560762c0 Author: Peter Foley pefol...@pefoley.com Date: Tue Sep 9 22:19:42 2014 -0400 Add support for external hamcrest when using junit 4.11+ Starting with junit 4.11 hamcrest is no longer bundled, so add a --with-hamcrest option to support this. Change-Id: Icdae946af82b9c56bf25d37cbf88275fc6a6a1eb Reviewed-on: https://gerrit.libreoffice.org/11383 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com (cherry picked from commit 4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/config_host.mk.in b/config_host.mk.in index 200c384..2165195 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -237,6 +237,7 @@ export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GUIBASE=@GUIBASE@ +export HAMCREST_JAR=@HAMCREST_JAR@ export HARDLINKDELIVER=@HARDLINKDELIVER@ export HAVE_CXX11=@HAVE_CXX11@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ diff --git a/configure.ac b/configure.ac index 3425c9f..bca5ded 100644 --- a/configure.ac +++ b/configure.ac @@ -1932,6 +1932,15 @@ AC_ARG_WITH(junit, ], ,with_junit=yes) +AC_ARG_WITH(hamcrest, +AS_HELP_STRING([--with-hamcrest], +[Specifies the hamcrest jar file to use for JUnit-based tests. + --without-junit disables those tests. Not relevant in the --without-java case.]) +[ + Usage: --with-hamcrest=absolute path to hamcrest jar +], +,with_hamcrest=yes) + AC_ARG_WITH(perl-home, AS_HELP_STRING([--with-perl-home], [If you have installed Perl 5 Distribution, on your system, please @@ -12278,23 +12287,53 @@ if test $ENABLE_JAVA != -a $with_junit != no; then if test $_os = WINNT; then OOO_JUNIT_JAR=`cygpath -m $OOO_JUNIT_JAR` fi -printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \ - conftest.java +printf 'import org.junit.Before;' conftest.java if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_ERROR( -[cannot find JUnit 4 jar, or JUnit 4 jar does not provide Hamcrest; please -install one in the default location (/usr/share/java), specify its pathname via ---with-junit=..., or disable it via --without-junit]) +[cannot find JUnit 4 jar; please install one in the default location (/usr/share/java), + specify its pathname via --with-junit=..., or disable it via --without-junit]) fi -rm -f conftestj.class conftestj.java +rm -f conftest.class conftest.java if test $OOO_JUNIT_JAR != ; then BUILD_TYPE=$BUILD_TYPE QADEVOOO fi fi AC_SUBST(OOO_JUNIT_JAR) +HAMCREST_JAR= +if test $ENABLE_JAVA != -a $with_junit != no; then +AC_MSG_CHECKING([for included Hamcrest]) +printf 'import org.hamcrest.BaseDescription;' conftest.java +if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then +AC_MSG_RESULT([Included in $OOO_JUNIT_JAR]) +else +AC_MSG_RESULT([Not included]) +AC_MSG_CHECKING([for standalone hamcrest jar.]) +if test $with_hamcrest = yes; then +if test -e /usr/share/lib/java/hamcrest.jar; then +HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar +else +HAMCREST_JAR=/usr/share/java/hamcrest.jar +fi +else +HAMCREST_JAR=$with_hamcrest +fi +if test $_os = WINNT; then +HAMCREST_JAR=`cygpath -m $HAMCREST_JAR` +fi +if $JAVACOMPILER -classpath $HAMCREST_JAR conftest.java 5 25; then +AC_MSG_RESULT([$HAMCREST_JAR]) +else +AC_MSG_ERROR([junit does not contain hamcrest; please use a junit jar that includes hamcrest, install a hamcrest jar in the default location (/usr/share/java), + specify its path with --with-hamcrest=..., or disable junit with --without-junit]) +fi +fi +rm -f conftest.class conftest.java +fi +AC_SUBST(HAMCREST_JAR) + AC_SUBST(SCPDEFS) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 9801ed2..8370603 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -54,12 +54,13 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7086ac7dad014e08160f9a7f87fcfba789420828 Author: Peter Foley pefol...@pefoley.com Date: Fri Oct 3 14:44:39 2014 -0400 make gbuild-to-ide VS files work with separate builddir Change-Id: I847885885ed12dbbd64e3b694799e4835497d736 Reviewed-on: https://gerrit.libreoffice.org/11799 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 34ae1fb..ea4cde4 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -668,7 +668,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): return ide_toolset_map[ide] def module_make_command(self, targets): -return '%(sh)s -c PATH=\\/bin:$PATH\\; cd %(location)s %(makecmd)s -rs ' + targets + '' +return '%(sh)s -c PATH=\\/bin:$PATH\\;BUILDDIR=\\%(builddir)s\\ %(makecmd)s -rsC %(location)s ' + targets + '' class Project: @@ -796,6 +796,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): Condition='$(Configuration)|$(Platform)'=='%s|%s' % (cfg_name, platform)) nmake_params = { 'sh': os.path.join(self.gbuildparser.binpath, 'dash.exe'), +'builddir': self.gbuildparser.builddir, 'location': target.location, 'makecmd': self.gbuildparser.makecmd, 'target': target.target_name()} ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) New commits: commit 79141e2ce2cac45634d48d13cf07f5d3fad171a6 Author: Peter Foley pefol...@pefoley.com Date: Fri Oct 3 13:50:27 2014 -0400 gbuild-to-ide improvments Use gperf instead of ls to find binpath, so that vs2012/3 can be tested on non-Windows systems. Output the vcxproj and vcxproj.filters files with indentation and formatting. Make some minor changes to improve pep8 compliance. Change-Id: Ie8ac11ecf75ad170f0756f803c45356685792e5c Reviewed-on: https://gerrit.libreoffice.org/11797 Tested-by: David Ostrovsky da...@ostrovsky.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index dae2313..34ae1fb 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -17,6 +17,7 @@ import sys import uuid import json import xml.etree.ElementTree as ET +import xml.dom.minidom as minidom class GbuildParserState: @@ -86,7 +87,7 @@ class GbuildParser: srcdirpattern = re.compile('^SRCDIR = (.*)') builddirpattern = re.compile('^BUILDDIR = (.*)') instdirpattern = re.compile('^INSTDIR = (.*)') -binpathpattern = re.compile('^LS = (.*)ls(.exe)?') +binpathpattern = re.compile('^GPERF = (.*)gperf(.exe)?') libnamespattern = re.compile('^gb_Library_ILIBFILENAMES := (.*)') exenamepattern = re.compile('^gb_Executable_FILENAMES_FOR_BUILD := (.*)') rulepattern = re.compile('^(.+?):( .*)?$') @@ -214,6 +215,7 @@ class GbuildParser: state = GbuildParserState() return self + class IdeIntegrationGenerator: def __init__(self, gbuildparser, ide): @@ -417,7 +419,6 @@ VersionControl=kdevgit def write_includepaths(self, path): includedirfile = open(os.path.join(path, '.kdev_include_paths'), 'w') -fullpath = '%s/%s' % (self.gbuildparser.srcdir, path) include = set() for target in self.target_by_path[path]: include |= set(target.include) @@ -658,12 +659,12 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): for target in set(self.gbuildparser.libs) | set(self.gbuildparser.exes): if target.is_empty(): continue -if not target.location in self.target_by_location: +if target.location not in self.target_by_location: self.target_by_location[target.location] = set() self.target_by_location[target.location] |= set([target]) def retrieve_toolset(self, ide): -ide_toolset_map = {'vs2012':'v110', 'vs2013':'v120'} +ide_toolset_map = {'vs2012': 'v110', 'vs2013': 'v120'} return ide_toolset_map[ide] def module_make_command(self, targets): @@ -694,9 +695,6 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): nmake_project_guid = '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942' -def get_project_directory(self, target): -return os.path.join(self.solution_directory, target.location.split('/')[-1]) - def get_dependency_libs(self, linked_libs, library_projects): dependency_libs = {} for linked_lib in linked_libs: @@ -713,7 +711,6 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): for project in projects: target = project.target print(' %s' % target.name, end='') -module = target.location.split('/')[-1] proj_path = os.path.relpath(project.path, os.path.abspath(os.path.dirname(solution_path))) f.write('Project({%s}) = %s, %s, {%s}\n' % (VisualStudioIntegrationGenerator.nmake_project_guid, @@ -783,15 +780,15 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): platform_toolset_node = ET.SubElement(conf_node, '{%s}PlatformToolset' % ns) platform_toolset_node.text = self.toolset -import_node = ET.SubElement(proj_node, '{%s}Import' % ns, Project='$(VCTargetsPath)\Microsoft.Cpp.props') +ET.SubElement(proj_node, '{%s}Import' % ns, Project='$(VCTargetsPath)\Microsoft.Cpp.props') ET.SubElement(proj_node, '{%s}ImportGroup' % ns, Label='ExtensionSettings') for configuration in self.configurations: prop_sheets_node = ET.SubElement(proj_node, '{%s}ImportGroup' % ns, Label='Configuration', Condition='$(Configuration)|$(Platform)'=='%s|%s' % (configuration, platform)) -import_node = ET.SubElement(prop_sheets_node, '{%s}Import' % ns, - Project='$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props', - Condition=exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props
Re: [Re] I am new employee, with VS problem
On Tue, Sep 30, 2014 at 8:00 PM, David Ostrovsky d.ostrov...@gmx.de wrote: Yes, i can reproduce that. The reason is Win32 make. It confuses some of regex in gbuild-to-ide generator. Peter Foley mentioned in another thread that he is going to increase GNU make version to 4.0 to run gbuild-to-ide to address that. The problem is actually that gbuild-to-ide doesn't work with make 4.0. I'll hopefully fix that when I get the time, but it may take a while. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/787/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/09/809/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/2521/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/823/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/1240/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/823/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/802/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/1465/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/2521/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/87/787/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/09/809/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/11632/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/802/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/1465/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/2518/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/2242/14'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/11654/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/448/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/2242/10'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/2242/12'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/794/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/1183/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/791/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/1488/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/806/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/785/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/825/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/9'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/2242/13'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/11632/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/2242/11'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/1901/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/1183/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/825/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/11406/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/11421/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/824/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/791/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/11654/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/813/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/812/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/2521/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/2193/11'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2192/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/2193/10'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/1183/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/812/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/10'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2953/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2653/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/2288/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/11421/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/2197/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits