Kaydet (Commit) 8bcc971d authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

#i107009# source_config file / multiple repository support in l10n tools

üst 867b9406
...@@ -78,7 +78,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV ...@@ -78,7 +78,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
# Environment variables. # Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL, 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, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
...@@ -794,6 +794,7 @@ $SRC_ROOT =~ s/\/config_office//; ...@@ -794,6 +794,7 @@ $SRC_ROOT =~ s/\/config_office//;
$SRC_ROOT = PathFormat($SRC_ROOT); $SRC_ROOT = PathFormat($SRC_ROOT);
CheckPathExist( $SRC_ROOT ); CheckPathExist( $SRC_ROOT );
#----------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------
# Copy top level makefile from config_office/ to $SRC_ROOT # Copy top level makefile from config_office/ to $SRC_ROOT
#----------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------
...@@ -967,6 +968,12 @@ if ( $platform =~ m/darwin/ ) ...@@ -967,6 +968,12 @@ if ( $platform =~ m/darwin/ )
$WORK_STAMP = "@SOURCEVERSION@"; $WORK_STAMP = "@SOURCEVERSION@";
# Location of the source. # Location of the source.
$SOLARSRC = '$SRC_ROOT'; $SOLARSRC = '$SRC_ROOT';
# SOURCE_ROOT_DIR equals $SOLARSRC/..
my @list1 = split( /\// , $SOLARSRC );
pop @list1;
$SOURCE_ROOT_DIR = join ( '/' , @list1 );
# #
$DEVROOT = '$SRC_ROOT'; $DEVROOT = '$SRC_ROOT';
# Set solenv and solver to given or default values. # Set solenv and solver to given or default values.
...@@ -1919,6 +1926,7 @@ if ($platform !~ m/cygwin|os2/) { ...@@ -1919,6 +1926,7 @@ if ($platform !~ m/cygwin|os2/) {
} }
} }
ToFile( "SOLARSRC", $SOLARSRC, "e" ); ToFile( "SOLARSRC", $SOLARSRC, "e" );
ToFile( "SOURCE_ROOT_DIR", $SOURCE_ROOT_DIR, "e" );
if ( $platform =~ m/cygwin/ ) if ( $platform =~ m/cygwin/ )
{ {
ToFile( "ILIB", $ILIB, "e" ); ToFile( "ILIB", $ILIB, "e" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment