diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | HACKING | 7 | ||||
| -rw-r--r-- | MSVC.README.rst | 16 | ||||
| -rw-r--r-- | README.rst | 16 |
4 files changed, 28 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aa002ad..b0119bcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,4 +165,4 @@ pages: paths: - public only: - - master + - main @@ -52,7 +52,7 @@ giscanner even 'make distcheck' * While hacking on annotationparser.py it is a good idea to: - 1) Update your GLib build to git master. + 1) Update your GLib build to the tip of the `main` branch. 2) Run the following command from your gobject-introspection source directory before making changes to annotationparser.py (adapt GLib source and/or build directory as required): (cd misc && ./update-glib-annotations.py /path/to/gnome.org/checkout/glib/) @@ -61,8 +61,9 @@ giscanner - gir/gio-2.0.c - gir/glib-2.0.c - gir/gobject-2.0.c - When satisfied, commit these files adding "Update GLib annotations to master" as the - commit message. + When satisfied, commit these files adding "Update GLib annotations to ${commit}" as the + commit message. Fill out the `${commit}` with the GLib commit at the tip of the `main` + development branch 4) Only now start editing annotationparser.py. 5) run make check. 6) Run update-glib-annotations.py again and carefully study the changes (if any) to: diff --git a/MSVC.README.rst b/MSVC.README.rst index 0c0dd409..724402da 100644 --- a/MSVC.README.rst +++ b/MSVC.README.rst @@ -25,14 +25,14 @@ You will need the following, in addition to your Visual Studio installation: - A recent enough version of GLib, preferably built with the same compiler that is now being used to build G-I. If none is found, the Meson build will fetch - GLib from GIT master and build it first before continuing to build G-I. Note - that it will require a libintl implementation (must be installed beforehand, the - headers and lib and DLL must be found in the paths specified by %INCLUDE, %LIB% - and %PATH% respectively), along with ZLib and libffi (GLib's own Meson build will - build them if they are not found). If a pre-existing copy of GLib is available, - be sure to set PKG_CONFIG_PATH to where its .pc files can be found, and ensure - that its DLLs/ executables can be first found in the paths specified in %PATH%. - Note that libffi is needed both by GLib and G-I. + GLib from the tip of the main branch and build it first before continuing to + build G-I. Note that it will require a libintl implementation (must be installed + beforehand, the headers and lib and DLL must be found in the paths specified by + %INCLUDE%, %LIB% and %PATH% respectively), along with ZLib and libffi (GLib's + own Meson build will build them if they are not found). If a pre-existing copy + of GLib is available, be sure to set PKG_CONFIG_PATH to where its .pc files can + be found, and ensure that its DLLs/ executables can be first found in the paths + specified in %PATH%. Note that libffi is needed both by GLib and G-I. - A DLL build of Cairo with Cairo-GObject built, also preferably with the same compiler that is now used to build G-I. @@ -51,7 +51,21 @@ roundtrip tests (GIR -> typelib -> GIR). Helping out ----------- -The introspection framework needs a lot more work, see TODO. +The introspection framework needs a lot more work, see the ``TODO`` file. + +Default branch renamed to ``main`` +---------------------------------- + +The default development branch of GObject Introspection has been renamed +to ``main``. To update your local checkout, use:: + + git checkout master + git branch -m master main + git fetch + git branch --unset-upstream + git branch -u origin/main + git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main + Homepage -------- |