mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
cleanup packages.cmake & extend NSIS plugin directory
This commit is contained in:
parent
4d37409d62
commit
1910d359bc
9
.github/workflows/pull-request.yml
vendored
9
.github/workflows/pull-request.yml
vendored
@ -149,13 +149,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
|
|
||||||
- name: Install NSIS & copy plugins
|
- name: Install OpenSSL & NSIS
|
||||||
run: |
|
run: choco install --no-progress openssl nsis -y
|
||||||
choco install --no-progress nsis -y
|
|
||||||
copy "cmake\nsis\template\*.dll" "C:\Program Files (x86)\NSIS\Plugins\x86-ansi\"
|
|
||||||
|
|
||||||
- name: Install OpenSSL
|
|
||||||
run: choco install --no-progress openssl -y
|
|
||||||
|
|
||||||
- name: Set up x64 build architecture environment
|
- name: Set up x64 build architecture environment
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
9
.github/workflows/push-master.yml
vendored
9
.github/workflows/push-master.yml
vendored
@ -113,13 +113,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
|
|
||||||
- name: Install NSIS & copy plugins
|
- name: Install OpenSSL & NSIS
|
||||||
run: |
|
run: choco install --no-progress openssl nsis -y
|
||||||
choco install --no-progress nsis -y
|
|
||||||
copy "cmake\nsis\template\*.dll" "C:\Program Files (x86)\NSIS\Plugins\x86-ansi\"
|
|
||||||
|
|
||||||
- name: Install OpenSSL
|
|
||||||
run: choco install --no-progress openssl -y
|
|
||||||
|
|
||||||
- name: Set up x64 build architecture environment
|
- name: Set up x64 build architecture environment
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
4
.vscode/tasks.json
vendored
4
.vscode/tasks.json
vendored
@ -11,7 +11,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
|
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
|
||||||
},
|
},
|
||||||
"group": "build",
|
"group": "build"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "cmake:conf Debug",
|
"label": "cmake:conf Debug",
|
||||||
@ -21,7 +21,7 @@
|
|||||||
"windows": {
|
"windows": {
|
||||||
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
|
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
|
||||||
},
|
},
|
||||||
"group": "build",
|
"group": "build"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "build:debug hyperiond",
|
"label": "build:debug hyperiond",
|
||||||
|
@ -84,7 +84,7 @@ brew install zlib
|
|||||||
```
|
```
|
||||||
|
|
||||||
## Windows (WIP)
|
## Windows (WIP)
|
||||||
We assume a 64bit Windows 7 or higher. Install the following
|
We assume a 64bit Windows 7 or higher. Install the following;
|
||||||
- [Git](https://git-scm.com/downloads) (Check: Add to PATH)
|
- [Git](https://git-scm.com/downloads) (Check: Add to PATH)
|
||||||
- [CMake (Windows win64-x64 Installer)](https://cmake.org/download/) (Check: Add to PATH)
|
- [CMake (Windows win64-x64 Installer)](https://cmake.org/download/) (Check: Add to PATH)
|
||||||
- [Visual Studio 2019 Build Tools](https://go.microsoft.com/fwlink/?linkid=840931) ([direct link](https://aka.ms/vs/16/release/vs_buildtools.exe))
|
- [Visual Studio 2019 Build Tools](https://go.microsoft.com/fwlink/?linkid=840931) ([direct link](https://aka.ms/vs/16/release/vs_buildtools.exe))
|
||||||
@ -95,6 +95,8 @@ We assume a 64bit Windows 7 or higher. Install the following
|
|||||||
- Open a console window and execute `pip install aqtinstall`.
|
- Open a console window and execute `pip install aqtinstall`.
|
||||||
- Now we can download Qt to _C:\Qt_ `mkdir c:\Qt && aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64`
|
- Now we can download Qt to _C:\Qt_ `mkdir c:\Qt && aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64`
|
||||||
|
|
||||||
|
- Optional for package creation: [NSIS 3.x](https://sourceforge.net/projects/nsis/files/NSIS%203/) ([direct link](https://sourceforge.net/projects/nsis/files/latest/download))
|
||||||
|
|
||||||
# Compiling and installing Hyperion
|
# Compiling and installing Hyperion
|
||||||
|
|
||||||
### The general quick way (without big comments)
|
### The general quick way (without big comments)
|
||||||
|
@ -43,6 +43,8 @@
|
|||||||
;Tnstaller window branding text
|
;Tnstaller window branding text
|
||||||
BrandingText /TRIMLEFT "@CPACK_NSIS_BRANDING_TEXT@"
|
BrandingText /TRIMLEFT "@CPACK_NSIS_BRANDING_TEXT@"
|
||||||
|
|
||||||
|
@CPACK_NSIS_EXTRA_DEFS@
|
||||||
|
|
||||||
@CPACK_NSIS_DEFINES@
|
@CPACK_NSIS_DEFINES@
|
||||||
|
|
||||||
!include Sections.nsh
|
!include Sections.nsh
|
||||||
|
@ -105,19 +105,12 @@ SET ( CPACK_NSIS_HELP_LINK "https://www.hyperion-project.org")
|
|||||||
SET ( CPACK_NSIS_URL_INFO_ABOUT "https://www.hyperion-project.org")
|
SET ( CPACK_NSIS_URL_INFO_ABOUT "https://www.hyperion-project.org")
|
||||||
SET ( CPACK_NSIS_MUI_FINISHPAGE_RUN "hyperiond.exe")
|
SET ( CPACK_NSIS_MUI_FINISHPAGE_RUN "hyperiond.exe")
|
||||||
SET ( CPACK_NSIS_BRANDING_TEXT "Hyperion-${HYPERION_VERSION}")
|
SET ( CPACK_NSIS_BRANDING_TEXT "Hyperion-${HYPERION_VERSION}")
|
||||||
|
# custom nsis plugin directory
|
||||||
|
SET ( CPACK_NSIS_EXTRA_DEFS "!addplugindir ${CMAKE_SOURCE_DIR}/cmake/nsis/plugins")
|
||||||
# additional hyperiond startmenu link, won't be created if the user disables startmenu links
|
# additional hyperiond startmenu link, won't be created if the user disables startmenu links
|
||||||
SET ( CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hyperion (Console).lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe' '-d -c'")
|
SET ( CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hyperion (Console).lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe' '-d -c'")
|
||||||
SET ( CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Hyperion (Console).lnk'")
|
SET ( CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Hyperion (Console).lnk'")
|
||||||
|
|
||||||
|
|
||||||
#SET ( CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Hyperion.lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe'")
|
|
||||||
#SET ( CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Hyperion.lnk'")
|
|
||||||
# hyperiond desktop link
|
|
||||||
#SET ( CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$DESKTOP\\\\Hyperion.lnk' '$INSTDIR\\\\bin\\\\hyperiond.exe' ")
|
|
||||||
#SET ( CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '$DESKTOP\\\\Hyperion.lnk' ")
|
|
||||||
#SET ( CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut \\\"$DESKTOP\\\\Hyperion.lnk\\\" \\\"$INSTDIR\\\\bin\\\\hyperiond.exe\\\" ")
|
|
||||||
#SET ( CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete \\\"$DESKTOP\\\\Hyperion.lnk\\\" ")
|
|
||||||
|
|
||||||
# define the install components
|
# define the install components
|
||||||
# See also https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/Component-Install-With-CPack
|
# See also https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/Component-Install-With-CPack
|
||||||
# and https://cmake.org/cmake/help/latest/module/CPackComponent.html
|
# and https://cmake.org/cmake/help/latest/module/CPackComponent.html
|
||||||
|
Loading…
Reference in New Issue
Block a user