From 27b568e4e474f8b020203a7190b4db2afe5c8cc5 Mon Sep 17 00:00:00 2001 From: donovaly Date: Fri, 5 Mar 2021 03:42:59 +0100 Subject: [PATCH] update for FC 0.19.0 --- src/WindowsInstaller/README.md | 8 ++++---- src/WindowsInstaller/Settings.nsh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/WindowsInstaller/README.md b/src/WindowsInstaller/README.md index 52c0b23a2e..1b162bd247 100644 --- a/src/WindowsInstaller/README.md +++ b/src/WindowsInstaller/README.md @@ -20,14 +20,14 @@ To build the installer you can do the following: (You can alternatively get nsProcess from https://nsis.sourceforge.io/NsProcess_plugin) 7. Copy all FreeCAD files to the folder "~\FreeCAD" e.g. "C:\FreeCAD\Installer\FreeCAD" -8. If you use a version of FreeCAD that was compiled using another MSVC version than MSVC 2017, +8. If you use a version of FreeCAD that was compiled using another MSVC version than MSVC 2019, 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.19. 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 diff --git a/src/WindowsInstaller/Settings.nsh b/src/WindowsInstaller/Settings.nsh index dbd2411938..82da5beb93 100644 --- a/src/WindowsInstaller/Settings.nsh +++ b/src/WindowsInstaller/Settings.nsh @@ -18,14 +18,14 @@ SetCompressor /SOLID lzma !define APP_VERSION_MAJOR 0 !define APP_VERSION_MINOR 19 !define APP_VERSION_REVISION 0 -!define APP_VERSION_EMERGENCY "rev18731" # use "1" for an emergency release of FreeCAD otherwise "" +!define APP_VERSION_EMERGENCY "" # 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 @@ -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"