Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update guix studio installer #106

Merged
merged 6 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
IgnorableNamespaces="uap rescap">

<Identity
Name="Eclipse.EclipseThreadXGUIXStudio"
bo-ms marked this conversation as resolved.
Show resolved Hide resolved
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
Version="6.4.0.0" Name="Microsoft.AzureRTOSGUIXStudio"/>
Version="6.4.0.0" />

<Properties>
<DisplayName>Azure RTOS GUIX Studio</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
<DisplayName>Eclipse ThreadX GUIX Studio</DisplayName>
<PublisherDisplayName>Eclipse Foundation</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>

Expand Down
4 changes: 2 additions & 2 deletions guix_studio/clone_repo_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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"

Expand Down
20 changes: 10 additions & 10 deletions guix_studio/installer/guix_installer_release.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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=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
Expand Down Expand Up @@ -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/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

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions guix_studio/studiox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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/blob/main/rtos-docs/guix/about-guix-studio.md"), NULL, NULL, SW_SHOW);
}

void CstudioxApp::OnProjectNew()
Expand Down
4 changes: 2 additions & 2 deletions guix_studio/studiox_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ports/win32/src/gx_win32_display_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading