[ooo-build-commit] Branch 'ooo/OOO320' - 4 commits - instsetoo_native/util scp2/source solenv/config

Jan Holesovsky kendy at kemper.freedesktop.org
Wed Nov 25 17:14:15 PST 2009


 instsetoo_native/util/pack.lst                             |    4 -
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   48 -------------
 solenv/config/sooo320.ini                                  |    2 
 solenv/config/ssolar.cmn                                   |    1 
 4 files changed, 5 insertions(+), 50 deletions(-)

New commits:
commit bbbc2fa7ce4f369b0b568e5d945b1cbeb9d33133
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Nov 25 11:34:04 2009 +0000

    #i10000# fixed languages

diff --git a/solenv/config/sooo320.ini b/solenv/config/sooo320.ini
index 9cd0b5a..c629593 100644
--- a/solenv/config/sooo320.ini
+++ b/solenv/config/sooo320.ini
@@ -89,7 +89,7 @@ common
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
-			WITH_LANG af ar as-IN be-BY bg bn br brx bs ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu gu-IN he hi-IN hr hu id it ja ka kk km kn-IN ko kok ks ku lt mai mk ml-IN mn mni mr-IN my nb ne nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sa-IN sat sd sh sk sl sr ss st sv sw-TZ ta ta-IN te-IN tg th ti-ER tn tr ts uk ur-IN uz ve vi xh zh-CN zh-TW zu
+			WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hr hu id is it ja ka kid kk km kn ko kok ks ku ln lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th ti tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu                                                                                                                                                                                                                                                                                             
 		}
 		pro:1 IF %UPDATER% != YES
 		{
commit 3a88f6216c4eb55f3b02248edda66cd8056a7c43
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Nov 25 10:32:52 2009 +0000

    #i10000# changed , to |

diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 6ecd36d..aff6c30 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,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.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     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   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,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
+OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro   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
 
commit 8e7c542f79c3bf09bf3c15a784e5949ef28b8eaf
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Nov 25 10:24:41 2009 +0000

    #i10000# merge issue fixed

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 472b099..8708469 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -184,50 +184,4 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Val64 = "Apartment";
 End
 
-// End registry entries for the PropertySheet handler
-
-// Begin registry items for the MS Indexing server filter component
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
-    Value = "OpenDocument Format Filter";
-	Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
-    Value = "OpenDocument Format Persistent Handler";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
-    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-End
-
-// End registry items for the MS Indexing server filter component
\ No newline at end of file
+// End registry entries for the PropertySheet handler
\ No newline at end of file
commit a866bc7353027b963913c3361eec4068bf707105
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 25 07:05:40 2009 +0000

    #i10000# BUILD_X64 is missing

diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index dca20cc..bfcaadf 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -42,6 +42,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+        BUILD_X64
 		CLASSPATH
 		CALL_CDECL
 		COMEX


More information about the ooo-build-commit mailing list