Update Mac Installer #7323
Update Mac Installer #7323
Conversation
…Installer * commit '727be933c7f1f180dee1d86d73b2ec9cb81d2cfd': link to /usr/local/bin instead
…that actually requires admin privileges.
…ghts aren't required. Properly deletes symlink when uninstall too. Still a problem with the man pages
… of "Execute" ln -sf but it didn't work.
…ix aren't referenced anywhere. Uninstall EnergyPlus.app is deprecated for the QtIFW "Maintenance Tool"
…are using. due to switch to QtIFW.
…10_7298_Mac_Installer
There was a problem hiding this comment.
From a coding standpoint, this looks good. The IFW installer is so much nicer than PackageMaker. I built this locally and tested it out successfully. Thanks for cleaning out so much stuff. I'll push a small commit to change one string and then this can merge in.
| @@ -59,8 +59,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | |||
| "MinSizeRel" "RelWithDebInfo") | |||
| endif() | |||
|
|
|||
| set(CPACK_PACKAGE_CONTACT "Edwin Lee <[email protected]>") | |||
|
|
|||
| @@ -1,4 +1,6 @@ | |||
| set( CPACK_PACKAGE_VENDOR "US Department of Energy" ) | |||
| set(CPACK_PACKAGE_VENDOR "US Department of Energy" ) | |||
| set(CPACK_PACKAGE_CONTACT "Edwin Lee <[email protected]>") | |||
| install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/workflows/transition.py" DESTINATION "workflows/") | ||
| install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-2-0-Energy+.idd" ) | ||
|
|
||
| # Workflow stuff, takes about 40KB, so not worth it proposing to not install it |
There was a problem hiding this comment.
Agreed, and it would stink for a user to have to add it in later if they use EP-Launch-3
cmake/Install.cmake
Outdated
|
|
||
| cpack_add_component(WeatherData | ||
| DISPLAY_NAME "Weather Data" | ||
| DESCRIPTION "A few EPW files" |
There was a problem hiding this comment.
I'm going to make a change here to "A set of EPW files" rather than "A few..."
There was a problem hiding this comment.
Maybe "EPW Weather Files"? to mimic "IDF Example Files"
There was a problem hiding this comment.
Wouldn't that expand to "EnergyPlus Weather Weather Files"?
There was a problem hiding this comment.
@jasondegraw EPW is actually a recursive acronym where the E stands for EnergyPlus Weather Data Files, so the full name is "EnergyPlus Weather Data Files Plus Weather Weather Files ... the 3rd Baron of Townsville"
As bad as having a PIN number or a VIN number or and IDF file is, I think "EPW Weather Files" will make perfect sense to the users.
There was a problem hiding this comment.
Well, yes. Using that same logic it would be "Input Data File Examples" and "EnergyPlus Weather Files".
On my work machine, it still asks for an admin password if I install it into /Applications even if I don't have symlinks installed. It probably wouldn't have asked if I had installed it into a user directory. |
Pull request overview
Fix #5410: Symlink to
/usr/local/binon MacFix #7298: Mac EP-Launch-Lite and IDFVersionUpdater work on mac.
The Gist here is that
darwinpostflight.shis something only used by PackageMaker (the old packaging program used for Mac), and now we use QtIFW, so instead you should use some install operations (cf doc).I also added actual components that you can choose to install or not (all enabled by default):
I have tested the installer and the various combinations of stuff you can install and diff'ed the directory structure compared to an installer of current develop, and everything does make sense. If you enable eveyrthing, the only difference is that now you don't have "Uninstall Energyplus.app" (since it's superseeded by the "Maintenance Tool" created by QtIFW that will correctly remove the symlinks etc))
Work Checklist
Add to this list or remove from it as applicable. This is a simple templated set of guidelines.
Review Checklist
This will not be exhaustively relevant to every PR.