mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MACOSX linker/loader bug workaround code.

Browse Source
This commit is contained in:
Ping Liao
2001-02-07 02:40:09 +00:00
parent fa0ab14b47
commit 7629ea50fb
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bridges/prj/d.lst
View File

@@ -29,4 +29,5 @@ mkdir: %_DEST%\inc%_EXT%\bridges\java
..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.* ..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libgcc2_uno*.dylib; fi" dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libgcc2_uno*.dylib; fi"
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libprot_uno*.dylib; fi"
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libjava_uno*.dylib; fi" dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libjava_uno*.dylib; fi"

9
cppu/source/uno/lbenv.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: lbenv.cxx,v $ * $RCSfile: lbenv.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: dbo $ $Date: 2001-02-01 09:12:44 $ * last change: $Author: pliao $ $Date: 2001-02-07 03:40:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -943,12 +943,7 @@ static uno_Environment * initDefaultEnvironment(
oslModule hMod = ::osl_loadModule( aStr.pData, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ); oslModule hMod = ::osl_loadModule( aStr.pData, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
if (hMod) if (hMod)
{ {
#ifdef MACOSX
OUString aSymbolName(
rEnvTypeName + OUString( RTL_CONSTASCII_USTRINGPARAM("_uno" UNO_INIT_ENVIRONMENT) ) );
#else
OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT) ); OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT) );
#endif
uno_initEnvironmentFunc fpInit = uno_initEnvironmentFunc fpInit =
(uno_initEnvironmentFunc)::osl_getSymbol( hMod, aSymbolName.pData ); (uno_initEnvironmentFunc)::osl_getSymbol( hMod, aSymbolName.pData );
if (fpInit) if (fpInit)

9
cppu/source/uno/lbmap.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: lbmap.cxx,v $ * $RCSfile: lbmap.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: mh $ $Date: 2001-01-31 09:36:30 $ * last change: $Author: pliao $ $Date: 2001-02-07 03:40:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -398,12 +398,7 @@ static Mapping loadExternalMapping(
if (hModule) if (hModule)
{ {
#ifdef MACOSX
OUString aSymbolName(
aName + OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) ) );
#else
OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) ); OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) );
#endif
uno_ext_getMappingFunc fpGetMapFunc = uno_ext_getMappingFunc fpGetMapFunc =
(uno_ext_getMappingFunc)::osl_getSymbol( hModule, aSymbolName.pData ); (uno_ext_getMappingFunc)::osl_getSymbol( hModule, aSymbolName.pData );

8
cppu/test/makefile.mk
View File

@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.9 $ # $Revision: 1.10 $
# #
# last change: $Author: dbo $ $Date: 2001-01-09 12:48:18 $ # last change: $Author: pliao $ $Date: 2001-02-07 03:40:09 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@@ -83,8 +83,8 @@ INCPRE+= $(OUT)$/inc$/test
OBJFILES= \ OBJFILES= \
$(OBJ)$/testcppu.obj \ $(OBJ)$/testcppu.obj \
$(OBJ)$/test_di.obj \ $(OBJ)$/test_di.obj
$(OBJ)$/test_Cincludes.obj # $(OBJ)$/test_Cincludes.obj
# $(OBJ)$/test_sec.obj \ # $(OBJ)$/test_sec.obj \

11
sal/osl/unx/module.c
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: module.c,v $ * $RCSfile: module.c,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: pliao $ $Date: 2001-02-05 00:44:08 $ * last change: $Author: pliao $ $Date: 2001-02-07 03:40:09 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -268,9 +268,12 @@ oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 n
if ( pModule ) if ( pModule )
{ {
// ignore ".dylib.framework"
int len = strlen( pszModuleName ) - 16;
pModule->pModule = pLib; pModule->pModule = pLib;
pModule->pModuleName = (sal_Char *)malloc( strlen( pszModuleName ) ); pModule->pModuleName = (sal_Char *)malloc( len );
strcpy( pModule->pModuleName, pszModuleName ); strncpy( pModule->pModuleName, pszModuleName, len );
pModule->pModuleName[len] = '\0';
} }
return pModule; return pModule;