GNU bug report logs - #13984
Automate the build of ja-dic.el

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 13984 in the body.
You can then email your comments to 13984 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Paul Eggert <eggert <at> cs.ucla.edu>
To: bug-gnu-emacs <at> gnu.org
Cc: Kenichi Handa <handa <at> m17n.org>
Subject: Automate the build of ja-dic.el
Date: Fri, 15 Mar 2013 23:13:50 -0700

[Message part 1 (text/plain, inline)]

Tags: patch
Severity: wishlist

Currently the procedure for building ja-dic.el is semiautomated
and it's installed by hand into the bzr repository.  Here's a patch
to automate the build, so that the bzr repository need not contain
this file.  The file is still part of the Emacs tarball, so ordinary
builds are unchanged; the patch should affect only bootstrap builds.

I'm CC'ing this to Mr. Handa to give him a heads-up.

The full patch (gzipped) is attached.  Most of the
patch consists of removing or updating catalogs and so it's
pretty boring.  The key part of the patch is copied below.

# Begin patch
=== modified file '.bzrignore'
--- .bzrignore	2013-02-21 22:42:56 +0000
+++ .bzrignore	2013-03-16 06:03:12 +0000
@@ -80,6 +80,7 @@
 build-aux/depcomp
 build-aux/install-sh
 build-aux/missing
