diff options
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 57 |
1 files changed, 8 insertions, 49 deletions
diff --git a/set_soenv.in b/set_soenv.in index 76363e42c561..dffde97f5f2e 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -94,8 +94,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, 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, $XLIB, $XINC, - $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, - $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); + $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH ); # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, @@ -109,7 +108,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, - $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLABUILD, + $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLABUILD, $PROEXT, $TARFILE_LOCATION, $ENABLE_HUNSPELL, $ENABLE_HYPHEN, $SYSTEM_PYTHON, $EPM_FLAGS); @@ -145,10 +144,8 @@ $I = " -I"; # include search path $L = " -L"; # library search path $D = " -D"; # define search path $empty = ""; # used as argument -$no_stl = "NO_STLPORT4"; # possible argument $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages -$STLPORT4 = '@STLPORT4@'; # Location of STLport4 $SYSTEM_PYTHON = '@SYSTEM_PYTHON@'; $JDK = '@JDK@'; $JAVAFLAGS = '@JAVAFLAGS@'; @@ -857,11 +854,6 @@ else $OOO_SHELL = '@SHELLPATH@'."\/bash"; } -if ( '@STLPORT4@' eq $no_stl ) -{ - $STLPORT4 = "$no_stl"; -} - # ml.exe assembler path for Windows users. if ($platform =~ m/cygwin/) { $ASM_PATH = PathFormat('@ASM_HOME@'); @@ -909,19 +901,6 @@ if ($GUI eq "OS2") $outfile_bat =~ s/set$/cmd/i; } -if ($STLPORT4 ne $no_stl) { - $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 { - $ps_STLPORT_LIB = ""; - $L_STLPORT_LIB = ""; - $STLPORT_stlport = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl"; - $STLPORT_inc_stlport = ""; -} - - # Windows NT only variables if ($platform =~ m/cygwin/) { @@ -1061,10 +1040,6 @@ if ($platform =~ m/cygwin|os2/) $ILIB = $cur_dir; - if ($STLPORT4 ne $no_stl) { - $ILIB .= $wps.$STLPORT4.$LIB64; - } - # Mingw is different if ( $COM eq "MSC" ) { $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB. @@ -1219,7 +1194,6 @@ elsif ($platform =~ m/cygwin/) if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) { $PATH .= $ps.$tmppath; } - $PATH .= $ps_STLPORT_LIB; # nsis path for Windows users. $NSIS_PATH = PathFormat('@NSIS_PATH@'); $tmppath = CygFormat($NSIS_PATH); @@ -1334,7 +1308,6 @@ if ($platform =~ m/solaris/) $L.$JRELIBDIR. $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. - $L_STLPORT_LIB. $L.$XLIB; } elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/) @@ -1346,18 +1319,15 @@ elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/) $L.$JRELIBDIR. $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. - $L_STLPORT_LIB. $L.$XLIB; } elsif ($platform =~ m/cygwin|os2/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. - $L_STLPORT_LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB; } elsif ($platform =~ m/darwin/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. - $L_STLPORT_LIB. $L.$USR_LIB; # [ed] 6/15/02 Add in X11 libraries onto the library path if ($GUIBASE eq "unx") { @@ -1378,11 +1348,9 @@ $SOLARINC = $I.$cur_dir. if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/) { -$SOLARINC .= $STLPORT_stlport; if ($platform =~ m/linux|freebsd|netbsd/) { # This simply adds an include path, so even cases that break the FHS work -$SOLARINC .= $STLPORT_inc_stlport; } if ($platform =~ m/solaris/ && ! $CC =~ "gcc") { @@ -1396,7 +1364,6 @@ if ($platform =~ m/solaris/) if ($platform =~ m/linux/) { # This simply adds an include path, so even cases that break the FHS work - $SOLARINC .= $STLPORT_inc_stlport; } @@ -1436,8 +1403,7 @@ if ($platform =~ m/linux/) } } elsif ($platform =~ m/cygwin/) -{ $SOLARINC .= $STLPORT_stlport. - $I.'$JAVA_HOME'.$ds."include".$ds."win32". +{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32". $I.'$JAVA_HOME'.$ds."include"; # Mingw is different if ( $COM eq "MSC" ) @@ -1477,14 +1443,9 @@ elsif ($platform =~ m/cygwin/) } } elsif ($platform =~ m/darwin/) -{ $SOLARINC .= $STLPORT_stlport. - $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers". - $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; - # [ed] 6/15/02 Add in X11 headers as appropriate for the build - if ($GUIBASE eq "unx") { - $SOLARINC .= $I.$XINC. - $I.$XINC.$ds."freetype2"; - } +{ + my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; + $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; } else { AddWarning( "set_soenv", "$platform not configured for system dependant include dir" ); @@ -1550,8 +1511,6 @@ ToFile( "ANT_HOME", PathFormat("@ANT_HOME@"), "e" ); ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); ToFile( "ANT", PathFormat("@ANT@"), "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); -ToFile( "STLPORT4", $STLPORT4, "e" ); -ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); @@ -1716,10 +1675,10 @@ if ( $platform =~ m/darwin/ ) { # MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build, # build can assume functions/libraries of that version to be available -# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk +# unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) # http://developer.apple.com/technotes/tn2002/tn2064.html - ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" ); + ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" ); } # |