Commit 425b45a3 authored by Per Cederqvist's avatar Per Cederqvist

Move the version number from vars.el.in to a separate file.

parent 4a14a62e
......@@ -3,3 +3,4 @@
/lyskom.elc
/swedish-help.el
/vars.el
/version.el
2013-05-06 Per Cederqvist <ceder@lysator.liu.se>
Move the version number from vars.el.in to a separate file.
* version.el.in: New file.
(lyskom-clientversion): Moved from vars.el.in.
* vars.el.in (lyskom-clientversion): Moved to version.el.in.
* Makefile (HEADER): Added $(VERSION-EL).
(VERSION-EL): Set to version.el or version.el-release.
(version.el): New target.
(version.el-release): New target.
($(TARGET-EL) lyskom-all-$(CLIENTVERSION).el): Rebuild version.el.
(release): Depend on $(VERSION-EL).
(clean): Remove version.el and version.el-release.
* .gitignore: Ignore version.el
2013-05-04 Per Cederqvist <ceder@lysator.liu.se>
Some basic Git adjustments.
......
......@@ -57,6 +57,7 @@ TARGET-EL := $(TARGET:%.elc=%.el)
HEADER = header.el \
defvar.el \
feature.el \
$(VERSION-EL) \
$(VARS-EL) \
macros.el \
compatibility.el \
......@@ -140,6 +141,12 @@ else
VARS-EL = vars.el
endif
ifeq ($(MAKECMDGOALS),release)
VERSION-EL = version.el-release
else
VERSION-EL = version.el
endif
EMACS-BATCH := $(EMACS) -batch
all: $(TARGET)
......@@ -152,10 +159,18 @@ vars.el: vars.el.in Makefile
vars.el-release: vars.el.in Makefile
sed 's/@@CLIENTVERSION@@/$(CLIENTVERSION)/g' <$< >$@
version.el: version.el.in Makefile
rm -f $@
sed "s/@@CLIENTVERSION@@/$(CLIENTVERSION) (`date +%Y-%m-%d`; Git)/g" <$< >$@
chmod 444 $@
version.el-release: version.el.in Makefile
sed 's/@@CLIENTVERSION@@/$(CLIENTVERSION)/g' <$< >$@
$(TARGET-EL) lyskom-all-$(CLIENTVERSION).el: \
$(HEADER) $(LANGUAGE-EL) $(SOURCES)
rm -f $(VARS-EL)
$(MAKE) $(VARS-EL)
rm -f $(VARS-EL) $(VERSION-EL)
$(MAKE) $(VARS-EL) $(VERSION-EL)
echo ";;;;; -*-coding: x-ctext;-*-" >$@
cat $^ >>$@
......@@ -227,7 +242,7 @@ RELEASE-DIST-ARCHIVES := \
$(patsubst %,$(PACKAGENAME)-%-$(CLIENTVERSION).tar.gz,$(RELEASE-DIST-FLAVOURS)) \
$(patsubst %,$(PACKAGENAME)-%-$(CLIENTVERSION).zip,$(RELEASE-DIST-FLAVOURS))
release: $(VARS-EL) $(RELEASE-DIST-ARCHIVES)
release: $(VARS-EL) $(VERSION-EL) $(RELEASE-DIST-ARCHIVES)
@echo
@echo
@echo "Release archives created:"
......@@ -341,6 +356,7 @@ clean:
rm -f *~ *.gz *.zip *.buildstamp *.elc* _header.el $(TARGET-EL)
rm -rf $(PACKAGENAME)-*-$(CLIENTVERSION)* lyskom-*-$(CLIENTVERSION).el
rm -f vars.el vars.el-release
rm -f version.el version.el-release
rm -f distribution-README-src distribution-README-nonsrc
.PHONY: all verbose verbose-el fast check release redhat-packages clean debian-packages
......@@ -3841,9 +3841,6 @@ Users are encouraged to use their best sense of humor."
;;; Internal variables and constants
(defconst lyskom-clientversion "@@CLIENTVERSION@@"
"Version of the LysKOM elisp client.")
(def-kom-var lyskom-settings-version lyskom-clientversion
"Version of saved settings."
server)
......
;;;;; -*-coding: iso-8859-1;-*-
;;;;; Copyright (C) 1991-1994, 2013 Lysator Academic Computer Association.
;;;;;
;;;;; This file is part of the LysKOM Emacs LISP client.
;;;;;
;;;;; LysKOM is free software; you can redistribute it and/or modify it
;;;;; under the terms of the GNU General Public License as published by
;;;;; the Free Software Foundation; either version 2, or (at your option)
;;;;; any later version.
;;;;;
;;;;; LysKOM is distributed in the hope that it will be useful, but WITHOUT
;;;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
;;;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
;;;;; for more details.
;;;;;
;;;;; You should have received a copy of the GNU General Public License
;;;;; along with LysKOM; see the file COPYING. If not, write to
;;;;; Lysator, c/o ISY, Linkoping University, S-581 83 Linkoping, SWEDEN,
;;;;; or the Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
;;;;; MA 02139, USA.
;;;;;
;;;;; Please mail bug reports to bug-lyskom@lysator.liu.se.
;;;; ================================================================
;;;;
;;;; File: version.el.in
;;;;
;;;; This file contains the version number.
;;;;
(defconst lyskom-clientversion "@@CLIENTVERSION@@"
"Version of the LysKOM elisp client.")
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