Re: [Emacs-diffs] /srv/bzr/emacs/trunk r105007: Add C interface for Unicode character property table.

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r105007: Add C interface for Unicode character property table.

[Juanma Barranquero]

On Thu, Jul 7, 2011 at 06:21, Kenichi Handa <handa@m17n.org> wrote:

> === modified file 'admin/unidata/Makefile.in'
> --- a/admin/unidata/Makefile.in 2011-01-14 17:18:41 +0000
> +++ b/admin/unidata/Makefile.in 2011-07-06 22:43:48 +0000
> @@ -33,9 +33,10 @@
>
>  ${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt
>        ELC=`/bin/pwd`/unidata-gen.elc; \
> -       DATA=`/bin/pwd`/unidata.txt; \
> +       DATADIR=`/bin/pwd`; \
> +       DATA=unidata.txt; \
>        cd ${DSTDIR}; \
> -       ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATA}
> +       ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}
>
>  ../../src/biditype.h: UnicodeData.txt
>        gawk -F";" -f biditype.awk $< > $@
>

After replicating that change in the Windows makefile (see below), I
try to regenerate the files and I get an error:

@C:\emacs\trunk\admin\unidata> make all
"../../src/oo-spd/i386/emacs.exe" -Q -batch --eval "(cd
\"../../lisp/international\")" --load
C:/emacs/trunk/admin/unidata/unidata-gen.elc
-f unidata-gen-files C:/emacs/trunk/admin/unidata unidata.txt
Generating uni-name.el...
Can't change extra-slot of char-code-property-table
make: *** [charprop-CMD] Error -1

    Juanma



=== modified file 'admin/unidata/makefile.w32-in'
--- admin/unidata/makefile.w32-in	2011-01-14 17:18:41 +0000
+++ admin/unidata/makefile.w32-in	2011-07-07 10:02:59 +0000
@@ -41,12 +41,13 @@

 charprop-SH: unidata-gen.elc unidata.txt
 	ELC=$(CURDIR)/unidata-gen.elc; \
-	DATA=$(CURDIR)/unidata.txt; \
+	DATADIR=$(CURDIR); \
+	DATA=unidata.txt; \
 	cd $(DSTDIR); \
-	  $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATA}
+	  $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}

 charprop-CMD: unidata-gen.elc unidata.txt
-	$(RUNEMACS) --eval $(ARGQUOTE)(cd
$(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load
$(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR)/unidata.txt
+	$(RUNEMACS) --eval $(ARGQUOTE)(cd
$(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load
$(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR) unidata.txt

 ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)