Skip to content

Commit

Permalink
Fix runtime problems on Windows machines that do not have installed t…
Browse files Browse the repository at this point in the history
…he C++ DLL.

Closes smathot#6
  • Loading branch information
Saxonbeta committed Jun 16, 2020
1 parent 3721c26 commit 92ceed4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 5 additions & 5 deletions qnotero.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,18 @@
; For each new release, adjust the PRODUCT_VERSION as follows:
; version-win32-package#

; After compilation, rename the .exe file to (e.g.)
; qnotero_{PRODUCT_VERSION}.exe

; Build Unicode installer
Unicode True

; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Qnotero"
!define PRODUCT_VERSION "2.2"
!define PRODUCT_VERSION "2.2.0"
!define PRODUCT_PUBLISHER "E. Albiter"
!define PRODUCT_WEB_SITE "https://github.com/ealbiter/qnotero"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define PRODUCT_BUILD_DIRECTORY "E:\PycharmProjects\qnotero\build\exe.win-amd64-3.8"

; MUI 1.67 compatible ------
!include "MUI2.nsh"
Expand Down Expand Up @@ -66,15 +65,16 @@ Unicode True
; MUI end ------

Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "build\qnotero-setup_${PRODUCT_VERSION}.exe"
OutFile "build\setup-qnotero-${PRODUCT_VERSION}.exe"
InstallDir "$PROGRAMFILES64\Qnotero"
ShowInstDetails hide
ShowUnInstDetails hide

Section "Qnotero" SEC01
SetOutPath "$INSTDIR"
SetOverwrite try
File /r "E:\PycharmProjects\qnotero\build\exe.win-amd64-3.8\*.**"
File /r "${PRODUCT_BUILD_DIRECTORY}\*.*"
File "${PRODUCT_BUILD_DIRECTORY}\lib\PyQt5\VCRUNTIME140.dll"
SectionEnd

Section -AdditionalIcons
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'build_exe': {
'optimize': '2',
'silent': '0',
'include_msvcr': 'True',
'packages': [
"libqnotero",
"libzotero",
Expand Down

0 comments on commit 92ceed4

Please sign in to comment.