Skip to content

Commit bf30b3a

Browse files
authored
Merge pull request #106 from eclipse-threadx/bo-ms/update_installer
Update guix studio installer
2 parents f37f39a + 63d4cb3 commit bf30b3a

6 files changed

Lines changed: 21 additions & 20 deletions

File tree

guix_studio/build/vs_2019/msix_package_project/Package.appxmanifest

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
IgnorableNamespaces="uap rescap">
1010

1111
<Identity
12+
Name="Microsoft.AzureRTOSGUIXStudio"
1213
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
13-
Version="6.4.0.0" Name="Microsoft.AzureRTOSGUIXStudio"/>
14+
Version="6.4.0.0" />
1415

1516
<Properties>
16-
<DisplayName>Azure RTOS GUIX Studio</DisplayName>
17-
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
17+
<DisplayName>Eclipse ThreadX GUIX Studio</DisplayName>
18+
<PublisherDisplayName>Eclipse Foundation</PublisherDisplayName>
1819
<Logo>Images\StoreLogo.png</Logo>
1920
</Properties>
2021

guix_studio/clone_repo_dialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define new DEBUG_NEW
99
#endif
1010

11-
char guix_repo_url[] = "https://github.com/azure-rtos/guix.git";
11+
char guix_repo_url[] = "https://github.com/eclipse-threadx/guix.git";
1212

1313
BEGIN_MESSAGE_MAP(clone_repo_dialog, express_dialog)
1414
ON_WM_CLOSE()
@@ -263,7 +263,7 @@ void clone_repo_dialog::OnCloneRepo()
263263
TCHAR folder_path[MAX_PATH];
264264
char *repo_url = guix_repo_url;
265265

266-
if (BrowseForFolder(this->GetSafeHwnd(), _T("Select root for GUIX git repository clone..."), _T("C:\\Azure_RTOS"), folder_path))
266+
if (BrowseForFolder(this->GetSafeHwnd(), _T("Select root for GUIX git repository clone..."), _T("C:\\Eclipse_ThreadX"), folder_path))
267267
{
268268
//"git clone --depth 1 aka.ms/azrtos-guix-repo --branch master --single-branch"
269269

guix_studio/installer/guix_installer_release.iss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
; Do not use the same AppId value in installers for other applications.
77
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
88
AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF}
9-
AppName= GUIX Studio
9+
AppName=GUIX Studio
1010
AppVersion=6.4.0.0
11-
;AppPublisher=
12-
AppPublisherURL=https://azure.com/rtos
13-
AppSupportURL=https://azure.com/rtos
14-
AppUpdatesURL=https://azure.com/rtos
15-
DefaultDirName={sd}\Azure_RTOS\GUIX_Studio_6.4
16-
DefaultGroupName=Azure RTOS
11+
AppPublisher=Eclipse Foundation
12+
AppPublisherURL=https://threadx.io/
13+
AppSupportURL=https://threadx.io/
14+
AppUpdatesURL=https://threadx.io/
15+
DefaultDirName={sd}\Eclipse_ThreadX\GUIX_Studio_6.4
16+
DefaultGroupName=Eclipse_ThreadX
1717
CloseApplications=no
1818
;LicenseFile=
1919
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
4747

4848
[Icons]
4949
Name: "{group}\GUIX Studio 6.4\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio.exe"
50-
Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://aka.ms/azrtos-guix-studio-user-guide"
51-
Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://aka.ms/azrtos-guix-user-guide"
50+
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"
51+
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"
5252
Name: "{group}\GUIX Studio 6.4\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}"
5353
Name: "{commondesktop}\GUIX Studio 6.4.0.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon
5454

@@ -58,7 +58,7 @@ Root: HKCR; Subkey: "GUIX_Studio_Project"; ValueType: string; ValueName: ""; Val
5858
Root: HKCR; Subkey: "GUIX_Studio_Project\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\studio\GUIX_Studio.exe,0"; Tasks: associate
5959
Root: HKCR; Subkey: "GUIX_Studio_Project\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\studio\GUIX_Studio.exe"" ""%1"""; Tasks: associate
6060

61-
Root: HKLM; Subkey: "Software\Microsoft\Azure_RTOS\GUIX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}";
61+
Root: HKLM; Subkey: "Software\Eclipse Foundation\GUIX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}";
6262

6363
[Run]
6464
Filename: "{tmp}\vc_redist.x86.exe"; StatusMsg: "Installing Visual C++ 2015-2019 Redistributable(x86)"; Parameters:"/passive"

guix_studio/studiox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ BOOL CstudioxApp::InitInstance()
220220
studiox_version_string += CString("-engineering");
221221
#endif
222222

223-
CString fulltitle = _T("Azure RTOS GUIX Studio ");
223+
CString fulltitle = _T("Eclipse ThreadX GUIX Studio ");
224224
fulltitle += studiox_version_string;
225225

226226
m_pMainWnd->SetWindowText(fulltitle);
@@ -456,7 +456,7 @@ void CstudioxApp::OnAppAbout()
456456

457457
void CstudioxApp::OnUsersGuide()
458458
{
459-
ShellExecute(NULL, _T("open"), _T("https://aka.ms/azrtos-guix-studio-user-guide"), NULL, NULL, SW_SHOW);
459+
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);
460460
}
461461

462462
void CstudioxApp::OnProjectNew()

guix_studio/studiox_util.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ void MakePath(CString path)
846846
CString GetAppDataPath()
847847
{
848848
CString path = CString(getenv("APPDATA"));
849-
path += "\\Microsoft\\Azure_RTOS\\GUIX_Studio";
849+
path += "\\Eclipse Foundation\\Eclipse_ThreadX\\GUIX_Studio";
850850
MakePath(path);
851851
return path;
852852
}
@@ -1037,7 +1037,7 @@ CString GetSamplesDir()
10371037
{
10381038
// Not installed from App Store, so running local test.
10391039
// Added this for testing, version test might needed here.
1040-
return _T("C:\\Azure_RTOS\\GUIX_Studio_test");
1040+
return _T("C:\\Eclipse_ThreadX\\GUIX_Studio_test");
10411041
}
10421042
}
10431043
}

ports/win32/src/gx_win32_display_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ LONG status;
584584

585585
icon_path[0] = 0;
586586

587-
status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Azure_RTOS\\GUIX\\InstallDir", 0, READ_CONTROL | KEY_QUERY_VALUE, &key);
587+
status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Eclipse Foundation\\GUIX\\InstallDir", 0, READ_CONTROL | KEY_QUERY_VALUE, &key);
588588

589589
if (key)
590590
{

0 commit comments

Comments
 (0)