[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ess c9a66069be 3/4: primitive automation of :package-ve
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/ess c9a66069be 3/4: primitive automation of :package-version |
|
Date: |
Sun, 21 Jan 2024 15:57:55 -0500 (EST) |
branch: externals/ess
commit c9a66069be2dae226c2dc1df8db06bea4cce4a57
Author: rsparapa <rsparapa@mcw.edu>
Commit: rsparapa <rsparapa@mcw.edu>
primitive automation of :package-version
---
Makeconf | 8 ++++++++
Makefile | 3 ++-
NEWS | 9 ++++++---
lisp/ess-custom.el | 28 ++++++++++++++--------------
lisp/ess.el | 2 +-
5 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/Makeconf b/Makeconf
index 34976611a1..ea515cafc8 100644
--- a/Makeconf
+++ b/Makeconf
@@ -19,6 +19,14 @@ SITELISP ?= $(PREFIX)/share/emacs/site-lisp
ESSDESTDIR ?= $(SITELISP)/ess
EMACSBATCH ?= $(EMACS) -batch -Q
+##__ GNU Emacs __ preparing for ESS release
+DESTDIR = /usr/local
+PREFIX = $(DESTDIR)
+EMACS = $(PREFIX)/emacs/29.1/bin/emacs
+SITELISP = $(PREFIX)/emacs/29.1/share/emacs/site-lisp
+ESSDESTDIR = $(SITELISP)/ess
+EMACSBATCH = $(EMACS) -batch -Q
+
##__ GNU Emacs __ for macOS
# PREFIX=/Applications/Emacs.app/Contents/Resources
# EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs
diff --git a/Makefile b/Makefile
index 0e0bf59d5d..f5802c989f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,12 @@ ESSR-VERSION := $(shell sed -n "s/;; ESSR-Version: *\(.*\)
*/\1/p" lisp/ess.el)
all: lisp doc etc autoloads
.PHONY: version
-version:
+version: VERSION
@echo "********************* VERSIONS **************************"
@echo $(shell $(EMACS) --version | sed -n 1p)
@echo ESS $(ESSVERSION)
@echo ESSR $(ESSR-VERSION)
+ @sed -i "s/\"VERSION\"/\"$(ESSVERSION)\"/" lisp/ess-custom.el
@echo "*********************************************************"
.PHONY: lisp
diff --git a/NEWS b/NEWS
index f6edbbf333..606aecdf5b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
-Changes and New Features in 24.01:
+Changes and New Features in 24.01.0:
* updating version number
* fix docstring warnings in ess-custom
+ sed/VERSION/24.01.0/
+ commit ess-custom with VERSION NOT 24.01.0
+ so remember to git checkout ess-custom.el after make install
- * make `ess-request-a-process' obey `ess-gen-proc-buffer-name-function'
- thanks to Ihor Radchenko <yantar92@posteo.net>
+ * make `ess-request-a-process' obey `ess-gen-proc-buffer-name-function'
+ thanks to Ihor Radchenko <yantar92@posteo.net>
Changes and New Features in 19.04 (unreleased):
diff --git a/lisp/ess-custom.el b/lisp/ess-custom.el
index b769dd1e3c..4982a19e3c 100644
--- a/lisp/ess-custom.el
+++ b/lisp/ess-custom.el
@@ -1,6 +1,6 @@
;;; ess-custom.el --- Customize variables for ESS -*- lexical-binding: t; -*-
-;; Copyright (C) 1997-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2024 Free Software Foundation, Inc.
;; Author: Rodney Sparapani
;; Maintainer: ESS-help <ess-help@r-project.org>
@@ -141,7 +141,7 @@
"Directory containing ess-site.el(c) and other ESS Lisp files."
:group 'ess
:type 'directory
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-etc-directory
;; Try to detect the `etc' folder only if not already set up by distribution
@@ -156,7 +156,7 @@ The ESS etc directory stores various auxiliary files that
are useful
for ESS, such as icons."
:group 'ess
:type 'directory
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
;; Depending on how ESS is loaded the `load-path' might not contain
;; the `lisp' directory. For this reason we need to add it before we
@@ -192,7 +192,7 @@ See `ess-auto-width'. Be warned that ESS can set the width a
lot."
:group 'ess
:type 'boolean
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-auto-width nil
"When non-nil, set the width option when the window configuration changes.
@@ -206,7 +206,7 @@ window's width minus that number. Anything else is treated
as
(const :tag "Frame width" :value frame)
(const :tag "Window width" :value window)
(integer :tag "Integer value"))
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-handy-commands '(("change-directory" . ess-change-directory)
("install.packages" . ess-install-library)
@@ -478,7 +478,7 @@ If \\='process, only check if the buffer has an inferior
process."
:type '(choice (const :tag "Always" t)
(const :tag "With running inferior process" process)
(const :tag "Never" nil))
- :package-version '(ess . "18.10"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-use-auto-complete t
"If non-nil, activate auto-complete support.
@@ -562,7 +562,7 @@ contain spaces on either side."
;; them.
:type '(repeat string)
:group 'ess
- :package-version '(ess "18.10"))
+ :package-version '(ess . "VERSION"))
(defvar ess-S-assign)
(make-obsolete-variable 'ess-S-assign 'ess-assign-list "ESS 18.10")
@@ -584,7 +584,7 @@ This gets appended to `prettify-symbols-alist', so set it
to nil
if you want to disable R specific prettification."
:group 'ess-R
:type '(alist :key-type string :value-type symbol)
- :package-version '(ess . "18.10"))
+ :package-version '(ess . "VERSION"))
;;*;; Variables concerning editing behavior
@@ -751,7 +751,7 @@ is non-nil. Affects `ess-save-file'."
(const :tag "Use compilation-ask-about-save and
auto-save-visited-mode."
:value auto)
(const :tag "Save without asking." :value t))
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
;;*;; Variables controlling editing
@@ -1371,7 +1371,7 @@ This always dumps to a sub-directory (\".Src\") of the
current ess
working directory (i.e. first elt of search list)."
:group 'ess-edit
:type 'directory
- :package-version '(ess . "18.10"))
+ :package-version '(ess . "VERSION"))
(defvar ess-dump-filename-template nil
"Internal. Initialized by dialects.")
@@ -1531,7 +1531,7 @@ there is no project root in the current directory."
(const :tag "*proc:project-root* or *proc*"
ess-gen-proc-buffer-name:project-or-simple)
(const :tag "*proc:project-root* or *proc:dir*"
ess-gen-proc-buffer-name:project-or-directory)
function)
- :package-version '(ess . "19.04"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-kermit-command "gkermit -T"
@@ -1858,7 +1858,7 @@ This variable also affect the evaluation of input code in
iESS. The effect is similar to the above. If t then ess waits for
the process output, otherwise not."
:group 'ess-proc
- :package-version '(ess . "19.04")
+ :package-version '(ess . "VERSION")
:type '(choice (const t) (const nowait) (const nil)))
(defcustom ess-eval-deactivate-mark (fboundp 'deactivate-mark); was nil till
2010-03-22
@@ -2317,7 +2317,7 @@ This defaults to `default-frame-alist' and is used only
when
the variable `ess-help-own-frame' is non-nil."
:group 'ess-help
:type 'alist
- :package-version '(ess . "18.10"))
+ :package-version '(ess . "VERSION"))
; Faces
;;;=====================================================
@@ -2463,7 +2463,7 @@ Created for each process."
See also `ess-verbose'."
:group 'ess-proc
:type 'boolean
- :package-version '(ess . "18.10"))
+ :package-version '(ess . "VERSION"))
(defcustom ess-verbose nil
"Non-nil means write more information to `ess-dribble-buffer' than usual."
diff --git a/lisp/ess.el b/lisp/ess.el
index 86434961d2..d76b74c9d2 100644
--- a/lisp/ess.el
+++ b/lisp/ess.el
@@ -1,6 +1,6 @@
;;; ess.el --- Emacs Speaks Statistics -*- lexical-binding: t; -*-
-;; Copyright (C) 1997-2022 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2024 Free Software Foundation, Inc.
;; Author: David Smith <dsmith@stats.adelaide.edu.au>
;; A.J. Rossini <blindglobe@gmail.com>