From 24618774faa4d8a701c76fa9b7643a59d64b677c Mon Sep 17 00:00:00 2001 From: bo chen Date: Wed, 21 Feb 2024 16:54:54 +0800 Subject: [PATCH 1/5] Update installer --- .../msix_package_project/Package.appxmanifest | 9 +++++---- guix_studio/clone_repo_dialog.cpp | 2 +- .../installer/guix_installer_release.iss | 20 +++++++++---------- guix_studio/studiox.cpp | 4 ++-- guix_studio/studiox_util.cpp | 4 ++-- ports/win32/src/gx_win32_display_driver.c | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest index faf95155..1bcf4b9e 100644 --- a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest +++ b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest @@ -9,12 +9,13 @@ IgnorableNamespaces="uap rescap"> + Name="Eclipse.EclipseThreadXTraceX" + Publisher="CN=Eclipse Foundation, O=Eclipse Foundation, L=Ottawa, S=Ontario, C=CA" + Version="6.4.0.0" /> - Azure RTOS GUIX Studio - Microsoft Corporation + Eclipse ThreadX GUIX Studio + Eclipse Foundation Images\StoreLogo.png diff --git a/guix_studio/clone_repo_dialog.cpp b/guix_studio/clone_repo_dialog.cpp index 1f45c77e..265ea863 100644 --- a/guix_studio/clone_repo_dialog.cpp +++ b/guix_studio/clone_repo_dialog.cpp @@ -263,7 +263,7 @@ void clone_repo_dialog::OnCloneRepo() TCHAR folder_path[MAX_PATH]; char *repo_url = guix_repo_url; - if (BrowseForFolder(this->GetSafeHwnd(), _T("Select root for GUIX git repository clone..."), _T("C:\\Azure_RTOS"), folder_path)) + if (BrowseForFolder(this->GetSafeHwnd(), _T("Select root for GUIX git repository clone..."), _T("C:\\Eclipse_ThreadX"), folder_path)) { //"git clone --depth 1 aka.ms/azrtos-guix-repo --branch master --single-branch" diff --git a/guix_studio/installer/guix_installer_release.iss b/guix_studio/installer/guix_installer_release.iss index b9337c8c..d62d032f 100644 --- a/guix_studio/installer/guix_installer_release.iss +++ b/guix_studio/installer/guix_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= GUIX Studio +AppName=Eclipse ThreadX GUIX Studio 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\GUIX_Studio_6.4 -DefaultGroupName=Azure RTOS +AppPublisher=Eclipse Foundation +AppPublisherURL=https://threadx.io/ +AppSupportURL=https://threadx.io/ +AppUpdatesURL=https://threadx.io/ +DefaultDirName={sd}\Eclipse_ThreadX\GUIX_Studio_6.4 +DefaultGroupName=Eclipse_ThreadX CloseApplications=no ;LicenseFile= OutputBaseFilename=guix_studio_setup_version_6.4.0.0 @@ -47,8 +47,8 @@ Source: "build\vs_2019\Release\guix_studio.exe"; DestDir: "{app}\studio"; DestNa [Icons] Name: "{group}\GUIX Studio 6.4\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio.exe" -Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://aka.ms/azrtos-guix-studio-user-guide" -Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://aka.ms/azrtos-guix-user-guide" +Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" +Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" Name: "{group}\GUIX Studio 6.4\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}" Name: "{commondesktop}\GUIX Studio 6.4.0.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon @@ -58,7 +58,7 @@ Root: HKCR; Subkey: "GUIX_Studio_Project"; ValueType: string; ValueName: ""; Val Root: HKCR; Subkey: "GUIX_Studio_Project\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\studio\GUIX_Studio.exe,0"; Tasks: associate Root: HKCR; Subkey: "GUIX_Studio_Project\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\studio\GUIX_Studio.exe"" ""%1"""; Tasks: associate -Root: HKLM; Subkey: "Software\Microsoft\Azure_RTOS\GUIX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}"; +Root: HKLM; Subkey: "Software\Eclipse Foundation\GUIX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}"; [Run] Filename: "{tmp}\vc_redist.x86.exe"; StatusMsg: "Installing Visual C++ 2015-2019 Redistributable(x86)"; Parameters:"/passive" diff --git a/guix_studio/studiox.cpp b/guix_studio/studiox.cpp index 79a820b9..42a1e8cd 100644 --- a/guix_studio/studiox.cpp +++ b/guix_studio/studiox.cpp @@ -220,7 +220,7 @@ BOOL CstudioxApp::InitInstance() studiox_version_string += CString("-engineering"); #endif - CString fulltitle = _T("Azure RTOS GUIX Studio "); + CString fulltitle = _T("Eclipse ThreadX GUIX Studio "); fulltitle += studiox_version_string; m_pMainWnd->SetWindowText(fulltitle); @@ -456,7 +456,7 @@ void CstudioxApp::OnAppAbout() void CstudioxApp::OnUsersGuide() { - ShellExecute(NULL, _T("open"), _T("https://aka.ms/azrtos-guix-studio-user-guide"), NULL, NULL, SW_SHOW); + ShellExecute(NULL, _T("open"), _T("https://github.com/eclipse-threadx/rtos-docs"), NULL, NULL, SW_SHOW); } void CstudioxApp::OnProjectNew() diff --git a/guix_studio/studiox_util.cpp b/guix_studio/studiox_util.cpp index fd720cc8..dadcca12 100644 --- a/guix_studio/studiox_util.cpp +++ b/guix_studio/studiox_util.cpp @@ -846,7 +846,7 @@ void MakePath(CString path) CString GetAppDataPath() { CString path = CString(getenv("APPDATA")); - path += "\\Microsoft\\Azure_RTOS\\GUIX_Studio"; + path += "\\Eclipse Foundation\\Eclipse_ThreadX\\GUIX_Studio"; MakePath(path); return path; } @@ -1037,7 +1037,7 @@ CString GetSamplesDir() { // Not installed from App Store, so running local test. // Added this for testing, version test might needed here. - return _T("C:\\Azure_RTOS\\GUIX_Studio_test"); + return _T("C:\\Eclipse_ThreadX\\GUIX_Studio_test"); } } } diff --git a/ports/win32/src/gx_win32_display_driver.c b/ports/win32/src/gx_win32_display_driver.c index 67976905..a65fe4de 100644 --- a/ports/win32/src/gx_win32_display_driver.c +++ b/ports/win32/src/gx_win32_display_driver.c @@ -584,7 +584,7 @@ LONG status; icon_path[0] = 0; - status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Azure_RTOS\\GUIX\\InstallDir", 0, READ_CONTROL | KEY_QUERY_VALUE, &key); + status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Eclipse Foundation\\GUIX\\InstallDir", 0, READ_CONTROL | KEY_QUERY_VALUE, &key); if (key) { From e559706b02d320466ccb7278e0d9102ffb03d02f Mon Sep 17 00:00:00 2001 From: bo chen Date: Wed, 21 Feb 2024 17:53:49 +0800 Subject: [PATCH 2/5] Update repo url --- guix_studio/clone_repo_dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix_studio/clone_repo_dialog.cpp b/guix_studio/clone_repo_dialog.cpp index 265ea863..1e442e24 100644 --- a/guix_studio/clone_repo_dialog.cpp +++ b/guix_studio/clone_repo_dialog.cpp @@ -8,7 +8,7 @@ #define new DEBUG_NEW #endif -char guix_repo_url[] = "https://github.com/azure-rtos/guix.git"; +char guix_repo_url[] = "https://github.com/eclipse-threadx/guix.git"; BEGIN_MESSAGE_MAP(clone_repo_dialog, express_dialog) ON_WM_CLOSE() From 8b9fb006e5e4ad2520e7688c80c259bd5a6e8c45 Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 13:36:37 +0800 Subject: [PATCH 3/5] Update the link. --- .../build/vs_2019/msix_package_project/Package.appxmanifest | 4 ++-- guix_studio/installer/guix_installer_release.iss | 4 ++-- guix_studio/studiox.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest index 1bcf4b9e..6d58180f 100644 --- a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest +++ b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest @@ -9,8 +9,8 @@ IgnorableNamespaces="uap rescap"> diff --git a/guix_studio/installer/guix_installer_release.iss b/guix_studio/installer/guix_installer_release.iss index d62d032f..f71d40e9 100644 --- a/guix_studio/installer/guix_installer_release.iss +++ b/guix_studio/installer/guix_installer_release.iss @@ -47,8 +47,8 @@ Source: "build\vs_2019\Release\guix_studio.exe"; DestDir: "{app}\studio"; DestNa [Icons] Name: "{group}\GUIX Studio 6.4\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio.exe" -Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" -Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs" +Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/guix/about-guix-studio.md" +Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/guix/about-guix-studio.md" Name: "{group}\GUIX Studio 6.4\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}" Name: "{commondesktop}\GUIX Studio 6.4.0.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon diff --git a/guix_studio/studiox.cpp b/guix_studio/studiox.cpp index 42a1e8cd..4b65c14e 100644 --- a/guix_studio/studiox.cpp +++ b/guix_studio/studiox.cpp @@ -456,7 +456,7 @@ void CstudioxApp::OnAppAbout() void CstudioxApp::OnUsersGuide() { - ShellExecute(NULL, _T("open"), _T("https://github.com/eclipse-threadx/rtos-docs"), NULL, NULL, SW_SHOW); + ShellExecute(NULL, _T("open"), _T("https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/guix/about-guix-studio.md"), NULL, NULL, SW_SHOW); } void CstudioxApp::OnProjectNew() From 7fe826600d2488e7e960b96dd9a7ecfd4a1fcfc7 Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 13:59:32 +0800 Subject: [PATCH 4/5] Update the name. --- guix_studio/installer/guix_installer_release.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix_studio/installer/guix_installer_release.iss b/guix_studio/installer/guix_installer_release.iss index f71d40e9..6f43b4f6 100644 --- a/guix_studio/installer/guix_installer_release.iss +++ b/guix_studio/installer/guix_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 GUIX Studio +AppName=GUIX Studio AppVersion=6.4.0.0 AppPublisher=Eclipse Foundation AppPublisherURL=https://threadx.io/ From f264eb1879dde7e6eb52909ca2f10e39e8419190 Mon Sep 17 00:00:00 2001 From: bo chen Date: Thu, 22 Feb 2024 15:30:45 +0800 Subject: [PATCH 5/5] Revert the changes for identity. --- .../build/vs_2019/msix_package_project/Package.appxmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest index 6d58180f..41b79491 100644 --- a/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest +++ b/guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest @@ -9,7 +9,7 @@ IgnorableNamespaces="uap rescap">