office-gobmx/solenv
Stephan Bergmann e53ea908b7 Fix duplicate "stringresource" in MERGE_LIBRARY_LIST
...where both entries were added with 40fe721462
"add some more libs to libmerged", and defining Library_stringresource in
scripting/Module_scripting.mk is conditional on BUILD_TYPE SCRIPTING.

This will hopefully fix
<https://ci.libreoffice.org/job/lo_callgrind_linux/7884/> (which apparently uses
--enable-mergelibs),

> /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o: in function `stringresource::StringResourceImpl::isReadOnly()':
> /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297: multiple definition of `stringresource::StringResourceImpl::isReadOnly()'; /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297: first defined here
> /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o: in function `stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)':
> /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659: multiple definition of `stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)'; /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659: first defined here
[...]

Change-Id: Ie667487bced048d3b0b0081a9fa4abafa090f02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88468
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Jenkins
2020-02-11 22:11:31 +01:00
..
bin android hunspell: Turn on the hunspell build on Android... 2020-02-10 18:14:40 +01:00
buck
clang-cl
clang-format remove graphicprimitive2d.{cxx,hxx} from clang-format blacklist 2020-02-11 18:53:46 +01:00
doc/gbuild Fix typos 2019-08-16 22:23:08 +02:00
gbuild Fix duplicate "stringresource" in MERGE_LIBRARY_LIST 2020-02-11 22:11:31 +01:00
gbuildtojson loplugin:constvars in solenv..svtools 2019-08-20 15:35:37 +02:00
gcc-wrappers
gdb
inc add Silesian (szl) language pack 2019-08-27 14:10:43 +02:00
lldb/libreoffice
maven Fix typos 2019-08-12 11:43:04 +02:00
qa/python add support for Clang's -building-pch-with-obj 2020-01-18 14:56:12 +01:00
sanitizers weld SvxFmAbsRecWin item window 2020-02-10 15:20:40 +01:00
vs Remove useless and wrong mask; it turns signed short into unsigned 2019-10-18 13:11:40 +02:00
CompilerTest_compilerplugins_clang.mk new loplugin:namespaceindentation 2020-01-31 09:34:46 +01:00
CustomTarget_gbuildtesttools.mk
Executable_concat-deps.mk
Executable_g++-wrapper.mk
Executable_gbuildtojson.mk
Executable_gcc-wrapper.mk
flatpak-manifest.in upload libcdr 0.1.6 2020-02-08 16:26:23 +01:00
Makefile
Module_solenv.mk
PythonTest_solenv_python.mk Revert "Make font-based unit test depend on instdir fonts" 2019-12-16 12:58:35 +01:00
README
StaticLibrary_wrapper.mk

Tools and makefile fragments necessary for compilation

This module contains many tools and makefile configuration pieces,
critical for building LibreOffice:

bin/
    contains lots of tools used during the build:

    concat-deps*
        these aggregate, and remove duplicates from module
        dependencies, to accelerate build times.

    make_installer.pl
        this script executes the compiled instructions from
        the scp2/ module to create an installer, and/or to
        do a local install for the smoketest.

gbuild/
    implementation of the LibreOffice build system
    See gbuild/README for more info.

gdb/
    lots of nice python helpers to make debugging -much- easier
    that (eg.) print UCS2 strings as UTF-8 on the console to
    help with debugging.

inc/
    old / increasingly obsolete dmake setup and includes, we are
    trying to entirely rid ourselves of this

src/
    useful standard / re-usable component map files for components
    which shouldn't export anything more than a few registration
    symbols.