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

INTEGRATION: CWS ooo20031216 (1.12.2); FILE MERGED

Browse source 
2004/01/23 11:20:30 mh 1.12.2.7: RESYNC: (1.12-1.13); FILE MERGED
2003/12/29 23:58:14 pjanik 1.12.2.6: Blackdown.org JDK porting project uses server in JDK 1.4.2 RC1
2003/12/29 22:24:30 pjanik 1.12.2.5: Blackdown.org JDK porting project uses amd64 in JDK 1.4.2 RC1
2003/12/28 12:07:32 pjanik 1.12.2.4: #i8585#: Configure updates for x86_64.
2003/12/20 12:58:42 waratah 1.12.2.3: #i23464# implement ANT_LIB in the set environment
2003/12/15 09:35:25 waratah 1.12.2.2: Remove incorrect warnings from the Windows builds
2003/12/10 15:57:15 dsherwin 1.12.2.1:
#i19048# Add support for building with Visual Studio .NET 2003
This commit is contained in:
Jens-Heiner Rechtien 2004-02-04 14:08:23 +00:00
parent c2610c6233
commit d63cb9716a
1 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
config_office/set_soenv.in
View file

@ -1,8 +1,8 @@
#!@PERL@ -w
#
# Program: set_soenv.in
# Version: $Revision: 1.14 $
# Date: $Date: 2004-02-02 18:17:15 $
# Version: $Revision: 1.15 $
# Date: $Date: 2004-02-04 15:08:23 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@ -70,7 +70,7 @@ my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE,
#-------------------------------------------
#
# Help variables.
my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
$CYGWIN, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
@ -339,6 +339,18 @@ elsif ( $platform eq "$Linux" )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
elsif ($machine_type eq "x86_64")
{ print "Setting Linux x86-64 specific values... ";
$outfile = "LinuxAMDEnv.Set";
$CPU = "X";
$CPUNAME = "X86_64";
$DLLSUFFIX = "lx";
$OUTPATH = "unxlngx4";
# Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
}
elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64"))
{ print "Setting Linux Sparc specific values... ";
@ -538,13 +550,20 @@ elsif ( $platform eq "$Winnt" )
$INPATH = $OUTPATH.$PROEXT;
$GVERDIR = $INPATH;
$COMEX = '@COMEX@';
if ( "@COMEX@" eq "8" )
{ # .NET needs M1300
$CVER = "M1300";
if ( "@COMEX@" eq "10" )
{ # .NET 2003 needs M1310
$CVER = "M1310";
}
else
{ # keep the historical value for MSVC 6
$CVER = "MI200";
{
if ( "@COMEX@" eq "8" )
{ # .NET needs M1300
$CVER = "M1300";
}
else
{ # keep the historical value for MSVC 6
$CVER = "MI200";
}
}
if ( "@USE_SHELL@" ne "4nt" )
@ -684,6 +703,9 @@ $USR = $ds."usr";
$ETC = $ds."etc";
$BIN = $ds."bin";
$LIB = $ds."lib";
$LIB64 = $ds."lib";
$LIB64 .= "64"
if ($platform eq "Linux" && $machine_type eq "x86_64");
$INC = $ds."inc";
$INCLUDE = $ds."include";
$DEV = $ds."dev";
@ -693,7 +715,7 @@ $SOLENV = $ds."solenv";
$SOLVER = $ds."solver";
$CONFIG = $ds."config";
$USR_BIN = $USR.$BIN;
$USR_LIB = $USR.$LIB;
$USR_LIB = $USR.$LIB64;
$USR_LOCAL = $USR.$ds."local";
$USR_CCS = $USR.$ds."ccs";
$USR_OPENWIN = $USR.$ds."openwin";
@ -718,8 +740,8 @@ else
}
if ($STLPORT4 ne $no_stl) {
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB;
$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB;
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
$STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';
$STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
} else {
@ -854,7 +876,7 @@ elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||
$ps.$JRELIBDIR.
$ps.$JRETOOLKITDIR.
$ps.$JRETHREADDIR.
$ps.$par_dir.$LIB.
$ps.$par_dir.$LIB64.
$ps_STLPORT_LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
$ps.$ENV{'LD_LIBRARY_PATH'};
@ -873,7 +895,7 @@ elsif ($platform eq $Macosx)
{ $LD_LIBRARY_PATH = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
$ps_STLPORT_LIB;
}
else
elsif ($platform ne $Winnt )
{ AddWarning( "set_soenv", "$platform not configured for runtime shared libraries" );
}
@ -922,7 +944,7 @@ elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||
elsif ($platform eq "$Macosx") {
;
}
else
elsif ($platform ne $Winnt )
{ AddWarning( "set_soenv", "$platform not configured for compiler directives" );
}
@ -941,13 +963,13 @@ elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||
($platform eq "$Irix64") || ($platform eq "$FreeBSD") ||
($platform eq "AIX"))
{
$SOLAREXTRALIB = $L.$par_dir.$LIB;
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
elsif ($platform eq "$Macosx")
{ $SOLAREXTRALIB = $L.$LIB.
$L.$USR.$LIB;
}
else
elsif ($platform ne $Winnt )
{ AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
}
@ -1092,7 +1114,7 @@ elsif ($platform eq "$Winnt")
if ( $noldPATH !~ /(?:[:]|\A)(?:$MSPDB_PATH)(?:[:]|\Z)/ ) {
$PATH .= $ps.$MSPDB_PATH;
}
if ( $COMEX eq "8" ) {
if ( ( $COMEX eq "8" ) || ( $COMEX eq "10" ) ) {
# .NET needs midl.exe
if ( $noldPATH !~ /(?:[:]|\A)(?:$MIDL_PATH)(?:[:]|\Z)/ ) {
$PATH .= $ps.$MIDL_PATH;
@ -1365,6 +1387,7 @@ if ( '@JDK@' ne '' )
}
ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
ToFile( "ANT_LIB", "@ANT_LIB@", "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
ToFile( "STLPORT4", $STLPORT4, "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );