diff options
26 files changed, 26 insertions, 104 deletions
diff --git a/Makefile.in b/Makefile.in index 13a635f5596d..208f6197cf88 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,7 +31,6 @@ Makefile: $(BUILDDIR)/config_host.mk force-restart $(BUILDDIR)/config_host.mk : \ $(SRCDIR)/config_host.mk.in \ $(SRCDIR)/Makefile.in \ - $(SRCDIR)/solenv/inc/minor.mk.in \ $(SRCDIR)/instsetoo_native/util/openoffice.lst.in \ $(SRCDIR)/configure.ac \ $(BUILDDIR)/autogen.lastrun @@ -129,8 +128,7 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/config_host/*.mk \ $(BUILDDIR)/configure \ $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ - $(BUILDDIR)/lo.xcent \ - $(BUILDDIR)/solenv/inc/minor.mk + $(BUILDDIR)/lo.xcent find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \; # diff --git a/config_host.mk.in b/config_host.mk.in index 828bcd65fb43..8dd533aa3b35 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -298,6 +298,7 @@ export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@ export LIBMYSQL=@LIBMYSQL@ export LIBMYSQL_PATH=@LIBMYSQL_PATH@ +export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@ diff --git a/configure.ac b/configure.ac index 5b503c931310..45980d873516 100644 --- a/configure.ac +++ b/configure.ac @@ -4053,7 +4053,6 @@ if test "$cross_compiling" = "yes"; then bin/get_config_variables \ solenv/bin/getcompver.awk \ solenv/inc/langlist.mk \ - solenv/inc/minor.mk.in \ instsetoo_native/util/openoffice.lst.in) \ | (cd CONF-FOR-BUILD && tar xf -) cp configure CONF-FOR-BUILD @@ -11845,17 +11844,6 @@ if test -f config_host.mk; then fi AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst]) -# Unlike AC_CONFIG_HEADERS, AC_CONFIG_FILES updates the target file even if the contents -# would be unchanged, avoid that. -AC_CONFIG_FILES([solenv/inc/minor.mk.tmp:solenv/inc/minor.mk.in], - [ - AC_MSG_NOTICE([creating solenv/inc/minor.mk]) - if diff solenv/inc/minor.mk.tmp solenv/inc/minor.mk >/dev/null 2>&1 ; then - AC_MSG_NOTICE([solenv/inc/minor.mk is unchanged]) - else - cp -f solenv/inc/minor.mk.tmp solenv/inc/minor.mk - fi - ]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) diff --git a/crashrep/WinResTarget_crashrep.mk b/crashrep/WinResTarget_crashrep.mk index 6036157c8bea..c4c44ada5a72 100644 --- a/crashrep/WinResTarget_crashrep.mk +++ b/crashrep/WinResTarget_crashrep.mk @@ -16,7 +16,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,crashrep,\ $(eval $(call gb_WinResTarget_add_defs,crashrep,\ -DRES_APP_NAME=crashrep \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Crashreporter" \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk index f4f49d4dfe8d..bdf753153f9b 100644 --- a/desktop/WinResTarget_sbase.mk +++ b/desktop/WinResTarget_sbase.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,sbase/src,\ -DRES_APP_NAME=sbase \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Base" \ -DRES_APP_ICON=icons/base_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk index 8781d0df0eb5..56e56f14a16b 100644 --- a/desktop/WinResTarget_scalc.mk +++ b/desktop/WinResTarget_scalc.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,scalc/src,\ -DRES_APP_NAME=scalc \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Calc" \ -DRES_APP_ICON=icons/calc_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk index 09a8bf29a7fc..dcd9091e8abe 100644 --- a/desktop/WinResTarget_sdraw.mk +++ b/desktop/WinResTarget_sdraw.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,sdraw/src,\ -DRES_APP_NAME=sdraw \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Draw" \ -DRES_APP_ICON=icons/draw_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk index eeb869f7259b..1a6213db6932 100644 --- a/desktop/WinResTarget_simpress.mk +++ b/desktop/WinResTarget_simpress.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,simpress/src,\ -DRES_APP_NAME=simpress \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Impress" \ -DRES_APP_ICON=icons/impress_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk index d90ad7d57c77..6e6c9aacf6e7 100644 --- a/desktop/WinResTarget_smath.mk +++ b/desktop/WinResTarget_smath.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,smath/src,\ -DRES_APP_NAME=smath \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Math" \ -DRES_APP_ICON=icons/math_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index 54395bc4e0b8..cf64456373b5 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,soffice/src,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ -DRES_APP_ICON=icons/main_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index 98580fb7c1b7..675477ead002 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ -DRES_APP_ICON=icons/main_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk index 845879f198de..3d5a540acc97 100644 --- a/desktop/WinResTarget_sweb.mk +++ b/desktop/WinResTarget_sweb.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,sweb/src,\ -DRES_APP_NAME=sweb \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer (Web)" \ -DRES_APP_ICON=icons/writer_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk index 92f16e98a9cf..b726e7d60519 100644 --- a/desktop/WinResTarget_swriter.mk +++ b/desktop/WinResTarget_swriter.mk @@ -36,7 +36,7 @@ $(eval $(call gb_WinResTarget_add_defs,swriter/src,\ -DRES_APP_NAME=swriter \ -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer" \ -DRES_APP_ICON=icons/writer_app.ico \ - -DVERVARIANT=$(BUILD) \ + -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 1383e3193cb3..0087239415d9 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -85,7 +85,7 @@ $(foreach pkgformat,$(5),\ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ -p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \ -u $(instsetoo_OUT) \ - -buildid $(BUILD) \ + -buildid $(LIBO_VERSION_PATCH) \ $(if $(filter WNT,$(OS)), \ -msitemplate $(dir $@)msi_templates \ -msilanguage $(dir $@)win_ulffiles \ diff --git a/solenv/CustomTarget_versionlist.mk b/solenv/CustomTarget_versionlist.mk index 5ffed0bbc0d5..eb8b4406aca4 100644 --- a/solenv/CustomTarget_versionlist.mk +++ b/solenv/CustomTarget_versionlist.mk @@ -27,19 +27,15 @@ $(eval $(call gb_CustomTarget_CustomTarget,solenv/versionlist)) -include $(BUILDDIR)/solenv/inc/minor.mk - -$(call gb_CustomTarget_get_target,solenv/versionlist) : $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc - -$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : \ - $(BUILDDIR)/solenv/inc/minor.mk \ - | $(call gb_CustomTarget_get_workdir,solenv/versionlist)/.dir +$(eval $(call gb_CustomTarget_register_targets,solenv/versionlist,\ + versionlist.hrc \ +)) $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : $(call gb_Output_announce,solenv/versionlist,$(true),ECH,1) - echo '#define VERSION $(VERSIONMAJOR)' > $@ && \ - echo '#define SUBVERSION $(VERSIONMINOR)' >> $@ && \ - echo '#define MICROVERSION $(VERSIONMICRO)' >> $@ && \ - echo '#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)' >> $@ + echo '#define VERSION $(LIBO_VERSION_MAJOR)' > $@ && \ + echo '#define SUBVERSION $(LIBO_VERSION_MINOR)' >> $@ && \ + echo '#define MICROVERSION $(LIBO_VERSION_MICRO)' >> $@ && \ + echo '#define VER_YEARRANGE 2000-$(LIBO_THIS_YEAR)' >> $@ # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 6c827937ce64..538b4e8cff5c 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,solenv)) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_versionlist \ Package_inc \ - Package_minor \ )) ifeq ($(CROSS_COMPILING),$(false)) diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk deleted file mode 100644 index 70b0faf90aa2..000000000000 --- a/solenv/Package_minor.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,solenv_minor_mk,$(BUILDDIR)/solenv/inc)) - -$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk)) -$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 51f831bfab96..31025b63cab0 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -71,17 +71,8 @@ if ($help) { exit 1; } -my $BUILD=undef; -my $LAST_MINOR=undef; -open MINORMK, "$ENV{'BUILDDIR'}/solenv/inc/minor.mk"; -while (<MINORMK>) { - my $t = "\$" . $_; - if (/^BUILD/ || /^LAST_MINOR/) { - eval $t; - } -} -close MINORMK; -$ENV{LAST_MINOR} = $LAST_MINOR; +my $BUILD=$ENV{LIBO_VERSION_PATCH}; +$ENV{LAST_MINOR} = 'm0'; $ENV{OUT} = "../$ENV{'INPATH'}"; $ENV{LOCAL_OUT} = $ENV{OUT}; $ENV{LOCAL_COMMON_OUT} = $ENV{OUT}; diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b0b6f92b7925..b65325466f4e 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -282,8 +282,6 @@ include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) -include $(BUILDDIR)/solenv/inc/minor.mk - # We are using a set of scopes that we might as well call classes. # It is important to include them in the right order as that is diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 09606436c19d..5b5c21ec9113 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -275,7 +275,7 @@ define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) $(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) $(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(BUILD)" \ + -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DADDITIONAL_VERINFO1="" \ -DADDITIONAL_VERINFO2="" \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index e2cfc4970fe7..7e003194afc4 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -321,7 +321,7 @@ define gb_Library_add_default_nativeres $(call gb_WinResTarget_WinResTarget_init,$(2)) $(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo) $(call gb_WinResTarget_add_defs,$(2),\ - -DVERVARIANT="$(BUILD)" \ + -DVERVARIANT="$(LIBO_VERSION_PATCH)" \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\ -DINTERNAL_NAME="$(subst $(gb_Library_DLLEXT),,$(call gb_Library_get_dllname,$(1)))" \ diff --git a/solenv/inc/.gitignore b/solenv/inc/.gitignore deleted file mode 100644 index ef9372e6bfd7..000000000000 --- a/solenv/inc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/minor.mk -/minor.mk.tmp diff --git a/solenv/inc/minor.mk.in b/solenv/inc/minor.mk.in deleted file mode 100644 index 2e96c0bea044..000000000000 --- a/solenv/inc/minor.mk.in +++ /dev/null @@ -1,9 +0,0 @@ -BUILD=@LIBO_VERSION_PATCH@ -LAST_MINOR=m0 -SOURCEVERSION=OOO410 - -VERSIONMAJOR=@LIBO_VERSION_MAJOR@ -VERSIONMINOR=@LIBO_VERSION_MINOR@ -VERSIONMICRO=@LIBO_VERSION_MICRO@ - -COPYRIGHTYEARRANGE=2000-@LIBO_THIS_YEAR@ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index e0f9b0ac4187..3b8a6d21814b 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) ifeq ($(ENABLE_DBUS),TRUE) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index da60f73b5b75..7f29e762b8d4 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DVCLPLUG_GTK_IMPLEMENTATION \ - -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index ee7fb6e959d3..e1cb134fd5bd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -43,6 +43,7 @@ #include "atkutil.hxx" #include <gtk/gtk.h> +#include <config_version.h> #include <set> @@ -689,11 +690,7 @@ ooo_atk_util_get_toolkit_name (void) static G_CONST_RETURN gchar * ooo_atk_util_get_toolkit_version (void) { - /* - * Version is passed in as a -D flag when this file is - * compiled. - */ - return LIBO_VERSION; + return LIBO_VERSION_DOTTED; } /*****************************************************************************/ |