From ccd8e5442c8d5e412ca022a24e0a4b2e35e8313d Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Thu, 10 May 2012 12:19:06 +0300 Subject: [PATCH] Fixed installation script for windows. Added CFFExportAdaptor; --- Sankore 3.1.iss | 6 +++++- release.win7.vc9.64.bat | 2 +- release.win7.vc9.bat | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index 553f777f..eaeacb68 100644 --- a/Sankore 3.1.iss +++ b/Sankore 3.1.iss @@ -45,7 +45,10 @@ Type: files ; Name: "{app}\*.dll" [Files] Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" -Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +;Sankore plugins +Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion ;OpenSSL Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion @@ -60,6 +63,7 @@ Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignorever Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtOpenGL4.dll"; DestDir: "{app}"; Flags: ignoreversion ;Qt plugins Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion diff --git a/release.win7.vc9.64.bat b/release.win7.vc9.64.bat index 810f9b0d..b344d2f8 100644 --- a/release.win7.vc9.64.bat +++ b/release.win7.vc9.64.bat @@ -62,7 +62,7 @@ nmake release-install copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\ del build\win32\release\product\i18n\qt_help* -del ".\build\win32\release\product\Sankore.pdb" +del "build\win32\release\product\Sankore.pdb" set INSTALLER_NAME=Open-Sankore diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index 51885958..dbf91aa2 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -66,7 +66,7 @@ copy resources\customizations build\win32\release\product\ del build\win32\release\product\i18n\qt_help* -del ".\build\win32\release\product\Sankore.pdb" +del "build\win32\release\product\Sankore.pdb" set INSTALLER_NAME=Open-Sankore