diff options
author | David Cole <david.cole@kitware.com> | 2008-07-08 15:52:25 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2008-07-08 15:52:25 (GMT) |
commit | 83ec8c35933439305895b8569b2125a7e091fc57 (patch) | |
tree | ee94a4f9cdd476a27a4ad466269c214dc1254d6c /Source/CPack/cmCPackNSISGenerator.h | |
parent | 75154920793c285cd00a4ff225654d693158b679 (diff) | |
download | CMake-83ec8c35933439305895b8569b2125a7e091fc57.zip CMake-83ec8c35933439305895b8569b2125a7e091fc57.tar.gz CMake-83ec8c35933439305895b8569b2125a7e091fc57.tar.bz2 |
ENH: Further refinement of the CPack components functionality from Doug Gregor.
Details:
==========
- New cpack_add_component, cpack_add_component_group, and
cpack_add_install_type "commands" defined as macros in the CPack
module.
- Documentation for all of the variables and commands in the CPack module.
- Added get_cmake_property(... COMPONENTS) to CMake to ask for the
names of all components. Used in the CPack module to automatically
build component-based installers. (Set CPACK_MONOLITHIC_INSTALL to
turn off component-based installation).
- A group can declare its PARENT_GROUP, to build an arbitrary
hierarchy of groups.
- New CPack command cpack_configure_downloads, which creates an
installer that downloads only the selected components on-the-fly.
Those components marked DOWNLOADED will be separate packages
downloaded on-the-fly (or, all packages can be marked as such with the
ALL option to cpack_configure_downloads). Individual components are
compressed with ZIP at installer-creation time and
downloaded/uncompressed by the installer as needed. This feature is
only available on Windows with NSIS at the moment.
- NSIS installers can install themselves and enable the "Change"
button in Add/Remove programs, allowing users to go back and install
or remove components. This can be disabled through
cpack_configure_downloads, because it's only really useful is most of
the application's functionality is in downloaded components.
- Bug fix: automatically install everything whose COMPONENT was not
specified (it's a hidden, required group)
- Bug fix: fixed removal of components when re-running the NSIS
installer and unchecking components
- Bug fix: NSIS installers now only install/remove the minimal
number of files when re-run to update the installation (or by clicking
"Change" in Add/Remove programs)
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.h')
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index 70068e41..5299a91 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -53,24 +53,30 @@ protected: virtual bool SupportsComponentInstallation() const; /// Produce a string that contains the NSIS code to describe a - /// particular component. - std::string CreateComponentDescription(cmCPackComponent *component) const; + /// particular component. Any added macros will be emitted via + /// macrosOut. + std::string + CreateComponentDescription(cmCPackComponent *component, + cmOStringStream& macrosOut); /// Produce NSIS code that selects all of the components that this component /// depends on, recursively. std::string CreateSelectionDependenciesDescription (cmCPackComponent *component, - std::set<cmCPackComponent *>& visited) const; + std::set<cmCPackComponent *>& visited); /// Produce NSIS code that de-selects all of the components that are dependent /// on this component, recursively. std::string CreateDeselectionDependenciesDescription (cmCPackComponent *component, - std::set<cmCPackComponent *>& visited) const; + std::set<cmCPackComponent *>& visited); /// Produce a string that contains the NSIS code to describe a - /// particular component group, including its components. - std::string CreateComponentGroupDescription(cmCPackComponentGroup *group) const; + /// particular component group, including its components. Any + /// added macros will be emitted via macrosOut. + std::string + CreateComponentGroupDescription(cmCPackComponentGroup *group, + cmOStringStream& macrosOut); /// Translations any newlines found in the string into \r\n, so that the /// resulting string can be used within NSIS. |