diff options
| -rw-r--r-- | solenv/inc/settings.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/tg_javav.mk | 93 |
2 files changed, 98 insertions, 3 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index d461da656d00..2608b3733673 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -2,9 +2,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.99 $ +# $Revision: 1.100 $ # -# last change: $Author: hjs $ $Date: 2002-03-19 18:12:37 $ +# last change: $Author: hjs $ $Date: 2002-03-21 18:21:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -1206,7 +1206,9 @@ SVXLIBS=svxitems dialogs editeng svrtf svdraw outliner xout si basicide \ .ELSE # "$(DISABLE_ENHANCED_COMID)"=="" COMID=$(COM) .ENDIF # "$(DISABLE_ENHANCED_COMID)"=="" - +.IF "$(SOLAR_JAVA)"=="TRUE" +.INCLUDE : tg_javav.mk +.ENDIF # "$(SOLAR_JAVA)"=="TRUE" # --- Neues Environment erweitern ---------------------------------- CDEFS+= -DSUPD=$(UPD) -DBUILD=$(BUILD) diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk new file mode 100644 index 000000000000..2de98fa15190 --- /dev/null +++ b/solenv/inc/tg_javav.mk @@ -0,0 +1,93 @@ +#************************************************************************* +# +# $RCSfile: tg_javav.mk,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: hjs $ $Date: 2002-03-21 18:21:53 $ +# +# The Contents of this file are made available subject to the terms of +# either of the following licenses +# +# - GNU Lesser General Public License Version 2.1 +# - Sun Industry Standards Source License Version 1.1 +# +# Sun Microsystems Inc., October, 2000 +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2000 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library 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 for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +# +# Sun Industry Standards Source License Version 1.1 +# ================================================= +# The contents of this file are subject to the Sun Industry Standards +# Source License Version 1.1 (the "License"); You may not use this file +# except in compliance with the License. You may obtain a copy of the +# License at http://www.openoffice.org/license.html. +# +# Software provided under this License is provided on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, +# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. +# See the License for the specific provisions governing your rights and +# obligations concerning the Software. +# +# The Initial Developer of the Original Code is: Sun Microsystems, Inc. +# +# Copyright: 2000 by Sun Microsystems, Inc. +# +# All Rights Reserved. +# +# Contributor(s): _______________________________________ +# +# +# +#************************************************************************* + +JAVAVERMK:=$(INCCOM)$/java_ver.mk + +.INCLUDE .IGNORE : $(JAVAVERMK) + +.IF "$(JAVAVER)"=="" +.IF "$(L10N_framework)"=="" + +#temporary hack to get the right AWK +.IF "$(OS)"=="SOLARIS" +AWK_HERE :=nawk +.ELSE # "$(OS)"=="SOLARIS" +AWK_HERE:=awk +.ENDIF # "$(OS)"=="SOLARIS" + +JAVAVER:= +JAVANUMVER:= + +JFLAGSVERSION=-version +JFLAGSVERSION_CMD=-version |& $(AWK_HERE) -f $(SOLARENV)$/bin$/getcompver.awk +JFLAGSNUMVERSION_CMD=-version |& $(AWK_HERE) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk + +# that's the version known by the specific +# java version +JAVAVER:=$(shell -java $(JFLAGSVERSION_CMD)) + +# and a computed integer for comparing +# each point seperated token blown up to 4 digits +JAVANUMVER:=$(shell -java $(JFLAGSNUMVERSION_CMD)) + +.ENDIF # "$(L10N_framework)"=="" +.ENDIF # "$(COMNAME)"=="" |