From f227ba4093fb79140044938d73a978fe92285d96 Mon Sep 17 00:00:00 2001 From: Esko Pekkarinen Date: Thu, 12 Jan 2023 12:10:52 +0200 Subject: [PATCH] [PERFECTIVE] Update files for release --- Administrative/releaseFiles/release_notes.txt | 28 +++++++++++++ Administrative/releaseFiles/setupx64.nsi | 41 +++++++++---------- Kactus2.vcxproj | 2 +- version.h | 18 ++++---- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/Administrative/releaseFiles/release_notes.txt b/Administrative/releaseFiles/release_notes.txt index 75a6beaed..a5eb24631 100644 --- a/Administrative/releaseFiles/release_notes.txt +++ b/Administrative/releaseFiles/release_notes.txt @@ -8,6 +8,34 @@ * Changed or Information =============================================================================== + +12/01/2023 3.11.0 +---------------------------------------------------- +* Migrated to Qt 6.2.4, Qt5 build is no longer supported + ++ Updated choice editor ++ Added line editor for expressions ++ Added doxygen flag to swig for better documentation of functions ++ Added undo/redo in Python script editor ++ Added support for ternary opertor (?:) in SystemVerilog expressions (community contribution) ++ Added width for port default values in generated Verilog (community contribution) ++ Added register dimensions in SVD generation + +- Changed configurable element values of a component instance to use table instead of a tree view +- Improved port editor performance +- Improved configuration and help generation in Linux (community contribution) +- Fixed disappearing component remap states +- Fixed application settings losing code editor settings on startup +- Fixed Python script editor visibility to persist between documents +- Fixed Python interpreter thread not quiting at application shutdown +- Fixed component editor crashing after removing last memory map +- Fixed component editor crashing after removing memory remaps +- Fixed SVD generator crashing on sticky note with assosiaction +- Removed win32 build configurations for VS + +* Migrated to VS2022 +* Windows installer now embeds Python version 3.10.6 + 21/06/2022 3.10.0 ---------------------------------------------------- + Added bus interfaces in Python API diff --git a/Administrative/releaseFiles/setupx64.nsi b/Administrative/releaseFiles/setupx64.nsi index 3e834c12d..cfb4cfaa5 100644 --- a/Administrative/releaseFiles/setupx64.nsi +++ b/Administrative/releaseFiles/setupx64.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Kactus2" -!define PRODUCT_VERSION "3.10.12 64-bit" +!define PRODUCT_VERSION "3.11.0 64-bit" !define PRODUCT_PUBLISHER "TUNI" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Kactus2.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -57,16 +57,15 @@ ShowUnInstDetails show Section "MainSection" SEC01 SetOutPath "$INSTDIR" SetOverwrite on - File "..\..\x64\executable\Qt5Core.dll" - File "..\..\x64\executable\Qt5Gui.dll" - File "..\..\x64\executable\Qt5Help.dll" - File "..\..\x64\executable\Qt5Network.dll" - File "..\..\x64\executable\Qt5PrintSupport.dll" - File "..\..\x64\executable\Qt5Sql.dll" - File "..\..\x64\executable\Qt5Widgets.dll" - File "..\..\x64\executable\Qt5Xml.dll" - File "..\..\x64\executable\Qt5XmlPatterns.dll" - File "..\..\x64\executable\Qt5Svg.dll" + File "..\..\x64\executable\Qt6Core.dll" + File "..\..\x64\executable\Qt6Gui.dll" + File "..\..\x64\executable\Qt6Help.dll" + File "..\..\x64\executable\Qt6Network.dll" + File "..\..\x64\executable\Qt6PrintSupport.dll" + File "..\..\x64\executable\Qt6Sql.dll" + File "..\..\x64\executable\Qt6Widgets.dll" + File "..\..\x64\executable\Qt6Xml.dll" + File "..\..\x64\executable\Qt6Svg.dll" File "..\..\x64\executable\libEGL.dll" File "..\..\x64\executable\libGLESv2.dll" File "..\..\x64\executable\icuin51.dll" @@ -296,16 +295,15 @@ Section Uninstall Delete "$INSTDIR\icuin51.dll" Delete "$INSTDIR\libGLESv2.dll" Delete "$INSTDIR\libEGL.dll" - Delete "$INSTDIR\Qt5Svg.dll" - Delete "$INSTDIR\Qt5XmlPatterns.dll" - Delete "$INSTDIR\Qt5Xml.dll" - Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Sql.dll" - Delete "$INSTDIR\Qt5PrintSupport.dll" - Delete "$INSTDIR\Qt5Network.dll" - Delete "$INSTDIR\Qt5Help.dll" - Delete "$INSTDIR\Qt5Gui.dll" - Delete "$INSTDIR\Qt5Core.dll" + Delete "$INSTDIR\Qt6Svg.dll" + Delete "$INSTDIR\Qt6Xml.dll" + Delete "$INSTDIR\Qt6Widgets.dll" + Delete "$INSTDIR\Qt6Sql.dll" + Delete "$INSTDIR\Qt6PrintSupport.dll" + Delete "$INSTDIR\Qt6Network.dll" + Delete "$INSTDIR\Qt6Help.dll" + Delete "$INSTDIR\Qt6Gui.dll" + Delete "$INSTDIR\Qt6Core.dll" Delete "$INSTDIR\python310.dll" Delete "$INSTDIR\_asyncio.pyd" Delete "$INSTDIR\_bz2.pyd" @@ -360,7 +358,6 @@ Section Uninstall RMDir "$INSTDIR\Plugins" RMDir "$INSTDIR\sqldrivers" RMDir "$INSTDIR\platforms" - RMDir "$INSTDIR\accessible" RMDir "$INSTDIR\ExampleScripts" RMDir "$INSTDIR\__pycache__" RMDir "$INSTDIR\Library\tut.fi\ip.swp.api\IPTLM.apiDef\1.1" diff --git a/Kactus2.vcxproj b/Kactus2.vcxproj index 2ba9f5e55..f145371d4 100644 --- a/Kactus2.vcxproj +++ b/Kactus2.vcxproj @@ -196,7 +196,7 @@ CreateHelp "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) - IPXACTmodels.lib;python38.lib;KactusAPI.lib;%(AdditionalDependencies) + IPXACTmodels.lib;python310.lib;KactusAPI.lib;%(AdditionalDependencies) x64\executable\Kactus2.exe true $(SolutionDir)x64\executable;$(PYTHON_DIR)\libs;%(AdditionalLibraryDirectories) diff --git a/version.h b/version.h index bdcced669..c6cb185dc 100644 --- a/version.h +++ b/version.h @@ -10,20 +10,20 @@ #ifndef VERSIONNO__H #define VERSIONNO__H -#define VERSION_FULL 3.10.148.0 +#define VERSION_FULL 3.11.0.0 #define VERSION_BASEYEAR 0 -#define VERSION_DATE "2023-01-11" -#define VERSION_TIME "08:23:16" +#define VERSION_DATE "2023-01-12" +#define VERSION_TIME "10:05:52" #define VERSION_MAJOR 3 -#define VERSION_MINOR 10 -#define VERSION_BUILDNO 148 +#define VERSION_MINOR 11 +#define VERSION_BUILDNO 0 #define VERSION_EXTEND 0 -#define VERSION_FILE 3,10,148,0 -#define VERSION_PRODUCT 3,10,148,0 -#define VERSION_FILESTR "3,10,148,0" -#define VERSION_PRODUCTSTR "3,10,148,0" +#define VERSION_FILE 3,11,0,0 +#define VERSION_PRODUCT 3,11,0,0 +#define VERSION_FILESTR "3,11,0,0" +#define VERSION_PRODUCTSTR "3,11,0,0" #endif