Commit graph

344 commits

Author SHA1 Message Date
Roxanne Skelly
1aaaca4e6c Code review changes 2018-09-28 10:48:20 -07:00
Roxanne Skelly
308deeaa8d Refactoring of NSIS setup files with respect to Sandbox vs Console 2018-09-27 19:54:42 -07:00
Roxanne Skelly
6d0996c254 Show "Sandbox" as the server component for server installs, show
"Console" for client-only installs
2018-09-27 16:52:03 -07:00
Roxanne Skelly
ba1bae6408 OSX Build fix 2018-09-26 17:43:04 -07:00
Roxanne Skelly
be87773b2c Checkpoint sysTray Installer 2018-09-26 10:47:33 -07:00
Simon Walton
dc5da4e22b Add cmake variable BYPASS_SIGNING to control signing-file behaviour 2018-08-01 16:35:14 -07:00
SimonWalton-HiFi
21b2187f66
Merge branch 'master' into check-pfx-file 2018-07-03 13:22:27 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate
Updated time stamping server for authenticode signatures
2018-06-29 16:46:22 -07:00
Marko Kudjerski
0ac1ea078e Updated time stamping server for authenticode signatures
Symantec's time stamp server seems to be more robust.
2018-06-15 08:20:58 -07:00
Simon Walton
929f6f3059 Only try to sign a Win installer if we have a private key file 2018-06-13 16:42:05 -07:00
Simon Walton
ce7a10c143 Add AppUserModelID to desktop shortcut for Sandbox also 2018-06-13 15:30:35 -07:00
SimonWalton-HiFi
66cad7831e
Merge branch 'master' into snoretoast 2018-06-13 12:10:51 -07:00
Simon Walton
01ef636411 Merge branch 'master' into snoretoast
Two simple conflicts fixed.
2018-06-13 11:19:56 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
2018-06-13 11:16:56 -07:00
Stephen Birarda
be64f4bcbf
Merge pull request #12917 from kitely/cmake-fixes
CMake fixes
2018-06-11 10:51:49 -07:00
Stephen Birarda
8dd268addb handle semantic version updates in sandbox 2018-06-08 17:21:06 -07:00
Simon Walton
97613f1f07 Only set app ID on sandbox link
Also pass down the app ID from CMake files to installer and
server-console.
2018-06-01 14:13:52 -07:00
Stephen Birarda
33a122c08e remove short SHA where it should not appear 2018-05-30 12:05:07 -07:00
Simon Walton
ef4d09c5e2 Add app user-model IDs to Sandbox shortcut and use in server-console 2018-05-30 10:21:07 -07:00
Simon Walton
65bb4c218e Distinguish appIDs for production & nonproduction 2018-05-25 11:02:49 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Simon Walton
f0570557b2 Assign a Win 'appUserModelId' and use it for toaster popups (notifications) 2018-05-24 10:56:17 -07:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
Stephen Birarda
02c1cd2d50 optionally use campaign serverless content during install 2018-04-23 13:54:47 -07:00
Stephen Birarda
0da51672bb don't stop image slideshow when install concludes 2018-04-19 18:52:45 -07:00
Stephen Birarda
7ecc279e00 show default or campaigned slideshow during install 2018-04-19 17:58:21 -07:00
Oren Hurvitz
cd06067030 Fixed based on PR review 2018-04-18 10:18:29 +03:00
Oren Hurvitz
5cdcf1c53e Eliminated spurious "resolved_item" warnings in CMake
Previously, building the project produced many warnings with this message:
    "resolved_item == resolved_embedded_item - not copying..."

These warnings are distracting as they make it difficult to see actual warnings. This commit changes the warnings to status messages.

This fix was copied from: https://github.com/jherico/OculusMinimalExample/blob/master/cmake/templates/FixupBundlePostBuild.cmake.in
2018-04-17 11:53:37 +03:00
Stephen Birarda
0d237f84b0 remove the installer information file during uninstall 2018-04-10 14:56:47 -07:00
Stephen Birarda
a2250a2a6d write an install info ini file to the installation dir 2018-04-05 18:52:07 -07:00
Stephen Birarda
16335a3b4b only remove selected components on clean install, leave wallet 2018-04-05 17:09:38 -07:00
Stephen Birarda
cfdf8c2588 handle launch client option for client only 2018-03-20 14:22:37 -07:00
Stephen Birarda
45d16731c3 fix abort of setup options page for express client 2018-03-20 14:22:37 -07:00
Stephen Birarda
9a664f25dc setup custom or express label correctly in installer 2018-03-20 14:22:37 -07:00
Stephen Birarda
932c55ca08 handle client section in component-less install 2018-03-20 14:22:37 -07:00
Stephen Birarda
c743bfcf27 templatize conditional for selection of server component 2018-03-20 14:21:52 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe
switch back to app-local VC runtimes and UCRT
2018-03-20 14:07:27 -07:00
Stephen Birarda
283eccd043 remove unneeded ANDROID block, revert removed line in NSIS 2018-03-15 16:21:49 -07:00
Atlante45
bbe98f61a6 Pull GUID storage in Registry for now. 2018-03-15 12:20:19 -07:00
Stephen Birarda
10dd16ae8d remove VS redist handling from NSIS template 2018-03-14 17:59:04 -07:00
Atlante45
2fe9f6df6f Add google analytics to installer 2018-03-14 14:17:38 -07:00
Atlante45
97729e8f41 Cleanup bad install 2018-01-30 17:10:06 -08:00
Stephen Birarda
c329a58c14 ignore vcredist when performing fixup_bundle 2017-12-06 11:26:34 -08:00
Brad Davis
2ae61cb96b Prototype packaging QML and related resources into a QRC 2017-10-14 14:40:46 -07:00
Bradley Austin Davis
2eff3dcbd6 Add additional DLL cleanup 2017-09-19 09:18:40 -07:00
Brad Davis
e595541da0 Remove old versions of the VC Runtime from the installation directory 2017-09-13 17:21:54 -07:00
Brad Hefta-Gaub
ca00349abc Merge pull request #11248 from birarda/feat/install-remember-custom
remember if express or custom was selected for install
2017-09-07 12:43:01 -07:00
Cain Kilgore
84f37b9663 Changed string name 2017-09-07 18:53:05 +01:00
Cain Kilgore
d429bd0b01 Changed the Interface text to say 'Task bar' instead of 'system tray' 2017-09-06 13:42:13 +01:00
Cain Kilgore
2a6b523542 Again 2017-09-06 13:09:43 +01:00
Cain Kilgore
14e5cf31f2 Apparently I didn't need 'em 2017-09-06 12:42:17 +01:00
Cain Kilgore
4d0df705a9 Forgot some {}'s 2017-09-06 11:46:57 +01:00
Cain Kilgore
e9f666d970 Made the system tray message specific to Sandbox only 2017-09-06 02:06:10 +01:00
Cain Kilgore
99a99ce71b WL 21513 - Update text in the "How to Quit The Sandbox" Prompt 2017-09-04 21:14:26 +01:00
Stephen Birarda
2661f92e09 fix state setting for express/custom 2017-08-25 14:05:40 -07:00
Stephen Birarda
6ac255dd21 add custom install reg key to cpack properties 2017-08-25 12:07:26 -07:00
Stephen Birarda
e848253618 remember if express or custom was selected for install 2017-08-25 10:59:56 -07:00
Brad Davis
be9c1b0d12 Revert "Fix bad plugins causing instant crash on startup" 2017-08-10 16:05:16 -07:00
Brad Davis
0452bcfbd5 Fix bad plugins causing instant crash on startup 2017-08-09 17:15:04 -07:00
utkarshgautamnyu
56c695acbb Update NSIS.template.in 2017-08-07 18:34:20 -07:00
utkarshgautamnyu
dc4121f9d1 Update NSIS.template.in 2017-08-07 17:55:45 -07:00
utkarshgautamnyu
b80def995f Update NSIS.template.in 2017-08-07 17:53:39 -07:00
utkarshgautamnyu
c9c36bb19e indentation fixes 2017-08-07 17:50:53 -07:00
utkarshgautamnyu
3ee5f78c40 bug fixes for express installer 2017-08-07 17:44:07 -07:00
Marko Kudjerski
2279e174e6 Switching to completely silent VC++ redistributable installation 2017-08-03 09:41:41 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
Marko Kudjerski
ae31df426c remove vcredist_x64 after installation 2017-07-31 16:52:38 -07:00
Marko Kudjerski
de97dfc9d7 install the bundled vcredist_x64 instead of relying on DLLs being setup by cmake directly in the install folder 2017-07-31 15:25:02 -07:00
utkarshgautamnyu
e5ddded464 Moved Express/Custom install window just after EULA window 2017-07-25 16:16:15 -07:00
utkarshgautamnyu
0ae8f4526e Merge branch 'express_custom_install' of https://github.com/highfidelity/hifi into express_custom_install 2017-07-20 13:55:39 -07:00
utkarshgautamnyu
7ddac54b37 copy from production for PR builds unchecked for custom and express also over rides deselection 2017-07-20 13:55:04 -07:00
utkarshgautamnyu
2310ecab8d Update NSIS.template.in 2017-07-20 11:18:49 -07:00
utkarshgautamnyu
de5984d121 Update NSIS.template.in 2017-07-20 10:39:04 -07:00
utkarshgautamnyu
0277f6a7e6 Update NSIS.template.in 2017-07-20 10:11:24 -07:00
utkarshgautamnyu
0a64a1e3b0 Added a page in installer for express/custom installation 2017-07-19 18:26:35 -07:00
utkarshgautamnyu
35f97837e7 ensured clean install state is not saved in the registry 2017-07-13 10:50:14 -07:00
utkarshgautamnyu
902705297f indentation fix 2017-07-12 16:28:21 -07:00
utkarshgautamnyu
d6ac67d221 Added option for clean install 2017-07-12 16:09:30 -07:00
Zach Fox
e5666fbb2f Two different options for server and client 2017-06-22 15:44:55 -07:00
Zach Fox
2318b6aef8 Add a /forceNoLaunch switch to the installer 2017-06-22 15:02:59 -07:00
howard-stearns
cec4b4e86b change var to a global per CR 2017-06-22 12:54:30 -07:00
howard-stearns
8f51beda17 installer allows /nSandboxIfNew command line switch, which defaults
sandbox to off if this is a new install
2017-06-21 16:54:47 -07:00
Atlante45
e6b9d3604d Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-12-01 09:45:50 -08:00
Atlante45
db263df03e Select Audio DLL at runtime 2016-11-29 19:42:59 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Atlante45
2f2da8ccd3 Do not read launchClientNowState if client disabled 2016-11-16 13:15:10 -08:00
Atlante45
9e0230980b Enable Server Only install 2016-11-16 10:52:30 -08:00
Atlante45
d7d54dd82f Only launch interface if selected 2016-11-16 10:44:59 -08:00
Ryan Huffman
3d160cca75 Merge pull request #8969 from huffman/feat/task-manager-app-name
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
2016-11-02 14:21:19 -07:00
Atlante45
46102d93c6 Launch interface on install after content loading 2016-11-01 18:15:27 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
ea31a8e3b4 Add VersionInfo.rc.in 2016-11-01 08:59:56 -07:00
Atlante45
36bd9ef4e6 Update new ACClientApp code 2016-10-12 14:02:05 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Ken Cooke
40393bd8ef remove Installer debugging code 2016-10-03 22:31:43 -07:00
Ken Cooke
541f7ebb05 Select the correct plugin in the Installer, based on Windows version 2016-10-03 21:46:55 -07:00
Ken Cooke
eb5b03d008 Don't pre-delete qtaudio_windows.dll in Installer 2016-10-03 20:52:24 -07:00
Chris Collins
1c4fcb5112 Merge pull request #8620 from ZappoMan/detectMasterOrStable
add basic support for master vs stable builds
2016-09-19 15:08:40 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00