kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Win installer update for FC 0.20dev

Browse Source
This commit is contained in:
donovaly
2021-03-05 04:24:43 +01:00
committed by wwmayer
parent 6789ddaac9
commit 08988b8769
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WindowsInstaller/README.md
View File

@@ -24,10 +24,10 @@ To build the installer you can do the following:
copy its distributable DLLs to the folder FILES_DEPS (see step 3).
9. Right-click on the file FreeCAD-installer.nsi and choose "Compile NSIS script"
to compile the installer.
10. The folder ~\MSVCRedist contains already all MSVC 2017 x64 redistributable DLLs necessary
for FreeCAD 0.19dev. If another MSVC version was used to compile FreeCAD, replace the DLLs by
10. The folder ~\MSVCRedist contains already all MSVC 2019 x64 redistributable DLLs necessary
for FreeCAD 0.20dev. If another MSVC version was used to compile FreeCAD, replace the DLLs by
the ones of the used MSVC. (They are usually available in the folder
C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC)
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC)
For test builds of the installer you can turn off the compression. This speeds up
the build time for the installer a lot but increases its file size. The compression

14
src/WindowsInstaller/Settings.nsh
View File

@@ -16,20 +16,20 @@ SetCompressor /SOLID lzma
# Version number
!define APP_VERSION_MAJOR 0
!define APP_VERSION_MINOR 19
!define APP_VERSION_MINOR 20
!define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "rev18731" # use "1" for an emergency release of FreeCAD otherwise ""
!define APP_VERSION_EMERGENCY "rev24344" # use "1" for an emergency release of FreeCAD otherwise ""
# alternatively you can use APP_VERSION_EMERGENCY for a custom suffix of the version number
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of FreeCAD otherwise ""
!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
!define COPYRIGHT_YEAR 2020
!define COPYRIGHT_YEAR 2021
#--------------------------------
# Installer file name
# Typical names for the release are "FreeCAD-018-Installer-1.exe" etc.
# Typical names for the release are "FreeCAD-020-Installer-1.exe" etc.
!define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -43,6 +43,6 @@ SetCompressor /SOLID lzma
# File locations
# !!! you need to adjust them to the folders in your Windows system !!!
!define FILES_FREECAD "D:\usti\FreeCAD\Installer\FreeCAD"
!define FILES_DEPS "D:\usti\FreeCAD\Installer\MSVCRedist"
!define FILES_THUMBS "D:\usti\FreeCAD\Installer\thumbnail"
!define FILES_FREECAD "G:\FreeCADInst\Installer\FreeCAD"
!define FILES_DEPS "G:\FreeCADInst\Installer\MSVCRedist"
!define FILES_THUMBS "G:\FreeCADInst\Installer\thumbnail"