From a4531411eb96c05965a1fcd1c47493c61ae9e51c Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 26 Apr 2011 17:09:11 +0200 Subject: [PATCH 1/8] Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3) From 05e34ed9156b0d64b1c3edba7979ce1f5f121d6c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 28 Apr 2011 22:40:25 +0200 Subject: [PATCH 2/8] help: build only those languages which have localized helpcontent2 --- helpcontent2/settings.pmk | 4 +++- helpcontent2/source/auxiliary/makefile.mk | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index c9d2722258..185438e89b 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,4 +1,5 @@ .INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk +.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/help_exist.mk my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$ @@ -12,4 +13,5 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERA JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) .ENDIF -aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL)))) diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 48b02b5d0e..c617b6f597 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -46,7 +46,7 @@ TREEFILES = \ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF +.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF L10N_MODULE ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst @@ -54,8 +54,10 @@ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" ) aux_langdirs:=$(uniq $(t_aux_langdirs:d:d)) +help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US -aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL)))) WITH_LANG!:=$(aux_alllangiso) @@ -92,6 +94,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done aux_dirs .PHONY : echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk + echo help_exist:=$(help_exist) > $(LOCAL_COMMON_OUT)/inc$/help_exist.mk $(COMMONBIN)$/helpimg.ilst .PHONY: -$(RM) $@ From bb8908a92c7d3c026da6ca5fdcd8c0fb643f244b Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 29 Apr 2011 08:46:53 +0200 Subject: [PATCH 3/8] fix en-US only build --- helpcontent2/source/auxiliary/makefile.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index c617b6f597..94b1370d48 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -66,6 +66,7 @@ WITH_LANG!:=$(aux_alllangiso) LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j)) .ELSE #IF "$(WITH_LANG)"!="" aux_langdirs:=en-US +help_exist:=en-US LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j) .ENDIF #IF "$(WITH_LANG)"!="" From 9da7535e67707a818c647b1036284beb011909ce Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 3 May 2011 20:01:35 +0200 Subject: [PATCH 4/8] Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4) From 65bf32d7189c21d2d5d52c2a4ba090e7c545af3e Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 10 May 2011 20:01:40 +0200 Subject: [PATCH 5/8] Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5) From 4fff103b89380e022e3aa9f74f2d6ade1dc55fa0 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 17 May 2011 19:55:33 +0200 Subject: [PATCH 6/8] Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1) From 7f9cc73efc9c4218dc2d7cc298b3344474a34a1c Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 17 May 2011 20:49:45 +0200 Subject: [PATCH 7/8] Branch libreoffice-3-4-0 This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. If you want to build something cool, unstable, and risky, use master. From 0c8a27cfa9036efc45974a02751b70034ad5bbd5 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 24 May 2011 19:29:12 +0200 Subject: [PATCH 8/8] Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)