strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove minor.mk

Browse source 
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>
This commit is contained in:
Matúš Kukan 2013-03-01 13:50:16 +01:00 committed by David Ostrovsky
parent 5f985d3759
commit ee0dd36715
26 changed files with 26 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -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 {} \;
#

1
config_host.mk.in
View file

@ -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@

12
configure.ac
View file

@ -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])

2
crashrep/WinResTarget_crashrep.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_sbase.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_scalc.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_sdraw.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_simpress.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_smath.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_soffice.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_sofficebin.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_sweb.mk
View file

@ -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)" \
))

2
desktop/WinResTarget_swriter.mk
View file

@ -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)" \
))

2
instsetoo_native/CustomTarget_install.mk
View file

@ -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 \

18
solenv/CustomTarget_versionlist.mk
View file

@ -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:

1
solenv/Module_solenv.mk
View file

@ -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))

33
solenv/Package_minor.mk
View file

@ -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:

13
solenv/bin/ooinstall
View file

@ -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};

2
solenv/gbuild/gbuild.mk
View file

@ -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

2
solenv/gbuild/platform/WNT_INTEL_GCC.mk
View file

@ -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="" \

2
solenv/gbuild/platform/com_MSC_class.mk
View file

@ -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)))" \

2
solenv/inc/.gitignore vendored
View file

@ -1,2 +0,0 @@
/minor.mk
/minor.mk.tmp

9
solenv/inc/minor.mk.in
View file

@ -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@

1
vcl/Library_vclplug_gtk.mk
View file

@ -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)

1
vcl/Library_vclplug_gtk3.mk
View file

@ -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))

7
vcl/unx/gtk/a11y/atkutil.cxx
View file

@ -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;
}
/*****************************************************************************/