rpms/openoffice.org/devel experiment.parallel.patch,1.3,1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Sep 19 16:33:20 UTC 2005


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14601

Modified Files:
	experiment.parallel.patch 
Log Message:
add more

experiment.parallel.patch:
 configmgr/prj/build.lst                            |   27 ++++-----
 cppuhelper/source/makefile.mk                      |   60 ---------------------
 cpputools/source/registercomponent/makefile.mk     |   20 -------
 cpputools/source/regsingleton/makefile.mk          |   22 -------
 cpputools/source/unoexe/makefile.mk                |   30 ----------
 io/source/TextInputStream/makefile.mk              |   18 ------
 io/source/TextOutputStream/makefile.mk             |   16 -----
 io/source/acceptor/makefile.mk                     |    8 --
 io/source/connector/makefile.mk                    |    8 --
 io/source/stm/makefile.mk                          |    7 --
 prj/build.lst                                      |    0 
 source/TextInputStream/makefile.mk                 |    0 
 source/TextOutputStream/makefile.mk                |    0 
 source/acceptor/makefile.mk                        |    0 
 source/config/makefile.mk                          |    0 
 source/connector/makefile.mk                       |    0 
 source/corereflection/makefile.mk                  |    0 
 source/defaultregistry/makefile.mk                 |    0 
 source/i18n/makefile.mk                            |    0 
 source/implementationregistration/makefile.mk      |    0 
 source/inspect/makefile.mk                         |    0 
 source/invocation/makefile.mk                      |    0 
 source/invocation_adapterfactory/makefile.mk       |    0 
 source/javaloader/makefile.mk                      |    0 
 source/javavm/makefile.mk                          |    0 
 source/loader/makefile.mk                          |    0 
 source/makefile.mk                                 |    0 
 source/misc/makefile.mk                            |    0 
 source/namingservice/makefile.mk                   |    0 
 source/proxy_factory/makefile.mk                   |    0 
 source/registercomponent/makefile.mk               |    0 
 source/registry_tdprovider/makefile.mk             |    0 
 source/regsingleton/makefile.mk                    |    0 
 source/security/makefile.mk                        |    0 
 source/servicemanager/makefile.mk                  |    0 
 source/simpleregistry/makefile.mk                  |    0 
 source/stm/makefile.mk                             |    0 
 source/tdmanager/makefile.mk                       |    0 
 source/typeconv/makefile.mk                        |    0 
 source/unoexe/makefile.mk                          |    0 
 source/uriproc/makefile.mk                         |    0 
 stoc/source/corereflection/makefile.mk             |    3 -
 stoc/source/defaultregistry/makefile.mk            |    3 -
 stoc/source/implementationregistration/makefile.mk |    3 -
 stoc/source/inspect/makefile.mk                    |    3 -
 stoc/source/invocation/makefile.mk                 |    3 -
 stoc/source/invocation_adapterfactory/makefile.mk  |    3 -
 stoc/source/javaloader/makefile.mk                 |    3 -
 stoc/source/javavm/makefile.mk                     |    3 -
 stoc/source/loader/makefile.mk                     |    3 -
 stoc/source/namingservice/makefile.mk              |    3 -
 stoc/source/proxy_factory/makefile.mk              |    3 -
 stoc/source/registry_tdprovider/makefile.mk        |    3 -
 stoc/source/security/makefile.mk                   |    3 -
 stoc/source/servicemanager/makefile.mk             |    3 -
 stoc/source/simpleregistry/makefile.mk             |    3 -
 stoc/source/tdmanager/makefile.mk                  |    3 -
 stoc/source/typeconv/makefile.mk                   |    3 -
 stoc/source/uriproc/makefile.mk                    |   17 -----
 ucbhelper/prj/build.lst                            |    5 -
 unotools/source/config/makefile.mk                 |   14 ----
 unotools/source/i18n/makefile.mk                   |   26 ---------
 unotools/source/misc/makefile.mk                   |    6 --
 63 files changed, 16 insertions(+), 319 deletions(-)

