Commit graph

1138 commits

Author SHA1 Message Date
Stephen Birarda
4fb5a142f7 check during uninstall for running applications 2016-01-18 15:50:44 -08:00
Stephen Birarda
a83c3a3385 write to registry when sections not selected 2016-01-18 15:23:51 -08:00
Stephen Birarda
b7998935b0 install a json file with build info beside console 2016-01-18 14:56:06 -08:00
Stephen Birarda
2311627599 set installer to be DPI aware 2016-01-18 14:20:33 -08:00
Stephen Birarda
83120594f5 make installer icon lowercase 2016-01-18 14:12:41 -08:00
Stephen Birarda
552b2d2bdc add an installer ico with more sizes 2016-01-18 13:32:57 -08:00
Stephen Birarda
81426c05f4 add WinVer header for nsis dpi tests 2016-01-18 12:08:43 -08:00
Stephen Birarda
da1a72ed19 manually set installer/uninstaller dpi aware 2016-01-18 11:59:16 -08:00
Stephen Birarda
66a15e8f82 make the installer DPI aware 2016-01-18 11:49:56 -08:00
Stephen Birarda
88604a0110 make sure ADD_REMOVE_ICON_NAME set for nsis 2016-01-18 10:57:45 -08:00
Stephen Birarda
7d4a7983ed update the installer icon and header 2016-01-18 10:38:38 -08:00
Stephen Birarda
ba6c4d90df install the ssleay32 dll, not lib 2016-01-18 10:34:42 -08:00
Stephen Birarda
d4597f9e8b Revert "comment out manual ssleay copying"
This reverts commit 0355e816b0.
2016-01-18 10:11:36 -08:00
Stephen Birarda
0355e816b0 comment out manual ssleay copying 2016-01-15 16:02:24 -08:00
Stephen Birarda
6e8b54bc65 remove the branding tag in installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0876da7a7d call manual install of ssleay from console install 2016-01-15 15:41:34 -08:00
Stephen Birarda
cf5b6198fd use install command to manually place ssleay library 2016-01-15 15:41:34 -08:00
Stephen Birarda
29b5076da4 set a variable in template to boolean 2016-01-15 15:41:34 -08:00
Stephen Birarda
05e48528bd make sure SSL_EAY_LIBRARY_* is set when used 2016-01-15 15:41:34 -08:00
Stephen Birarda
bb9f7856f4 use cmake generator expression to fixup correct ssleay 2016-01-15 15:41:34 -08:00
Stephen Birarda
e19b61bcbf fixup the only used ssleay library 2016-01-15 15:41:34 -08:00
Stephen Birarda
c1a9a7f4c1 add ssleay copy for win AC/DS/Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
e474a60971 include InstallOptions for MUI2 2016-01-15 15:41:34 -08:00
Stephen Birarda
ccf459454d fix install options setup for MUI2 2016-01-15 15:41:34 -08:00
Stephen Birarda
34da13c148 test of next version of nsis modern ui 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b4c2545f remove DDE as component of installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
5730772f6b disable install button with neither component selected 2016-01-15 15:41:34 -08:00
Stephen Birarda
0098fe27df don't uninstall a previously installed section from the installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
124e0fb61f remove the add/remove icon during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
0533438b8f use backslashes in add remove icon path 2016-01-15 15:41:34 -08:00
Stephen Birarda
95acd2cfc3 drop in add remove icon during core install 2016-01-15 15:41:34 -08:00
Stephen Birarda
d57bd887b1 install the add/remove icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
fc65053eb5 add an icon for item in add/remove 2016-01-15 15:41:34 -08:00
Stephen Birarda
9ce0f6a0b1 add a header image for uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
92c221620c use backslashes for header image path on win 2016-01-15 15:41:34 -08:00
Stephen Birarda
d34c3bdc1c add custom header image for installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
537f8deeec update to new license in root and installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
81493f9b4e only sign production build executables 2016-01-15 15:41:34 -08:00
Stephen Birarda
99ad79d833 add an icon for nsis installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
c0c627a226 explicitly set install directory to match display name 2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9319001e use BUILD_ORGANIZATION for installer display name 2016-01-15 15:41:34 -08:00
Stephen Birarda
7d2684f01e use alpha for packaged installer name 2016-01-15 15:41:34 -08:00
Stephen Birarda
0a15f0400c fix env variable referencing in SetPackagingParameters 2016-01-15 15:41:34 -08:00
Stephen Birarda
ffd79a5df4 pretty up the packaged installer name 2016-01-15 15:41:34 -08:00
Stephen Birarda
926b75782f use build version for cpack package version 2016-01-15 15:41:34 -08:00
Stephen Birarda
3e9f124209 update packaging parameters for suggested jenkins setup 2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
e9ce0318a2 add the custom installer license 2016-01-15 15:41:34 -08:00
Stephen Birarda
69ceb9fa98 use string comparison for cleaner registry checking 2016-01-15 15:41:34 -08:00
Stephen Birarda
fef0c31fad fix handling of not-present post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
7a6c37aa2f read checkbox states from registry 2016-01-15 15:41:34 -08:00
Stephen Birarda
3c3ef094bb use macro to write post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
a1a92cf3a9 change registry location for post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
8e3f18b628 require append of @CPACK_PACKAGE_INSTALL_REGISTRY_KEY@ to root 2016-01-15 15:41:34 -08:00
Stephen Birarda
a0647756b5 delete the post-install options info from registry on uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
a47cf35b32 write post install option choices to registry 2016-01-15 15:41:34 -08:00
Stephen Birarda
f4817032ec make uninstaller name a cmake/cpack variable 2016-01-15 15:41:34 -08:00
Stephen Birarda
2619c351e8 constantize the uninstaller name 2016-01-15 15:41:34 -08:00
Stephen Birarda
24ef51c40b use EXEDIR to check if uninstaller is in temp 2016-01-15 15:41:34 -08:00
Stephen Birarda
24903ad161 add the StrContains macro 2016-01-15 15:41:34 -08:00
Stephen Birarda
c002332f9c copy uninstaller to temp directory for correct naming 2016-01-15 15:41:34 -08:00
Stephen Birarda
4e03a06ff9 set package name prior to uninstaller creation 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f92312d06 reference new elevated uninstaller for file command 2016-01-15 15:41:34 -08:00
Stephen Birarda
e6b106e152 move UAC include outside inner defines 2016-01-15 15:41:34 -08:00
Stephen Birarda
6bccdc81b4 use the UAC plugin to elevate uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
0a0b152f97 attempt to specify user only level for temp installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
265879cacf request admin elevation for uninstaller as well 2016-01-15 15:41:34 -08:00
Stephen Birarda
75a8ab56bc attempt to sign in inner invocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
ed56dd7303 call makensis with RunAsInvoker 2016-01-15 15:41:34 -08:00
Stephen Birarda
9972e2b096 attempt to use RunAsInvoker for inner/outer uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
c064a31b77 use ExecWait so it is performed as admin 2016-01-15 15:41:34 -08:00
Stephen Birarda
c0095e57d9 run elevated prior to running temp installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
e1ebb5ae5d use execute in place of system 2016-01-15 15:41:34 -08:00
Stephen Birarda
fceb916787 request admin prior to system call 2016-01-15 15:41:34 -08:00
Stephen Birarda
d8a0b28655 allow execution of command to use env 2016-01-15 15:41:34 -08:00
Stephen Birarda
35211049a0 fix for env variable referencing for signtool 2016-01-15 15:41:34 -08:00
Stephen Birarda
89e8cd16d3 use quotes in nsis template for signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
b9ccef6c2c use string replace to escape signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
0d2b8f183e use fully escaped path for nsis compatibility 2016-01-15 15:41:34 -08:00
Stephen Birarda
256347f6ef use direct comparison instead of define check 2016-01-15 15:41:34 -08:00
Stephen Birarda
a17ac026cc use compile time command for conditional signing 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8ca9e64a9 pass the signtool executable to nsis 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f08d77b36 move uninstaller signing to onInit 2016-01-15 15:41:34 -08:00
Stephen Birarda
cc4f7a9ad8 add message if executable signing enabled 2016-01-15 15:41:34 -08:00
Stephen Birarda
6b796a26b0 replace name of script for inner invocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
3cc8457a98 only call signtool on uninstaller for production build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d6f50b66d6 add the inner/outer paradigm for signed uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b12eef79b use full path and not simply name for target 2016-01-15 15:41:34 -08:00
Stephen Birarda
14196ba370 fix for target file name interpolation 2016-01-15 15:41:34 -08:00
Stephen Birarda
44e1cdfe00 make executable signing a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
e036531796 attempt to sign executable as a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
547d2043e8 fix for execute_process call with signtool command 2016-01-15 15:41:34 -08:00
Stephen Birarda
e50e28468c add a status message for executable signing 2016-01-15 15:41:34 -08:00
Stephen Birarda
798d234d63 remove package bundle copying of ssleay dll 2016-01-15 15:41:34 -08:00
Stephen Birarda
d14c8cf9cc add signing of DS and AC executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
9aa5d017d6 add optional signing of interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
3a9ac7d4ac remove macro to consolidate installer components 2016-01-15 15:41:34 -08:00
Stephen Birarda
fec7b77577 leave the disabled cancel button for spacing 2016-01-15 15:41:34 -08:00
Stephen Birarda
ef0d3b11e9 use explicit text for finish button 2016-01-15 15:41:34 -08:00
Stephen Birarda
47dbd9d850 hide back and cancel buttons on finish page 2016-01-15 15:41:34 -08:00
Stephen Birarda
7ce36a69a0 change close button text before nsDialog create 2016-01-15 15:41:34 -08:00
Stephen Birarda
db5935c275 try to change button text at very end 2016-01-15 15:41:34 -08:00
Stephen Birarda
f830c9ce25 launch interface or console post-install if requested 2016-01-15 15:41:34 -08:00
Stephen Birarda
fa71136880 drop post install options label size to 10 2016-01-15 15:41:34 -08:00
Stephen Birarda
fe220ca658 attempted fix for finish button text change 2016-01-15 15:41:34 -08:00
Stephen Birarda
399cc5c4d4 tweak options label font and close button text 2016-01-15 15:41:34 -08:00
Stephen Birarda
8d8c3426d2 delete startup shortcut for server console during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
a5ea0777c2 make the options label bold 2016-01-15 15:41:34 -08:00
Stephen Birarda
98284862f0 explicitly set text for post install dialog button 2016-01-15 15:41:34 -08:00
Stephen Birarda
b1b99479cc add missing SERVER_STARTUP_STATE variable 2016-01-15 15:41:34 -08:00
Stephen Birarda
26933573c2 handle desktop shortcut for console, startup item 2016-01-15 15:41:34 -08:00
Stephen Birarda
92d4cc6fc1 add a label above post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
ca2b3c323d create interface desktop shortcut if required 2016-01-15 15:41:34 -08:00
Stephen Birarda
fd3b665add make the confirmation page the finish page 2016-01-15 15:41:34 -08:00
Stephen Birarda
f041479f42 default some checkboxes to checked 2016-01-15 15:41:34 -08:00
Stephen Birarda
269937fe7f add conditional options to post install dialog 2016-01-15 15:41:34 -08:00
Stephen Birarda
a6c8c62d36 make sure nsDialog file is included 2016-01-15 15:41:34 -08:00
Stephen Birarda
288b044a0f use nsDialogs for custom post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
dd0f541759 move call to ReserveFile to right spot 2016-01-15 15:41:34 -08:00
Stephen Birarda
c9ecf35d82 rename template file used for post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
58cc86bc5b add a file for NSIS post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
cfcda488c4 use corect interpolation of display name option 2016-01-15 15:41:34 -08:00
Stephen Birarda
798760f175 change cpack names for generated installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
9f2fbc37bb only remove protocol handler if installed 2016-01-15 15:41:34 -08:00
Stephen Birarda
929976e781 use new console exec name var from properties 2016-01-15 15:41:34 -08:00
Stephen Birarda
53eb66418a fix for falsity of build types 2016-01-15 15:41:34 -08:00
Stephen Birarda
a2904cdc7b use a CPackProperties file for custom installer variables 2016-01-15 15:41:34 -08:00
Stephen Birarda
b4002d5f42 conditional reg entries for prod build only 2016-01-15 15:41:34 -08:00
Stephen Birarda
0cdc78bdbe remove High Fidelity protocol during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
f844573566 name hifi:// links the High Fidelity Protocol 2016-01-15 15:41:34 -08:00
Stephen Birarda
7739749220 add URL handler registration for Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
b8966de85e simplified shortcut creation for nsis installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f1c66f529 replace interface icon name with icon index 2016-01-15 15:41:34 -08:00
Stephen Birarda
25d9a1869a handle skipped parameters in CreateShortcut call 2016-01-15 15:41:34 -08:00
Stephen Birarda
ae67da4bcb use absolute path to interface icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
301124ba3c fix reference to rc template and icon prefix 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
6f7663fbae add conditional handling for server-console shortcut 2016-01-15 15:41:34 -08:00
Stephen Birarda
70077591df correct intepolation for defines in NSIS 2016-01-15 15:41:34 -08:00
Stephen Birarda
9c8a05fad9 use string variables for interface shortcut setup 2016-01-15 15:41:34 -08:00
Stephen Birarda
a6006af7be use variables in NSIS script for names 2016-01-15 15:41:34 -08:00
Stephen Birarda
9621773082 add back the NSIS.template.in file 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b6d8fde8 set CPACK_MODULE_PATH so custom template is used 2016-01-15 15:41:34 -08:00
Stephen Birarda
d2f35adc11 add space back to package name and vendor 2016-01-15 15:41:34 -08:00
Stephen Birarda
63a88815bc add NSIS template for custom installer options 2016-01-15 15:41:34 -08:00
Stephen Birarda
87e55543ce repairs to component group for client/dde 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
718e994050 fix for faceshift library name on OS X 2016-01-15 15:41:34 -08:00