Skip to content

Commit

Permalink
Improve and simplify Windows installer flow
Browse files Browse the repository at this point in the history 
* Always install the the user's local directory
  (skip the dialog asking where to install)

* Skip login/register dialog (it doesn't work yet)

* Improve prose
  • Loading branch information
@avital
avital committed Mar 4, 2015
1 parent ff0f304 commit 405009a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion scripts/windows/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PowerShell.
Prerequisites:
==============

Installed Visual C++ 2010 Express, which can be found here:
Install Visual C++ 2010 Express, which can be found here:
* http://www.visualstudio.com/downloads/download-visual-studio-vs

Then, install Visual Studio 2010 Service Pack 1 here:
Expand Down
12 changes: 6 additions & 6 deletions scripts/windows/installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,9 +793,9 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati

WCHAR wzInfo[1024] = { };
if (m_fIsUninstall)
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Uninstalling %s ...", wz);
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Uninstalling %s...", wz);
else
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Installing %s ...", wz);
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Installing %s...", wz);

ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz);
ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz);
Expand Down Expand Up @@ -831,9 +831,9 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati

WCHAR wzInfo[1024] = { };
if (m_fIsUninstall)
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Uninstalling %s ... [ %u%% ]", wzPackageName, dwProgressPercentage);
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Uninstalling %s...", wzPackageName, dwProgressPercentage);
else
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Installing %s ... [ %u%% ]", wzPackageName, dwProgressPercentage);
::StringCchPrintfW(wzInfo, countof(wzInfo), L"Installing %s...", wzPackageName, dwProgressPercentage);
ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wzInfo);

m_dwCalculatedExecuteProgress = dwOverallProgressPercentage * (100 - WIXSTDBA_ACQUIRE_PERCENTAGE) / 100;
Expand Down Expand Up @@ -1892,7 +1892,7 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
return 0;

case WIXSTDBA_CONTROL_INSTALL_BUTTON:
pBA->OnClickInstallButton(FALSE);
pBA->OnClickInstallButton(TRUE);
return 0;

case WIXSTDBA_CONTROL_REPAIR_BUTTON:
Expand Down Expand Up @@ -2191,7 +2191,7 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati

