diff options
-rw-r--r-- | jvmfwk/prj/d.lst | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 40 | ||||
-rw-r--r-- | jvmfwk/source/makefile.mk | 11 |
3 files changed, 31 insertions, 22 deletions
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 26758b1032f1..ac8c84af0faf 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -2,6 +2,8 @@ mkdir: %_DEST%\inc%_EXT%\jvmaccess ..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h ..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h ..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib +..\%__SRC%\lib\libjvmfwk*.so.*.*.* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libjvmfwk*.dylib* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\sunjavaplugin*.dll %_DEST%\bin%_EXT%\* ..\source\useatjava.txt %_DEST%\bin%_EXT%\useatjava.txt diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index cdb2bd3035e1..b6db069bf4ba 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -2,9 +2,9 @@ * * $RCSfile: framework.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: jl $ $Date: 2004-04-27 15:22:14 $ + * last change: $Author: jl $ $Date: 2004-04-28 10:13:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,11 +91,17 @@ namespace { JavaVM * g_pJavaVM = NULL; -sal_Bool SAL_CALL areEqualJavaInfo( +sal_Bool areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB) { return jfw_areEqualJavaInfo(pInfoA, pInfoB); } + +void freeJavaInfo( JavaInfo * pInfo) +{ + jfw_freeJavaInfo(pInfo); +} + } javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize) @@ -152,18 +158,18 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi & versionInfo); if (errcode != JFW_E_NONE) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_CONFIG_READWRITE; } osl::Module pluginLib(library.sPath); if (pluginLib.is() == sal_False) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_NO_PLUGIN; } getAllJavaInfos_ptr getAllJavaFunc = @@ -174,9 +180,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi if (getAllJavaFunc == NULL) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_ERROR; } //get all installations of one vendor according to minVersion, @@ -193,9 +199,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi if (plerr != JFW_PLUGIN_E_NONE) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_ERROR; } for (int i = 0; i < cInfos; i++) @@ -212,9 +218,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi OSL_ASSERT(getJavaInfoByPathFunc); if (getJavaInfoByPathFunc == NULL) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_ERROR; } typedef std::vector<rtl::OString>::const_iterator citLoc; @@ -237,9 +243,9 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi continue; else if (plerr !=JFW_PLUGIN_E_NONE) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); std::for_each(vecInfoManual.begin(), vecInfoManual.end(), - jfw_freeJavaInfo); + freeJavaInfo); return JFW_E_ERROR; } if (pInfo) @@ -263,8 +269,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi nSize * sizeof(JavaInfo*)); if (*pparInfo == NULL) { //delete JavaInfo objects - std::for_each(vecInfo.begin(), vecInfo.end(), jfw_freeJavaInfo); - std::for_each(vecInfoManual.begin(), vecInfoManual.end(), jfw_freeJavaInfo); + std::for_each(vecInfo.begin(), vecInfo.end(), freeJavaInfo); + std::for_each(vecInfoManual.begin(), vecInfoManual.end(), freeJavaInfo); return JFW_E_ERROR; } typedef std::vector<JavaInfo*>::iterator it; diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index aa7ff8e55e8d..7256c5307b01 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: jl $ $Date: 2004-04-27 15:22:15 $ +# last change: $Author: jl $ $Date: 2004-04-28 10:13:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -63,16 +63,17 @@ PRJ = .. PRJNAME = jvmfwk FRAMEWORKLIB=jvmfwk TARGET = $(FRAMEWORKLIB) -#LIBTARGET=NO ENABLE_EXCEPTIONS = TRUE +.IF "$(OS)" != "WNT" +UNIXVERSIONNAMES = UDK +.ENDIF # WNT .INCLUDE: settings.mk -DLLPRE = .IF "$(SOLAR_JAVA)"=="" nojava: - @echo "Not building jvmaccess because Java is disabled" + @echo "Not building jvmfwk because Java is disabled" .ENDIF |