INTEGRATION: CWS pj51 (1.92.2); FILE MERGED

2006/03/20 20:52:07 pjanik 1.92.2.3: RESYNC: (1.92-1.93); FILE MERGED
2006/03/15 21:52:23 pjanik 1.92.2.2: #i62778#: Remove env. variable URD_ONLY.
2006/03/03 20:31:18 pjanik 1.92.2.1: #i62720#: Remove TF_ONE51 completely from OOo files.

config_office/set_soenv.in

 #!@PERL@ -w
 #
 # Program:     set_soenv.in
-# Version:     $Revision: 1.96 $
-# Date:        $Date: 2006-04-06 11:53:26 $
+# Version:     $Revision: 1.97 $
+# Date:        $Date: 2006-04-07 08:02:29 $
 # Author:      Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
 #
 #---------------------------------------------------------------------------
@@ -75,8 +75,8 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $SHELL,
-     $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
-     $URD_ONLY, $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+     $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB, 
+     $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
      $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, 
@@ -846,10 +846,6 @@ if ( $platform =~ m/darwin/ )
 $SOLARUPD             = $UPD;
 # The project's workstamp.
 $WORK_STAMP            = "@SOURCEVERSION@";
-#
-$TF_ONE51             = $WORK_STAMP;
-# 
-$URD_ONLY             = $WORK_STAMP;
 # Location of the build root.
 $SOLARROOT            = '$SRC_ROOT';
 # Location of the source.
@@ -1640,8 +1636,6 @@ ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );
 ToFile( "UPD",               $UPD,               "e" );
 ToFile( "SOLARUPD",          $SOLARUPD,          "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
-ToFile( "TF_ONE51",          $TF_ONE51,          "e" );
-ToFile( "URD_ONLY",          $URD_ONLY,          "e" );
 ToFile( "SOLARROOT",         $SOLARROOT,         "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
 ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );