From da0c470f1f1d70caa5b0ac8059cbe47f0575eef0 Mon Sep 17 00:00:00 2001 From: bo chen Date: Wed, 21 Feb 2024 16:16:28 +0800 Subject: [PATCH 1/5] Update tracex installer. --- installer/tracex_installer_release.iss | 16 ++++++++-------- src/MsixPackageProject/Package.appxmanifest | 12 ++++++------ src/TraceX/Properties/AssemblyInfo.cs | 6 +++--- src/TraceX/TraceXView.xaml.cs | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/installer/tracex_installer_release.iss b/installer/tracex_installer_release.iss index 16520af..2520069 100644 --- a/installer/tracex_installer_release.iss +++ b/installer/tracex_installer_release.iss @@ -6,14 +6,14 @@ ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF} -AppName=TraceX +AppName=Eclipse ThreadX TraceX AppVersion=6.4.0.0 -;AppPublisher= -AppPublisherURL=https://azure.com/rtos -AppSupportURL=https://azure.com/rtos -AppUpdatesURL=https://azure.com/rtos -DefaultDirName={sd}\Azure_RTOS\TraceX_6.4 -DefaultGroupName=Azure RTOS +AppPublisher=Eclipse Foundation +AppPublisherURL=https://threadx.io/ +AppSupportURL=https://threadx.io/ +AppUpdatesURL=https://threadx.io/ +DefaultDirName={sd}\Eclipse_ThreadX\TraceX_6.4 +DefaultGroupName=Eclipse ThreadX CloseApplications=no ;LicenseFile= OutputBaseFilename=tracex_setup @@ -55,7 +55,7 @@ Source: "src\MsixPackageProject\TraceFiles\demo_threadx.trx"; DestDir: "{app}/Tr [Icons] Name: "{group}\TraceX 6.4\TraceX"; Filename: "{app}\TraceX.exe" -Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://aka.ms/azrtos-tracex-user-guide" +Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" Name: "{group}\TraceX 6.4\{cm:UninstallProgram,TraceX}"; Filename: "{uninstallexe}" Name: "{commondesktop}\TraceX 6.4.0.0"; Filename: "{app}\TraceX.exe"; Tasks: desktopicon diff --git a/src/MsixPackageProject/Package.appxmanifest b/src/MsixPackageProject/Package.appxmanifest index 3542efd..4e46a02 100644 --- a/src/MsixPackageProject/Package.appxmanifest +++ b/src/MsixPackageProject/Package.appxmanifest @@ -9,13 +9,13 @@ IgnorableNamespaces="uap rescap"> - Azure RTOS TraceX - Microsoft Corporation + Eclipse ThreadX TraceX + Eclipse Foundation Images\StoreLogo.png @@ -34,8 +34,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> diff --git a/src/TraceX/Properties/AssemblyInfo.cs b/src/TraceX/Properties/AssemblyInfo.cs index 666aa9b..d106d4c 100644 --- a/src/TraceX/Properties/AssemblyInfo.cs +++ b/src/TraceX/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Azure RTOS TraceX")] +[assembly: AssemblyTitle("Eclipse ThreadX TraceX")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyCompany("Eclipse Foundation")] [assembly: AssemblyProduct("TraceX")] -[assembly: AssemblyCopyright("Microsoft Corporation, 2006 - 2020")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/TraceX/TraceXView.xaml.cs b/src/TraceX/TraceXView.xaml.cs index 60e99dc..da1bbd6 100644 --- a/src/TraceX/TraceXView.xaml.cs +++ b/src/TraceX/TraceXView.xaml.cs @@ -20,7 +20,7 @@ namespace AzureRTOS.TraceManagement public partial class TraceXView : Window { - public const string _tracexVersion = "Azure RTOS TraceX 6.4.0.0"; + public const string _tracexVersion = "Eclipse ThreadX TraceX 6.4.0.0"; private List _infoWindows = new List(); private const double _eventDisplayWidth = 12; @@ -128,7 +128,7 @@ private void CheckInvokeInstallDialog() // Create the default directory, otherwise the Browser dialog // will not allow us to start there: - string default_path = "C:\\Azure_RTOS\\TraceX"; + string default_path = "C:\\Eclipse_ThreadX\\TraceX"; if (!Directory.Exists(default_path)) { @@ -1115,7 +1115,7 @@ private void ZoomLimitReached(object sender, Code.ZoomEventArgs e) public static string GetInstallDir() { // default to something reasonable in case registry key lookup fails - string installDir = "C:\\Azure_RTOS\\TraceX"; + string installDir = "C:\\Eclipse_ThreadX\\TraceX"; string installPath = Path.GetDirectoryName(Application.ResourceAssembly.Location); if (!installPath.Contains("WindowsApps")) @@ -1157,7 +1157,7 @@ private void OnExit(object sender, RoutedEventArgs e) // Handler for Help -> Manual. private void OnOpenManual(object sender, RoutedEventArgs e) { - string url = "https://docs.microsoft.com/en-us/azure/rtos/tracex/"; + string url = "https://github.com/eclipse-threadx/rtos-docs"; System.Diagnostics.Process.Start(url); } From 512d1631800e275ea61241411f3b901ede8e0587 Mon Sep 17 00:00:00 2001 From: bo chen Date: Wed, 21 Feb 2024 16:25:45 +0800 Subject: [PATCH 2/5] Update --- installer/tracex_installer_release.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/tracex_installer_release.iss b/installer/tracex_installer_release.iss index 2520069..19885d4 100644 --- a/installer/tracex_installer_release.iss +++ b/installer/tracex_installer_release.iss @@ -64,7 +64,7 @@ Root: HKCR; Subkey: ".trx"; ValueType: string; ValueName: ""; ValueData: "TraceX Root: HKCR; Subkey: "TraceX_Data_File\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\TraceX.exe,0"; Tasks: associate Root: HKCR; Subkey: "TraceX_Data_File\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\TraceX.exe"" ""%1"""; Tasks: associate -Root: HKLM; Subkey: "Software\Microsoft Corporation\TraceX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}"; +Root: HKLM; Subkey: "Software\Eclipse Foundation\TraceX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}"; [Run] ; Filename: "{app}\TraceX.exe"; Description: "{cm:LaunchProgram,TraceX}"; Flags: nowait postinstall skipifsilent From 4b3b929a5dfeb5b695befbe390c8e1cb77236669 Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 13:37:21 +0800 Subject: [PATCH 3/5] Update the link --- installer/tracex_installer_release.iss | 2 +- src/MsixPackageProject/Package.appxmanifest | 2 +- src/TraceX/TraceXView.xaml.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/tracex_installer_release.iss b/installer/tracex_installer_release.iss index 19885d4..e3b9d60 100644 --- a/installer/tracex_installer_release.iss +++ b/installer/tracex_installer_release.iss @@ -55,7 +55,7 @@ Source: "src\MsixPackageProject\TraceFiles\demo_threadx.trx"; DestDir: "{app}/Tr [Icons] Name: "{group}\TraceX 6.4\TraceX"; Filename: "{app}\TraceX.exe" -Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" +Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/tracex/overview-tracex.md" Name: "{group}\TraceX 6.4\{cm:UninstallProgram,TraceX}"; Filename: "{uninstallexe}" Name: "{commondesktop}\TraceX 6.4.0.0"; Filename: "{app}\TraceX.exe"; Tasks: desktopicon diff --git a/src/MsixPackageProject/Package.appxmanifest b/src/MsixPackageProject/Package.appxmanifest index 4e46a02..1cc3e1f 100644 --- a/src/MsixPackageProject/Package.appxmanifest +++ b/src/MsixPackageProject/Package.appxmanifest @@ -10,7 +10,7 @@ diff --git a/src/TraceX/TraceXView.xaml.cs b/src/TraceX/TraceXView.xaml.cs index da1bbd6..6a310c5 100644 --- a/src/TraceX/TraceXView.xaml.cs +++ b/src/TraceX/TraceXView.xaml.cs @@ -1157,7 +1157,7 @@ private void OnExit(object sender, RoutedEventArgs e) // Handler for Help -> Manual. private void OnOpenManual(object sender, RoutedEventArgs e) { - string url = "https://github.com/eclipse-threadx/rtos-docs"; + string url = "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/tracex/overview-tracex.md"; System.Diagnostics.Process.Start(url); } From 242052e30ed32453a98366ddf4237a00b2ff0343 Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 13:59:13 +0800 Subject: [PATCH 4/5] Update the name. --- installer/tracex_installer_release.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/tracex_installer_release.iss b/installer/tracex_installer_release.iss index e3b9d60..e50091b 100644 --- a/installer/tracex_installer_release.iss +++ b/installer/tracex_installer_release.iss @@ -6,7 +6,7 @@ ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF} -AppName=Eclipse ThreadX TraceX +AppName=TraceX AppVersion=6.4.0.0 AppPublisher=Eclipse Foundation AppPublisherURL=https://threadx.io/ From a57833dd993f454f76a36fca33e30c15a3a262ae Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 15:32:39 +0800 Subject: [PATCH 5/5] Revert the changes of identity. --- src/MsixPackageProject/Package.appxmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MsixPackageProject/Package.appxmanifest b/src/MsixPackageProject/Package.appxmanifest index 1cc3e1f..d611792 100644 --- a/src/MsixPackageProject/Package.appxmanifest +++ b/src/MsixPackageProject/Package.appxmanifest @@ -9,7 +9,7 @@ IgnorableNamespaces="uap rescap">