Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
setup: don't require the user to agree to GPL to complete setup.
As @foone complains on twitter often enough, this should not require
agreement for use since GPL is not an EULA.

The definitions are inspired from the similar NSIS setup file from VLC.
  • Loading branch information
Flameeyes authored and yorikvanhavre committed Jan 2, 2019
1 parent 01367d2 commit 0274e73
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi
Expand Up @@ -55,6 +55,10 @@ outFile "..\..\${INSTNAME}.${VERSIONBUILD}_x86_unstable_setup.exe"
#Interface Settings
!define MUI_ABORTWARNING

# GPL is not an EULA, no need to agree to it.
!define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."

#Pages
# rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n)
!insertmacro MUI_PAGE_LICENSE "License.rtf"
Expand Down
4 changes: 4 additions & 0 deletions src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi
Expand Up @@ -55,6 +55,10 @@ outFile "..\..\${INSTNAME}.${VERSIONBUILD}_x64_unstable_setup.exe"
#Interface Settings
!define MUI_ABORTWARNING

# GPL is not an EULA, no need to agree to it.
!define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."

#Pages
# rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n)
!insertmacro MUI_PAGE_LICENSE "License.rtf"
Expand Down

0 comments on commit 0274e73

Please sign in to comment.