summaryrefslogtreecommitdiff
path: root/set_soenv.in
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-01-08 13:21:39 +0100
committersb <sb@openoffice.org>2010-01-08 13:21:39 +0100
commit822b6695e2f3848fa8fddc23d9599c322db0d955 (patch)
treec975c1958eaabeba0c2792338d3768953bac9381 /set_soenv.in
parente5586f047f2c3174c4a94fd5609f6beb98d1ece1 (diff)
parent29215a2062903a6391d9903c2c8f47656181099d (diff)
sb111: merged in DEV300_m69
Diffstat (limited to 'set_soenv.in')
-rw-r--r--set_soenv.in53
1 files changed, 5 insertions, 48 deletions
diff --git a/set_soenv.in b/set_soenv.in
index e1655da4a928..4d3e41383a38 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT,
- $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
+ $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -591,33 +591,6 @@ elsif ( $platform =~ m/osf1/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
}
-elsif ( $platform =~ m/irix/ )
-{ print "Setting Irix specific values... ";
- $outfile = "IrixMipsEnv.Set";
- $BIG_SVX = "TRUE";
- if ($CC =~ "gcc" ) {
- $COM = "GCC";
- $OUTPATH = "unxirgm";
- $CVER = "C300";
- }
- else {
- $COM = "C730";
- $CVER = "C730";
- $OUTPATH = "unxirxm3";
- }
- $COMPATH = '@COMPATH@';
- $CPU = "M";
- $CPUNAME = "MIPS";
- $GUI = "UNX";
- $GUIBASE = "unx";
- $GVER = "VCL";
- $INPATH = $OUTPATH.$PROEXT;
- $OS = "IRIX";
- $PATH_SEPERATOR = $ps;
- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
-}
elsif ( $platform =~ m/cygwin/ )
{
$COMPATH = PathFormat('@COMPATH@');
@@ -1032,7 +1005,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
-elsif ($platform =~ m/linux|netbsd|osf1|irix|freebsd|aix/)
+elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1098,7 +1071,7 @@ if ($platform =~ m/cygwin|os2/)
}
# The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
+if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
{ $PATH = $cur_dir.
# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1330,7 +1303,7 @@ if ($platform =~ m/solaris/)
$L_STLPORT_LIB.
$L.$XLIB;
}
-elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/)
+elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1373,7 +1346,7 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|irix/)
+if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
{
$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
@@ -1418,9 +1391,6 @@ if ($platform =~ m/linux/)
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
- elsif ($platform =~ m/irix/)
- { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
- }
#java threads include path
@@ -1490,14 +1460,6 @@ else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
}
-if ($SYSTEM_PYTHON eq "NO") {
- $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
- if ($GUIBASE eq "WIN") {
- # PYTHONPATH need to use '\' directory seperators;
- $PYTHONPATH = WinPath( $PYTHONPATH, ";" );
- }
-}
-
#
print "done\n";
@@ -1821,11 +1783,9 @@ ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" );
ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" );
ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" );
ToFile( "VERBOSE", "@VERBOSE@", "e" );
-ToFile( "WITH_FONTOOO", "@WITH_FONTOOO@", "e" );
ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" );
ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" );
ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" );
-ToFile( "SYSTEM_MSPACK", "@SYSTEM_MSPACK@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
@@ -1973,9 +1933,6 @@ ToFile( "MKOUT", $perlpre."mkout.pl", "e" );
ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" );
ToFile( "USE_SHELL", '@USE_SHELL@', "e" );
-if ($SYSTEM_PYTHON eq "NO") {
- ToFile( "PYTHONPATH", $PYTHONPATH, "e" );
-}
#
# Writing the aliases to file.