diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:24:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:24:03 +0000 |
| commit | 93ac3d63c82d535eee4a2929a4d9f64b858b1230 (patch) | |
| tree | 768de76308f241767db3f4df476bbf3664883ee8 /config_office | |
| parent | 996a27a91037c3276f5d4da8d30c416f5b5b5710 (diff) | |
INTEGRATION: CWS vq07 (1.26.6); FILE MERGED
2004/12/03 22:48:06 vq 1.26.6.1: #i38411# Remove check for wdevenv in configure.
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index d35f2fb0df58..6500a47daa4a 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.28 $ -# Date: $Date: 2004-12-10 17:49:56 $ +# Version: $Revision: 1.29 $ +# Date: $Date: 2004-12-13 12:24:03 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -80,7 +80,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL, $URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, - $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, $WDEVENV_PATH, + $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $EXTRA_DOTNET_FILES, $USE_NEW_SDK, $FRAME_HOME, @@ -499,7 +499,6 @@ elsif ( $platform eq "$Winnt" ) $MIDL_PATH = PosixFormat('@MIDL_PATH@'); $CSC_PATH = PosixFormat('@CSC_PATH@'); $NMAKE_PATH = PosixFormat('@NMAKE_PATH@'); - $WDEVENV_PATH = PosixFormat('@WDEVENV_PATH@'); $PSDK_HOME = PosixFormat('@PSDK_HOME@'); if('@EXTRA_DOTNET_FILES@') { $EXTRA_DOTNET_FILES = PosixFormat('@EXTRA_DOTNET_FILES@'); @@ -1072,10 +1071,6 @@ elsif ($platform eq "$Winnt") if ( "@ENABLE_VCTK@" and $noldPATH !~ /(?:[:]|\A)(?:$NMAKE_PATH)(?:[:]|\Z)/ ) { $PATH .= $ps.$NMAKE_PATH; } - # .NET needs wdevenv.exe, VC toolkit doesn't - if ( !"@ENABLE_VCTK@" and $noldPATH !~ /(?:[:]|\A)(?:$WDEVENV_PATH)(?:[:]|\Z)/ ) { - $PATH .= $ps.$WDEVENV_PATH; - } # Native installer needs some files if the Windows Installer SDK if ( $noldPATH !~ /(?:[:]|\A)(?:$PSDK_HOME\/bin)(?:[:]|\Z)/i ) { $PATH .= $ps.$PSDK_HOME.$BIN; |