? unxmacxp.pro
? source/bridgetest/uno_services.rdb
Index: prj/d.lst
===================================================================
RCS file: /cvs/oo/udk/testtools/prj/d.lst,v
retrieving revision 1.1
diff -u -r1.1 d.lst
--- prj/d.lst	2001/05/04 07:05:17	1.1
+++ prj/d.lst	2002/01/24 03:47:55
@@ -1,2 +1,3 @@
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
Index: source/bridgetest/cppobj.cxx
===================================================================
RCS file: /cvs/oo/udk/testtools/source/bridgetest/cppobj.cxx,v
retrieving revision 1.1
diff -u -r1.1 cppobj.cxx
--- source/bridgetest/cppobj.cxx	2001/05/04 07:05:17	1.1
+++ source/bridgetest/cppobj.cxx	2002/01/24 03:47:57
@@ -462,13 +462,35 @@
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+void SAL_CALL 
+/* [ed] 1/20/02 Since we're building multiple libraries out of this single directory
+   the symbol renaming makefile suggestion for OS X doesn't work properly.  That only works
+   if all the sources in the directory build a single module.  Thus now we
+   need to explicitly rename the entry points here.
+   */
+#ifdef MACOSX
+	libcppobjcomponent_getImplementationEnvironment
+#else
+   component_getImplementationEnvironment
+#endif
+	(
 	const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
 {
 	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
+sal_Bool SAL_CALL 
+/* [ed] 1/20/02 Since we're building multiple libraries out of this single directory
+   the symbol renaming makefile suggestion for OS X doesn't work properly.  That only works
+   if all the sources in the directory build a single module.  Thus now we
+   need to explicitly rename the entry points here.
+   */
+#ifdef MACOSX
+	libcppobjcomponent_writeInfo
+#else
+	component_writeInfo
+#endif
+	(
 	void * pServiceManager, void * pRegistryKey )
 {
 	if (pRegistryKey)
@@ -490,7 +512,18 @@
 	return sal_False;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+void * SAL_CALL 
+/* [ed] 1/20/02 Since we're building multiple libraries out of this single directory
+   the symbol renaming makefile suggestion for OS X doesn't work properly.  That only works
+   if all the sources in the directory build a single module.  Thus now we
+   need to explicitly rename the entry points here.
+   */
+#ifdef MACOSX
+	libcppobjcomponent_getFactory
+#else
+	component_getFactory
+#endif
+	(
 	const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
 	void * pRet = 0;
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/oo/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.4
diff -u -r1.4 makefile.mk
--- source/bridgetest/makefile.mk	2001/06/29 08:06:28	1.4
+++ source/bridgetest/makefile.mk	2002/01/24 03:47:57
@@ -21,8 +21,20 @@
 BATCH_SUFFIX=.bat
 GIVE_EXEC_RIGHTS=@echo
 .ELSE
+
+# [ed] 1/19/02 Add in OS X support.  regcomp already adds in the "lib"
+# prefix and the ".dylib.frameowrk" postfix for us
+
+.IF "$(OS)"=="MACOSX"
+
+MY_DLLPOSTFIX=
+MY_DLLPREFIX=
+
+.ELSE
 MY_DLLPOSTFIX=.so
 MY_DLLPREFIX=lib
+.ENDIF
+
 DESTDIR=$(OUT)$/lib
 BATCH_INPROCESS=bridgetest_inprocess
 GIVE_EXEC_RIGHTS=chmod +x 
@@ -120,6 +132,21 @@
 
 # I can't make a dependency on shared libraries, because dependent targets
 # get the .setdir current directory. AAARGGGGGG !
+.IF "$(OS)"=="MACOSX"
+
+$(DESTDIR)$/uno_services.rdb : 
+	deliver.pl
+	regcomp -register -r uno_services.rdb \
+		-c $(MY_DLLPREFIX)bridgetest$(MY_DLLPOSTFIX)	\
+		-c $(MY_DLLPREFIX)cppobj$(MY_DLLPOSTFIX)		\
+		-c $(MY_DLLPREFIX)connectr$(MY_DLLPOSTFIX)		\
+		-c $(MY_DLLPREFIX)acceptor$(MY_DLLPOSTFIX)		\
+		-c $(MY_DLLPREFIX)brdgfctr$(MY_DLLPOSTFIX)		\
+		-c $(MY_DLLPREFIX)remotebridge$(MY_DLLPOSTFIX)	\
+		-c $(MY_DLLPREFIX)uuresolver$(MY_DLLPOSTFIX)
+
+.ELSE
+
 $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : 
 	regcomp -register -r uno_services.rdb \
 		-c $(MY_DLLPREFIX)bridgetest$(MY_DLLPOSTFIX)	\
@@ -129,3 +156,5 @@
 		-c $(MY_DLLPREFIX)brdgfctr$(MY_DLLPOSTFIX)		\
 		-c $(MY_DLLPREFIX)remotebridge$(MY_DLLPOSTFIX)	\
 		-c $(MY_DLLPREFIX)uuresolver$(MY_DLLPOSTFIX)	
+
+.ENDIF
\ No newline at end of file