[ADDITIVE] Update release files

[Corrective] Fix kactus2 cli in windows release builds, remove old vcredist installers

Administrative/releaseFiles/release_notes.txt

@@ -8,6 +8,22 @@
               * Changed or Information
 ===============================================================================
 
+14/10/2024 3.13.3
+----------------------------------------------------
+* Document lock made optional. Can be changed in settings, locking is disabled by default.
++ Added parameter editors to abstraction definition editor and bus definition editor, added expression support to port abstractions
++ Added HW Designer tool shortcuts
++ Added ability to open referenced bus and abstraction definitions in bus interfaces by right-clicking in the component editor tree
++ Improved validation in the component editor
++ Improved windows installer
+- Fixed launching Kactus2 in CLI mode on Windows
+- Fixed design parameter dock window disappearing when switching tabs
+- Fixed changes made in component editor not reflecting in edited design (bus interfaces, ports)
+- Fixed issue with expression editors scrambling expression when overwriting current expression or a section of it
+- Fixed parsing unary minuses in systemverilog expressions
+- Fixed component mode condition validation
+- Fixed various bugs leading to crashes
+
 23/04/2024 3.13.2
 ----------------------------------------------------
 + HW Design improvements

Administrative/releaseFiles/setupx64.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Kactus2"
-!define PRODUCT_VERSION "3.13.2 64-bit"
+!define PRODUCT_VERSION "3.13.3 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}"
@@ -60,15 +60,13 @@ Section "MainSection" SEC01
   File "..\..\executable\Qt6Core.dll"
   File "..\..\executable\Qt6Gui.dll"
   File "..\..\executable\Qt6Help.dll"
-  File "..\..\executable\Qt6Network.dll"
   File "..\..\executable\Qt6PrintSupport.dll"
   File "..\..\executable\Qt6Sql.dll"
   File "..\..\executable\Qt6Widgets.dll"
   File "..\..\executable\Qt6Xml.dll"
   File "..\..\executable\Qt6Svg.dll"
-  File "..\..\executable\libEGL.dll"
-  File "..\..\executable\libGLESv2.dll"
-  File "..\..\executable\d3dcompiler_47.dll"
+  File "..\..\executable\opengl32sw.dll"
+  File "..\..\executable\D3Dcompiler_47.dll"
   File "..\..\executable\IPXACTmodels.dll"
   File "..\..\PythonAPI\pythonAPI.py"
   File "..\..\PythonAPI\_pythonAPI.pyd"
@@ -119,7 +117,6 @@ Section "MainSection" SEC01
 
   SetOutPath "$INSTDIR\platforms"
   SetOverwrite on
-  File "..\..\executable\platforms\qminimal.dll"
   File "..\..\executable\platforms\qwindows.dll"
 
   SetOutPath "$INSTDIR\sqldrivers"
@@ -130,6 +127,10 @@ Section "MainSection" SEC01
   SetOverwrite on
   File "..\..\executable\styles\qwindowsvistastyle.dll"
 
+  SetOutPath "$INSTDIR\imageformats"
+  SetOverwrite on
+  File "..\..\executable\imageformats\qjpeg.dll"
+
   SetOutPath "$INSTDIR\Plugins"
   SetOverwrite on
   File "..\..\executable\Plugins\MCAPICodeGenerator.dll"
@@ -207,8 +208,8 @@ SectionEnd
 Section "DependencySection" SEC02
   SetOutPath "$TEMP\Kactus2Installer"
   SetOverwrite ifnewer
-  File "vcredist_x64.exe"
-  ExecWait '"$OUTDIR\vcredist_x64.exe" /q /norestart'
+  File "..\..\executable\vc_redist.x64.exe"
+  ExecWait '"$OUTDIR\vc_redist.x64.exe" /q /norestart'
   SetOutPath "$INSTDIR"
   RMDir /r "$TEMP\Kactus2Installer"
 SectionEnd
@@ -281,8 +282,8 @@ Section Uninstall
   Delete "$INSTDIR\Plugins\MCAPICodeGenerator.dll"
   Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
   Delete "$INSTDIR\sqldrivers\qsqlite.dll"
-  Delete "$INSTDIR\platforms\qminimal.dll"
   Delete "$INSTDIR\platforms\qwindows.dll"
+  Delete "$INSTDIR\imageformats\qjpeg.dll"
   Delete "$INSTDIR\DefaultSettings.ini"
   Delete "$INSTDIR\upgrade.cfg"
   Delete "$INSTDIR\README.md"
@@ -293,15 +294,13 @@ Section Uninstall
   Delete "$INSTDIR\_pythonAPI.pyd"
   Delete "$INSTDIR\pythonAPI.py"
   Delete "$INSTDIR\IPXACTmodels.dll"
-  Delete "$INSTDIR\d3dcompiler_47.dll"
-  Delete "$INSTDIR\libGLESv2.dll"
-  Delete "$INSTDIR\libEGL.dll"
+  Delete "$INSTDIR\D3Dcompiler_47.dll"
+  Delete "$INSTDIR\opengl32sw.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"
@@ -360,6 +359,7 @@ Section Uninstall
   RMDir "$INSTDIR\styles"
   RMDir "$INSTDIR\sqldrivers"
   RMDir "$INSTDIR\platforms"
+  RMDir "$INSTDIR\imageformats"
   RMDir "$INSTDIR\ExampleScripts"
   RMDir "$INSTDIR\__pycache__"
   RMDir "$INSTDIR\Library\tut.fi\ip.swp.api\IPTLM.apiDef\1.1"

Kactus2.vcxproj

@@ -206,7 +206,7 @@ CreateHelp
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <ProgramDatabaseFile>
       </ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -2280,6 +2280,7 @@ CreateHelp
       <Command Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
       </Command>
     </CustomBuild>
+    <ClInclude Include="resource1.h" />
     <ClInclude Include="settings\FileTypeColumns.h" />
     <QtMoc Include="settings\NewPluginsDialog.h">
     </QtMoc>
@@ -2924,6 +2925,9 @@ CreateHelp
     <None Include="wizards\common\IPXactElementComparator.inl" />
     <None Include="wizards\common\ListComparator.inl" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Kactus21.rc" />
+  </ItemGroup>
   <ItemGroup>
     <Image Include="appicon.ico" />
   </ItemGroup>

version.h

@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.13.646.0
+#define VERSION_FULL           3.13.3.0
 
 #define VERSION_BASEYEAR       0
 #define VERSION_DATE           "2024-10-10"
 #define VERSION_TIME           "14:09:32"
 
 #define VERSION_MAJOR          3
 #define VERSION_MINOR          13
-#define VERSION_BUILDNO        646
+#define VERSION_BUILDNO        3
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,13,646,0
-#define VERSION_PRODUCT        3,13,646,0
-#define VERSION_FILESTR        "3,13,646,0"
-#define VERSION_PRODUCTSTR     "3,13,646,0"
+#define VERSION_FILE           3,13,3,0
+#define VERSION_PRODUCT        3,13,3,0
+#define VERSION_FILESTR        "3,13,3,0"
+#define VERSION_PRODUCTSTR     "3,13,3,0"
 
 #endif