Skip to content

Commit

Permalink
Merge pull request #343 from MediaPortal/MP1-5228-Bump_NSIS_3.09_to_3.10
Browse files Browse the repository at this point in the history
MP1-5228: Bump NSIS 3.09 to 3.10
  • Loading branch information
andrewjswan authored Nov 6, 2024
2 parents 6b7f4cd + 7c88519 commit 15b546d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mediaportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.09 --force
choco install --yes nsis --version=3.10 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.09 --force
choco install --yes nsis --version=3.10 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions Tools/InstallationScripts/include/MediaPortalMacros.nsh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal
/*
// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand All @@ -18,8 +18,8 @@
*/
#endregion

!if "${NSIS_VERSION}" != "v3.09"
!error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.09, http://nsis.sourceforge.net$\r$\n$\r$\n"
!if "${NSIS_VERSION}" != "v3.10"
!error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.10, http://nsis.sourceforge.net$\r$\n$\r$\n"
!endif

!ifndef ___COMMON_MP_MACROS__NSH___
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install:
- cmd: >-
git submodule update --init --recursive
choco install nsis --version=3.09
choco install --yes nsis --version=3.10 --force
java -version
Expand Down

0 comments on commit 15b546d

Please sign in to comment.