Skip to content

Commit

Permalink
Version bump and generate docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jordansissel committed Dec 9, 2024
1 parent f817f7a commit 08dc21b
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 7 deletions.
20 changes: 20 additions & 0 deletions docs/changelog_links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
.. _#1523: https://github.com/jordansissel/fpm/issues/1523
.. _#1528: https://github.com/jordansissel/fpm/issues/1528
.. _#1592: https://github.com/jordansissel/fpm/issues/1592
.. _#1627: https://github.com/jordansissel/fpm/issues/1627
.. _#1636: https://github.com/jordansissel/fpm/issues/1636
.. _#1642: https://github.com/jordansissel/fpm/issues/1642
.. _#1667: https://github.com/jordansissel/fpm/issues/1667
Expand Down Expand Up @@ -170,6 +171,7 @@
.. _#1877: https://github.com/jordansissel/fpm/issues/1877
.. _#1879: https://github.com/jordansissel/fpm/issues/1879
.. _#187: https://github.com/jordansissel/fpm/issues/187
.. _#1880: https://github.com/jordansissel/fpm/issues/1880
.. _#1882: https://github.com/jordansissel/fpm/issues/1882
.. _#1884: https://github.com/jordansissel/fpm/issues/1884
.. _#1886: https://github.com/jordansissel/fpm/issues/1886
Expand Down Expand Up @@ -205,14 +207,32 @@
.. _#1955: https://github.com/jordansissel/fpm/issues/1955
.. _#1959: https://github.com/jordansissel/fpm/issues/1959
.. _#196: https://github.com/jordansissel/fpm/issues/196
.. _#1978: https://github.com/jordansissel/fpm/issues/1978
.. _#1981: https://github.com/jordansissel/fpm/issues/1981
.. _#1988: https://github.com/jordansissel/fpm/issues/1988
.. _#198: https://github.com/jordansissel/fpm/issues/198
.. _#2009: https://github.com/jordansissel/fpm/issues/2009
.. _#202: https://github.com/jordansissel/fpm/issues/202
.. _#2036: https://github.com/jordansissel/fpm/issues/2036
.. _#2041: https://github.com/jordansissel/fpm/issues/2041
.. _#204: https://github.com/jordansissel/fpm/issues/204
.. _#2053: https://github.com/jordansissel/fpm/issues/2053
.. _#205: https://github.com/jordansissel/fpm/issues/205
.. _#2062: https://github.com/jordansissel/fpm/issues/2062
.. _#2063: https://github.com/jordansissel/fpm/issues/2063
.. _#2064: https://github.com/jordansissel/fpm/issues/2064
.. _#2065: https://github.com/jordansissel/fpm/issues/2065
.. _#2066: https://github.com/jordansissel/fpm/issues/2066
.. _#2067: https://github.com/jordansissel/fpm/issues/2067
.. _#2068: https://github.com/jordansissel/fpm/issues/2068
.. _#206: https://github.com/jordansissel/fpm/issues/206
.. _#2072: https://github.com/jordansissel/fpm/issues/2072
.. _#2074: https://github.com/jordansissel/fpm/issues/2074
.. _#2076: https://github.com/jordansissel/fpm/issues/2076
.. _#207: https://github.com/jordansissel/fpm/issues/207
.. _#2082: https://github.com/jordansissel/fpm/issues/2082
.. _#2084: https://github.com/jordansissel/fpm/issues/2084
.. _#2085: https://github.com/jordansissel/fpm/issues/2085
.. _#208: https://github.com/jordansissel/fpm/issues/208
.. _#212: https://github.com/jordansissel/fpm/issues/212
.. _#213: https://github.com/jordansissel/fpm/issues/213
Expand Down
24 changes: 19 additions & 5 deletions docs/cli-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ General Options
- (deb only) Add FILEPATH as debian changelog

* ``--deb-compression COMPRESSION``
- (deb only) The compression type to use, must be one of gz, bzip2, xz, none.
- (deb only) The compression type to use, must be one of gz, bzip2, xz, zst, none.

* ``--deb-compression-level [0-9]``
- (deb only) Select a compression level. 0 is none or minimal. 9 is max compression.

* ``--deb-config SCRIPTPATH``
- (deb only) Add SCRIPTPATH as debconf config file.
Expand Down Expand Up @@ -204,6 +207,9 @@ General Options
* ``--[no-]deb-systemd-enable``
- (deb only) Enable service on install or upgrade

* ``--deb-systemd-path FILEPATH``
- (deb only) Relative path to the systemd service directory

* ``--[no-]deb-systemd-restart-after-upgrade``
- (deb only) Restart service after upgrade

Expand Down Expand Up @@ -247,7 +253,7 @@ General Options
- (freebsd only) Sets the FreeBSD 'origin' pkg field

* ``--freebsd-osversion VERSION``
- (freebsd only) Sets the FreeBSD 'version' pkg field, ie. 12 or 13, use '*' for all.
- (freebsd only) Sets the FreeBSD 'version' pkg field, ie 12 or 13, use '*' for all.

* ``--gem-bin-path DIRECTORY``
- (gem only) The directory to install gem executables
Expand Down Expand Up @@ -537,6 +543,9 @@ General Options
* ``--[no-]rpm-macro-expansion``
- (rpm only) install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html)

* ``--[no-]rpm-old-perl-dependency-name``
- (rpm only) Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'.

* ``--rpm-os OS``
- (rpm only) The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example

Expand Down Expand Up @@ -693,7 +702,9 @@ deb
* ``--deb-changelog FILEPATH``
- Add FILEPATH as debian changelog
* ``--deb-compression COMPRESSION``
- The compression type to use, must be one of gz, bzip2, xz, none.
- The compression type to use, must be one of gz, bzip2, xz, zst, none.
* ``--deb-compression-level [0-9]``
- Select a compression level. 0 is none or minimal. 9 is max compression.
* ``--deb-config SCRIPTPATH``
- Add SCRIPTPATH as debconf config file.
* ``--deb-custom-control FILEPATH``
Expand Down Expand Up @@ -740,6 +751,8 @@ deb
- Start service after install or upgrade
* ``--[no-]deb-systemd-enable``
- Enable service on install or upgrade
* ``--deb-systemd-path FILEPATH``
- Relative path to the systemd service directory
* ``--[no-]deb-systemd-restart-after-upgrade``
- Restart service after upgrade
* ``--deb-templates FILEPATH``
Expand Down Expand Up @@ -768,9 +781,8 @@ freebsd

* ``--freebsd-origin ABI``
- Sets the FreeBSD 'origin' pkg field

* ``--freebsd-osversion VERSION``
- Sets the FreeBSD 'version' pkg field, ie. 12 or 13, use '*' for all.
- Sets the FreeBSD 'version' pkg field, ie 12 or 13, use '*' for all.

gem
---
Expand Down Expand Up @@ -983,6 +995,8 @@ rpm
- Add FILEPATH as an init script
* ``--[no-]rpm-macro-expansion``
- install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html)
* ``--[no-]rpm-old-perl-dependency-name``
- Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'.
* ``--rpm-os OS``
- The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example
* ``--rpm-posttrans FILE``
Expand Down
6 changes: 5 additions & 1 deletion docs/packages/cli/deb.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
* ``--deb-changelog FILEPATH``
- Add FILEPATH as debian changelog
* ``--deb-compression COMPRESSION``
- The compression type to use, must be one of gz, bzip2, xz, none.
- The compression type to use, must be one of gz, bzip2, xz, zst, none.
* ``--deb-compression-level [0-9]``
- Select a compression level. 0 is none or minimal. 9 is max compression.
* ``--deb-config SCRIPTPATH``
- Add SCRIPTPATH as debconf config file.
* ``--deb-custom-control FILEPATH``
Expand Down Expand Up @@ -58,6 +60,8 @@
- Start service after install or upgrade
* ``--[no-]deb-systemd-enable``
- Enable service on install or upgrade
* ``--deb-systemd-path FILEPATH``
- Relative path to the systemd service directory
* ``--[no-]deb-systemd-restart-after-upgrade``
- Restart service after upgrade
* ``--deb-templates FILEPATH``
Expand Down
2 changes: 2 additions & 0 deletions docs/packages/cli/rpm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
- Add FILEPATH as an init script
* ``--[no-]rpm-macro-expansion``
- install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html)
* ``--[no-]rpm-old-perl-dependency-name``
- Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'.
* ``--rpm-os OS``
- The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example
* ``--rpm-posttrans FILE``
Expand Down
2 changes: 1 addition & 1 deletion lib/fpm/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module FPM
VERSION = "1.15.1"
VERSION = "1.16.0"
end

0 comments on commit 08dc21b

Please sign in to comment.