if (m_fAttachedToConsole)
{
char szPgLine[] = "\nMeteor setup progress...\n";
char szPgLine[] = "\nInstalling...\n";
DWORD dSzWritten;
WriteConsole(m_fStdConsoleHandle, szPgLine, strlen(szPgLine), &dSzWritten, NULL);
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/windows/installer/WiXInstaller/Meteor_Bundle.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<Variable Name="TermsUrl" Type="string" Value="$(var.METEOR_TermsUrl)" />
<Variable Name="PrivacyUrl" Type="string" Value="$(var.METEOR_PrivacyUrl)" />

<Variable Name="PerMachineInstall" Type="numeric" Persisted="yes" Value="1" />
<Variable Name="PerUserInstall" Type="numeric" Persisted="yes" Value="0" />
<Variable Name="PerMachineInstall" Type="numeric" Persisted="yes" Value="0" />
<Variable Name="PerUserInstall" Type="numeric" Persisted="yes" Value="1" />
<Variable Name="CreateRButton" Type="numeric" Persisted="yes" Value="1" />
<Variable Name="SignInRButton" Type="numeric" Persisted="yes" Value="0" />
<Variable Name="RegisterEmail" Type="string" Persisted="yes" Value="" Hidden="yes" />
Expand All @@ -45,7 +45,7 @@
<Variable Name="UserMeteorSessionFile" Type="string" Persisted="yes" Value="%HOMEPATH%\.meteorsession" />
<Variable Name="PerMachineInstallFolder" Type="string" Persisted="yes" Value="[ProgramFilesFolder][WixBundleName]" />
<Variable Name="PerUserInstallFolder" Type="string" Persisted="yes" Value="[LocalAppDataFolder]" />
<Variable Name="InstallFolder" Type="string" Persisted="yes" Value="[ProgramFilesFolder][WixBundleName]" />
<Variable Name="InstallFolder" Type="string" Persisted="yes" Value="[PerUserInstallFolder]" />

<Variable Name="InstallRegPath" Type="string" Persisted="yes" Value="SOFTWARE\$(var.METEOR_Manufacturer)\$(var.METEOR_ProductName)\Install" />
<Variable Name="MSICustomErrFile" Type="string" Persisted="yes" Value="[WixBundleLog].err" />
Expand Down
8 changes: 4 additions & 4 deletions scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.wxl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Caption">[WixBundleName] Setup</String>
<String Id="Caption">Install [WixBundleName]</String>
<String Id="Title">[WixBundleName]</String>
<String Id="InstallHeader">Welcome to the [WixBundleName] Setup</String>
<String Id="InstallMessage">Setup will install [WixBundleName] on your computer. During the wizard, you will be able to adjust product features and settings that fit best to your needs.</String>
Expand Down Expand Up @@ -75,14 +75,14 @@
<String Id="ExecuteProgressActionDataText"></String>
<String Id="ProgressCancelButton">&amp;Cancel</String>
<String Id="ModifyHeader">[WixBundleName] Maintenance</String>
<String Id="ModifyInfo">The setup wizard allows you to repair or remove the [WixBundleName] on your computer. If you have a previous [WixBundleName] application currently running, it is recommended to close it.&#13;&#13;&#10;Click Repair if you want to repair [WixBundleName], Uninstall to remove it or click Cancel to close this maintenance wizard.</String>
<String Id="ModifyInfo">The setup wizard allows you to repair or remove [WixBundleName] from your computer. If you have a [WixBundleName] application currently running, it is recommended to close it.&#13;&#13;&#10;Click Repair if you want to repair [WixBundleName], Uninstall to remove it or click Cancel to close this maintenance wizard.</String>
<String Id="ModifyRepairButton">&amp;Repair</String>
<String Id="ModifyUninstallButton">&amp;Uninstall</String>
<String Id="ModifyCloseButton">&amp;Close</String>
<String Id="SuccessHeader">Setup Successful</String>
<String Id="SuccessHeader">Meteor Installed</String>
<String Id="SuccessHeaderRepair">Repair Successful</String>
<String Id="SuccessHeaderUninstall">Uninstall Successful</String>
<String Id="SuccessInfo">Setup has finished installing [WixBundleName] on your computer.&#13;&#10;&#13;&#10;Open a commandprompt window and type "meteor" to start.</String>
<String Id="SuccessInfo">Meteor is now installed on your computer.&#13;&#10;&#13;&#10;Open a new command prompt and run "meteor".</String>
<String Id="SuccessErrorInfoText">Following non critical errors occured:</String>
<String Id="SuccessInfoRepair">Setup has finished repairing [WixBundleName] installed on your computer. The application may be launched by selecting the installed icons.</String>
<String Id="SuccessInfoUninstall">[WixBundleName] was successfully removed from your computer.</String>
Expand Down
6 changes: 2 additions & 4 deletions scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<Hypertext Name="UpgradeHyperlink" X="178" Y="-16" Width="-24" Height="17" TabStop="yes" FontId="4" HideWhenDisabled="yes">#(loc.InstallUpgradeLinkText)</Hypertext>-->

<Text X="24" Y="-10" Width="100" Height="14" FontId="5" DisablePrefix="yes">#(loc.InstallVersion)</Text>
<Button Name="NextButton" X="200" Y="-142" Width="-200" Height="44" TabStop="yes" FontId="3">#(loc.InstallMeteor)</Button>
<Button Name="InstallButton" X="200" Y="-142" Width="-200" Height="44" TabStop="yes" FontId="3">#(loc.InstallMeteor)</Button>
</Page>
<Page Name="InstallDir">
<Image X="0" Y="0" Width="618" Height="363" ImageFile="Background.png"/>
Expand Down Expand Up @@ -79,10 +79,8 @@
<Image X="0" Y="0" Width="618" Height="363" ImageFile="Background.png"/>
<Image X="0" Y="0" Width="618" Height="56" ImageFile="TopHeader.png"/>
<Text Name="ProgressHeader" X="24" Y="20" Width="-220" Height="24" FontId="2" DisablePrefix="yes">[varProgressHeader]</Text>
<Text Name="ProgressInfo" X="24" Y="78" Width="-24" Height="36" FontId="1" DisablePrefix="yes">[varProgressInfo]</Text>
<Text Name="OverallProgressPackageText" X="24" Y="161" Width="-24" Height="17" FontId="0" DisablePrefix="yes">#(loc.ExecuteProgressText)</Text>
<Progressbar Name="OverallCalculatedProgressbar" X="24" Y="183" Width="-24" Height="17" />
<Text Name="ExecuteProgressActionDataText" X="98" Y="205" Width="-24" Height="52" FontId="0" DisablePrefix="yes">#(loc.ExecuteProgressActionDataText)</Text>
<Text Name="ExecuteProgressActionDataText" X="24" Y="205" Width="-24" Height="52" FontId="0" DisablePrefix="yes">#(loc.ExecuteProgressActionDataText)</Text>
<Button Name="ProgressCancelButton" X="-24" Y="-10" Width="110" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
</Page>
<Page Name="Modify">
Expand Down

0 comments on commit 405009a

Please sign in to comment.