mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 06:56:14 +01:00
548ec9f186
The `gi-docgen` tool is not designed to be used like that. In particular, when nesting documentation directories, the generated `*.devhelp2` files (needed by Devhelp to show the documentation) are nested one directory level too deep for Devhelp to find them, and hence are useless, and the documentation doesn’t show up in this common documentation viewer. So, change the installed documentation directory hierarchy: * `${PREFIX}/share/doc/glib-2.0/gio` → `${PREFIX}/share/doc/gio-2.0` * `${PREFIX}/share/doc/glib-2.0/glib-unix` → `${PREFIX}/share/doc/glib-unix-2.0` * `${PREFIX}/share/doc/glib-2.0/gobject` → `${PREFIX}/share/doc/gobject-2.0` * etc. * `${PREFIX}/share/doc/glib-2.0/glib` → `${PREFIX}/share/doc/glib-2.0` This is going to seem like pointless churn (the contents of the documentation have not changed), and packagers may mourn the split of content in `/usr/share/doc` from `/usr/share/doc/${package_name}` to `/usr/share/doc/${pkg_config_id}` instead, but that seems to be the best approach to fix this issue in GLib. gi-docgen’s behaviour does feel fairly consistent and correct with the rest of how it works (single output directory). Signed-off-by: Philip Withnall <pwithnall@gnome.org> Fixes: #3287 |
||
---|---|---|
.. | ||
alpine.Dockerfile | ||
android-ndk.sh | ||
cache-subprojects.sh | ||
check-todos.py | ||
clang-format-diff.py | ||
coverage-docker.sh | ||
coverity-model.c | ||
coverity.Dockerfile | ||
cross_file_android_arm64_31.txt | ||
cross_file_ios_example.txt | ||
cross_file_mingw64.txt | ||
debian-stable.Dockerfile | ||
fedora.Dockerfile | ||
fixup-cov-paths.py | ||
install-gitlab-cobertura-tools.sh | ||
mingw.Dockerfile | ||
README.md | ||
run-check-todos.sh | ||
run-docker.sh | ||
run-style-check-diff.sh | ||
run-tests.sh | ||
search-common-ancestor.sh | ||
show-execution-environment.sh | ||
test-msvc.bat | ||
test-msys2.sh | ||
thorough-test-wrapper.sh |
CI support stuff
Docker image
GitLab CI jobs run in a Docker image, defined here. To update that image (perhaps to install some more packages):
- Edit
.gitlab-ci/*.Dockerfile
with the changes you want - Run
.gitlab-ci/run-docker.sh build --base=debian-stable --base-version=1
to build the new image (bump the version from the latest listed for thatbase
on https://gitlab.gnome.org/GNOME/glib/container_registry). If rebuilding thecoverity.Dockerfile
image, you’ll need to have access to Coverity Scan and will need to specify your project name and access token as the environment variablesCOVERITY_SCAN_PROJECT_NAME
andCOVERITY_SCAN_TOKEN
. - Run
.gitlab-ci/run-docker.sh push --base=debian-stable --base-version=1
to upload the new image to the GNOME GitLab Docker registry- If this is the first time you're doing this, you'll need to log into the registry
- If you use 2-factor authentication on your GNOME GitLab account, you'll
need to create a personal access token and use that rather than
your normal password — the token should have
read_registry
andwrite_registry
permissions
- Edit
.gitlab-ci.yml
(in the root of this repository) to use your new image