Commit f4f165f7 authored by Paul Eggert's avatar Paul Eggert

Bring macuvs.h back under Git control

* admin/unidata/Makefile.in (maintainer-clean):
Instead of removing macuvs.h here ...
(extraclean): ... Remove it here.
* admin/unidata/uvs.el (uvs-print-table-ivd):
Add to comment explaining why macuvs.h is in Git.
* src/macuvs.h: Regenerate and re-add to Git.
parent 9b766d3b
......@@ -112,11 +112,12 @@ distclean: clean
rm -f Makefile
maintainer-clean: distclean
rm -f ${top_srcdir}/src/macuvs.h
## Do not remove these files, even in a bootstrap, because they rarely
## change and it slows down bootstrap (a tiny bit).
## Cf leim/ja-dic (which is much slower).
extraclean: maintainer-clean
rm -f ${unidir}/charscript.el*
## Also, removing macuvs.h would mean that macOS builds would need
## to do a headless bootstrap, which is currently awkward.
extraclean: distclean
rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
rm -f ${unifiles} ${unidir}/charprop.el
......@@ -201,8 +201,16 @@ corresponding number."
(uvs-alist-from-ivd collection-id
sequence-id-to-glyph-func))))
(set-binary-mode 'stdout t)
(princ "/* This file was automatically generated from admin/unidata/IVD_Sequences.txt\n")
(princ " by the script admin/unidata/uvs.el */\n")
(princ "\
/* This file was automatically generated from admin/unidata/IVD_Sequences.txt
by the script admin/unidata/uvs.el. It is version-controlled
because otherwise the first build on macOS from the source
repository would need to be headless.
FIXME: Make it convenient to do headless bootstrap builds on macOS,
so that this file need not be put into the source repository. */
")
(princ
(format "static const unsigned char mac_uvs_table_%s_bytes[] =\n {\n"
(replace-regexp-in-string "[^_[:alnum:]]" "_"
......
......@@ -1960,9 +1960,9 @@ CFLAGS="$CFLAGS -x objective-c"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
if test "${with_ns}" != no; then
# macfont.o requires macuvs.h which is absent in the repository,
# macfont.o requires macuvs.h which is absent after 'make extraclean',
# so avoid NS_IMPL_COCOA if macuvs.h is absent.
# Even a headless Emacs can build macuvs.h, so this lets you bootstrap.
# Even a headless Emacs can build macuvs.h, so this should let you bootstrap.
if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment