# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # $(eval $(call gb_Executable_Executable,soffice_bin)) $(eval $(call gb_Executable_set_include,soffice_bin,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/source/inc \ )) $(eval $(call gb_Executable_add_defs,soffice_bin,\ $(if $(DISABLE_DYNLOADING),$(if $(SYSTEM_LIBXML),,-DNOTEST_xmlCleanupParser)) \ )) $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ )) $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) ifeq ($(OS),EMSCRIPTEN) $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link # don't sort; later can override previous settings! $(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/environment.js)) $(eval $(call gb_Executable_add_prejs,soffice_bin,$(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link)) endif ifeq ($(OS),WNT) $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO)) $(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader)) $(eval $(call gb_Executable_add_default_nativeres,soffice_bin,$(PRODUCTNAME))) ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_ldflags,soffice_bin,\ /STACK:10000000 \ )) endif endif ifeq ($(OS),EMSCRIPTEN) $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(call gb_StaticLibrary_get_linktarget_target,unoembind) $(call gb_LinkTarget_get_headers_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(call gb_StaticLibrary_get_headers_target,unoembind) $(call gb_LinkTarget__static_lib_dummy_depend,unoembind) $(call gb_Executable_get_linktarget_target,soffice_bin): \ $(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports $(eval $(call gb_Executable_add_ldflags,soffice_bin,\ -s EXPORTED_FUNCTIONS=@$(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports -Wl$(COMMA)--whole-archive $(call gb_StaticLibrary_get_target,unoembind) -Wl$(COMMA)--no-whole-archive \ $(if $(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD), \ -sPROXY_TO_PTHREAD=1 \ $(if $(DISABLE_GUI),, \ -sOFFSCREENCANVAS_SUPPORT=1 -sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas)) \ )) ifeq ($(ENABLE_QT6),TRUE) $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ -s MODULARIZE=1 \ -s EXPORT_NAME=soffice_entry \ )) endif $(call gb_Executable_get_linktarget_target,soffice_bin): \ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ $(SRCDIR)/static/emscripten/uno.js \ $(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS) $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ --post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ --post-js $(SRCDIR)/static/emscripten/uno.js \ $(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS),--pre-js $(i)) \ )) ifeq ($(ENABLE_DBGUTIL)-$(gb_SUPPRESS_TESTS),TRUE-) $(call gb_Executable_get_linktarget_target,soffice_bin): \ $(SRCDIR)/unotest/source/embindtest/embindtest.js $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ --post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \ )) endif endif # vim: set ts=4 sw=4 et: /collabora/cp-4.1'>distro/collabora/cp-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)Author
2024-12-02tdf#147021 - Use std::size() instead of SAL_N_ELEMENTS() macroLeSci-0x1
Change-Id: If8222286f36cda3071d63a14896d8d89c5802437 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177650 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Tested-by: Jenkins
2024-12-02tdf#147021 - Use std::size() instead of SAL_N_ELEMENTS() macroLeSci-0x1
Change-Id: I3d8b65f0ef386eed2ada12664aa33d2efd53fb65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177641 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2024-11-11clang-tidy: performance-unnecessary-copy-initialization in variousNoel Grandin
Change-Id: Ib7d75d4d8207261898568402e7983e0f11da14bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176417 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-10-04cid#1606631 Overflowed constantCaolán McNamara
Change-Id: I5dda80aaa2fa7ec47ad005048ec3738481e5b50c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174491 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-10-02cid#1606631 Overflowed constantCaolán McNamara
Change-Id: I9ed28057b0435b78743303d1d6edea928598787b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174379 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-07-20Remove now unneeded osl/diagnose.hGabor Kelemen
followup to commit 57c228803e55ed343c6693de7d0857ad7d3cd9e3 Change-Id: Iebfb23bb65e2bf898bf27f367cc9641f47a14cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167998 Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de> Tested-by: Jenkins
2024-05-12WaE: C6011 Dereferencing NULL pointer warningsCaolán McNamara
Change-Id: I6d1ea7e14f5d2a75d485dae69d51cec8c2343445 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167558 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-12WaE: C6011 Dereferencing NULL pointer warningsCaolán McNamara
Change-Id: Ica8b3c8c5476f2f0f3bebf0cfcd80b08090c6119 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167556 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
2024-05-09loplugin:ostr in jvmfwkNoel Grandin
Change-Id: Ie21df5b25d15a15ba7a1660970ff7064bb8ec1d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167385 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-05-03makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)Christian Lohmaier
…by a simple/static $(gb_CustomTarget_workdir)/foo The build system has a lot of overly complicated leftovers from when it was introduced and had not only deal with split repositories but also had to coexist with another buildsystem. Along with lots of copy'n'paste along the years the makefiles became hard to grasp for newcomers with all our calls and evals. As a first step to streamline that, the macros from TargetLocations that simply prefix a static path to the argument (and similar of the same kind) are a natural pick before simplifying the rules themselves/getting rid of a bunch of eval statements. Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-03-21Tie javac -g option to --enable-symbols instead of gb_DEBUGLEVELStephan Bergmann
...which appears to be a better fit. Now, gb_JavaClassSet_JAVACDEBUG is unconditionally defined as -g, but conditionally only used if gb_target_symbols_enabled is true for the given target (where the target is spelled "Jar/..." resp. "CustomTarget_jvmfwk/jreproperties" for the --enable-sybmols=... mini-language in configure.ac). Also, the odd special case to "force debug information for OOoRunner" has just been dropped. Change-Id: Ief10efc689d65e2f50888d3e96cb40f43cbb1b2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165071 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-03-08use more string_viewNoel Grandin
found by tweaking the stringview loplugin Change-Id: I92203ba99642bef7951ffa146184c5562cb31d09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163744 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-03-06Use less boost_headers in low level librariesGabor Kelemen
Most of these don't use boost themselves, nor do they need it transitively since the use of boost::optional was removed Change-Id: Ic9dee1c4e160b313ec5b91677b02ffdea6c5779d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164440 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-11-20Extended loplugin:ostr: jvmfwkStephan Bergmann
Change-Id: Ibb17d89a5ed618b4d5e6be9ac9ee89e2751c3ed7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159696 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-10-20Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: jvmfwkStephan Bergmann
Change-Id: I23ce970ad67047b0b22a9dda3dff047e5f59dff5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158203 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-06-27loplugin:stringstatic look for more stringsNoel Grandin
that can be initialised at compile-time instead of runtime Change-Id: I08d516fdc13a3a79f93c079f89ac44cbc7a1ed71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153620 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-06-21Allow bootstrap variables in Java user classpath settings, 2nd trySamuel Mehrbrodt
Add a second mode: When a classpath starts with '$', bootstrap variables are recognized. The classpath must then be provided as URL, not native path. Change-Id: Idcc229a2b4e9a512b0e712ea932a6e4293907db3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152899 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-06-08Revert "Allow bootstrap variables in Java user classpath settings"Samuel Mehrbrodt
This breaks existing paths which contain "\" or "$". This reverts commit cfc2376f804f13eb562f39182cb24fe7dc61d6ef. Change-Id: Ia58df0a4f061f45140575e89231bd18d044a9bc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152604 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-05-25Allow bootstrap variables in Java user classpath settingsSamuel Mehrbrodt
This allows for relative paths to be configured as Java class path. Change-Id: Ie3e6bc3836fb316457e5c9f11dfb77d2fcd49ad4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152271 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-04-11accept aarch64 JDK for win/aarch64Christian Lohmaier
the check is only done for windows & mac since the property can have arbitrary values - in OpenJDK it is hardcoded for windows, but for other platforms it can come from autoconf. For a more detailed explanation see f05a42ef8c8192186f91a169047742e5c3ae9b9e Change-Id: I8555ef3b7153a9b744b45cf07deae3c3a1d48ae3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150119 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2023-03-30loplugin:stringadd in variousNoel Grandin
when applying my upcoming patch to also consider O[U]StringBuffer Change-Id: I8cf6a47ad357ddc73e2c430d966be72d5efd1485 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149767 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-14elide some temporary OStringsNoel Grandin
where we can pass a string_view into OStringToOUString Change-Id: If7803ba49aa15f6e9c7bd386d32fb84003155390 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148844 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-27Remove support for 32-bit S390Stephan Bergmann
As discussed in the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html> "Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)", the bridge implementation at bridges/source/cpp_uno/gcc3_linux_s390 is apparently dead and should thus be removed. However, that was the only bridge implementation for 32-bit S390, which implies that support for the 32-bit S390 architecture as a whole is dead and should thus be removed. Change-Id: I18b3b4fa11df4ce693107bad6bbea2fab1c19f26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146058 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-27Remove support for AIXStephan Bergmann
As discussed in the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html> "Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)", the bridge implementation at bridges/source/cpp_uno/gcc3_aix_powerpc is apparently dead and should thus be removed. However, that was the only bridge implementation for AIX, which implies that support for the AIX platform as a whole is dead and should thus be removed. Change-Id: I96de3f7f97d4fd770ff78256f0ea435383688be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-11-24loplugin:unusedfields make some fields privateNoel Grandin
this is one of the secondary analyses this plugin performs Change-Id: I1c496e234513362338600180e51f7e71e605a7cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143180 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>