Author: truckman
Date: Fri Mar 9 04:22:18 2018
New Revision: 1826296
URL: http://svn.apache.org/viewvc?rev=1826296&view=rev
Log:
#127664# $CCNUMVER from dmake to configure
Move the calculation of $CCNUMVER and some other variables from
main/solenv/inc/tg_compv.mk, where it is only usable by dmake, to
configure, where it can be used by both dmake and gbuild. This is
a requirement to upstream some compiler bug workaround patches from
the FreeBSD port.
A bit of logic from set_soenv is also moved into configure. A bunch
more should probably be moved so that the configuration logic is
not spread across so many different places, but that can wait.
Something else to consider is that it would be nice to use a different
value of $COM for Apple's clang, maybe "ACLANG" or "APPLECLANG"
since it has a different version numbering scheme that the open-source
version of clang and having a unique identifier would simplify
version checking when applying compiler bug workarounds.
Note: I think the old value of $CCNUMVER on the Mac is wrong. It
should look something like 000800010000 or 000700030000, depending
on the installed version.
Change -DCPPU_ENV on the Mac from $(COMID) to $(COMNAME) for
consistency with the dmake side. It shouldn't make a difference
in practice since both have the same value on the Mac.
Removed:
openoffice/trunk/main/solenv/inc/tg_compv.mk
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
openoffice/trunk/main/solenv/gbuild/platform/linux.mk
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/gbuild/platform/solaris.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
openoffice/trunk/main/solenv/inc/settings.mk
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Mar 9 04:22:18 2018
@@ -1698,29 +1698,6 @@ if test "$_os" != "WINNT" -o "$WITH_MING
AC_PROG_CC
fi
-dnl Clang detection on supported platforms
-if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
- if $CC --version 2>&1 | $GREP clang > /dev/null ; then
- COM_IS=CLANG
- else
- COM_IS=GCC
- fi
- AC_SUBST(COM_IS)
-fi
-
-if test "$_os" = "FreeBSD"; then
- FBSD_GCC_RPATH=
- if "$COM_IS" = "GCC"; then
- rpath=`$CC --print-file-name libstdc++.so`
- rpath=`realpath $rpath`
- rpath=`dirname $rpath`
- if test "$rpath" != "/usr/lib" ; then
- FBSD_GCC_RPATH="-Wl,-rpath=$rpath"
- fi
- fi
- AC_SUBST(FBSD_GCC_RPATH)
-fi
-
COMPATH=`dirname "$CC"`
if test "$COMPATH" = "." ; then
AC_PATH_PROGS(COMPATH, $CC)
@@ -2170,6 +2147,101 @@ AC_SUBST(COMEX)
AC_SUBST(MSPDB_PATH)
AC_SUBST(USE_MINGW)
+dnl Compiler detection, logic from setsoenv.in
+case "$build_os" in
+ *cygwin*)
+ if test "$WITH_MINGWIN" = "yes"; then
+ COM="GCC";
+ else
+ COM="MSC";
+ fi;;
+ os2*)
+ COM="GCC";;
+ netbsd | kfreebsd* | freebsd* | linux* | darwin* )
+ if $CC --version 2>&1 | $GREP clang > /dev/null ; then
+ COM="CLANG";
+ else
+ COM="GCC";
+ fi;;
+ solaris*)
+ case "$CC" in
+ *gcc*) COM="GCC";;
+ *) COM="C52";;
+ esac;;
+ osf | aix*)
+ COM="CXX";;
+ *) AC_MSG_ERROR([Unable to decipher compiler for $build_os]);;
+esac
+AC_SUBST(COM)
+
+dnl Decode the compiler version. Logic from main/solenv/inc/tg_compv.mk.
+case $COM in
+ GCC)
+ CCVER=`${CC} -dumpversion 2>&1`;
+ CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f
${_solenv}/bin/getcompver.awk`;
+ if test "${CCNUMVER}" -ge 000300000001; then
+ COMID="gcc3";
+ COMNAME="gcc3";
+ elif test "${CCNUMVER}" -ge 000300000001; then
+ COMID="GCC";
+ COMNAME="gcc2";
+ else
+ AC_MSG_ERROR([gcc too old]);
+ fi
+ ;;
+ CLANG)
+ CCVER=`${CC} --version 2>&1 | head -n1 | sed -e"s/.*version //"
-e"s/ .*//"`;
+ CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f
${_solenv}/bin/getcompver.awk`;
+ # The version in tg_compv.mk for darwin does not look correct
+ # CCNUMVER = `echo ${CCVER} | sed -e"s/\.//";
+ if test "$build_os" == "darwin"; then
+ COMID="s5abi";
+ COMNAME="s5abi";
+ else
+ COMID="gcc3";
+ COMNAME="gcc3";
+ fi;;
+ MSC)
+ CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
+ CCNUMVER=`${CC} 2>&1 | $AWK -v num=true -f
${_solenv}/bin/getcompver.awk`;
+ if test "${CCNUMVER}" -ge 001200000000; then
+ COMID="MSC";
+ COMNAME="msci";
+ else
+ AC_MSG_ERROR([MSC compiler too old]);
+ fi
+ ;;
+ C55 | C54 | C52 | C40 | sunpro)
+ CCVER=`${CC} -V 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
+ CCNUMVER=`${CC} -V 2>&1 | $AWK -v num=true -f
${_solenv}/bin/getcompver.awk`;
+ if test "${CCNUMVER}" -ge 00050002; then
+ COMID="C52";
+ COMNAME="sunpro5";
+ else
+ AC_MSG_ERROR([Sun compiler too old]);
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR([Unable to detect compiler version]);;
+esac
+AC_SUBST(CCVER)
+AC_SUBST(CCNUMVER)
+AC_SUBST(COMID)
+AC_SUBST(COMNAME)
+
+if test "$_os" = "FreeBSD"; then
+ FBSD_GCC_RPATH=
+ if "$COM" = "GCC"; then
+ rpath=`$CC --print-file-name libstdc++.so`
+ rpath=`realpath $rpath`
+ rpath=`dirname $rpath`
+ if test "$rpath" != "/usr/lib" ; then
+ FBSD_GCC_RPATH="-Wl,-rpath=$rpath"
+ fi
+ fi
+ AC_SUBST(FBSD_GCC_RPATH)
+fi
+
dnl ===================================================================
dnl .NET needs special treatment
dnl ===================================================================
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Fri Mar 9 04:22:18 2018
@@ -74,7 +74,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_W
$BUILD_SOSL_RELEASE, $RSC_ONCE );
#
# Platform dependent constant values.
-my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
+my ( $BIG_SVX, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
$GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
$DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR,
@@ -248,10 +248,8 @@ if ( $platform =~ m/solaris/ )
}
if ( $CC =~ "gcc") {
- $COM = "GCC";
$CVER = "C300";
} else {
- $COM = "C52";
$CVER = "C52";
$COMEX = 4;
}
@@ -306,7 +304,6 @@ elsif ( $platform =~ m/netbsd/ )
$OUTPATH = $OUTPATH."2";
# General NetBSD settings:
$BIG_SVX = "TRUE";
- $COM = "GCC";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
$GUIBASE = "unx";
@@ -320,7 +317,6 @@ elsif ( $platform =~ m/kfreebsd/ )
# General GNU/kFreeBSD settings:
$CVER = "C341";
$BIG_SVX = "TRUE";
- $COM = "GCC";
$COMPATH = '@COMPATH@';
$GLIBC = "2REDHAT60";
$GUI = "UNX";
@@ -358,7 +354,6 @@ elsif ( $platform =~ m/kfreebsd/ )
}
elsif ( $platform =~ m/freebsd/ )
{ $BIG_SVX = "TRUE";
- $COM = "@COM_IS@";
$COMPATH = '@COMPATH@';
$CVER = "C300";
$GUI = "UNX";
@@ -442,7 +437,6 @@ elsif ( $platform =~ m/linux/ )
# General Linux settings:
$CVER = "C341";
$BIG_SVX = "TRUE";
- $COM = "@COM_IS@";
$COMPATH = '@COMPATH@';
$GLIBC = "2REDHAT60";
$GUI = "UNX";
@@ -661,7 +655,6 @@ elsif ( $platform =~ m/osf1/ )
{ print "Setting Tru64 specific values... ";
$outfile = "Tru64AlphaEnv.Set";
$BIG_SVX = "TRUE";
- $COM = "CXX";
$COMPATH = '@COMPATH@';
$CPU = "A";
$CPUNAME = "ALPHA_";
@@ -705,7 +698,6 @@ elsif ( $platform =~ m/cygwin/ )
$outfile = "winmingw.set";
$COMPATH = PathFormat('@COMPATH@/bin');
$COMPATH =~ s/\/bin$//i;
- $COM = "GCC";
$CVER = "C341";
$OUTPATH = "wntgcci";
$INPATH = $OUTPATH.$PROEXT;
@@ -717,7 +709,6 @@ elsif ( $platform =~ m/cygwin/ )
$CXX_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/cl.exe');
$LINK_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/link.exe');
$LIBMGR_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/lib.exe');
- $COM = "MSC";
$OUTPATH = "wntmsci@COMEX@";
$INPATH = $OUTPATH.$PROEXT;
$COMEX = '@COMEX@';
@@ -759,7 +750,6 @@ elsif ( $platform =~ m/os2/ )
{
print "Setting OS/2 gcc 3.3.5 specific values... \n";
$outfile = "os2env.set";
- $COM = "GCC";
$CVER = "C300";
$OUTPATH = "os2gcci";
$INPATH = $OUTPATH.$PROEXT;
@@ -783,7 +773,6 @@ elsif ( $platform =~ m/darwin/ )
if( $CC =~ "gcc" )
{
print "Setting values for MacOSX/Darwin for Xcode<=3";
- $COM = "GCC";
$outfile = "MacOSXX86Env.Set";
$CPU = "I";
$CPUNAME = "INTEL";
@@ -792,7 +781,6 @@ elsif ( $platform =~ m/darwin/ )
elsif ($platform =~ m/^i[3456]86/)
{
print "Setting values for MacOSX/Darwin on x86_32... ";
- $COM = "CLANG";
$outfile = "MacOSXX32Env.Set";
$CPU = "I";
$CPUNAME = "INTEL";
@@ -801,7 +789,6 @@ elsif ( $platform =~ m/darwin/ )
elsif ($platform =~ m/^x86_64/)
{
print "Setting values for MacOSX/Darwin on x86_64... ";
- $COM = "CLANG";
$outfile = "MacOSXX64Env.Set";
$CPU = "X";
$CPUNAME = "X86_64";
@@ -836,7 +823,6 @@ elsif ( $platform =~ m/aix/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
$JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
$BIG_SVX = "TRUE";
- $COM = "GCC";
$CVER = "C300";
$COMPATH = '@COMPATH@';
$GUI = "UNX";
@@ -1073,7 +1059,7 @@ if ($platform =~ m/cygwin|os2/)
$ILIB = $cur_dir;
# Mingw is different
- if ( $COM eq "MSC" )
+ if ( "@COM@" eq "MSC" )
{ $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB.
$wps.$JAVA_HOME.$LIB.
$wps.$PSDK_HOME.$LIB.
@@ -1094,7 +1080,7 @@ if ($platform =~ m/cygwin|os2/)
# ILIB needs to use '\' directory seperators;
$ILIB = WinPath( $ILIB, ";" );
}
- elsif ( $COM eq "GCC" )
+ elsif ( "@COM@" eq "GCC" )
{ $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB.
$wps.$SOLARVER.$ds.$INPATH.$BIN.
$wps.$JAVA_HOME.$LIB;
@@ -1172,7 +1158,7 @@ elsif ($platform =~ m/cygwin/)
$tmppath =~ s/^\/\//\//;
$PATH .= $ps.$tmppath;
- if ( $COM eq "MSC" ) {
+ if ( "@COM@" eq "MSC" ) {
$tmppath = CygFormat($MSPDB_PATH);
# for .NET to find mspdb71.dll (needed by CL.EXE C/C++ Compiler)
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
@@ -1443,7 +1429,7 @@ elsif ($platform =~ m/cygwin/)
{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32".
$I.'$JAVA_HOME'.$ds."include";
# Mingw is different
- if ( $COM eq "MSC" )
+ if ( "@COM@" eq "MSC" )
{ $SOLARINC .= $I.'$PSDK_HOME'.$INCLUDE.
$I.'$COMPATH'.$ds."include";
if ( '@ENABLE_DIRECTX@' ne "" ) {
@@ -1455,7 +1441,7 @@ elsif ($platform =~ m/cygwin/)
}
}
}
- elsif ( $COM eq "GCC" )
+ elsif ( "@COM@" eq "GCC" )
{ $SOLARINC .=
$I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$ds."include";
if ( $USE_MINGW eq "cygwin" )
{ $SOLARINC .= $I.PathFormat($USR.$ds."include".$ds."mingw").
@@ -1697,9 +1683,14 @@ ToFile( "ENABLE_ONLINE_UPDATE", "@ENABLE
ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
ToFile( "BIG_SVX", $BIG_SVX, "e" );
-ToFile( "COM", $COM, "e" );
+ToFile( "COM", "@COM@", "e" );
ToFile( "COMPATH", $COMPATH, "e" );
ToFile( "CC_PATH", "@CC_PATH@", "e" );
+ToFile( "COMNAME", "@COMNAME@", "e" );
+ToFile( "COMID", "@COMID@", "e" );
+ToFile( "CCNUMVER", "@CCNUMVER@", "e" );
+ToFile( "CCVER", "@CCVER@", "e" );
+
ToFile( "CXX_X64_BINARY", $CXX_X64_BINARY, "e" );
ToFile( "LINK_X64_BINARY", $LINK_X64_BINARY, "e" );
ToFile( "LIBMGR_X64_BINARY", $LIBMGR_X64_BINARY, "e" );
Modified: openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk Fri Mar 9 04:22:18
2018
@@ -59,7 +59,7 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(COMNAME) \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
Modified: openoffice/trunk/main/solenv/gbuild/platform/linux.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/linux.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/linux.mk Fri Mar 9 04:22:18
2018
@@ -56,7 +56,7 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(COMNAME) \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Fri Mar 9 04:22:18
2018
@@ -59,7 +59,7 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
- -DCPPU_ENV=$(COMID) \
+ -DCPPU_ENV=$(COMNAME) \
ifeq ($(CPUNAME),POWERPC)
gb_CPUDEFS := -DPOWERPC -DPPC
Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Fri Mar 9 04:22:18 2018
@@ -58,7 +58,7 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(COMNAME) \
gb_CPUDEFS := -DINTEL -D_X86_=1 -DX86
Modified: openoffice/trunk/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/solaris.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/solaris.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/solaris.mk Fri Mar 9 04:22:18
2018
@@ -55,7 +55,7 @@ gb_OSDEFS := \
gb_COMPILERDEFS := \
-D$(COM) \
- -DCPPU_ENV=sunpro5 \
+ -DCPPU_ENV=$(COMNAME) \
gb_CPUDEFS := -D$(CPUNAME)
ifeq ($(CPUNAME),SPARC)
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Fri Mar 9 04:22:18
2018
@@ -59,7 +59,7 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DBOOST_MEM_FN_ENABLE_CDECL \
- -DCPPU_ENV=msci \
+ -DCPPU_ENV=$(COMNAME) \
-DFULL_DESK \
-DM1500 \
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Fri Mar 9
04:22:18 2018
@@ -77,7 +77,7 @@ gb_COMPILERDEFS := \
-D$(CVER) \
-DCVER=$(CVER) \
-DGLIBC=2 \
- -DCPPU_ENV=gcc3 \
+ -DCPPU_ENV=$(COMNAME) \
-D_MT \
-D_NATIVE_WCHAR_T_DEFINED \
-D_MSC_EXTENSIONS \
Modified: openoffice/trunk/main/solenv/inc/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/settings.mk?rev=1826296&r1=1826295&r2=1826296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/settings.mk (original)
+++ openoffice/trunk/main/solenv/inc/settings.mk Fri Mar 9 04:22:18 2018
@@ -878,7 +878,7 @@ UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc
-I$(SOLARIDLDIR) -I$(SOLARINCDIR)
-CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
+CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
-DCPPU_ENV=$(COMNAME)
.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
CDEFS+=-D_STLP_DEBUG
@@ -1068,11 +1068,6 @@ SCPLINK=$(PERL) $(SOLARENV)/bin/par2scri
LZIP*=lzip
CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
.IF "$(SOLAR_JAVA)"=="TRUE"
.IF "$(USE_JAVAVER)"!=""
.INCLUDE : tg_javav.mk