+leim/SKK-DIC/SKK-JISYO.L.unannotated
 leim/leim-list.el
 leim/quail/*.el
 leim/changed.misc

=== modified file 'ChangeLog'
--- ChangeLog	2013-03-13 18:42:22 +0000
+++ ChangeLog	2013-03-16 06:03:12 +0000
@@ -1,3 +1,10 @@
+2013-03-15  Paul Eggert  <eggert <at> cs.ucla.edu>
+
+	Automate the build of ja-dic.el.
+	* .bzrignore: Add leim/SKK-DIC/SKK-JISYO.L.unannotated.
+	* configure.ac (AC_PROG_AWK): Mention in a comment.
+	* make-dist (files): Distribute new file leim/SKK-DIC/unannotation.awk.
+
 2013-03-13  Paul Eggert  <eggert <at> cs.ucla.edu>

 	File synchronization fixes (Bug#13944).

=== modified file 'configure.ac'
--- configure.ac	2013-03-13 18:42:22 +0000
+++ configure.ac	2013-03-16 06:03:12 +0000
@@ -789,7 +789,8 @@


 dnl Some other nice autoconf tests.
-dnl These are commented out, since gl_EARLY and/or Autoconf already does them.
+dnl Commented out, since gl_EARLY, gl_INIT and/or Autoconf already does them.
+dnl AC_PROG_AWK
 dnl AC_PROG_INSTALL
 dnl AC_PROG_MKDIR_P
 dnl if test "x$RANLIB" = x; then

=== modified file 'leim/ChangeLog'
--- leim/ChangeLog	2013-03-11 16:31:55 +0000
+++ leim/ChangeLog	2013-03-16 06:03:12 +0000
@@ -1,3 +1,20 @@
+2013-03-15  Paul Eggert  <eggert <at> cs.ucla.edu>
+
+	Automate the build of ja-dic.el.
+	ja-dic.el no longer needs to be in the repository: it's now
+	generated as part of the bootstrap.  Also, update SKK-JISYO.L to
+	match the upstream source exactly.
+	* ja-dic/ja-dic.el: Remove from repository.  It is still distributed
+	as part of the Emacs tarball.
+	* Makefile.in (AWK): New macro.
+	($(srcdir)/ja-dic/ja-dic.el): New rule.
+	(compile-main): Depend on it.
+	(clean): Remove SKK-DIC/SKK-JISYO.L.unannotated.
+	* SKK-DIC/README: Update to reflect new build procedure.
+	* SKK-DIC/SKK-JISYO.L: Update to match source exactly.
+	This is now the annotated version, to match the upstream file name;
+	the unannotated one is built from it automatically.
+
 2013-02-08  Stefan Monnier  <monnier <at> iro.umontreal.ca>

 	* quail/latin-ltx.el: Add greek superscripts.

=== modified file 'leim/Makefile.in'
--- leim/Makefile.in	2013-01-01 09:11:05 +0000
+++ leim/Makefile.in	2013-03-16 06:03:12 +0000
@@ -39,6 +39,7 @@
 RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
 	${EMACS} -batch --no-site-file --no-site-lisp

+AWK = @AWK@
 MKDIR_P = @MKDIR_P@

 # Files generated from TIT dictionaries for Chinese GB character set.
@@ -144,6 +145,15 @@
 	fi
 	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@

+$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L \
+  $(srcdir)/SKK-DIC/unannotation.awk
+	@$(MKDIR_P) $(srcdir)/ja-dic SKK-DIC
+	$(AWK) -f $(srcdir)/SKK-DIC/unannotation.awk \
+	  $(srcdir)/SKK-DIC/SKK-JISYO.L \
+	  > SKK-DIC/SKK-JISYO.L.unannotated
+	$(RUN_EMACS) -l $(buildlisppath)/international/ja-dic-cnv \
+	  --eval '(skkdic-convert "SKK-DIC/SKK-JISYO.L.unannotated" "$(srcdir)/ja-dic")'
+
 ## Following adapted from lisp/Makefile.in.
 setwins=wins="${srcdir}/ja-dic quail"; \
 	[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \
@@ -156,7 +166,7 @@
 # Compile all the Elisp files that need it.  Beware: it approximates
 # `no-byte-compile', so watch out for false-positives!
 .PHONY: compile-main
-compile-main: ${TIT_MISC}
+compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el
 	@($(setwins); \
 	els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
 	for el in $$els; do \
@@ -172,6 +182,7 @@

 clean mostlyclean:
 	rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
+		SKK-DIC/SKK-JISYO.L.unannotated \
 		leim-list.el changed.tit changed.misc

 # The following target is needed because the `clean' target only removes

=== modified file 'leim/SKK-DIC/README'
--- leim/SKK-DIC/README	2010-02-16 06:58:32 +0000
+++ leim/SKK-DIC/README	2013-03-16 06:03:12 +0000
@@ -1,4 +1,7 @@
-The file SKK-JISYO.L is renamed from SKK-JISYO.L.unannotated which is
-distributed at http://openlab.ring.gr.jp/skk/skk/dic/.
-SKK-JISYO.L.unannotated is free software distributed under the terms
+This directory contains a copy of the following files:
+
+http://openlab.ring.gr.jp/skk/skk/dic/SKK-JISYO.L
+http://openlab.ring.gr.jp/skk/skk/tools/unannotation.awk
+
+These files are free software distributed under the terms
 of the GNU General Public License.

=== modified file 'leim/SKK-DIC/SKK-JISYO.L'
[see full patch]

=== added file 'leim/SKK-DIC/unannotation.awk'
[see full patch]

=== removed directory 'leim/ja-dic'
=== removed file 'leim/ja-dic/ja-dic.el'
[see full patch]

=== modified file 'make-dist'
--- make-dist	2013-03-03 02:43:30 +0000
+++ make-dist	2013-03-16 06:03:12 +0000
@@ -324,7 +324,8 @@
  ln makefile.w32-in ../${tempdir}/leim
  ln ChangeLog README ../${tempdir}/leim
  ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
- ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
+ ln SKK-DIC/README SKK-DIC/SKK-JISYO.L SKK-DIC/unannotation.awk \
+   ../${tempdir}/leim/SKK-DIC
  ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
  ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic
  ln Makefile.in ../${tempdir}/leim/Makefile.in

[encoding3.txt.gz (application/x-gzip, attachment)]

Message #8 received at 13984 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Paul Eggert <eggert <at> cs.ucla.edu>
Cc: 13984 <at> debbugs.gnu.org, Kenichi Handa <handa <at> m17n.org>
Subject: Re: bug#13984: Automate the build of ja-dic.el
Date: Sat, 16 Mar 2013 22:36:14 -0400

> builds are unchanged; the patch should affect only bootstrap builds.

By "bootstrap builds" you mean "builds from the Bzr repository".  As it
turns out, these are the most important builds, I think.

So the problem I see with your patch (whose goal I agree with) is that
it adds a dependency on Awk, which is probably going to be a problem for
the Windows contributors.

Why not replace leim/SKK-DIC/unannotation.awk with
leim/SKK-DIC/unannotation.el?


        Stefan

Message #11 received at 13984 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 13984 <at> debbugs.gnu.org, eggert <at> cs.ucla.edu, handa <at> m17n.org
Subject: Re: bug#13984: Automate the build of ja-dic.el
Date: Sun, 17 Mar 2013 05:55:17 +0200

> From: Stefan Monnier <monnier <at> iro.umontreal.ca>
> Date: Sat, 16 Mar 2013 22:36:14 -0400
> Cc: 13984 <at> debbugs.gnu.org, Kenichi Handa <handa <at> m17n.org>
> 
> > builds are unchanged; the patch should affect only bootstrap builds.
> 
> By "bootstrap builds" you mean "builds from the Bzr repository".  As it
> turns out, these are the most important builds, I think.
> 
> So the problem I see with your patch (whose goal I agree with) is that
> it adds a dependency on Awk, which is probably going to be a problem for
> the Windows contributors.

Right.  Another problem is with the file name SKK-JISYO.L.unannotated,
since it clashes with SKK-JISYO.L on 8+3 DOS filesystems.  Can we use
a different name, please?

> Why not replace leim/SKK-DIC/unannotation.awk with
> leim/SKK-DIC/unannotation.el?

Yes, that would be much better.

Thanks.

Message #14 received at 13984 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Schwab <schwab <at> linux-m68k.org>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 13984 <at> debbugs.gnu.org, eggert <at> cs.ucla.edu,
	Stefan Monnier <monnier <at> iro.umontreal.ca>, handa <at> m17n.org
Subject: Re: bug#13984: Automate the build of ja-dic.el
Date: Sun, 17 Mar 2013 09:46:57 +0100

Eli Zaretskii <eliz <at> gnu.org> writes:

> Right.  Another problem is with the file name SKK-JISYO.L.unannotated,
> since it clashes with SKK-JISYO.L on 8+3 DOS filesystems.  Can we use
> a different name, please?

Can we please drop this stupid 8.3 limitation?

Andreas.

-- 
Andreas Schwab, schwab <at> linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Message #19 received at 13984-done <at> debbugs.gnu.org (full text, mbox):

From: Paul Eggert <eggert <at> cs.ucla.edu>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 13984-done <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>,
	Kenichi Handa <handa <at> m17n.org>
Subject: Re: bug#13984: Automate the build of ja-dic.el
Date: Sun, 17 Mar 2013 21:46:01 -0700

On 03/16/2013 07:36 PM, Stefan Monnier wrote:

> By "bootstrap builds" you mean "builds from the Bzr repository". 

Yes, thanks, I fixed that in the commentary.

> the problem I see with your patch (whose goal I agree with) is that
> it adds a dependency on Awk, which is probably going to be a problem for
> the Windows contributors.

That shouldn't be a showstopper, as Awk ports are widely available
for Windows, and the GNU coding standards have said for many years
that it's OK to assume Awk.  For this particular case, though,
it's easy to remove the dependency on Awk so I did that.

On 03/16/2013 08:55 PM, Eli Zaretskii wrote:

> Another problem is with the file name SKK-JISYO.L.unannotated,
> since it clashes with SKK-JISYO.L on 8+3 DOS filesystems.  Can we use
> a different name, please?

I altered things so that the file is not needed, which sidesteps
the problem.  I agree with Andreas that we should come up with a better
way of dealing with the 8+3 problem, though, so as to be less intrusive
to mainline development.

Installed as trunk bzr 112072 and marking this bug as done.

Message #22 received at 13984-done <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Paul Eggert <eggert <at> cs.ucla.edu>
Cc: 13984-done <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>,
	Kenichi Handa <handa <at> m17n.org>
Subject: Re: bug#13984: Automate the build of ja-dic.el
Date: Mon, 18 Mar 2013 09:01:16 -0400

> I altered things so that the file is not needed, which sidesteps
> the problem.  I agree with Andreas that we should come up with a better
> way of dealing with the 8+3 problem, though, so as to be less intrusive
> to mainline development.

It is a silly limitation, but it's really mostly a non-issue.  We seem
to spend more time arguing about it, than actually solving the rare few
problems it introduces.

> Installed as trunk bzr 112072 and marking this bug as done.

Thank you,


        Stefan

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.