qulogic/gplugin

Merged in feature/packaging-housekeeping (pull request #39)
develop
2020-02-04, Gary Kramlich
24334705e54e
Parents 8dc9e764a0a980a66127e1c4
Children bbca5bc652ee
Merged in feature/packaging-housekeeping (pull request #39)

Feature/packaging housekeeping

Approved-by: Elliott Sales de Andrade
8 files changed, 40 insertions(+), 47 deletions(-)
  • +5 -2
    ChangeLog
  • +9 -6
    HACKING
  • +10 -8
    HACKING.OSX
  • +4 -4
    HISTORY.md
  • +5 -3
    INSTALL.md
  • +5 -11
    README.md
  • +0 -1
    gplugin-version.sh.in
  • +2 -12
    meson.build
    • --- a/ChangeLog Tue Feb 04 08:21:49 2020 +0000
    +++ b/ChangeLog Tue Feb 04 09:04:59 2020 +0000
    @@ -1,11 +1,14 @@
    0.29.1:
    - * Nothing yet, be the first!
    + * Changed the website to the repository on keep.imfreedom.org.
    + * Removed an unnecessary meson version check.
    + * Bumped the required meson version to 0.50.0
    + * Removed gplugin-version.sh.in as it was used in the cmake build system.
    0.29.0: 2019/11/07
    * Synchronize GPluginGtkStore with the plugin manager, make the enabled
    toggle button work in GPluginGtkView, and allow developers to decide
    whether or not to show column headers in GPlugingGtkView. (PR #37)
    - (Gary Kramlich)
    + (Gary Kramlich)
    * Added error messages when the unload method of a plugin loader is called.
    (PR #38) (Gary Kramlich)
    --- a/HACKING Tue Feb 04 08:21:49 2020 +0000
    +++ b/HACKING Tue Feb 04 09:04:59 2020 +0000
    @@ -7,13 +7,16 @@
    fixes. When a release is deemed done, it's merged back into develop and into
    default. hgflow takes care of all of this for us.
    -To add a feature please fork https://bitbucket.org/gplugin/gplugin. Then clone
    -your fork. Once you have your fork cloned and hgflow setup and installed, type
    +To add a feature please clone `https://keep.imfreedom.org/gplugin/gplugin`.
    +Once you have your fork cloned and hgflow setup and installed, type:
    - hg flow feature start $NAME_OF_YOUR_FEATURE$
    +```
    +hg flow feature start $NAME_OF_YOUR_FEATURE$
    +```
    -This will create a new branch for you to do your work on. When you submit a
    -pull request, make sure it's this branch that you're requesting I pull.
    +This will create a new branch for you to do your work on. When your work has
    +been completed, please open a review request at
    +[reviews.imfreedom.org](https://reviews.imfreedom.org).
    -[1] https://bitbucket.org/yujiewu/hgflow
    +[1] https://hg.sr.ht/~wu/hgflow
    --- a/HACKING.OSX Tue Feb 04 08:21:49 2020 +0000
    +++ b/HACKING.OSX Tue Feb 04 09:04:59 2020 +0000
    @@ -14,25 +14,27 @@
    ninja
    ```
    -Lua
    -===
    +## Lua
    For the Lua loader to work, you need to install lgi from luarocks either
    systemwide or to a virtual environment created by LuaDist, vert, or something
    along those lines.
    When you're building lgi against homebrew you'll have to set the
    -PKG_CONFIG_PATH environment variable since homebrew does not install libffi
    +`PKG_CONFIG_PATH` environment variable since homebrew does not install libffi
    systemwide. This is easily done via:
    - export PKG_CONFIG_PATH=$(brew --prefix libffi)/lib/pkgconfig
    +```
    +export PKG_CONFIG_PATH=$(brew --prefix libffi)/lib/pkgconfig
    +```
    -and then running "luarocks install lgi"
    +and then running `luarocks install lgi`.
    -PYTHON
    -======
    +## Python
    If you're using homebrew, you need to install pygobject3 with
    - brew install pygobject3 --with-python3
    +```
    +brew install pygobject3 --with-python3
    +```
    --- a/HISTORY.md Tue Feb 04 08:21:49 2020 +0000
    +++ b/HISTORY.md Tue Feb 04 09:04:59 2020 +0000
    @@ -32,10 +32,10 @@
    but come on, that should be a one time cost to the library author, instead of
    an additional startup cost to the plugin author. STRIKE TWO!
    -So with two strikes down, I continued researching libpeas, by now working on a
    -plugin for rhythmbox, and just found the API to be clunky and poorly
    -documented. Now maybe I just wasn't finding the write documentation, but this
    -was STRIKE THREE!
    +So with two strikes down, I continued researching libpeas, and discovered that
    +you can only use one language other than the native loader. We, the Pidgin,
    +developers have always aimed to support as many languages as possible, and this
    +just wasn't going to cut it. So there was STRIKE THREE!
    Libpeas had struck out for me, and as such I started GPlugin the very next day!
    --- a/INSTALL.md Tue Feb 04 08:21:49 2020 +0000
    +++ b/INSTALL.md Tue Feb 04 09:04:59 2020 +0000
    @@ -1,6 +1,7 @@
    # Dependencies
    GPlugin depends on the following at a bare minimum:
    +
    * glib-2.0 >= 2.40.0
    * gobject-introspection, libgirepository1.0-dev
    * meson >= 0.42.0
    @@ -9,6 +10,7 @@
    * a C compiler
    A full build (enabled by default) depends on the following:
    +
    * gtk-3
    * python3-dev, python-gi-dev, python3-gi
    * liblua5.1-0-dev, lua-lgi
    @@ -20,8 +22,8 @@
    # Building
    GPlugin uses meson (http://mesonbuild.com/) as its build system. As such
    -compiling is a little bit different than your typical ./configure, make,
    -sudo make install. But luckily for you, not too much different.
    +compiling is a little bit different than your typical `./configure`, `make`,
    +`sudo make install`.
    Meson requires you to build in a separate directory than your source. As such,
    these instructions use a separate build directory.
    @@ -35,5 +37,5 @@
    ```
    If you want/need to tweak the build system (to enable/disable certain loaders)
    -you can do so at any time by using mesonconf in the build directory.
    +you can do so at any time by using `meson configure` in the build directory.
    --- a/README.md Tue Feb 04 08:21:49 2020 +0000
    +++ b/README.md Tue Feb 04 09:04:59 2020 +0000
    @@ -7,13 +7,7 @@
    It has a simple API which makes it very easy to use in your application.
    For more information on using GPlugin in your application, please see the
    -[embedding](Embedding) page.
    -
    -## Build Status
    -
    -Default: [![Default Build Status](https://bamboo.pidgin.im/plugins/servlet/wittified/build-status/GPLUG-GPLUGIN)](https://bamboo.pidgin.im/browse/GPLUG-GPLUGIN)
    -
    -Develop: [![Develop Build Status](https://bamboo.pidgin.im/plugins/servlet/wittified/build-status/GPLUG-GPLUGIN0)](https://bamboo.pidgin.im/browse/GPLUG-GPLUGIN0/)
    +[embedding](https://docs.pidgin.im/gplugin/latest/chapter-embedding.html) page.
    ## History
    @@ -25,8 +19,8 @@
    ## API Reference
    -The API reference for the `default` branch can be found at
    -[docs.pidgin.im/gplugin/default](https://docs.pidgin.im/gplugin/default).
    +The API reference for the stable branch can be found at
    +[docs.pidgin.im/gplugin/stable](https://docs.pidgin.im/gplugin/stable).
    -The in-development API reference for the `develop` branch can be found at
    -[docs.pidgin.im/gplugin/develop](https://docs.pidgin.im/gplugin/develop).
    +The in-development API reference for the development branch can be found at
    +[docs.pidgin.im/gplugin/latest](https://docs.pidgin.im/gplugin/latest).
    --- a/gplugin-version.sh.in Tue Feb 04 08:21:49 2020 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +0,0 @@
    -export GPLUGIN_VERSION=@GPLUGIN_MAJOR_VERSION@.@GPLUGIN_MINOR_VERSION@.@GPLUGIN_MICRO_VERSION@
    --- a/meson.build Tue Feb 04 08:21:49 2020 +0000
    +++ b/meson.build Tue Feb 04 09:04:59 2020 +0000
    @@ -2,7 +2,7 @@
    # Project Info
    ###############################################################################
    project('gplugin', 'c', version : '0.29.1-dev',
    - meson_version : '>=0.42.0',
    + meson_version : '>=0.50.0',
    default_options : ['c_std=c99'])
    parts = meson.project_version().split('-')
    @@ -61,7 +61,7 @@
    add_project_arguments(
    '-DPREFIX="@0@"'.format(get_option('prefix')),
    '-DLIBDIR="@0@"'.format(get_option('libdir')),
    - '-DGPLUGIN_WEBSITE="https://bitbucket.org/gplugin/gplugin"',
    + '-DGPLUGIN_WEBSITE="https://keep.imfreedom.org/gplugin/gplugin"',
    language : 'c'
    )
    @@ -72,11 +72,6 @@
    endif
    endif
    -configure_file(
    - input : 'gplugin-version.sh.in',
    - output : 'gplugin-version.sh',
    - configuration : version_conf)
    -
    toplevel_inc = include_directories('.')
    @@ -84,11 +79,6 @@
    # gtk-doc
    ###############################################################################
    ENABLE_DOC = get_option('doc')
    -if ENABLE_DOC
    - if meson.version().version_compare('<0.41.2')
    - error('Meson 0.41.2 or newer is required to build documentation.')
    - endif
    -endif
    ###############################################################################
    # Subdirectories