[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - instsetoo_native/util solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 24 17:20:21 PST 2009
instsetoo_native/util/pack.lst | 6
solenv/bin/modules/installer/globals.pm | 11 +
solenv/inc/minor.mk | 6
solenv/inc/postset.mk | 224 ++++++++++++++++----------------
solenv/inc/settings.mk | 52 ++++---
solenv/inc/target.mk | 29 ++--
6 files changed, 174 insertions(+), 154 deletions(-)
New commits:
commit 1ebe8e612ad2eeb4fa154b80dc6e5dba84a7b16f
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Nov 24 14:02:05 2009 +0000
OOO320
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 4a99c11..85ad50f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=320
-RSCREVISION=320m5(Build:9458)
-BUILD=9458
-LAST_MINOR=m5
+RSCREVISION=320m6(Build:9459)
+BUILD=9459
+LAST_MINOR=m6
SOURCEVERSION=OOO320
commit 0666bcaad3f822734839b592d5cc4f7314a74e92
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Nov 24 13:40:24 2009 +0000
CWS-TOOLING: integrate CWS localization37
2009-11-20 17:34:04 +0100 ihi r277585 : not yet the best solution
2009-11-19 14:34:34 +0100 ihi r277560 : #i103247# updated Luxembourgish autocorrect data
2009-11-16 16:58:56 +0100 ihi r277525 : added ast to no_ms_lang
2009-11-16 16:57:23 +0100 ihi r277524 : added ast
2009-11-16 16:41:22 +0100 ihi r277523 : #i106900# updated identifier ShowAnnotation -> ShowAnnotations
2009-11-16 16:39:34 +0100 ihi r277522 : small helper script
2009-11-16 15:24:34 +0100 ihi r277520 : Fixed german and removed ln ti pap ur
2009-11-11 14:27:38 +0100 releng r277457 : added ug, om, si, oc, or, ml, as to non ms langs
2009-11-11 14:23:30 +0100 releng r277456 : Fix for merging more then just one
2009-11-11 14:12:52 +0100 ihi r277455 : #i106775# Merge of OOo 3.2 l10n cws localization37 nb nn he ga uk my bg ja uz fi bn kid fr nl vi ca pt-BR ru ka oc gl cs km kn ko sh si om gu sk sl zh-CN ku or da sr de sv hi-IN pa-IN ta te pl th hu dz lv pt tr en-GB id el ar as eo es ml et eu zh-TW is ug it mr
2009-11-05 23:07:09 +0100 ihi r277375 : added om kid , removed dupe ta-IN
2009-11-03 18:09:39 +0100 ihi r277327 : removed dupe
2009-11-02 19:02:55 +0100 ihi r277303 : #i105973 obsolete sdf files removed
2009-11-02 19:02:16 +0100 ihi r277302 : #i105973 obsolete sdf files removed
2009-10-13 19:19:06 +0200 ihi r276871 : CWS-TOOLING: rebase CWS localization37 to branches/OOO320 at 276773 (milestone: OOO320:m1)
2009-10-01 13:19:45 +0200 ihi r276598 : key -> ky ... this one triggered a bad crash in rsc
2009-09-09 17:02:20 +0200 ihi r276004 : added some langs
2009-09-09 13:17:16 +0200 ihi r275986 : lucky local cygwin fix
2009-09-03 18:47:45 +0200 ihi r275769 : #104328# deal with l10nless src files
2009-09-03 15:58:51 +0200 ihi r275760 : added some new langs
2009-09-03 15:54:16 +0200 ihi r275759 : old localize.pl tool used as a helper
2009-09-03 15:53:48 +0200 ihi r275758 : do not merge not wellformated sdf files
2009-09-03 15:51:59 +0200 ihi r275757 : old localize.pl tool used as a helper
2009-09-03 15:50:03 +0200 ihi r275756 : some small helpers added
2009-09-01 18:22:04 +0200 ihi r275681 : update DEV300 code line with OOO310 strings
2009-09-01 13:45:43 +0200 ihi r275658 : #i104680# prevent that self defined or dupe ms ids are merged
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 34159c1..2eba722 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -82,8 +82,15 @@ BEGIN
"dgo",
"kok",
"mni",
- "sat"
-
+ "sat",
+ "ug",
+ "om",
+ "si",
+ "or",
+ "oc",
+ "ml",
+ "as",
+ "ast"
);
@items_at_modules = ("Files", "Dirs", "Unixlinks");
@asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 3101d0a..30bb915 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -35,116 +35,118 @@
defaultlangiso=en-US
# Complete list of all supported ISO codes
-
-completelangiso=\
- af \
- ar \
- as-IN \
- ast \
- be-BY \
- bg \
- bn \
- bn-BD \
- bn-IN \
- br \
- brx \
- bs \
- by \
- ca \
- cs \
- cy \
- da \
- de \
- dgo \
- dz \
- el \
- en-GB \
- en-US \
- en-ZA \
- eo \
- es \
- et \
- eu \
- fa \
- fi \
- fr \
- ga \
- gd \
- gl \
- gu \
- gu-IN \
- he \
- hi-IN \
- hr \
- hu \
- is \
- it \
- ja \
- ka \
- kk \
- km \
- kn \
- ko \
- kok \
- ks \
- ku \
- lo \
- lt \
- lv \
- mai \
- mk \
- ml-IN \
- mn \
- mni \
- mr-IN \
- ms \
- my \
- nb \
- ne \
- nl \
- nn \
- nr \
- ns \
- oc \
- om \
- or-IN \
- pa-IN \
- pl \
- pt \
- pt-BR \
- ro \
- ru \
- rw \
- sa-IN \
- sat \
- sc \
- sd \
- sh \
- sk \
- sl \
- so \
- sr \
- ss \
- st \
- sv \
- sw \
- sw-TZ \
- ta-IN \
- te-IN \
- tg \
- th \
- ti-ER \
- tn \
- tr \
- ts \
- uk \
- ur-IN \
- uz \
- ve \
- vi \
- xh \
- zh-CN \
- zh-TW \
- zu
+completelangiso=af \
+ar \
+as-IN \
+be-BY \
+bo \
+bg \
+br \
+brx \
+bn \
+bn-BD \
+bn-IN \
+bs \
+by \
+ca \
+cs \
+cy \
+da \
+de \
+dgo \
+dz \
+el \
+en-GB \
+en-US \
+en-ZA \
+eo \
+es \
+et \
+eu \
+fa \
+fi \
+fr \
+ga \
+gd \
+gl \
+gu \
+gu-IN \
+he \
+hi-IN \
+hr \
+hu \
+is \
+it \
+ja \
+kid \
+ky \
+ka \
+kk \
+km \
+kn \
+ko \
+kok \
+ks \
+ku \
+lo \
+lt \
+lv \
+mai \
+mk \
+mn \
+mni \
+ms \
+ml-IN \
+mr-IN \
+my \
+ne \
+nb \
+nl \
+nn \
+nr \
+ns \
+om \
+oc \
+or-IN \
+pap \
+pa-IN \
+pl \
+ps \
+pt \
+pt-BR \
+ru \
+rw \
+sat \
+sa-IN \
+si \
+sc \
+sd \
+sk \
+sl \
+sh \
+sr \
+ss \
+st \
+sv \
+sw \
+sw-TZ \
+te-IN \
+ti-ER \
+ta-IN \
+th \
+tn \
+tr \
+ts \
+tg \
+ug \
+ur-IN \
+uk \
+uz \
+ve \
+vi \
+xh \
+zh-CN \
+zh-TW \
+zu
alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 4771e6d..cefa580 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -646,28 +646,6 @@ MISC=$(OUT)/misc
COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
.ENDIF
-L10N_MODULE*=l10n
-ALT_L10N_MODULE*=l10n_so
-
-.IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk
-
-.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-# TODO: check performance impact...
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!=""
-some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) ))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF))
-.ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-.ENDIF # "$(WITH_LANG)"!=""
-
OUTCXX=$(OUT)/cxx
@@ -841,6 +819,36 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
+L10N_MODULE*=l10n
+ALT_L10N_MODULE*=l10n_so
+
+.IF "$(WITH_LANG)"!=""
+.INCLUDE .IGNORE: $(SOLARSRC)$/$(L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(SOLARSRC)$/$(ALT_L10N_MODULE)/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:=$(SOLARSRC)$/$(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
+TRYSDF:=$(SOLARSRC)$/$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)))
+.ENDIF # "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
+# else use localize.sdf from local output tree if localization .zip exists
+.IF "$(LOCALIZESDF)"==""
+LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.ENDIF # "$(LOCALIZESDF)"==""
+# dummy target to keep the build happy.
+.IF "$(LOCALIZESDF)"==""
+LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
+.ENDIF # "$(LOCALIZESDF)"==""
+.ENDIF # "$(WITH_LANG)"!=""
+
.IF "$(PRE)"==""
#JARDIR=$(CLASSDIR)
JARDIR=$(OUT)/class
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index adf5079..5aa754e 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1389,24 +1389,27 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
.ENDIF # "$(UNIXTEXT)"!=""
.IF "$(WITH_LANG)"!=""
-.IF "$(LOCALIZATION_FOUND)"==""
.IF "$(LOCALIZESDF)"!=""
-"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
+
+# dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing
+# localize.sdf themself
+"$(LOCALIZESDF)%":
+ @echo $(LOCALIZESDF)
@@-$(MKDIRHIER) $(@:d)
- @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
- @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI)
- @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME)
- @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-.ENDIF # "$(LOCALIZESDF)"!=""
-.ENDIF # "$(LOCALIZATION_FOUND)"==""
-.ENDIF # "$(WITH_LANG)"!=""
+ @touch $@
-.IF "$(LOCALIZESDF)"!=""
-"$(LOCALIZESDF)%" :
- echo $(LOCALIZESDF)
+.IF "$(LOCALIZATION_FOUND)"==""
+.IF "$(LOCALSDFFILE)"!=""
+$(LOCALSDFFILE) : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
@@-$(MKDIRHIER) $(@:d)
- @$(TOUCH) $(LOCALIZESDF)
+ @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
+ $(TOUCH) $@
+
+.ENDIF # "$(LOCALSDFFILE)"!=""
+.ENDIF # "$(LOCALIZATION_FOUND)"==""
.ENDIF # "$(LOCALIZESDF)"!=""
+.ENDIF # "$(WITH_LANG)"!=""
.IF "$(EXTUPDATEINFO_NAME)"!=""
$(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
commit 5365d6a10781c9f8750f7d7f785b7bfd9e6efd27
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Nov 24 11:58:53 2009 +0000
#i10000# added l10n langpacks
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index d61b134..6ecd36d 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -17,8 +17,8 @@ OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pr
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
-OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack
+OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de,ar,as,ast,bg,bn,ca,cs,da,de,dz,el,en-GB,en-US,eo,es,et,eu,fi,fr,gl,gu,hi-IN,hu,id,is,it,ja,ka,km,kn,ko,ku,lv,ml,mr,my,nl,oc,om,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,si,sk,sl,sr,sv,ta,te,th,tr,ug,uk,uz,vi,zh-CN,zh-TW ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack
-OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar ooodevlanguagepack
-#BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
+OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar,de,ar,as,ast,bg,bn,ca,cs,da,de,dz,el,en-GB,en-US,eo,es,et,eu,fi,fr,gl,gu,hi-IN,hu,id,is,it,ja,ka,km,kn,ko,ku,lv,ml,mr,my,nl,oc,om,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,si,sk,sl,sr,sv,ta,te,th,tr,ug,uk,uz,vi,zh-CN,zh-TW ooodevlanguagepack
+BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack
More information about the ooo-build-commit
mailing list