diff options
author | Rene Engelhard <rene@debian.org> | 2020-07-16 18:17:56 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-23 10:51:30 +0200 |
commit | 5fdf2009d21fa220dfee70ea755bd698c16257a7 (patch) | |
tree | a0facfa2ce98515cb48402e263eac31a34e11567 | |
parent | configmgr: Use a proper LanguageTag-based locale fallback mechanism. (diff) | |
download | core-5fdf2009d21fa220dfee70ea755bd698c16257a7.tar.gz core-5fdf2009d21fa220dfee70ea755bd698c16257a7.zip |
tdf#134522 remove --with-build-version ./configure flag
Noop. Use --with-extra-buildid
Change-Id: I110514f6f58c1cd2ca635234a20cf560e6e3d6e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98923
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 24 | ||||
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 |
4 files changed, 3 insertions, 26 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index f0383acb318d..00288ccb6968 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -54,7 +54,6 @@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_TYPE=@BUILD_TYPE@ export BUILD_UNOWINREG=@BUILD_UNOWINREG@ -export BUILD_VER_STRING=@BUILD_VER_STRING@ export BUILD_X64=@BUILD_X64@ export BUILD_X86=@BUILD_X86@ export BUILDING_PCH_WITH_OBJ=@BUILDING_PCH_WITH_OBJ@ diff --git a/configure.ac b/configure.ac index be09b10a74a0..e89c23732c40 100644 --- a/configure.ac +++ b/configure.ac @@ -2291,13 +2291,6 @@ AC_ARG_WITH(idlc-cpp, [Specify the C Preprocessor to use for idlc. Default is ucpp.]), ,) -AC_ARG_WITH(build-version, - AS_HELP_STRING([--with-build-version="Built by Jim"], - [Allows the builder to add a custom version tag that will appear in the - Help/About box for QA purposes.]), -with_build_version=$withval, -) - AC_ARG_WITH(parallelism, AS_HELP_STRING([--with-parallelism], [Number of jobs to run simultaneously during build. Parallel builds can @@ -7435,20 +7428,6 @@ AC_SUBST(LD_PLUGIN) AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES, [HAVE_POSIX_FALLOCATE=NO]) AC_SUBST(HAVE_POSIX_FALLOCATE) -dnl =================================================================== -dnl Custom build version -dnl =================================================================== - -AC_MSG_CHECKING([whether to add custom build version]) -if test "$with_build_version" != ""; then - BUILD_VER_STRING=$with_build_version - AC_MSG_RESULT([yes, $BUILD_VER_STRING]) -else - BUILD_VER_STRING= - AC_MSG_RESULT([no]) -fi -AC_SUBST(BUILD_VER_STRING) - JITC_PROCESSOR_TYPE="" if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then # IBMs JDK needs this... @@ -12959,6 +12938,9 @@ AC_SUBST(PROGRESSTEXTCOLOR) AC_SUBST(PROGRESSTEXTBASELINE) +dnl =================================================================== +dnl Custom build version +dnl =================================================================== AC_MSG_CHECKING([for extra build ID]) if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then EXTRA_BUILDID="$with_extra_buildid" diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 5692f45f2e89..ea0d2137c1a1 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -172,7 +172,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ define instsetoo_native_genversionini [Version] AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US) -BuildVersion=$(BUILD_VER_STRING) buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H) ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG))) @@ -192,7 +191,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) printf '[Version]\n' > $@ && \ printf 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)\n' >> $@ && \ - printf 'BuildVersion=$(BUILD_VER_STRING)\n' >> $@ && \ printf 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)\n' >> $@ && \ printf 'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update\n' >> $@ && \ printf 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))\n' >> $@ && \ diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index da0768daa9ba..81f0271dfe7f 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -687,8 +687,6 @@ sub replace_setup_variables $value =~ s/\<pkgformat\>/$installer::globals::packageformat/; $ENV{'OOO_VENDOR'} = "" if !defined $ENV{'OOO_VENDOR'}; $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/; - $ENV{'BUILD_VER_STRING'} = "" if !defined $ENV{'BUILD_VER_STRING'}; - $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/; $oneitem->{'Value'} = $value; } |