diff --git a/src/WindowsInstaller/Bitmaps/BackgroundBitmap.bmp b/tools/build/WindowsInstaller/Bitmaps/BackgroundBitmap.bmp similarity index 100% rename from src/WindowsInstaller/Bitmaps/BackgroundBitmap.bmp rename to tools/build/WindowsInstaller/Bitmaps/BackgroundBitmap.bmp diff --git a/src/WindowsInstaller/Bitmaps/BanerBitmap.bmp b/tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp similarity index 100% rename from src/WindowsInstaller/Bitmaps/BanerBitmap.bmp rename to tools/build/WindowsInstaller/Bitmaps/BanerBitmap.bmp diff --git a/src/WindowsInstaller/Delete.bat b/tools/build/WindowsInstaller/Delete.bat similarity index 100% rename from src/WindowsInstaller/Delete.bat rename to tools/build/WindowsInstaller/Delete.bat diff --git a/src/WindowsInstaller/FCweborg.pfx b/tools/build/WindowsInstaller/FCweborg.pfx similarity index 100% rename from src/WindowsInstaller/FCweborg.pfx rename to tools/build/WindowsInstaller/FCweborg.pfx diff --git a/src/WindowsInstaller/FreeCAD-installer.nsi b/tools/build/WindowsInstaller/FreeCAD-installer.nsi similarity index 100% rename from src/WindowsInstaller/FreeCAD-installer.nsi rename to tools/build/WindowsInstaller/FreeCAD-installer.nsi diff --git a/src/WindowsInstaller/LICENSE b/tools/build/WindowsInstaller/LICENSE similarity index 100% rename from src/WindowsInstaller/LICENSE rename to tools/build/WindowsInstaller/LICENSE diff --git a/src/WindowsInstaller/License.rtf b/tools/build/WindowsInstaller/License.rtf similarity index 100% rename from src/WindowsInstaller/License.rtf rename to tools/build/WindowsInstaller/License.rtf diff --git a/src/WindowsInstaller/README.md b/tools/build/WindowsInstaller/README.md similarity index 100% rename from src/WindowsInstaller/README.md rename to tools/build/WindowsInstaller/README.md diff --git a/src/WindowsInstaller/Settings.nsh b/tools/build/WindowsInstaller/Settings.nsh similarity index 93% rename from src/WindowsInstaller/Settings.nsh rename to tools/build/WindowsInstaller/Settings.nsh index 47669a6949..77c4815c0a 100644 --- a/src/WindowsInstaller/Settings.nsh +++ b/tools/build/WindowsInstaller/Settings.nsh @@ -16,7 +16,7 @@ SetCompressor /SOLID lzma # Version number !define APP_VERSION_MAJOR 0 -!define APP_VERSION_MINOR 20 +!define APP_VERSION_MINOR 22 !define APP_VERSION_REVISION 0 !define APP_VERSION_EMERGENCY "beta" # use "1" for an emergency release of FreeCAD otherwise "" # alternatively you can use APP_VERSION_EMERGENCY for a custom suffix of the version number @@ -25,7 +25,7 @@ SetCompressor /SOLID lzma !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display -!define COPYRIGHT_YEAR 2022 +!define COPYRIGHT_YEAR 2023 #-------------------------------- # Installer file name @@ -41,6 +41,6 @@ SetCompressor /SOLID lzma # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_FREECAD "G:\FreeCADInst\Installer\FreeCAD-0-20" +!define FILES_FREECAD "G:\FreeCADInst\Installer\FreeCAD" !define FILES_DEPS "G:\FreeCADInst\Installer\MSVCRedist" !define FILES_THUMBS "G:\FreeCADInst\Installer\thumbnail" diff --git a/src/WindowsInstaller/Signing.bat b/tools/build/WindowsInstaller/Signing.bat similarity index 100% rename from src/WindowsInstaller/Signing.bat rename to tools/build/WindowsInstaller/Signing.bat diff --git a/src/WindowsInstaller/graphics/header.bmp b/tools/build/WindowsInstaller/graphics/header.bmp similarity index 100% rename from src/WindowsInstaller/graphics/header.bmp rename to tools/build/WindowsInstaller/graphics/header.bmp diff --git a/src/WindowsInstaller/graphics/orange.bmp b/tools/build/WindowsInstaller/graphics/orange.bmp similarity index 100% rename from src/WindowsInstaller/graphics/orange.bmp rename to tools/build/WindowsInstaller/graphics/orange.bmp diff --git a/src/WindowsInstaller/icons/FreeCAD-clean.ico b/tools/build/WindowsInstaller/icons/FreeCAD-clean.ico similarity index 100% rename from src/WindowsInstaller/icons/FreeCAD-clean.ico rename to tools/build/WindowsInstaller/icons/FreeCAD-clean.ico diff --git a/src/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp b/tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp similarity index 100% rename from src/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp rename to tools/build/WindowsInstaller/icons/FreeCAD-icon-57px-height.bmp diff --git a/src/WindowsInstaller/icons/FreeCAD-icon.bmp b/tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp similarity index 100% rename from src/WindowsInstaller/icons/FreeCAD-icon.bmp rename to tools/build/WindowsInstaller/icons/FreeCAD-icon.bmp diff --git a/src/WindowsInstaller/icons/FreeCAD-icon.xcf b/tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf similarity index 100% rename from src/WindowsInstaller/icons/FreeCAD-icon.xcf rename to tools/build/WindowsInstaller/icons/FreeCAD-icon.xcf diff --git a/src/WindowsInstaller/icons/FreeCAD.ico b/tools/build/WindowsInstaller/icons/FreeCAD.ico similarity index 100% rename from src/WindowsInstaller/icons/FreeCAD.ico rename to tools/build/WindowsInstaller/icons/FreeCAD.ico diff --git a/src/WindowsInstaller/include/declarations.nsh b/tools/build/WindowsInstaller/include/declarations.nsh similarity index 100% rename from src/WindowsInstaller/include/declarations.nsh rename to tools/build/WindowsInstaller/include/declarations.nsh diff --git a/src/WindowsInstaller/include/gui.nsh b/tools/build/WindowsInstaller/include/gui.nsh similarity index 100% rename from src/WindowsInstaller/include/gui.nsh rename to tools/build/WindowsInstaller/include/gui.nsh diff --git a/src/WindowsInstaller/include/init.nsh b/tools/build/WindowsInstaller/include/init.nsh similarity index 100% rename from src/WindowsInstaller/include/init.nsh rename to tools/build/WindowsInstaller/include/init.nsh diff --git a/src/WindowsInstaller/include/utils.nsh b/tools/build/WindowsInstaller/include/utils.nsh similarity index 100% rename from src/WindowsInstaller/include/utils.nsh rename to tools/build/WindowsInstaller/include/utils.nsh diff --git a/src/WindowsInstaller/information/Creation of SHA256 checksum file.txt b/tools/build/WindowsInstaller/information/Creation of SHA256 checksum file.txt similarity index 100% rename from src/WindowsInstaller/information/Creation of SHA256 checksum file.txt rename to tools/build/WindowsInstaller/information/Creation of SHA256 checksum file.txt diff --git a/src/WindowsInstaller/information/FreeCAD-filename-SHA256.txt b/tools/build/WindowsInstaller/information/FreeCAD-filename-SHA256.txt similarity index 100% rename from src/WindowsInstaller/information/FreeCAD-filename-SHA256.txt rename to tools/build/WindowsInstaller/information/FreeCAD-filename-SHA256.txt diff --git a/src/WindowsInstaller/information/ISO_3166.html b/tools/build/WindowsInstaller/information/ISO_3166.html similarity index 100% rename from src/WindowsInstaller/information/ISO_3166.html rename to tools/build/WindowsInstaller/information/ISO_3166.html diff --git a/src/WindowsInstaller/information/InstallerStructure.odg b/tools/build/WindowsInstaller/information/InstallerStructure.odg similarity index 100% rename from src/WindowsInstaller/information/InstallerStructure.odg rename to tools/build/WindowsInstaller/information/InstallerStructure.odg diff --git a/src/WindowsInstaller/information/InstallerStructure.pdf b/tools/build/WindowsInstaller/information/InstallerStructure.pdf similarity index 100% rename from src/WindowsInstaller/information/InstallerStructure.pdf rename to tools/build/WindowsInstaller/information/InstallerStructure.pdf diff --git a/src/WindowsInstaller/information/WinLangCode.htm b/tools/build/WindowsInstaller/information/WinLangCode.htm similarity index 100% rename from src/WindowsInstaller/information/WinLangCode.htm rename to tools/build/WindowsInstaller/information/WinLangCode.htm diff --git a/src/WindowsInstaller/information/iso639.htm b/tools/build/WindowsInstaller/information/iso639.htm similarity index 100% rename from src/WindowsInstaller/information/iso639.htm rename to tools/build/WindowsInstaller/information/iso639.htm diff --git a/src/WindowsInstaller/lang/TranslatedLanguages.nsh b/tools/build/WindowsInstaller/lang/TranslatedLanguages.nsh similarity index 100% rename from src/WindowsInstaller/lang/TranslatedLanguages.nsh rename to tools/build/WindowsInstaller/lang/TranslatedLanguages.nsh diff --git a/src/WindowsInstaller/lang/arabic.nsh b/tools/build/WindowsInstaller/lang/arabic.nsh similarity index 100% rename from src/WindowsInstaller/lang/arabic.nsh rename to tools/build/WindowsInstaller/lang/arabic.nsh diff --git a/src/WindowsInstaller/lang/basque.nsh b/tools/build/WindowsInstaller/lang/basque.nsh similarity index 100% rename from src/WindowsInstaller/lang/basque.nsh rename to tools/build/WindowsInstaller/lang/basque.nsh diff --git a/src/WindowsInstaller/lang/catalan.nsh b/tools/build/WindowsInstaller/lang/catalan.nsh similarity index 100% rename from src/WindowsInstaller/lang/catalan.nsh rename to tools/build/WindowsInstaller/lang/catalan.nsh diff --git a/src/WindowsInstaller/lang/czech.nsh b/tools/build/WindowsInstaller/lang/czech.nsh similarity index 100% rename from src/WindowsInstaller/lang/czech.nsh rename to tools/build/WindowsInstaller/lang/czech.nsh diff --git a/src/WindowsInstaller/lang/danish.nsh b/tools/build/WindowsInstaller/lang/danish.nsh similarity index 100% rename from src/WindowsInstaller/lang/danish.nsh rename to tools/build/WindowsInstaller/lang/danish.nsh diff --git a/src/WindowsInstaller/lang/dutch.nsh b/tools/build/WindowsInstaller/lang/dutch.nsh similarity index 100% rename from src/WindowsInstaller/lang/dutch.nsh rename to tools/build/WindowsInstaller/lang/dutch.nsh diff --git a/src/WindowsInstaller/lang/english.nsh b/tools/build/WindowsInstaller/lang/english.nsh similarity index 100% rename from src/WindowsInstaller/lang/english.nsh rename to tools/build/WindowsInstaller/lang/english.nsh diff --git a/src/WindowsInstaller/lang/french.nsh b/tools/build/WindowsInstaller/lang/french.nsh similarity index 100% rename from src/WindowsInstaller/lang/french.nsh rename to tools/build/WindowsInstaller/lang/french.nsh diff --git a/src/WindowsInstaller/lang/galician.nsh b/tools/build/WindowsInstaller/lang/galician.nsh similarity index 100% rename from src/WindowsInstaller/lang/galician.nsh rename to tools/build/WindowsInstaller/lang/galician.nsh diff --git a/src/WindowsInstaller/lang/german.nsh b/tools/build/WindowsInstaller/lang/german.nsh similarity index 100% rename from src/WindowsInstaller/lang/german.nsh rename to tools/build/WindowsInstaller/lang/german.nsh diff --git a/src/WindowsInstaller/lang/hungarian.nsh b/tools/build/WindowsInstaller/lang/hungarian.nsh similarity index 100% rename from src/WindowsInstaller/lang/hungarian.nsh rename to tools/build/WindowsInstaller/lang/hungarian.nsh diff --git a/src/WindowsInstaller/lang/indonesian.nsh b/tools/build/WindowsInstaller/lang/indonesian.nsh similarity index 100% rename from src/WindowsInstaller/lang/indonesian.nsh rename to tools/build/WindowsInstaller/lang/indonesian.nsh diff --git a/src/WindowsInstaller/lang/italian.nsh b/tools/build/WindowsInstaller/lang/italian.nsh similarity index 100% rename from src/WindowsInstaller/lang/italian.nsh rename to tools/build/WindowsInstaller/lang/italian.nsh diff --git a/src/WindowsInstaller/lang/japanese.nsh b/tools/build/WindowsInstaller/lang/japanese.nsh similarity index 100% rename from src/WindowsInstaller/lang/japanese.nsh rename to tools/build/WindowsInstaller/lang/japanese.nsh diff --git a/src/WindowsInstaller/lang/norwegian.nsh b/tools/build/WindowsInstaller/lang/norwegian.nsh similarity index 100% rename from src/WindowsInstaller/lang/norwegian.nsh rename to tools/build/WindowsInstaller/lang/norwegian.nsh diff --git a/src/WindowsInstaller/lang/polish.nsh b/tools/build/WindowsInstaller/lang/polish.nsh similarity index 100% rename from src/WindowsInstaller/lang/polish.nsh rename to tools/build/WindowsInstaller/lang/polish.nsh diff --git a/src/WindowsInstaller/lang/portuguese.nsh b/tools/build/WindowsInstaller/lang/portuguese.nsh similarity index 100% rename from src/WindowsInstaller/lang/portuguese.nsh rename to tools/build/WindowsInstaller/lang/portuguese.nsh diff --git a/src/WindowsInstaller/lang/portugueseBR.nsh b/tools/build/WindowsInstaller/lang/portugueseBR.nsh similarity index 100% rename from src/WindowsInstaller/lang/portugueseBR.nsh rename to tools/build/WindowsInstaller/lang/portugueseBR.nsh diff --git a/src/WindowsInstaller/lang/romanian.nsh b/tools/build/WindowsInstaller/lang/romanian.nsh similarity index 100% rename from src/WindowsInstaller/lang/romanian.nsh rename to tools/build/WindowsInstaller/lang/romanian.nsh diff --git a/src/WindowsInstaller/lang/russian.nsh b/tools/build/WindowsInstaller/lang/russian.nsh similarity index 100% rename from src/WindowsInstaller/lang/russian.nsh rename to tools/build/WindowsInstaller/lang/russian.nsh diff --git a/src/WindowsInstaller/lang/slovak.nsh b/tools/build/WindowsInstaller/lang/slovak.nsh similarity index 100% rename from src/WindowsInstaller/lang/slovak.nsh rename to tools/build/WindowsInstaller/lang/slovak.nsh diff --git a/src/WindowsInstaller/lang/spanish.nsh b/tools/build/WindowsInstaller/lang/spanish.nsh similarity index 100% rename from src/WindowsInstaller/lang/spanish.nsh rename to tools/build/WindowsInstaller/lang/spanish.nsh diff --git a/src/WindowsInstaller/lang/swedish.nsh b/tools/build/WindowsInstaller/lang/swedish.nsh similarity index 100% rename from src/WindowsInstaller/lang/swedish.nsh rename to tools/build/WindowsInstaller/lang/swedish.nsh diff --git a/src/WindowsInstaller/lang/turkish.nsh b/tools/build/WindowsInstaller/lang/turkish.nsh similarity index 100% rename from src/WindowsInstaller/lang/turkish.nsh rename to tools/build/WindowsInstaller/lang/turkish.nsh diff --git a/src/WindowsInstaller/lang/ukrainian.nsh b/tools/build/WindowsInstaller/lang/ukrainian.nsh similarity index 100% rename from src/WindowsInstaller/lang/ukrainian.nsh rename to tools/build/WindowsInstaller/lang/ukrainian.nsh diff --git a/src/WindowsInstaller/setup/configure.nsh b/tools/build/WindowsInstaller/setup/configure.nsh similarity index 100% rename from src/WindowsInstaller/setup/configure.nsh rename to tools/build/WindowsInstaller/setup/configure.nsh diff --git a/src/WindowsInstaller/setup/install.nsh b/tools/build/WindowsInstaller/setup/install.nsh similarity index 100% rename from src/WindowsInstaller/setup/install.nsh rename to tools/build/WindowsInstaller/setup/install.nsh diff --git a/src/WindowsInstaller/setup/uninstall.nsh b/tools/build/WindowsInstaller/setup/uninstall.nsh similarity index 100% rename from src/WindowsInstaller/setup/uninstall.nsh rename to tools/build/WindowsInstaller/setup/uninstall.nsh diff --git a/src/WindowsInstaller/thumbnail/FCStdThumbnail.dll b/tools/build/WindowsInstaller/thumbnail/FCStdThumbnail.dll similarity index 100% rename from src/WindowsInstaller/thumbnail/FCStdThumbnail.dll rename to tools/build/WindowsInstaller/thumbnail/FCStdThumbnail.dll