Index: experiment.parallel.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/experiment.parallel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- experiment.parallel.patch	19 Sep 2005 14:38:14 -0000	1.3
+++ experiment.parallel.patch	19 Sep 2005 16:33:16 -0000	1.4
@@ -89,3 +89,834 @@
 +uh	ucbhelper\source\client		nmake	-	all	uh_client NULL
 +uh	ucbhelper\source\provider	nmake	-	all	uh_provider NULL
  uh	ucbhelper\util			nmake	-	all	uh_util uh_client uh_provider NULL
+Index: source/registercomponent/makefile.mk
+===================================================================
+RCS file: /cvs/udk/cpputools/source/registercomponent/makefile.mk,v
+retrieving revision 1.15
+diff -u -p -u -r1.15 makefile.mk
+--- openoffice.org.orig/cpputools/source/registercomponent/makefile.mk	8 Sep 2005 09:37:23 -0000	1.15
++++ openoffice.org/cpputools/source/registercomponent/makefile.mk	19 Sep 2005 15:54:32 -0000
+@@ -49,27 +49,9 @@ LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-
+-UNOUCROUT = $(OUT)$/inc$/$(TARGET)
+-INCPRE += $(UNOUCROUT)
+-CPPUMAKERFLAGS += -C
+-
++# --- Files --------------------------------------------------------
+ UNIXTEXT= $(MISC)$/regcomp.sh
+-UNOTYPES=\
+-		 	com.sun.star.uno.TypeClass \
+-		 	com.sun.star.lang.XMultiServiceFactory \
+-		 	com.sun.star.lang.XSingleServiceFactory \
+-		 	com.sun.star.lang.XMultiComponentFactory \
+-		 	com.sun.star.lang.XSingleComponentFactory \
+-		 	com.sun.star.lang.XComponent \
+-		 	com.sun.star.container.XContentEnumerationAccess \
+-		 	com.sun.star.container.XSet \
+-		 	com.sun.star.loader.CannotActivateFactoryException \
+-			com.sun.star.registry.XImplementationRegistration
+ 
+-# --- Files --------------------------------------------------------
+ CDEFS += -DDLL_VERSION=\"$(UPD)$(DLLPOSTFIX)\"
+ 
+ DEPOBJFILES=   $(OBJ)$/registercomponent.obj 
+Index: source/regsingleton/makefile.mk
+===================================================================
+RCS file: /cvs/udk/cpputools/source/regsingleton/makefile.mk,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 makefile.mk
+--- openoffice.org.orig/cpputools/source/regsingleton/makefile.mk	8 Sep 2005 09:38:15 -0000	1.5
++++ openoffice.org/cpputools/source/regsingleton/makefile.mk	19 Sep 2005 15:54:32 -0000
+@@ -44,28 +44,6 @@ NO_BSYMBOLIC=TRUE
+ 
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-
+-UNOUCROUT = $(OUT)$/inc$/$(TARGET)
+-INCPRE += $(UNOUCROUT)
+-CPPUMAKERFLAGS+= -C
+-
+-UNOTYPES= \
+- 	com.sun.star.uno.TypeClass \
+- 	com.sun.star.uno.XAggregation \
+- 	com.sun.star.uno.XWeak \
+- 	com.sun.star.uno.XComponentContext \
+- 	com.sun.star.lang.XTypeProvider \
+- 	com.sun.star.lang.XComponent \
+- 	com.sun.star.lang.XSingleServiceFactory \
+- 	com.sun.star.lang.XSingleComponentFactory \
+- 	com.sun.star.lang.XMultiServiceFactory \
+- 	com.sun.star.lang.XMultiComponentFactory \
+- 	com.sun.star.container.XHierarchicalNameAccess \
+-	com.sun.star.registry.XSimpleRegistry \
+-	com.sun.star.registry.XRegistryKey
+-
+ # --- Files --------------------------------------------------------
+ 
+ DEPOBJFILES= \
+Index: source/unoexe/makefile.mk
+===================================================================
+RCS file: /cvs/udk/cpputools/source/unoexe/makefile.mk,v
+retrieving revision 1.12
+diff -u -p -u -r1.12 makefile.mk
+--- openoffice.org.orig/cpputools/source/unoexe/makefile.mk	8 Sep 2005 09:39:36 -0000	1.12
++++ openoffice.org/cpputools/source/unoexe/makefile.mk	19 Sep 2005 15:54:32 -0000
+@@ -50,36 +50,6 @@ LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:
+ 
+ .INCLUDE :  settings.mk
+ 
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-
+-UNOUCROUT = $(OUT)$/inc$/$(TARGET)
+-INCPRE += $(UNOUCROUT)
+-CPPUMAKERFLAGS+= -C
+-
+-UNOTYPES= \
+- 	com.sun.star.uno.TypeClass \
+- 	com.sun.star.uno.XAggregation \
+- 	com.sun.star.uno.XWeak \
+- 	com.sun.star.uno.XComponentContext \
+- 	com.sun.star.lang.XTypeProvider \
+-	com.sun.star.lang.XMain \
+- 	com.sun.star.lang.XInitialization \
+- 	com.sun.star.lang.XComponent \
+- 	com.sun.star.lang.XSingleServiceFactory \
+- 	com.sun.star.lang.XSingleComponentFactory \
+- 	com.sun.star.lang.XMultiServiceFactory \
+- 	com.sun.star.lang.XMultiComponentFactory \
+- 	com.sun.star.container.XSet \
+- 	com.sun.star.container.XHierarchicalNameAccess \
+-	com.sun.star.loader.XImplementationLoader \
+-	com.sun.star.registry.XSimpleRegistry \
+-	com.sun.star.registry.XRegistryKey \
+-	com.sun.star.connection.XAcceptor \
+-	com.sun.star.connection.XConnection \
+-	com.sun.star.bridge.XBridgeFactory \
+-	com.sun.star.bridge.XBridge
+-
+ # --- Files --------------------------------------------------------
+ 
+ DEPOBJFILES=$(OBJ)$/unoexe.obj
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/util/configmgr/prj/build.lst,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 build.lst
+--- openoffice.org.orig/configmgr/prj/build.lst	30 Mar 2004 14:52:16 -0000	1.14
++++ openoffice.org/configmgr/prj/build.lst	19 Sep 2005 15:57:24 -0000
+@@ -1,19 +1,18 @@
+ cg	configmgr	:	offapi comphelper cppuhelper vos NULL
+ cg	configmgr								usr1	-	all	cg_mkout NULL
+ cg	configmgr\source\cmdtools				nmake	-	all	cg_cmdtools cg_misc NULL
+-cg	configmgr\source\cppugen				nmake	-	all	cg_cppugen NULL
+-cg	configmgr\source\misc					nmake	-	all	cg_misc cg_cppugen NULL
+-cg	configmgr\source\data					nmake	-	all	cg_data cg_cppugen NULL
+-cg	configmgr\source\tree					nmake	-	all	cg_tree cg_cppugen NULL
+-cg	configmgr\source\treecache				nmake	-	all	cg_trcache cg_cppugen NULL
+-cg	configmgr\source\xml					nmake	-	all	cg_xml cg_cppugen NULL
+-cg	configmgr\source\backend				nmake	-	all	cg_backend cg_cppugen NULL
+-cg	configmgr\source\backendhelper			nmake	-	all	cg_backendhelper cg_cppugen NULL
+-cg	configmgr\source\api					nmake	-	all	cg_api cg_cppugen NULL
+-cg	configmgr\source\api2					nmake	-	all	cg_api2 cg_cppugen NULL
+-cg	configmgr\source\treemgr				nmake	-	all	cg_treemgr cg_cppugen NULL
+-cg	configmgr\source\registry				nmake	-	all	cg_reg cg_cppugen NULL
+-cg	configmgr\source\platformbe				nmake	-	all	cg_platformbe cg_cppugen NULL
++cg	configmgr\source\misc					nmake	-	all	cg_misc NULL
++cg	configmgr\source\data					nmake	-	all	cg_data NULL
++cg	configmgr\source\tree					nmake	-	all	cg_tree NULL
++cg	configmgr\source\treecache				nmake	-	all	cg_trcache NULL
++cg	configmgr\source\xml					nmake	-	all	cg_xml NULL
++cg	configmgr\source\backend				nmake	-	all	cg_backend NULL
++cg	configmgr\source\backendhelper			nmake	-	all	cg_backendhelper NULL
++cg	configmgr\source\api					nmake	-	all	cg_api NULL
++cg	configmgr\source\api2					nmake	-	all	cg_api2 NULL
++cg	configmgr\source\treemgr				nmake	-	all	cg_treemgr NULL
++cg	configmgr\source\registry				nmake	-	all	cg_reg NULL
++cg	configmgr\source\platformbe				nmake	-	all	cg_platformbe NULL
+ cg	configmgr\util							nmake	-	all	cg_util cg_platformbe cg_api cg_api2 cg_cmdtools cg_misc cg_reg cg_trcache cg_data cg_tree cg_treemgr cg_xml cg_backend cg_localbe NULL
+-cg	configmgr\source\localbe				nmake	-	all	cg_localbe cg_cppugen NULL
++cg	configmgr\source\localbe				nmake	-	all	cg_localbe NULL
+ 
+Index: source/TextInputStream/makefile.mk
+===================================================================
+RCS file: /cvs/util/io/source/TextInputStream/makefile.mk,v
+retrieving revision 1.13
+diff -u -p -u -r1.13 makefile.mk
+--- openoffice.org.orig/io/source/TextInputStream/makefile.mk	7 Sep 2005 18:26:28 -0000	1.13
++++ openoffice.org/io/source/TextInputStream/makefile.mk	19 Sep 2005 16:09:03 -0000
+@@ -46,24 +46,6 @@ NO_BSYMBOLIC=TRUE
+ .INCLUDE :  sv.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCROUT=$(OUT)$/inc$/textinputstream
+-INCPRE+= $(UNOUCROUT)
+-
+-
+-UNOTYPES=	com.sun.star.io.XTextInputStream \
+-		com.sun.star.io.XActiveDataSink \
+-		com.sun.star.lang.XSingleComponentFactory \
+-		com.sun.star.lang.XSingleServiceFactory \
+-		com.sun.star.lang.XMultiServiceFactory \
+-		com.sun.star.lang.XTypeProvider \
+-		com.sun.star.lang.XServiceInfo \
+-		com.sun.star.registry.XRegistryKey \
+-		com.sun.star.reflection.XInterfaceMemberTypeDescription \
+-		com.sun.star.uno.XAggregation \
+-		com.sun.star.uno.XWeak	\
+-		com.sun.star.uno.XComponentContext
+ 
+ SLOFILES= \
+ 	$(SLO)$/TextInputStream.obj
+Index: source/TextOutputStream/makefile.mk
+===================================================================
+RCS file: /cvs/util/io/source/TextOutputStream/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/io/source/TextOutputStream/makefile.mk	7 Sep 2005 18:27:03 -0000	1.11
++++ openoffice.org/io/source/TextOutputStream/makefile.mk	19 Sep 2005 16:09:03 -0000
+@@ -46,22 +46,6 @@ NO_BSYMBOLIC=TRUE
+ .INCLUDE :  sv.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCROUT=$(OUT)$/inc$/textoutputstream
+-INCPRE+= $(UNOUCROUT)
+-
+-UNOTYPES=	com.sun.star.io.XTextOutputStream \
+-		com.sun.star.io.XActiveDataSource \
+-		com.sun.star.lang.XSingleServiceFactory \
+-		com.sun.star.lang.XMultiServiceFactory \
+-		com.sun.star.lang.XTypeProvider \
+-        com.sun.star.lang.XSingleComponentFactory   \
+-		com.sun.star.lang.XServiceInfo \
+-        com.sun.star.uno.XComponentContext          \
+-		com.sun.star.registry.XRegistryKey \
+-		com.sun.star.uno.XAggregation \
+-		com.sun.star.uno.XWeak 
+ 
+ SLOFILES= \
+ 	$(SLO)$/TextOutputStream.obj
+Index: source/acceptor/makefile.mk
+===================================================================
+RCS file: /cvs/util/io/source/acceptor/makefile.mk,v
+retrieving revision 1.13
+diff -u -p -u -r1.13 makefile.mk
+--- openoffice.org.orig/io/source/acceptor/makefile.mk	7 Sep 2005 18:28:27 -0000	1.13
++++ openoffice.org/io/source/acceptor/makefile.mk	19 Sep 2005 16:09:03 -0000
+@@ -39,8 +39,6 @@ PRJNAME=io
+ TARGET = acceptor.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+-COMP1TYPELIST = acceptor
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  svpre.mk
+@@ -48,12 +46,6 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ .INCLUDE :  sv.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+-
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCROUT=$(OUT)$/inc$/acceptor
+-INCPRE+= $(UNOUCROUT)
+-
+ 
+ SLOFILES= \
+ 		$(SLO)$/acceptor.obj \
+Index: source/connector/makefile.mk
+===================================================================
+RCS file: /cvs/util/io/source/connector/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/io/source/connector/makefile.mk	7 Sep 2005 18:29:46 -0000	1.11
++++ openoffice.org/io/source/connector/makefile.mk	19 Sep 2005 16:09:03 -0000
+@@ -39,8 +39,6 @@ PRJNAME=io
+ TARGET = connector.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+-COMP1TYPELIST = connectr
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  svpre.mk
+@@ -48,12 +46,6 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ .INCLUDE :  sv.mk
+ DLLPRE =
+ # ------------------------------------------------------------------
+-
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCROUT=$(OUT)$/inc$/connector
+-INCPRE+= $(UNOUCROUT)
+-
+ 
+ SLOFILES= \
+ 	$(SLO)$/connector.obj\
+Index: source/stm/makefile.mk
+===================================================================
+RCS file: /cvs/util/io/source/stm/makefile.mk,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 makefile.mk
+--- openoffice.org.orig/io/source/stm/makefile.mk	7 Sep 2005 18:30:31 -0000	1.10
++++ openoffice.org/io/source/stm/makefile.mk	19 Sep 2005 16:09:03 -0000
+@@ -38,8 +38,6 @@ PRJNAME=io
+ TARGET = streams.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC=TRUE
+-COMP1TYPELIST = stm
+-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ 
+ # --- Settings -----------------------------------------------------
+ .INCLUDE :  svpre.mk
+@@ -47,11 +45,6 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+ .INCLUDE :  sv.mk
+ DLLPRE =
+ # --- Files --------------------------------------------------------
+-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+-UNOUCROUT=$(OUT)$/inc$/stm
+-INCPRE+= $(UNOUCROUT)
+-
+ 
+ SLOFILES = 	$(SLO)$/opipe.obj\
+ 		$(SLO)$/factreg.obj\
+Index: source/config/makefile.mk
+===================================================================
+RCS file: /cvs/util/unotools/source/config/makefile.mk,v
+retrieving revision 1.12
+diff -u -p -u -r1.12 makefile.mk
+--- openoffice.org.orig/unotools/source/config/makefile.mk	9 Sep 2005 09:42:59 -0000	1.12
++++ openoffice.org/unotools/source/config/makefile.mk	19 Sep 2005 16:16:00 -0000
+@@ -40,20 +40,6 @@ TARGET=config
+ 
+ ENABLE_EXCEPTIONS=TRUE
+ 
+-# --- Settings common for the whole project -----
+-
+-#UNOTYPES=
+-
+-UNOTYPES+= com.sun.star.configuration.XTemplateContainer \
+-            com.sun.star.util.XChangesListener  \
+-            com.sun.star.util.XChangesNotifier  \
+-            com.sun.star.util.XStringEscape     \
+-            com.sun.star.util.XChangesBatch     \
+-            com.sun.star.uno.XWeak              \
+-            com.sun.star.uno.XAggregation
+-
+-.INCLUDE : $(PRJINC)$/unotools$/unotools.mk
+-
+ # --- Settings ----------------------------------
+ 
+ .INCLUDE : settings.mk
+Index: source/i18n/makefile.mk
+===================================================================
+RCS file: /cvs/util/unotools/source/i18n/makefile.mk,v
+retrieving revision 1.18
+diff -u -p -u -r1.18 makefile.mk
+--- openoffice.org.orig/unotools/source/i18n/makefile.mk	9 Sep 2005 09:44:55 -0000	1.18
++++ openoffice.org/unotools/source/i18n/makefile.mk	19 Sep 2005 16:16:00 -0000
+@@ -50,32 +50,6 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE : settings.mk
+ .INCLUDE :      $(PRJ)$/util$/makefile.pmk
+ 
+-# --- Types -------------------------------------
+-
+-
+-UNOTYPES+= \
+-	com.sun.star.i18n.CalendarDisplayIndex  \
+-	com.sun.star.i18n.CalendarFieldIndex    \
+-	com.sun.star.i18n.CollatorOptions       \
+-	com.sun.star.i18n.KCharacterType        \
+-	com.sun.star.i18n.KNumberFormatType     \
+-	com.sun.star.i18n.KNumberFormatUsage    \
+-	com.sun.star.i18n.KParseTokens          \
+-	com.sun.star.i18n.KParseType            \
+-	com.sun.star.i18n.LocaleItem            \
+-	com.sun.star.i18n.XCalendar             \
+-	com.sun.star.i18n.XCharacterClassification \
+-	com.sun.star.i18n.XCollator             \
+-	com.sun.star.i18n.XExtendedTransliteration      \
+-	com.sun.star.i18n.XLocaleData           \
+-	com.sun.star.i18n.XNativeNumberSupplier	\
+-	com.sun.star.i18n.XNumberFormatCode     \
+-	com.sun.star.i18n.XTransliteration      \
+-	com.sun.star.i18n.reservedWords         \
+-	com.sun.star.util.SearchFlags           \
+-	com.sun.star.util.XTextSearch
+-
+-
+ # --- Files -------------------------------------
+ 
+ SLOFILES=	\
+Index: source/misc/makefile.mk
+===================================================================
+RCS file: /cvs/util/unotools/source/misc/makefile.mk,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 makefile.mk
+--- openoffice.org.orig/unotools/source/misc/makefile.mk	9 Sep 2005 09:47:29 -0000	1.14
++++ openoffice.org/unotools/source/misc/makefile.mk	19 Sep 2005 16:16:00 -0000
+@@ -40,12 +40,6 @@ TARGET=misc
+ 
+ ENABLE_EXCEPTIONS=TRUE
+ 
+-# --- Settings common for the whole project -----
+-
+-#UNOTYPES=
+-UNOTYPES+= com.sun.star.util.XAtomServer
+-#.INCLUDE : $(PRJINC)$/unotools$/unotools.mk
+-
+ # --- Settings ----------------------------------
+ 
+ .INCLUDE : settings.mk
+Index: source/corereflection/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/corereflection/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/stoc/source/corereflection/makefile.mk	8 Sep 2005 07:53:53 -0000	1.11
++++ openoffice.org/stoc/source/corereflection/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=	stoc
+ TARGET = reflection.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = corefl
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = corefl
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES=	\
+ 		$(SLO)$/crefl.obj	\
+Index: source/defaultregistry/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/defaultregistry/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/stoc/source/defaultregistry/makefile.mk	8 Sep 2005 07:54:27 -0000	1.11
++++ openoffice.org/stoc/source/defaultregistry/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = nestedreg.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = defreg
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = defreg
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/defaultregistry.obj
+Index: source/implementationregistration/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/implementationregistration/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/stoc/source/implementationregistration/makefile.mk	8 Sep 2005 07:55:02 -0000	1.11
++++ openoffice.org/stoc/source/implementationregistration/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = implreg.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = impreg
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = impreg
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/mergekeys.obj	\
+Index: source/inspect/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/inspect/makefile.mk,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 makefile.mk
+--- openoffice.org.orig/stoc/source/inspect/makefile.mk	8 Sep 2005 07:56:07 -0000	1.9
++++ openoffice.org/stoc/source/inspect/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=	stoc
+ TARGET = introspection.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = insp
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = insp
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/introspection.obj
+Index: source/invocation/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/invocation/makefile.mk,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 makefile.mk
+--- openoffice.org.orig/stoc/source/invocation/makefile.mk	8 Sep 2005 07:56:43 -0000	1.10
++++ openoffice.org/stoc/source/invocation/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=	stoc
+ TARGET = invocation.uno
+ NO_BSYMBOLIC = TRUE
+ ENABLE_EXCEPTIONS=TRUE
+-COMP1TYPELIST = inv
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = inv
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/invocation.obj
+Index: source/invocation_adapterfactory/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/invocation_adapterfactory/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/stoc/source/invocation_adapterfactory/makefile.mk	8 Sep 2005 07:57:19 -0000	1.11
++++ openoffice.org/stoc/source/invocation_adapterfactory/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=stoc
+ TARGET = invocadapt.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = invadp
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = invadp
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES=	\
+ 		$(SLO)$/iafactory.obj
+Index: source/javaloader/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
+retrieving revision 1.16
+diff -u -p -u -r1.16 makefile.mk
+--- openoffice.org.orig/stoc/source/javaloader/makefile.mk	8 Sep 2005 07:57:58 -0000	1.16
++++ openoffice.org/stoc/source/javaloader/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ PRJNAME=stoc
+ TARGET = javaloader.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = javaloader
+ 
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+ # --- Settings -----------------------------------------------------
+@@ -48,8 +47,6 @@ COMP1TYPELIST = javaloader
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= 	$(SLO)$/javaloader.obj
+ 
+Index: source/javavm/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/javavm/makefile.mk,v
+retrieving revision 1.18
+diff -u -p -u -r1.18 makefile.mk
+--- openoffice.org.orig/stoc/source/javavm/makefile.mk	8 Sep 2005 08:00:33 -0000	1.18
++++ openoffice.org/stoc/source/javavm/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=stoc
+ TARGET = javavm.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = jen
+ 
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+ # --- Settings -----------------------------------------------------
+@@ -54,8 +53,6 @@ DLLPRE =
+ .IF "$(COM)" == "GCC"
+ CDEFS += -D__SGI_STL_BOOL_H
+ .ENDIF
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/javavm.obj		\
+Index: source/loader/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/loader/makefile.mk,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 makefile.mk
+--- openoffice.org.orig/stoc/source/loader/makefile.mk	8 Sep 2005 08:01:06 -0000	1.9
++++ openoffice.org/stoc/source/loader/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = shlibloader.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = cpld
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = cpld
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/dllcomponentloader.obj
+Index: source/namingservice/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/namingservice/makefile.mk,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 makefile.mk
+--- openoffice.org.orig/stoc/source/namingservice/makefile.mk	8 Sep 2005 08:01:23 -0000	1.8
++++ openoffice.org/stoc/source/namingservice/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -38,7 +38,6 @@ PRJNAME=	stoc
+ TARGET = namingservice.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = namingservice
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = namingservice
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/namingservice.obj
+Index: source/proxy_factory/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/proxy_factory/makefile.mk,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 makefile.mk
+--- openoffice.org.orig/stoc/source/proxy_factory/makefile.mk	8 Sep 2005 08:01:57 -0000	1.9
++++ openoffice.org/stoc/source/proxy_factory/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ PRJNAME=stoc
+ TARGET = proxyfac.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = proxyfac
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = proxyfac
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/proxyfac.obj
+Index: source/registry_tdprovider/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/registry_tdprovider/makefile.mk,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 makefile.mk
+--- openoffice.org.orig/stoc/source/registry_tdprovider/makefile.mk	8 Sep 2005 08:03:23 -0000	1.14
++++ openoffice.org/stoc/source/registry_tdprovider/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = regtypeprov.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = rdbtdp
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = rdbtdp
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES=	\
+ 		$(SLO)$/tdprovider.obj	\
+Index: source/security/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/security/makefile.mk,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 makefile.mk
+--- openoffice.org.orig/stoc/source/security/makefile.mk	8 Sep 2005 08:10:14 -0000	1.5
++++ openoffice.org/stoc/source/security/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = security.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = sec
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = sec
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/permissions.obj			\
+Index: source/servicemanager/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/servicemanager/makefile.mk,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 makefile.mk
+--- openoffice.org.orig/stoc/source/servicemanager/makefile.mk	8 Sep 2005 08:11:13 -0000	1.9
++++ openoffice.org/stoc/source/servicemanager/makefile.mk	19 Sep 2005 16:31:24 -0000
+@@ -39,7 +39,6 @@ TARGET = servicemgr.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = smgr
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = smgr
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/servicemanager.obj
+Index: source/simpleregistry/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/simpleregistry/makefile.mk,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 makefile.mk
+--- openoffice.org.orig/stoc/source/simpleregistry/makefile.mk	8 Sep 2005 08:11:50 -0000	1.10
++++ openoffice.org/stoc/source/simpleregistry/makefile.mk	19 Sep 2005 16:31:25 -0000
+@@ -39,7 +39,6 @@ TARGET = simplereg.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = simreg
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = simreg
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/simpleregistry.obj
+Index: source/tdmanager/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/tdmanager/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 makefile.mk
+--- openoffice.org.orig/stoc/source/tdmanager/makefile.mk	8 Sep 2005 08:12:58 -0000	1.11
++++ openoffice.org/stoc/source/tdmanager/makefile.mk	19 Sep 2005 16:31:25 -0000
+@@ -39,7 +39,6 @@ TARGET = typemgr.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+ BOOTSTRAP_SERVICE=TRUE
+-COMP1TYPELIST = tdmgr
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -47,8 +46,6 @@ COMP1TYPELIST = tdmgr
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+         $(SLO)$/tdmgr.obj \
+Index: source/typeconv/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/typeconv/makefile.mk,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 makefile.mk
+--- openoffice.org.orig/stoc/source/typeconv/makefile.mk	8 Sep 2005 08:15:14 -0000	1.8
++++ openoffice.org/stoc/source/typeconv/makefile.mk	19 Sep 2005 16:31:25 -0000
+@@ -38,7 +38,6 @@ PRJNAME=stoc
+ TARGET = typeconverter.uno
+ ENABLE_EXCEPTIONS=TRUE
+ NO_BSYMBOLIC = TRUE
+-COMP1TYPELIST = tcv
+ 
+ # --- Settings -----------------------------------------------------
+ 
+@@ -46,8 +45,6 @@ COMP1TYPELIST = tcv
+ DLLPRE =
+ 
+ # ------------------------------------------------------------------
+-
+-.INCLUDE :  ..$/cppumaker.mk
+ 
+ SLOFILES= \
+ 		$(SLO)$/convert.obj
+Index: source/uriproc/makefile.mk
+===================================================================
+RCS file: /cvs/udk/stoc/source/uriproc/makefile.mk,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 makefile.mk
+--- openoffice.org.orig/stoc/source/uriproc/makefile.mk	8 Sep 2005 08:18:57 -0000	1.5
++++ openoffice.org/stoc/source/uriproc/makefile.mk	19 Sep 2005 16:31:25 -0000
+@@ -43,23 +43,6 @@ ENABLE_EXCEPTIONS := TRUE
+ 
+ DLLPRE = # no leading "lib" on .so files
+ 
+-UNOTYPES = \
+-    com.sun.star.lang.WrappedTargetRuntimeException \
+-    com.sun.star.lang.XMultiComponentFactory \
+-    com.sun.star.lang.XServiceInfo \
+-    com.sun.star.uno.Exception \
+-    com.sun.star.uno.RuntimeException \
+-    com.sun.star.uno.XComponentContext \
+-    com.sun.star.uno.XInterface \
+-    com.sun.star.uri.RelativeUriExcessParentSegments \
+-    com.sun.star.uri.UriReferenceFactory \
+-    com.sun.star.uri.XExternalUriReferenceTranslator \
+-    com.sun.star.uri.XUriReference \
+-    com.sun.star.uri.XUriReferenceFactory \
+-    com.sun.star.uri.XUriSchemeParser \
+-    com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory \
+-    com.sun.star.uri.XVndSunStarScriptUrlReference
+-
+ SHL1TARGET = $(TARGET).uno
+ SHL1OBJS = \
+     $(SLO)$/ExternalUriReferenceTranslator.obj \




More information about the fedora-cvs-commits mailing list