mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retire build-nocheck

Browse Source 
Build target was kept for backward compat in 'rework the default make
target', so lets retire it after 1.5 years.

Use 'make build' instead (which is since the default target anyway).

Change-Id: I93d5237dce2abf2536a4d847d79d33d5b6d6cec9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126362
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
This commit is contained in:
Thorsten Behrens
2021-12-04 18:21:04 +01:00
parent d47628f287
commit 243c05ac27
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@@ -12,7 +12,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic
.PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) .PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
MAKECMDGOALS?=build MAKECMDGOALS?=build
build_goal:=$(if $(filter build build-nocheck uicheck,$(MAKECMDGOALS)),build)\ build_goal:=$(if $(filter build uicheck,$(MAKECMDGOALS)),build)\
$(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\ $(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\
$(filter build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS)) $(filter build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
@@ -291,7 +291,7 @@ ifeq ($(OS),iOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
endif endif
build-non-l10n-only build-l10n-only build-nocheck check debugrun translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build build-non-l10n-only build-l10n-only check debugrun translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
help showmodules gbuildtojson: help showmodules gbuildtojson:
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@

4
bin/gbuild-to-ide
View File

@@ -1314,7 +1314,7 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
xml += QtCreatorIntegrationGenerator.build_configs_template % { xml += QtCreatorIntegrationGenerator.build_configs_template % {
'index': '7', 'index': '7',
'base_folder': self.base_folder, 'base_folder': self.base_folder,
'arg': "build-nocheck", 'arg': "",
'name': "8-Global build -- nocheck", 'name': "8-Global build -- nocheck",
} }
xml += QtCreatorIntegrationGenerator.build_configs_template % { xml += QtCreatorIntegrationGenerator.build_configs_template % {
@@ -1373,7 +1373,7 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
xml += QtCreatorIntegrationGenerator.build_configs_template % { xml += QtCreatorIntegrationGenerator.build_configs_template % {
'index': '6', 'index': '6',
'base_folder': self.base_folder, 'base_folder': self.base_folder,
'arg': "build-nocheck", 'arg': "",
'name': "07-Global build -- nocheck", 'name': "07-Global build -- nocheck",
} }
xml += QtCreatorIntegrationGenerator.build_configs_template % { xml += QtCreatorIntegrationGenerator.build_configs_template % {

2
bin/update_pch_autotune.sh
View File

@@ -165,7 +165,7 @@ for module in $modules; do
then then
# Build all! # Build all!
echo "Failed to build $module with dependencies, building all..." echo "Failed to build $module with dependencies, building all..."
$MAKE build-nocheck > /dev/null $MAKE > /dev/null
if [ $? -ne 0 ]; if [ $? -ne 0 ];
then then
>&2 echo "Broken build. Please revert changes and try again." >&2 echo "Broken build. Please revert changes and try again."

2
osx/soffice.xcodeproj/project.pbxproj
View File

@@ -2407,7 +2407,7 @@
/* Begin PBXLegacyTarget section */ /* Begin PBXLegacyTarget section */
BEC3D91E1710B11E0030AD56 /* soffice */ = { BEC3D91E1710B11E0030AD56 /* soffice */ = {
isa = PBXLegacyTarget; isa = PBXLegacyTarget;
buildArgumentsString = "build-nocheck"; buildArgumentsString = "";
buildConfigurationList = BEC3D9211710B11E0030AD56 /* Build configuration list for PBXLegacyTarget "soffice" */; buildConfigurationList = BEC3D9211710B11E0030AD56 /* Build configuration list for PBXLegacyTarget "soffice" */;
buildPhases = ( buildPhases = (
); );

2
solenv/flatpak-manifest.in
View File

@@ -694,7 +694,7 @@
"buildsystem": "simple", "buildsystem": "simple",
"build-commands": [ "build-commands": [
"./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak", "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak",
"make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)", "make",
"make distro-pack-install", "make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
"printf '<?xml version=\"1.0\"?>\\n<oor:data xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:oor=\"http://openoffice.org/2001/registry\"><dependency file=\"main\"/><oor:component-data oor:name=\"Common\" oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>' >/app/libreoffice/share/registry/flatpak.xcd" "printf '<?xml version=\"1.0\"?>\\n<oor:data xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:oor=\"http://openoffice.org/2001/registry\"><dependency file=\"main\"/><oor:component-data oor:name=\"Common\" oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>' >/app/libreoffice/share/registry/flatpak.xcd"