79 lines
3.6 KiB
Text
79 lines
3.6 KiB
Text
--- set_soenv.in.orig Thu Feb 27 14:12:36 2003
|
|
+++ set_soenv.in Sat Mar 29 23:11:54 2003
|
|
@@ -52,7 +52,7 @@
|
|
#-------------------------------------------------
|
|
#
|
|
# Platform independent constant values.
|
|
-my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL",
|
|
+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", "GER",
|
|
"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" );
|
|
my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG,
|
|
$common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA,
|
|
@@ -88,7 +88,7 @@
|
|
$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
|
|
$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
|
|
$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
|
|
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
|
|
+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $USE_LINUXJDK );
|
|
#
|
|
#-------------------------------------------
|
|
# IId. Declaring the aliases.
|
|
@@ -140,7 +140,8 @@
|
|
$CC = '@CC@'; # C compiler
|
|
$CXX = '@CXX@'; # C++ compiler
|
|
$EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type
|
|
-$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build
|
|
+$ENABLE_DEBUG = '@ENABLE_DEBUG@'; # Enable a debug build
|
|
+$USE_LINUXJDK = '@USE_LINUXJDK@'; # Use the Linux JDK
|
|
$WRAPCMD = ""; # Wrapper (only for winnt)
|
|
|
|
#
|
|
@@ -863,7 +864,7 @@
|
|
# Location of
|
|
$STAR_SSCOMMON = '$SOLARENV'.$CONFIG.$ds."ssolar.cmn";
|
|
# Location of
|
|
-$STAR_SSOLARINI = '$SOLARENV'.$CONFIG.$ds."ssolar.ini";
|
|
+$STAR_SSOLARINI = '$SOLARENV'.$CONFIG.$ds."ssrx644.ini";
|
|
# Path to the OpenOffice.org recourses.
|
|
$STAR_RESOURCEPATH = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN;
|
|
# Location of the registry file.
|
|
@@ -1184,7 +1185,7 @@
|
|
$L_STLPORT_LIB.
|
|
$L.$XLIB;
|
|
}
|
|
-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64"))
|
|
+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
|
|
{ $SOLARLIB = $L.$par_dir.$LIB.
|
|
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
|
|
$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
|
|
@@ -1196,15 +1197,6 @@
|
|
$L_STLPORT_LIB.
|
|
$L.$XLIB;
|
|
}
|
|
-elsif ($platform eq "$FreeBSD")
|
|
-{ $SOLARLIB = $L.$par_dir.$LIB.
|
|
- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
|
|
- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
|
|
- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
|
|
- $L.'$JAVA_HOME'.$LIB.
|
|
- $L_STLPORT_LIB.
|
|
- $L.$XLIB;
|
|
-}
|
|
elsif ($platform eq "$Winnt")
|
|
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
|
|
$L.$par_dir.$LIB.
|
|
@@ -1265,7 +1257,13 @@
|
|
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
|
|
}
|
|
elsif ($platform eq "$FreeBSD")
|
|
-{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
|
|
+{
|
|
+ if ($USE_LINUXJDK eq "TRUE") {
|
|
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
|
|
+ } else {
|
|
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
|
|
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
|
|
+ }
|
|
}
|
|
elsif ($platform eq "$NetBSD")
|
|
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
|