From 9a2466d29cc55a30f4a5a13968d081f430da70bb Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 23 Jun 2022 12:09:07 +0200 Subject: [PATCH] Add ABI dump to .gitignore The ABI is only checked in maintenance branches, but it is sometimes useful to generate it for main. - The resulting file should be ignored in main. - The file should be created if it doesn't exist. --- .gitignore | 3 +++ Makefile.pre.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b3b22f471c2765..0ddfd717d737f8 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,6 @@ Python/frozen_modules/MANIFEST # Ignore ./python binary on Unix but still look into ./Python/ directory. /python !/Python/ + +# main branch only: ABI files are not checked/maintained +Doc/data/python*.abi diff --git a/Makefile.pre.in b/Makefile.pre.in index 20fc89eb767c29..102cd752c39cdf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1204,7 +1204,7 @@ regen-global-objects: $(srcdir)/Tools/scripts/generate_global_objects.py regen-abidump: all @$(MKDIR_P) $(srcdir)/Doc/data/ abidw "libpython$(LDVERSION).so" --no-architecture --out-file $(srcdir)/Doc/data/python$(LDVERSION).abi.new - @$(UPDATE_FILE) $(srcdir)/Doc/data/python$(LDVERSION).abi $(srcdir)/Doc/data/python$(LDVERSION).abi.new + @$(UPDATE_FILE) --create $(srcdir)/Doc/data/python$(LDVERSION).abi $(srcdir)/Doc/data/python$(LDVERSION).abi.new check-abidump: all abidiff $(srcdir)/Doc/data/python$(LDVERSION).abi "libpython$(LDVERSION).so" --drop-private-types --no-architecture --no-added-syms