diff options
-rwxr-xr-x | l10ntools/java/jpropex/jpropex | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | l10ntools/java/jpropex/jpropex.bat | 2 | ||||
-rwxr-xr-x | l10ntools/scripts/localize.pl | 9 | ||||
-rwxr-xr-x | l10ntools/scripts/xhtex | 14 | ||||
-rwxr-xr-x | l10ntools/scripts/xtxex | 15 | ||||
-rw-r--r-- | l10ntools/source/localize.cxx | 18 |
6 files changed, 6 insertions, 54 deletions
diff --git a/l10ntools/java/jpropex/jpropex b/l10ntools/java/jpropex/jpropex index 8c9982f2b1d3..69f2972a531e 100755 --- a/l10ntools/java/jpropex/jpropex +++ b/l10ntools/java/jpropex/jpropex @@ -9,4 +9,4 @@ if [ x${JAVA_HOME}x = xx ]; then exit 1 fi -exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL= -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@" +exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL= -jar ${SOLARVER}/${INPATH}/bin/jpropex.jar "$@" diff --git a/l10ntools/java/jpropex/jpropex.bat b/l10ntools/java/jpropex/jpropex.bat index a32c977781d0..6fad0d4b862d 100644..100755 --- a/l10ntools/java/jpropex/jpropex.bat +++ b/l10ntools/java/jpropex/jpropex.bat @@ -10,4 +10,4 @@ if "x%JAVA_HOME%x" EQU "xx" ( exit
)
-java -DSOLARSRC=%SOLARSRC% -DWORK_STAMP=%WORK_STAMP% -DUSE_SHELL= -jar %SOLARVER%\%INPATH%\bin%UPDMINOREXT%\jpropex.jar %*
+java -DSOLARSRC=%SOLARSRC% -DWORK_STAMP=%WORK_STAMP% -DUSE_SHELL= -jar %SOLARVER%\%INPATH%\bin\jpropex.jar %*
diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl index cb72944ed8d9..0e36c7af3e4f 100755 --- a/l10ntools/scripts/localize.pl +++ b/l10ntools/scripts/localize.pl @@ -89,14 +89,7 @@ my @sdfparticles; parse_options(); my $binpath = ''; -if( defined $ENV{UPDMINOREXT} ) -{ - $binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin".$ENV{UPDMINOREXT}."/" ; -} -else -{ - $binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin/" ; -} +$binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin/" ; #%sl_modules = fetch_sourcelanguage_dirlist(); diff --git a/l10ntools/scripts/xhtex b/l10ntools/scripts/xhtex index 5409f179777d..acf96ed713b6 100755 --- a/l10ntools/scripts/xhtex +++ b/l10ntools/scripts/xhtex @@ -31,16 +31,4 @@ if [ x${SOLARENV}x = xx ]; then exit 1 fi -if [ ${GUI} = "WNT" ]; then -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec python $SOLARVERSION/$INPATH/bin/xhtex.py "$@" -else - exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@" -fi -else -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec python $SOLARVERSION/$INPATH/bin/xhtex.py "$@" -else - exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@" -fi -fi +exec python $SOLARVERSION/$INPATH/bin/xhtex.py "$@" diff --git a/l10ntools/scripts/xtxex b/l10ntools/scripts/xtxex index 39da89fd81ce..2faae55ce965 100755 --- a/l10ntools/scripts/xtxex +++ b/l10ntools/scripts/xtxex @@ -31,17 +31,4 @@ if [ x${SOLARENV}x = xx ]; then exit 1 fi -if [ ${GUI} = "WNT" ]; then -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec python $SOLARVERSION/$INPATH/bin/xtxex.py "$@" -else - exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@" -fi -else -if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then - exec python $SOLARVERSION/$INPATH/bin/xtxex.py "$@" -else - exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@" -fi -fi - +exec python $SOLARVERSION/$INPATH/bin/xtxex.py "$@" diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 277ade3b97ba..7081cf6029ee 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -353,7 +353,6 @@ void SourceTreeLocalizer::WorkOnFile( ByteString sPath1( Export::GetEnv("SOLARVER") ); ByteString sPath2( Export::GetEnv("INPATH") ); ByteString sPath3( "bin" ); - ByteString sPath4( Export::GetEnv("UPDMINOREXT") ); ByteString sExecutable( sPath1 ); #if defined(WNT) || defined(OS2) sExecutable.SearchAndReplaceAll( "/", sDel ); @@ -362,7 +361,6 @@ void SourceTreeLocalizer::WorkOnFile( sExecutable += sPath2 ; sExecutable += sDel; sExecutable += sPath3 ; - sExecutable += sPath4 ; sExecutable += sDel ; sExecutable += rExecutable ; @@ -976,25 +974,11 @@ int _cdecl main( int argc, char *argv[] ) bool hasPwd = treeconfig.getActiveRepositories( repos ); if( hasPwd ) cout << "Found special path!\n"; - string minor_ext; - bool has_minor_ext; - - if( Export::GetEnv("UPDMINOREXT") != NULL ) - { - minor_ext = string( Export::GetEnv("UPDMINOREXT") ); - has_minor_ext = minor_ext.size(); - } - else - has_minor_ext = false; - // localize through all repositories for( vector<string>::iterator iter = repos.begin(); iter != repos.end() ; ++iter ) { string curRepository; - if( has_minor_ext ) - curRepository = string( Export::GetEnv("SRC_ROOT") ) + "/" + *iter + minor_ext; - else - curRepository = string( Export::GetEnv("SRC_ROOT") ) + "/" + *iter; + curRepository = string( Export::GetEnv("SRC_ROOT") ) + "/" + *iter; cout << "Localizing repository " << curRepository << "\n"; SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks ); aIter.SetLanguageRestriction( sLanguages ); |