Skip to content

Commit 4259e60

Browse files
authored
FEAT: Provide LICENSE file in installer (#49)
1 parent 4672a2d commit 4259e60

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

LICENSE

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ furnished to do so, subject to the following conditions:
1212
The above copyright notice and this permission notice shall be included in all
1313
copies or substantial portions of the Software.
1414

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
23+
24+
In addition, this installer allows you to access and install software
25+
that is licensed under separate terms (the "Separately Licensed Software").
26+
If you chose to install such Separately Licensed Software, you acknowledge
27+
that you are responsible for complying with any associated terms and
28+
conditions.

setup.nsi

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
; Set the name, version, and output path of the installer
44
!define VERSION_FILE "src/ansys/tools/installer/VERSION"
5+
!define LICENSE_FILE "LICENSE"
56
!define PRODUCT_NAME "Ansys Python Manager"
67
!define /file PRODUCT_VERSION "src/ansys/tools/installer/VERSION"
78
!define OUTFILE_NAME "Ansys-Python-Manager-Setup-v${PRODUCT_VERSION}.exe"
@@ -14,7 +15,7 @@ OutFile "dist\${OUTFILE_NAME}"
1415
!include "MUI2.nsh"
1516
!include "InstallOptions.nsh"
1617
!define MUI_PAGE_CUSTOMFUNCTION_PRE oneclickpre
17-
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE oneclickleave
18+
!insertmacro MUI_PAGE_LICENSE "${LICENSE_FILE}"
1819
!insertmacro MUI_PAGE_INSTFILES
1920
!include "uninstall.nsi"
2021

@@ -46,6 +47,9 @@ Section "Ansys Python Manager" SEC01
4647
; start after install
4748
Exec "$INSTDIR\Ansys Python Manager.exe"
4849

50+
; After installation succeeded, wait and close
51+
Sleep 5000
52+
Quit
4953
SectionEnd
5054

5155
; Define the uninstaller section
@@ -69,11 +73,6 @@ Function oneclickpre
6973
HideWindow
7074
FunctionEnd
7175

72-
Function oneclickleave
73-
Quit
74-
FunctionEnd
75-
7676
; Call the MUI2 OneClick plugin
7777
!insertmacro MUI_UNPAGE_CONFIRM
7878
!insertmacro MUI_UNPAGE_INSTFILES
79-
12 KB
Binary file not shown.
12.8 KB
Loading
-6.98 KB
Binary file not shown.

src/ansys/tools/installer/main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<p>Created by the PyAnsys Team.</p>
2727
<p>If you have any questions or issues, please open an issue the <a href='https://github.com/pyansys/python-installer-qt-gui/issues'>python-installer-qt-gui Issues</a> page.</p>
2828
<p>Alternatively, you can contact us at <a href='mailto:[email protected]'>[email protected]</a>.</p>
29+
<p>Your use of this software is governed by the MIT License. In addition, this installer allows you to access and install software that is licensed under separate terms ("Separately Licensed Software"). If you chose to install such Separately Licensed Software, you acknowledge that you are responsible for complying with any associated terms and conditions.</p>
2930
<p>Copyright 2023 ANSYS, Inc. All rights reserved.</p>
3031
"""
3132

0 commit comments

Comments
 (0)