[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - scp2/inc scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Nov 4 17:56:43 PST 2009
scp2/inc/macros.inc | 12 +++
scp2/source/ooo/file_library_ooo.scp | 17 ----
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/registryitem_ooo.scp | 46 -------------
scp2/source/winexplorerext/file_winexplorerext.scp | 14 +++
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 46 +++++++++++++
solenv/inc/libs.mk | 21 +++--
solenv/inc/minor.mk | 6 -
8 files changed, 90 insertions(+), 73 deletions(-)
New commits:
commit 59834fa99136a831eb9eb3177af05fa068e8f6d4
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Nov 4 10:30:53 2009 +0000
OOO320
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a36c20c..175153e 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=320
-RSCREVISION=320m3(Build:9436)
-BUILD=9436
-LAST_MINOR=m3
+RSCREVISION=320m4(Build:9450)
+BUILD=9450
+LAST_MINOR=m4
SOURCEVERSION=OOO320
commit 4be8b5d6672b450e578fe2e721fd2411ba6188a5
Author: Oliver Bolte <obo at openoffice.org>
Date: Wed Nov 4 10:12:54 2009 +0000
CWS-TOOLING: integrate CWS tkr27
2009-10-28 06:49:21 +0100 tkr r277234 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-27 12:25:20 +0100 tkr r277198 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-26 08:06:52 +0100 tkr r277172 : #105418# rename -lineon to -lneon for mingw port
2009-10-22 14:58:56 +0200 tkr r277125 : #i105418# rename neon lib name
2009-10-22 14:56:48 +0200 tkr r277123 : #i105418# rename neon lib name
2009-10-14 13:33:53 +0200 tkr r276894 : #i105891# windows ifilter relocated
2009-10-12 12:12:43 +0200 tkr r276826 : CWS-TOOLING: rebase CWS tkr27 to branches/OOO320 at 276773 (milestone: OOO320:m1)
2009-10-08 12:50:50 +0200 tkr r276787 : #i105418# introduced new defines for special_lib_file
2009-10-08 12:48:08 +0200 tkr r276786 : #i105418# build neon as shared library
2009-10-08 12:13:35 +0200 tkr r276782 : #i105418# build neon as shared library
2009-09-29 12:46:16 +0200 tkr r276523 : #i105418# build neon as shared library
2009-09-29 12:36:15 +0200 tkr r276522 : #i105418# build neon as shared library
2009-09-29 12:17:21 +0200 tkr r276519 : #i105418# build neon as shared library
2009-09-29 11:11:33 +0200 tkr r276512 : #i105418# build neon as shared library
2009-09-29 10:39:19 +0200 tkr r276509 : #i105418# build neon as shared library
2009-09-29 10:36:45 +0200 tkr r276508 : #i105418# build neon as shared library
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7d9cdbd..27ef934 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -156,6 +156,18 @@
PACKED_LIB_FILE_BODY_PATCH; \
End
+#define SPECIAL_LIB_FILE(id,name) \
+ File id \
+ Name = SPECIAL_NAME(name); \
+ PACKED_LIB_FILE_BODY; \
+ End
+
+#define SPECIAL_LIB_FILE_PATCH(id,name) \
+ File id \
+ Name = SPECIAL_NAME(name); \
+ PACKED_LIB_FILE_BODY_PATCH; \
+ End
+
#define STD_RES_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1685510..718eed7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1410,20 +1410,6 @@ End
#ifdef WNT
-File gid_File_Lib_OOoFilt
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "ooofilt.dll";
-End
-
-File gid_File_Lib_OOoFiltProxy
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "ooofiltproxy.dll";
-End
-
File gid_File_Lib_Instooofiltmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -1560,7 +1546,8 @@ File gid_File_Lib_Ucpchelp1
End
#ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
#endif
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9607c88..a6e276b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ucbhelper,
gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
+ gid_File_Lib_Neon,
gid_File_Lib_Ucpfile1,
gid_File_Lib_Ucpftp1,
gid_File_Lib_Ucphier1,
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 4e34805..8acb15d 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -518,52 +518,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
Value = "<progpath>\program";
End
-// 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\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
-
// "OpenWith" Windows Registry keys for extensions supported by OOo
// new oxt file extension for office extension packages
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index e7b3584..2f6b126 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -35,6 +35,20 @@ Directory gid_Dir_Shlxthdl
DosName = "shlxthdl";
End
+File gid_File_Lib_OOoFilt
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofilt.dll";
+End
+
+File gid_File_Lib_OOoFiltProxy
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "ooofiltproxy.dll";
+End
+
File gid_File_Lib_Shlxthdl
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 54974e9..0ce3c57 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -113,3 +113,49 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
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
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index cce1aac..5008168 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -220,12 +220,14 @@ JPEG3RDLIB=-ljpeg
.ELSE
JPEG3RDLIB=-ljpeglib
.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(SYSTEM_NEON)" == "YES"
+NEON3RDLIB=-lneon
+.ELIF "$(GUI)$(COM)"=="WNTGCC"
NEON3RDLIB=-lneon
.ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)/libneon.a
+NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
.ELSE
-NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC)
+NEON3RDLIB=-lneon
.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-ldb
@@ -348,11 +350,11 @@ AVMEDIALIB=iavmedia.lib
ICUINLIB=icuin.lib
ICULELIB=icule.lib
ICUUCLIB=icuuc.lib
-.IF "$(GUI)"=="OS2"
-ICUDATALIB=icudt.lib
-.ELSE
-ICUDATALIB=icudata.lib
-.ENDIF
+.IF "$(GUI)"=="OS2"
+ICUDATALIB=icudt.lib
+.ELSE
+ICUDATALIB=icudata.lib
+.ENDIF
I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib
I18NPAPERLIB=ii18npaper.lib
@@ -423,6 +425,7 @@ MAILLIB=mail.lib
DOCMGRLIB=docmgr.lib
BASICLIB=basic.lib
TKTLIB=tkt.lib
+SJLIB=sj.lib
SVXCORELIB=isvxcore.lib
SVXMSFILTERLIB=isvxmsfilter.lib
SVXLIB=isvx.lib
@@ -438,7 +441,7 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib
-NEON3RDLIB=neon.lib
+NEON3RDLIB=ineon.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
More information about the ooo-build-commit
mailing list