[Libreoffice-commits] .: set_soenv.in solenv/bin

[Andras Timar]

 set_soenv.in                       |    7 +------
 solenv/bin/modules/SourceConfig.pm |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit c7d8007aded7366877597e83119bc14651a2865e
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Mar 12 09:29:25 2011 +0100

    remove legacy SOURCE_ROOT_DIR variable

diff --git a/set_soenv.in b/set_soenv.in
index 098e2eb..403a039 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -74,7 +74,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
-     $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
+     $UPD, $WORK_STAMP, 
      $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $SOLARDEFIMG,
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
@@ -1010,10 +1010,6 @@ if ( $platform =~ m/darwin/ )
 $WORK_STAMP            = "@SOURCEVERSION@";
 # Location of the source.
 $SOLARSRC             = '$SRC_ROOT';
-# Location of the repository.
-my @splitlist = split( /\//, $SRC_ROOT );
-pop @splitlist;
-$SOURCE_ROOT_DIR      = join("/", @splitlist);
 
 # default TARFILE_LOCATION
 if ('@TARFILE_LOCATION@' eq "DEFAULT")
@@ -1981,7 +1977,6 @@ if ($platform !~ m/cygwin|os2/) {
    }
 }
 ToFile( "SOLARSRC",           $SOLARSRC,           "e" );
-ToFile( "SOURCE_ROOT_DIR",    $SOURCE_ROOT_DIR,    "e" );
 if ( $platform =~ m/cygwin/ )
 {
    ToFile( "ILIB",              $ILIB,              "e" );
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 5b147a5..fb11ce5 100755
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -76,7 +76,7 @@ sub new {
             $source_root .= '/..';
         }
     } else {
-        $source_root = $ENV{SOURCE_ROOT_DIR};
+        $source_root = $ENV{SRC_ROOT};
     };
     $source_root = Cwd::realpath($source_root);
     $self->{SOURCE_ROOT} = $source_root;