[Libreoffice-commits] .: Branch 'libreoffice-3-4' - set_soenv.in solenv/inc

[Andras Timar]

 set_soenv.in           |    5 +++++
 solenv/inc/settings.mk |   16 +---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 48a154fe76290238b7ba3cfc0f9095c8eae5df9e
Author: Andras Timar <atimar at novell.com>
Date:   Tue Apr 26 10:27:13 2011 +0200

    put L10N_MODULE definition to set_soenv instead of settings.mk
    
    and remove alternative l10n locations from settings.mk

diff --git a/set_soenv.in b/set_soenv.in
index 2c382c6..27107c5 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -74,6 +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,
+     $L10N_MODULE,
      $UPD, $WORK_STAMP, $gb_REPOS, $BUILD_TYPE,
      $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
@@ -1062,6 +1063,9 @@ $CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 # see above for why the change
 $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 
+# Location of the translations module
+$L10N_MODULE = PathFormat($SRC_ROOT."/translations");
+
 # Location used by the linker to create libraries.
 if ($platform =~ m/solaris/)
 {  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
@@ -1555,6 +1559,7 @@ CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
 ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
 ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
 ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
+ToFile( "L10N_MODULE",       $L10N_MODULE,       "e" );
 ToFile( "ANT_HOME",          PathFormat("@ANT_HOME@"), "e" );
 ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
 ToFile( "ANT",               PathFormat("@ANT@"), "e" );
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 356bda2..e15a8e0 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -809,23 +809,9 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .EXPORT : SOLARBINDIR
 
-.IF "$(GUI)" == "WNT" 
-L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations)
-.ELSE
-L10N_MODULE*=$(SRC_ROOT)/translations
-.ENDIF
-ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
-
 .IF "$(WITH_LANG)"!=""
 .INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-
-# check for localizations not hosted in l10n module. if a file exists there
-# it won't in l10n
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF			# "$(ALT_LOCALIZATION_FOUND)"!=""
+
 # if the l10n module exists, use split localize.sdf directly from there
 .IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
 # still check for existence as there may be no localization yet