Author: sasugaanija
Date: Wed Dec 19 06:54:39 2007
New Revision: 5060
Added:
trunk/emacs/uim-version.el.in
Modified:
trunk/emacs/Makefile.am
trunk/emacs/uim-var.el
Log:
* This change modifies versioning rule of uim.el.
Now, uim-el-version command returns a same version as uim.
uim-version.el is generated automatically at the make stage
when the configure is executed with --enable-maintainer-mode
option.
* emacs/uim-var.el
- (uim-el-version): Move to uim-version.el
- include uim-version.el
* emacs/uim-version.el.in
- New file
- Template for uim-version.el
* emacs/Makefile.am
- (EXTRA_DIST): Add uim-version.el.in
- (dist_uimel_lisp_DATA): Add uim-var.el
- Add a rule to make uim-version.el
Modified: trunk/emacs/Makefile.am
==============================================================================
--- trunk/emacs/Makefile.am (original)
+++ trunk/emacs/Makefile.am Wed Dec 19 06:54:39 2007
@@ -1,9 +1,10 @@
-EXTRA_DIST = README.ja
+EXTRA_DIST = README.ja uim-version.el.in
if UIM_EL
uimel_lispdir = $(UIMEL_LISP_DIR)
-dist_uimel_lisp_DATA = uim.el uim-var.el uim-keymap.el uim-key.el
uim-util.el \
+dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \
+ uim-key.el uim-util.el \
uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el
bin_PROGRAMS = uim-el-agent uim-el-helper-agent
@@ -25,5 +26,10 @@
uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir)
uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
$(top_builddir)/uim/libuim.la
+
+if MAINTAINER_MODE
+uim-version.el: uim-version.el.in $(top_srcdir)/configure.ac
+ sed -e 's/@\(VERSION\)@/$(VERSION)/' uim-version.el.in > $@
+endif
endif
Modified: trunk/emacs/uim-var.el
==============================================================================
--- trunk/emacs/uim-var.el (original)
+++ trunk/emacs/uim-var.el Wed Dec 19 06:54:39 2007
@@ -34,7 +34,7 @@
;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;
-(defconst uim-el-version "0.0.8.1")
+(require 'uim-version)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Added: trunk/emacs/uim-version.el.in
==============================================================================
--- (empty file)
+++ trunk/emacs/uim-version.el.in Wed Dec 19 06:54:39 2007
@@ -0,0 +1,38 @@
+;;
+;; Copyright (c) 2005-2007 uim Project http://code.google.com/p/uim/
+;;
+;; All rights reserved.
+;;
+;; Redistribution and use in source and binary forms, with or
+;; without modification, are permitted provided that the
+;; following conditions are met:
+;;
+;; 1. Redistributions of source code must retain the above
+;; copyright notice, this list of conditions and the
+;; following disclaimer.
+;; 2. Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the
+;; following disclaimer in the documentation and/or other
+;; materials provided with the distribution.
+;; 3. Neither the name of authors nor the names of its
+;; contributors may be used to endorse or promote products
+;; derived from this software without specific prior written
+;; permission.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+;; CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+;; INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+;; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+;; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+;; NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+;; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+;; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;
+
+(defconst uim-el-version "@VERSION@")
+(provide 'uim-version)
