remove minor.mk

Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.

Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
Reviewed-on: https://gerrit.libreoffice.org/2491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

9 files changed, 11 insertions, 71 deletions

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@