From 677c489be17a2417dbb6226e48e1aca9f0effa54 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 15 Apr 2007 21:34:38 +0000 Subject: [PATCH] use LibraryLocal on POSIX as well git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5086 212acab6-be3b-0410-9dea-997c60f758d6 --- Include/Library.nsh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Include/Library.nsh b/Include/Library.nsh index 213ea07e..f533a657 100644 --- a/Include/Library.nsh +++ b/Include/Library.nsh @@ -142,32 +142,28 @@ ### Get library version !macro __InstallLib_Helper_GetVersion TYPE FILE + !tempfile LIBRARY_TEMP_NSH + !ifdef NSIS_WIN32_MAKENSIS - !tempfile LIBRARY_TEMP_NSH !execute '"${NSISDIR}\Bin\LibraryLocal.exe" "${TYPE}" "${FILE}" "${LIBRARY_TEMP_NSH}"' - !include "${LIBRARY_TEMP_NSH}" - !delfile "${LIBRARY_TEMP_NSH}" - !undef LIBRARY_TEMP_NSH !else - !ifndef INSTALLLIB_GETVERSION_VARS_DEFINED + !execute 'LibraryLocal "${TYPE}" "${FILE}" "${LIBRARY_TEMP_NSH}"' - !define INSTALLLIB_GETVERSION_VARS_DEFINED + !if ${TYPE} == 'T' - Var /GLOBAL INSTALLLIB_VER_LOW - Var /GLOBAL INSTALLLIB_VER_HIGH + !warning "LibraryLocal currently supports TypeLibs version detection only on Windows" !endif - !define LIBRARY_VERSION_LOW $INSTALLLIB_VER_LOW - !define LIBRARY_VERSION_HIGH $INSTALLLIB_VER_HIGH - - GetDLLVersionLocal "${FILE}" $INSTALLLIB_VER_HIGH $INSTALLLIB_VER_LOW - !endif + !include "${LIBRARY_TEMP_NSH}" + !delfile "${LIBRARY_TEMP_NSH}" + !undef LIBRARY_TEMP_NSH + !macroend ### Install library