opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 18:12:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update all PostgreSQL libraries, add missing libiconv-2.dll, unify filename of 32bit version of libintl.dll (=> libintl-8.dll), and finally revert the previous 3 commits, which hopefully are not required with these updates. See http://www.heidisql.com/forum.php?t=21039

Browse Source
This commit is contained in:
Ansgar Becker
2016-04-08 16:26:00 +00:00
parent 4645c38bc2
commit 91cefe7c5e
14 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
out/heidisql.iss
View File

@ -94,11 +94,13 @@ Source: "libmysql32.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Check: not
Source: "libpq64.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: Is64BitInstallMode; Flags: ignoreversion Source: "libpq64.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "libintl-864.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Check: Is64BitInstallMode; Flags: ignoreversion Source: "libintl-864.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "libintl32.dll"; DestDir: "{app}"; DestName: "libintl.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion Source: "libintl-832.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "ssleay32-64.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion Source: "ssleay32-64.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "libeay32-64.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion Source: "libeay32-64.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "libiconv-264.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "libiconv-232.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "plugins64\*.dll"; DestDir: "{app}\plugins"; Check: Is64BitInstallMode; Flags: ignoreversion Source: "plugins64\*.dll"; DestDir: "{app}\plugins"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Check: not Is64BitInstallMode; Flags: ignoreversion Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Check: not Is64BitInstallMode; Flags: ignoreversion
Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets"; Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets";

3
out/heidisql32.iss
View File

@ -91,9 +91,10 @@ Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "gpl.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "gpl.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "libmysql32.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Flags: ignoreversion Source: "libmysql32.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Flags: ignoreversion
Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Flags: ignoreversion Source: "libpq32.dll"; DestDir: "{app}"; DestName: "libpq.dll"; Flags: ignoreversion
Source: "libintl32.dll"; DestDir: "{app}"; DestName: "libintl.dll"; Flags: ignoreversion Source: "libintl-832.dll"; DestDir: "{app}"; DestName: "libintl-8.dll"; Flags: ignoreversion
Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Flags: ignoreversion Source: "ssleay32-32.dll"; DestDir: "{app}"; DestName: "ssleay32.dll"; Flags: ignoreversion
Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Flags: ignoreversion Source: "libeay32-32.dll"; DestDir: "{app}"; DestName: "libeay32.dll"; Flags: ignoreversion
Source: "libiconv-232.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Flags: ignoreversion
Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion Source: "plugins32\*.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion
Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets"; Source: "Snippets\*.sql"; DestDir: "{commonappdata}\{#ProgName}\Snippets";

BIN
out/libeay32-32.dll
View File

Binary file not shown.

BIN
out/libeay32-64.dll
View File

Binary file not shown.

BIN
out/libiconv-232.dll Normal file
View File

Binary file not shown.

BIN
out/libiconv-264.dll Normal file
View File

Binary file not shown.

BIN
out/libintl-832.dll Normal file
View File

Binary file not shown.

BIN
out/libintl-864.dll
View File

Binary file not shown.

BIN
out/libintl32.dll
View File

Binary file not shown.

BIN
out/libpq32.dll
View File

Binary file not shown.

BIN
out/libpq64.dll
View File

Binary file not shown.

BIN
out/ssleay32-32.dll
View File

Binary file not shown.

BIN
out/ssleay32-64.dll
View File

Binary file not shown.

9
source/dbconnection.pas
View File

@ -2090,18 +2090,15 @@ end;
procedure TPgConnection.DoBeforeConnect; procedure TPgConnection.DoBeforeConnect;
var
LibWithPath: String;
begin begin
// Init lib before actually connecting. // Init lib before actually connecting.
// Each connection has its own library handle // Each connection has its own library handle
if LibPqHandle = 0 then begin if LibPqHandle = 0 then begin
LibWithPath := ExtractFileDir(Application.ExeName) + '\' + LibPqPath; Log(lcDebug, f_('Loading library file %s ...', [LibPqPath]));
if not FileExists(LibWithPath) then LibPqHandle := LoadLibrary(PWideChar(LibPqPath));
if LibPqHandle = 0 then
raise EDatabaseError.CreateFmt(_('Cannot find a usable %s. Please launch %s from the directory where you have installed it.'), [LibPqPath, ExtractFileName(ParamStr(0))]) raise EDatabaseError.CreateFmt(_('Cannot find a usable %s. Please launch %s from the directory where you have installed it.'), [LibPqPath, ExtractFileName(ParamStr(0))])
else begin else begin
Log(lcDebug, f_('Loading library file %s ...', [LibWithPath]));
LibPqHandle := LoadLibrary(PWideChar(LibWithPath));
AssignProc(@PQconnectdb, 'PQconnectdb'); AssignProc(@PQconnectdb, 'PQconnectdb');
AssignProc(@PQerrorMessage, 'PQerrorMessage'); AssignProc(@PQerrorMessage, 'PQerrorMessage');
AssignProc(@PQresultErrorMessage, 'PQresultErrorMessage'); AssignProc(@PQresultErrorMessage, 'PQresultErrorMessage');