[Libreoffice-commits] .: 2 commits - configure.in instsetoo_native/util set_soenv.in
Andras Timar
timar at kemper.freedesktop.org
Fri Apr 29 07:42:25 PDT 2011
configure.in | 18 ------------------
instsetoo_native/util/makefile.mk | 24 ++++++++++++++----------
set_soenv.in | 20 +++++++++++++++++---
3 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit d2f405940cf97887d73836e953bb58b758f2f9be
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 9641f81..a23eaa3 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.
@@ -7774,15 +7765,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 602adb6..a34b802 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -70,11 +70,11 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $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,
@@ -1004,6 +1004,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.
@@ -1486,7 +1500,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" );
commit a46f53bd3c3da9041521f459b34aa70829c5c7a4
Author: Andras Timar <atimar at novell.com>
Date: Fri Apr 29 08:09:29 2011 +0200
do not pack empty help packs
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index f4f1eda..e8b757c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,6 +76,10 @@ LOCALPYFILES= \
$(BIN)$/mailmerge.py
.ENDIF
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+
+allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
+
xxxx:
echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
@@ -129,9 +133,9 @@ ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
-ooohelppack : $(foreach,i,$(alllangiso) ooohelppack_$i)
+ooohelppack : $(foreach,i,$(allhelplangiso) ooohelppack_$i)
-ooodevhelppack: $(foreach,i,$(alllangiso) ooodevhelppack_$i)
+ooodevhelppack: $(foreach,i,$(allhelplangiso) ooodevhelppack_$i)
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
@@ -145,7 +149,7 @@ oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
-oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i)
+oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
@@ -184,9 +188,9 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) ooohelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
@@ -200,7 +204,7 @@ $(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
@@ -236,11 +240,11 @@ $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-$(foreach,i,$(alllangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
ooohelppack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-$(foreach,i,$(alllangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevhelppack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
@@ -282,13 +286,13 @@ $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
.ELSE # "$(alllangiso)"!=""
openoffice:
- @echo cannot pack nothing...
+ @echo cannot pack anything...
.ENDIF # "$(alllangiso)"!=""
More information about the Libreoffice-commits
mailing list