solenv: remove versionlist.hrc
Change-Id: Iddbfcacd17c1022293357ff5240ab7a52b1a390e Reviewed-on: https://gerrit.libreoffice.org/2677 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
This commit is contained in:
parent
c7bcb98de0
commit
133fbbcbd3
7 changed files with 14 additions and 85 deletions
|
@ -13,6 +13,7 @@ Version settings
|
|||
#undef LIBO_VERSION_MINOR
|
||||
#undef LIBO_VERSION_MICRO
|
||||
#undef LIBO_VERSION_PATCH
|
||||
#undef LIBO_THIS_YEAR
|
||||
|
||||
#define LIBO_VERSION_DOTTED \
|
||||
(LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) "." \
|
||||
|
|
|
@ -4138,14 +4138,14 @@ AC_SUBST(LIBO_VERSION_PATCH)
|
|||
AC_SUBST(LIBO_VERSION_SUFFIX)
|
||||
AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
|
||||
|
||||
LIBO_THIS_YEAR=`date +%Y`
|
||||
AC_SUBST(LIBO_THIS_YEAR)
|
||||
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
|
||||
|
||||
LIBO_THIS_YEAR=`date +%Y`
|
||||
AC_SUBST(LIBO_THIS_YEAR)
|
||||
|
||||
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
|
||||
|
||||
# This UPD silly thing must go away soon
|
||||
UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0"
|
||||
|
|
|
@ -1,41 +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_CustomTarget_CustomTarget,solenv/versionlist))
|
||||
|
||||
$(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 $(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:
|
|
@ -27,11 +27,6 @@
|
|||
|
||||
$(eval $(call gb_Module_Module,solenv))
|
||||
|
||||
$(eval $(call gb_Module_add_targets,solenv,\
|
||||
CustomTarget_versionlist \
|
||||
Package_inc \
|
||||
))
|
||||
|
||||
ifeq ($(CROSS_COMPILING),$(false))
|
||||
$(eval $(call gb_Module_add_targets,solenv,\
|
||||
Executable_concat-deps \
|
||||
|
|
|
@ -1,32 +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_inc,$(call gb_CustomTarget_get_workdir,solenv/versionlist)))
|
||||
|
||||
$(eval $(call gb_Package_add_file,solenv_inc,inc/versionlist.hrc,versionlist.hrc))
|
||||
|
||||
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
|
|
@ -13,13 +13,13 @@ endef
|
|||
|
||||
define gb_WinResTarget_WinResTarget_init
|
||||
$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
|
||||
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
|
||||
$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$(SRCDIR)/config_$(gb_Side)
|
||||
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
|
||||
$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
|
||||
|
||||
ifeq ($(gb_FULLDEPS),$(true))
|
||||
$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
|
||||
$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
|
||||
$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side)
|
||||
$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
|
||||
|
||||
-include $(call gb_WinResTarget_get_dep_target,$(1))
|
||||
|
|
|
@ -26,7 +26,13 @@
|
|||
*
|
||||
*************************************************************************/
|
||||
|
||||
#include "versionlist.hrc"
|
||||
#include <config_version.h>
|
||||
|
||||
#define VERSION LIBO_VERSION_MAJOR
|
||||
#define SUBVERSION LIBO_VERSION_MINOR
|
||||
#define MICROVERSION LIBO_VERSION_MICRO
|
||||
#define VER_YEARRANGE 2000-LIBO_THIS_YEAR
|
||||
|
||||
#include <winver.h>
|
||||
|
||||
#ifndef PPSX
|
||||
|
|
Loading…
Reference in a new issue