diff options
Diffstat (limited to 'Repository.mk')
-rw-r--r-- | Repository.mk | 117 |
1 files changed, 66 insertions, 51 deletions
diff --git a/Repository.mk b/Repository.mk index 2aa547a078cd..9317a29975df 100644 --- a/Repository.mk +++ b/Repository.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ concat-deps \ cpp \ cppunittester \ + $(if $(or $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),$(filter EMSCRIPTEN,$(OS))),embindmaker) \ gbuildtojson \ $(if $(filter MSC,$(COM)), \ gcc-wrapper \ @@ -66,35 +67,35 @@ $(eval $(call gb_Helper_register_executables,NONE, \ ) \ treex \ ulfex \ - unoidl-read \ - unoidl-write \ + unoidl-check \ xrmex \ $(if $(filter-out ANDROID iOS WNT,$(OS)), \ - svdemo \ - minvcl \ fftester \ - svptest \ svpclient ) \ $(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest) \ vcldemo \ + svdemo \ + minvcl \ + svptest \ tiledrendering \ mtfdemo \ visualbackendtest \ listfonts \ + listglyphs \ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ + $(if $(and $(ENABLE_GTKTILEDVIEWER), $(filter WNT,$(OS))), gtktiledviewer) \ $(if $(filter EMSCRIPTEN,$(OS)),wasm-qt5-mandelbrot) \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ - $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),climaker)) \ cppumaker \ - idlc \ javamaker \ $(call gb_CondExeSp2bv,sp2bv) \ - $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \ $(if $(filter ODK,$(BUILD_TYPE)),unoapploader) \ - unoidl-check \ + unoidl-read \ + unoidl-write \ $(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \ )) @@ -144,9 +145,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,qpwfuzzer) \ $(call gb_Helper_optional,FUZZERS,slkfuzzer) \ $(call gb_Helper_optional,FUZZERS,fodtfuzzer) \ + $(call gb_Helper_optional,FUZZERS,fodt2pdffuzzer) \ + $(call gb_Helper_optional,FUZZERS,fods2xlsfuzzer) \ $(call gb_Helper_optional,FUZZERS,fodsfuzzer) \ $(call gb_Helper_optional,FUZZERS,fodpfuzzer) \ $(call gb_Helper_optional,FUZZERS,xlsfuzzer) \ + $(call gb_Helper_optional,FUZZERS,schtmlfuzzer) \ $(call gb_Helper_optional,FUZZERS,scrtffuzzer) \ $(call gb_Helper_optional,FUZZERS,wksfuzzer) \ $(call gb_Helper_optional,FUZZERS,diffuzzer) \ @@ -158,6 +162,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,htmlfuzzer) \ $(call gb_Helper_optional,FUZZERS,sftfuzzer) \ $(call gb_Helper_optional,FUZZERS,dbffuzzer) \ + $(call gb_Helper_optional,FUZZERS,webpfuzzer) \ + $(call gb_Helper_optional,FUZZERS,zipfuzzer) \ + $(call gb_Helper_optional,FUZZERS,svgfuzzer) \ soffice_bin \ $(call gb_CondExeUnopkg, \ unopkg_bin \ @@ -248,7 +255,6 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ $(call gb_CondExeRegistryTools, \ - regmerge \ regview \ ) \ $(call gb_CondExeUno,uno) \ @@ -285,7 +291,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ animcore \ - PresenterScreen \ PresentationMinimizer \ wpftimpress \ )) @@ -316,6 +321,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,$(gb_haiku_or_kde), \ $(if $(ENABLE_KF5),vclplug_kf5) \ + $(if $(ENABLE_KF6),vclplug_kf6) \ $(if $(ENABLE_QT5),vclplug_qt5) \ $(if $(ENABLE_QT6),vclplug_qt6) \ $(if $(ENABLE_GTK3_KDE5),vclplug_gtk3_kde5) \ @@ -334,6 +340,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \ OGLTrans \ )) +ifeq ($(OS),EMSCRIPTEN) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ + lo-bootstrap \ +)) +endif + ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ canvastools \ @@ -367,6 +379,7 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ avmedia \ + $(if $(ENABLE_CURL),LanguageTool) \ $(call gb_Helper_optional,AVMEDIA, \ $(if $(filter MACOSX,$(OS)),\ avmediaMacAVF \ @@ -393,12 +406,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(call gb_Helper_optional,SCRIPTING,dlgprov) \ + docmodel \ drawinglayercore \ drawinglayer \ editeng \ + $(if $(filter EMSCRIPTEN,$(OS)),$(if $(ENABLE_DBGUTIL),embindtest)) \ $(if $(filter WNT,$(OS)),emser) \ evtatt \ - expwrap \ $(call gb_Helper_optional,DBCONNECTIVITY, \ flat \ file) \ @@ -413,6 +427,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ i18npool \ i18nsearch \ $(if $(ENABLE_JAVA),jdbc) \ + $(if $(filter WNT,$(OS)),jumplist) \ $(if $(ENABLE_LDAP),ldapbe2) \ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ localebe1 \ @@ -444,7 +459,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ scn \ sd \ sdd \ - sdfilt \ sfx \ slideshow \ sot \ @@ -504,7 +518,6 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ acc \ $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),components) \ cui \ - $(if $(USING_X11),desktop_detector) \ icg \ sdui \ $(if $(ENABLE_GEN),vclplug_gen) \ @@ -584,7 +597,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno_uno \ - $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),cli_uno)) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),cli_uno)) \ i18nlangtag \ $(if $(ENABLE_JAVA), \ java_uno \ @@ -642,6 +655,7 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(call gb_Helper_optional,AVMEDIA, \ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ + $(if $(ENABLE_GTK4),avmediagtk) \ $(if $(filter WNT,$(OS)),avmediawin) \ ) \ cached1 \ @@ -654,6 +668,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_JAVA),hsqldb) \ i18nutil \ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \ + $(if $(and $(ENABLE_GTKTILEDVIEWER), $(filter WNT,$(OS))), libreofficekitgtk) \ $(if $(ENABLE_JAVA), \ $(if $(filter $(OS),MACOSX),,officebean) \ ) \ @@ -667,7 +682,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ucbhelper \ $(if $(WITH_WEBDAV),ucpdav1) \ ucpfile1 \ - ucpftp1 \ $(call gb_Helper_optional,XMLHELP,ucpchelp1) \ ucphier1 \ ucppkg1 \ @@ -687,15 +701,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ )) $(eval $(call gb_Helper_register_plugins_for_install,PLAINLIBS_OOO,ooo, \ - collator_data \ dict_ja \ dict_zh \ - index_data \ localedata_en \ localedata_es \ localedata_euro \ localedata_others \ - textconv_dict \ )) ifeq ($(OS),WNT) @@ -732,6 +743,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta sdqsmsi \ sellangmsi \ sn_tools \ + $(if $(ENABLE_ONLINE_UPDATE_MAR),install_updateservice) \ ) \ )) @@ -773,6 +785,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ active_native \ passive_native \ + crashextension \ )) ifneq ($(ENABLE_JAVA),) @@ -818,12 +831,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \ )) endif -ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE))) -$(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\ - ct2n \ -)) -endif - ifeq (NUMBERTEXT,$(filter NUMBERTEXT,$(BUILD_TYPE))) $(eval $(call gb_Helper_register_packages_for_install,extensions_numbertext,\ numbertext \ @@ -876,6 +883,7 @@ $(eval $(call gb_Helper_register_packages_for_install,calc,\ $(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\ $(if $(filter LINUX %BSD SOLARIS, $(OS)),libreofficekit_selectionhandles) \ + $(if $(and $(ENABLE_GTKTILEDVIEWER), $(filter WNT,$(OS))), libreofficekit_selectionhandles) \ )) $(eval $(call gb_Helper_register_packages_for_install,ure,\ @@ -897,7 +905,7 @@ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ odk_share_readme \ odk_share_readme_generated \ - $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),odk_cli)) \ + $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),odk_cli)) \ odk_config \ $(if $(filter WNT,$(OS)),odk_config_win) \ odk_docs \ @@ -908,8 +916,6 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ odk_html \ odk_settings \ odk_settings_generated \ - offapi_idl \ - udkapi_idl \ $(if $(ENABLE_JAVA), \ odk_javadoc \ odk_uno_loader_classes \ @@ -919,6 +925,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ tipoftheday_images \ + whatsnew_images \ )) endif @@ -957,26 +964,18 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ extras_persona_pink \ extras_persona_sand \ extras_persona_white \ - extras_tplofficorr \ - extras_tploffimisc \ - extras_tplpresnt \ - extras_tpl_styles \ - extras_tpldraw \ - extras_tplpersonal \ - extras_tplwizbitmap \ extras_tplwizdesktop \ - extras_tplwizletter \ - extras_tplwizfax \ - extras_tplwizagenda \ - extras_tplwizreport \ - extras_tplwizstyles \ + $(if $(WITH_TEMPLATES),\ + extras_templates \ + extras_tplpresnt \ + extras_tplwizbitmap \ + extras_tplwizard \ + ) \ framework_dtd \ $(if $(filter $(OS),MACOSX),infoplist) \ oox_customshapes \ oox_generated \ package_dtd \ - sd_web \ - sfx2_emojiconfig \ $(call gb_Helper_optional,DESKTOP,\ $(if $(filter-out WNT,$(OS)),$(if $(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \ $(call gb_Helper_optional,DESKTOP,$(if $(filter-out EMSCRIPTEN MACOSX WNT,$(OS)),svx_gengal)) \ @@ -1004,6 +1003,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ wizards_basicsrvsfdatabases \ wizards_basicsrvsfdialogs \ wizards_basicsrvsfdocuments \ + wizards_basicsrvsfunittests \ wizards_basicsrvsfwidgets \ wizards_basicsrvstandard \ wizards_basicsrvtemplate \ @@ -1019,13 +1019,13 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ ) \ $(if $(filter SKIA,$(BUILD_TYPE)), \ vcl_skia_denylist ) \ - $(if $(DISABLE_PYTHON),,$(if $(filter-out AIX,$(OS)), \ + $(if $(DISABLE_PYTHON),, \ Pyuno/commonwizards \ Pyuno/fax \ Pyuno/letter \ Pyuno/agenda \ Pyuno/mailmerge \ - )) \ + ) \ sfx2_classification \ $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ $(if $(ENABLE_HTMLHELP),\ @@ -1036,6 +1036,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ ) \ resource_fonts \ cui \ + $(if $(filter EMSCRIPTEN,$(OS)), \ + favicon \ + unoembind \ + ) \ )) $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ @@ -1049,18 +1053,26 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_carlito \ $(if $(MPL_SUBSET),,fonts_culmus) \ fonts_dejavu \ - fonts_emojione_color \ fonts_gentium \ - $(if $(MPL_SUBSET),,fonts_kacst) \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ fonts_libre_hebrew \ - fonts_noto \ + fonts_noto_kufi_arabic \ + fonts_noto_naskh_arabic \ + fonts_noto_sans \ + fonts_noto_sans_arabic \ + fonts_noto_sans_armenian \ + fonts_noto_sans_georgian \ + fonts_noto_sans_hebrew \ + fonts_noto_sans_lao \ + fonts_noto_sans_lisu \ + fonts_noto_serif \ + fonts_noto_serif_armenian \ + fonts_noto_serif_georgian \ + fonts_noto_serif_hebrew \ + fonts_noto_serif_lao \ fonts_reem \ - fonts_sourcecode \ - fonts_sourcesans \ - fonts_sourceserif \ fonts_scheherazade \ ) \ )) @@ -1103,6 +1115,10 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\ readlicense_oo_files \ readlicense_oo_license \ $(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \ + $(if $(ENABLE_ONLINE_UPDATE_MAR), \ + update-settings_ini \ + updater_ini \ + ) \ )) ifeq ($(USING_X11), TRUE) @@ -1162,7 +1178,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\ genccode \ gencmn \ python \ - ucpp \ xmllint \ xsltproc \ )) |