From 8bcc971d38846adbce49a48a2469b8af6060249c Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 18 Nov 2009 17:50:36 +0100 Subject: [PATCH] #i107009# source_config file / multiple repository support in l10n tools --- set_soenv.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/set_soenv.in b/set_soenv.in index 462fb9533e97..31626d2f2ac7 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -78,7 +78,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, $SHELL, - $UPD, $WORK_STAMP, + $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, @@ -794,6 +794,7 @@ $SRC_ROOT =~ s/\/config_office//; $SRC_ROOT = PathFormat($SRC_ROOT); CheckPathExist( $SRC_ROOT ); + #----------------------------------------------------------------------------------------------------- # Copy top level makefile from config_office/ to $SRC_ROOT #----------------------------------------------------------------------------------------------------- @@ -967,6 +968,12 @@ if ( $platform =~ m/darwin/ ) $WORK_STAMP = "@SOURCEVERSION@"; # Location of the source. $SOLARSRC = '$SRC_ROOT'; + +# SOURCE_ROOT_DIR equals $SOLARSRC/.. +my @list1 = split( /\// , $SOLARSRC ); +pop @list1; +$SOURCE_ROOT_DIR = join ( '/' , @list1 ); + # $DEVROOT = '$SRC_ROOT'; # Set solenv and solver to given or default values. @@ -1919,6 +1926,7 @@ 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" );