bin icuversion.mk, set the variables in configure
Change-Id: Ife00d7477dacfe1eb325c722517fb038ead083db
This commit is contained in:
parent
db90240a65
commit
1cb5fa76a8
@ -7821,9 +7821,9 @@ SYSTEM_GENBRK=
|
||||
SYSTEM_GENCCODE=
|
||||
SYSTEM_GENCMN=
|
||||
|
||||
ICU_MAJOR=
|
||||
ICU_MINOR=
|
||||
ICU_MICRO=
|
||||
ICU_MAJOR=49
|
||||
ICU_MINOR=1
|
||||
ICU_MICRO=1
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
|
||||
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
|
||||
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES"
|
||||
|
@ -1,38 +0,0 @@
|
||||
#*************************************************************************
|
||||
#
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# Copyright 2000, 2010 Oracle and/or its affiliates.
|
||||
#
|
||||
# OpenOffice.org - a multi-platform office productivity suite
|
||||
#
|
||||
# This file is part of OpenOffice.org.
|
||||
#
|
||||
# OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License version 3
|
||||
# only, as published by the Free Software Foundation.
|
||||
#
|
||||
# OpenOffice.org is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Lesser General Public License version 3 for more details
|
||||
# (a copy is included in the LICENSE file that accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# version 3 along with OpenOffice.org. If not, see
|
||||
# <http://www.openoffice.org/license.html>
|
||||
# for a copy of the LGPLv3 License.
|
||||
#
|
||||
#*************************************************************************
|
||||
# major
|
||||
.IF "$(ICU_MAJOR)" == ""
|
||||
ICU_MAJOR=49
|
||||
.ENDIF
|
||||
# minor
|
||||
.IF "$(ICU_MINOR)" == ""
|
||||
ICU_MINOR=1
|
||||
.ENDIF
|
||||
# micro
|
||||
.IF "$(ICU_MICRO)" == ""
|
||||
ICU_MICRO=1
|
||||
.ENDIF
|
@ -35,8 +35,6 @@ TARGET=so_icu
|
||||
|
||||
# --- Files --------------------------------------------------------
|
||||
|
||||
.INCLUDE : icuversion.mk
|
||||
|
||||
TARFILE_NAME=icu4c-49_1_1-src
|
||||
TARFILE_MD5=7c53f83e0327343f4060c0eb83842daf
|
||||
TARFILE_ROOTDIR=icu
|
||||
|
@ -42,8 +42,6 @@ mkdir: %_DEST%\inc\external\unicode
|
||||
..\%__SRC%\lib\libicuuc.a %_DEST%\lib\
|
||||
..\%__SRC%\lib\libicutu.a %_DEST%\lib\
|
||||
|
||||
..\icuversion.mk %_DEST%\inc\icuversion.mk
|
||||
|
||||
linklib: libicudata.*.*.*
|
||||
linklib: libicui18n.*.*.*
|
||||
linklib: libicule.*.*.*
|
||||
|
@ -177,10 +177,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
|
||||
))
|
||||
endif
|
||||
|
||||
ifneq ($(SYSTEM_LIBXSLT),YES)
|
||||
include $(OUTDIR)/inc/icuversion.mk
|
||||
endif
|
||||
|
||||
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
|
||||
-DICU_MAJOR=$(ICU_MAJOR) \
|
||||
-DICU_MINOR=$(ICU_MINOR) \
|
||||
|
@ -26,7 +26,6 @@
|
||||
#*************************************************************************
|
||||
LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
|
||||
|
||||
.INCLUDE .IGNORE : icuversion.mk
|
||||
.INCLUDE .IGNORE : i18npool/version.mk
|
||||
.INCLUDE .IGNORE : comphelper/version.mk
|
||||
.INCLUDE .IGNORE : ucbhelper/version.mk
|
||||
|
Loading…
x
Reference in New Issue
Block a user