[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in set_soenv.in

[Andras Timar]

 configure.in |   18 ------------------
 set_soenv.in |   20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 022a3505165c384970ba15b3e8262a4def33f794
Author: Andras Timar <atimar at novell.com>
Date:   Thu Apr 28 22:45:20 2011 +0200

    do not ship non-localized helppacks

diff --git a/configure.in b/configure.in
index c1c74a5..88eefe2 100755
--- a/configure.in
+++ b/configure.in
@@ -1181,15 +1181,6 @@ AC_ARG_WITH(lang,
     ],
 ,)
 
-AC_ARG_WITH(poor-help-localizations,
-    AS_HELP_STRING([--with-poor-help-localizations],
-        [Use this option to specify which languages have unusable help localizations.
-         Separate multiple languages with space.])
-    [
-                          Usage:     --with-poor-help-localizations="af be"
-    ],
-,)
-
 AC_ARG_WITH(intro-bitmap,
 [  --with-intro-bitmap    Prefer the specified intro bitmap over the
                           the default one.
@@ -7806,15 +7797,6 @@ AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
 AC_SUBST(GIT_REPO_NAMES)
 
-AC_MSG_CHECKING([which languages have poor help localizations])
-WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
-if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
-   AC_MSG_RESULT([none])
-else
-   AC_MSG_RESULT([$WITH_POOR_HELP_LOCALIZATIONS])
-fi
-AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
-
 AC_MSG_CHECKING([for another 'intro' bitmap])
 INTRO_BITMAP=
 if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
diff --git a/set_soenv.in b/set_soenv.in
index 27107c5..a1bd947 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -70,11 +70,11 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
 my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
-     $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
+     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
-     $L10N_MODULE,
+     $L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
      $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,
@@ -1066,6 +1066,20 @@ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 # Location of the translations module
 $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
 
+# Check for poor help localizations, i.e. no help translation at all...
+opendir(DIR,$L10N_MODULE . "/source");
+ at languages = readdir(DIR);
+closedir(DIR);
+$WITH_POOR_HELP_LOCALIZATIONS = "";
+
+foreach $language (@languages)
+{
+    if ( ($language ne ".") && ($language ne "..") && (! -d $L10N_MODULE . "/source/" . $language . "/helpcontent2") )
+    {
+        $WITH_POOR_HELP_LOCALIZATIONS = $WITH_POOR_HELP_LOCALIZATIONS . " " . $language;
+    }
+}
+
 # Location used by the linker to create libraries.
 if ($platform =~ m/solaris/)
 {  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
@@ -1579,7 +1593,7 @@ ToFile( "INTRO_BITMAP",      "@INTRO_BITMAP@",   "e" );
 ToFile( "ABOUT_BITMAP",      "@ABOUT_BITMAP@",   "e" );
 ToFile( "OOO_VENDOR",        "@OOO_VENDOR@",     "e" );
 ToFile( "OOODMAKEMODE",      "YES",              "e" );
-ToFile( "WITH_POOR_HELP_LOCALIZATIONS", "@WITH_POOR_HELP_LOCALIZATIONS@", "e" );
+ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
 
 ToFile( "CALL_CDECL",        $CALL_CDECL,        "e" );
 ToFile( "COMMON_OUTDIR",     $COMMON_OUTDIR,     "e" );