[Prime-cvs] CVS update: prime-dict

アーカイブの一覧に戻る

Hiroyuki Komatsu komat****@users*****
2004年 12月 30日 (木) 21:44:51 JST


Index: prime-dict/ChangeLog
diff -u prime-dict/ChangeLog:1.20 prime-dict/ChangeLog:1.21
--- prime-dict/ChangeLog:1.20	Mon Nov 29 23:39:51 2004
+++ prime-dict/ChangeLog	Thu Dec 30 21:44:51 2004
@@ -1,3 +1,16 @@
+2004-12-30  Hiroyuki Komatsu  <komat****@taiya*****>
+
+	* prime-dict: 0.8.6 Release.
+	The list of the source data:
+	UPDATE: SKK-JISYO.L         (2004-12-29     @ SKK OpenLab)
+	KEEP:   gcanna.ctd          (Ver. 0.95c     @ Cannadic Project)
+	KEEP:   gcannaf.ctd         (Ver. 0.95c     @ Cannadic Project)
+	UPDATE: prime-newwords.dict (2004-12-29     @ PRIME Project)
+	UPDATE: usage.dict          (2004-12-29     @ PRIME Project)
+	
+	256,463 words / 7,150,581 bytes
+	- Added comments of the SKK dictionary as 'comment=*'.
+	
 2004-11-29  Hiroyuki Komatsu  <komat****@taiya*****>
 
 	* prime-dict: 0.8.5 Release.
Index: prime-dict/Makefile.am
diff -u prime-dict/Makefile.am:1.5 prime-dict/Makefile.am:1.6
--- prime-dict/Makefile.am:1.5	Tue Feb  3 07:34:53 2004
+++ prime-dict/Makefile.am	Thu Dec 30 21:44:51 2004
@@ -1,5 +1,5 @@
 # Makefile.am: Template of Automake for prime-dict.
-# $Id: Makefile.am,v 1.5 2004/02/02 22:34:53 tyuyu Exp $
+# $Id: Makefile.am,v 1.6 2004/12/30 12:44:51 komatsu Exp $
 #
 # Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****>
 #     All rights reserved.
@@ -20,3 +20,11 @@
 	cp -a packaging/Debian/debian/ debian
 	dch -v "$(VERSION)-0.local.1" 'Local build.'
 	fakeroot make -f debian/rules binary
+
+cygwin:
+	rm -rf cygwin/
+	./configure --prefix `pwd`/cygwin/usr/local \
+                    --with-rubydir=/usr/lib/ruby/site_ruby/1.8
+	make install
+	cd cygwin ; tar cjf $(PACKAGE)-$(VERSION).tar.bz2 usr ; rm -rf usr
+	rm ./configure
Index: prime-dict/acinclude.m4
diff -u prime-dict/acinclude.m4:1.2 prime-dict/acinclude.m4:1.3
--- prime-dict/acinclude.m4:1.2	Sun Feb 29 22:41:49 2004
+++ prime-dict/acinclude.m4	Thu Dec 30 21:44:51 2004
@@ -1,5 +1,5 @@
 dnl acinclude.m4: m4 macros for Autoconf
-dnl $Id: acinclude.m4,v 1.2 2004/02/29 13:41:49 komatsu Exp $
+dnl $Id: acinclude.m4,v 1.3 2004/12/30 12:44:51 komatsu Exp $
 dnl
 dnl Copyright (C) 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****>
 dnl     All rights reserved.
@@ -8,20 +8,20 @@
 dnl You can redistribute it and/or modify it under the terms of 
 dnl the GNU General Public License version 2.
 
-AC_DEFUN(AC_INIT_DEFAULT_VALUES,
+AC_DEFUN([AC_INIT_DEFAULT_VALUES],
 [
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 ])
-AC_DEFUN(AC_VAR_EXPAND, [`eval echo $1`])
+AC_DEFUN([AC_VAR_EXPAND], [`eval echo $1`])
 
 
-AC_DEFUN(MY_AC_PROG_RUBY,
+AC_DEFUN([MY_AC_PROG_RUBY],
 [
     AC_SUBST(ruby_version,
         [`ruby -r rbconfig -e "puts Config::CONFIG[['ruby_version']]"`])
 ])
 
-AC_DEFUN(AC_RUBY_SITELIBDIR,
+AC_DEFUN([AC_RUBY_SITELIBDIR],
     ['$(libdir)/site_ruby/$(ruby_version)'])
 #    [`ruby -r rbconfig -e "puts Config::MAKEFILE_CONFIG[['rubylibdir']]"`])
Index: prime-dict/configure.in
diff -u prime-dict/configure.in:1.16 prime-dict/configure.in:1.17
--- prime-dict/configure.in:1.16	Mon Nov 29 23:34:06 2004
+++ prime-dict/configure.in	Thu Dec 30 21:44:51 2004
@@ -1,5 +1,5 @@
 dnl configure.in: Creates a configure script for prime-dict of PRIME.
-dnl $Id: configure.in,v 1.16 2004/11/29 14:34:06 komatsu Exp $
+dnl $Id: configure.in,v 1.17 2004/12/30 12:44:51 komatsu Exp $
 dnl
 dnl Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****>
 dnl     All rights reserved.
@@ -9,14 +9,14 @@
 dnl the GNU General Public License version 2.
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT(prime-dict, 0.8.5, komat****@taiya*****,
+AC_INIT(prime-dict, 0.8.6, komat****@taiya*****,
 	[Dictionaries of PRIME])
 AC_PREREQ(2.53)
 
 AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
 # AM_MAINTAINER_MODE
 AC_INIT_DEFAULT_VALUES
-AC_SUBST(DATE, "2004-11-29")
+AC_SUBST(DATE, "2004-12-30")
 
 MY_AC_PROG_RUBY
 
Index: prime-dict/missing
diff -u prime-dict/missing:1.2 prime-dict/missing:1.3
--- prime-dict/missing:1.2	Sun Jan 18 19:02:32 2004
+++ prime-dict/missing	Thu Dec 30 21:44:51 2004
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2004-09-07.08
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinar****@iro*****>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,18 +42,24 @@
   configure_ac=configure.in
 fi
 
+msg="missing on your system"
+
 case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -74,11 +84,15 @@
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-a****@gnu*****>."
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
+    exit 0
     ;;
 
   -*)
@@ -87,14 +101,44 @@
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -102,13 +146,8 @@
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -116,13 +155,8 @@
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -140,13 +174,8 @@
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
@@ -185,7 +209,7 @@
 
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -262,13 +281,8 @@
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
@@ -284,10 +298,6 @@
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +333,8 @@
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
          it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
@@ -334,3 +344,10 @@
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:


Prime-cvs メーリングリストの案内
アーカイブの一覧に戻る