From 0c8e87b8d21d227b770ebfbe608e9b0cc4947442 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 23 Aug 2012 12:47:10 +0200 Subject: [PATCH] Rename UTILITIES/ to utils/ --- .gitignore | 2 +- README_maintainer | 10 +++++----- default.mk | 6 +++--- doc/Makefile | 10 +++++----- doc/org.texi | 2 +- lisp/org-compat.el | 2 +- targets.mk | 4 ++-- {UTILITIES => utils}/fake_change_log.pl | 0 {UTILITIES => utils}/git-changelog | 0 {UTILITIES => utils}/gplmanual.pl | 0 {UTILITIES => utils}/guidesplit.pl | 0 {UTILITIES => utils}/list-hooks.pl | 0 {UTILITIES => utils}/make_emacs_changelog | 2 +- {UTILITIES => utils}/manfull.pl | 0 {UTILITIES => utils}/mansplit.pl | 0 {UTILITIES => utils}/org-fixup.el | 0 {UTILITIES => utils}/orgcard2txt.pl | 0 {UTILITIES => utils}/pw | 0 {UTILITIES => utils}/server.mk | 0 {UTILITIES => utils}/set-version.pl | 0 {UTILITIES => utils}/x11idle.c | 0 21 files changed, 19 insertions(+), 19 deletions(-) rename {UTILITIES => utils}/fake_change_log.pl (100%) rename {UTILITIES => utils}/git-changelog (100%) rename {UTILITIES => utils}/gplmanual.pl (100%) rename {UTILITIES => utils}/guidesplit.pl (100%) rename {UTILITIES => utils}/list-hooks.pl (100%) rename {UTILITIES => utils}/make_emacs_changelog (97%) rename {UTILITIES => utils}/manfull.pl (100%) rename {UTILITIES => utils}/mansplit.pl (100%) rename {UTILITIES => utils}/org-fixup.el (100%) rename {UTILITIES => utils}/orgcard2txt.pl (100%) rename {UTILITIES => utils}/pw (100%) rename {UTILITIES => utils}/server.mk (100%) rename {UTILITIES => utils}/set-version.pl (100%) rename {UTILITIES => utils}/x11idle.c (100%) diff --git a/.gitignore b/.gitignore index 1470b8707..4000f68d8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ TODO .DS_Store *# .#* -/UTILITIES/x11idle +/utils/x11idle # # Local variables: diff --git a/README_maintainer b/README_maintainer index a4a93c704..655c6d818 100644 --- a/README_maintainer +++ b/README_maintainer @@ -19,7 +19,7 @@ accepting it. I have found that the best workflow for this is using the pw script by Nate Case, with the modifications for Org-mode made by John Wiegley and Carsten Dominik. The correct version of this script that should -be used with Org mode is distributed in the UTILITIES directory of the +be used with Org mode is distributed in the =utils/= directory of the Org mode distribution. Here is the basic workflow for this. ** Access to the patchwork server @@ -156,7 +156,7 @@ org-version= will spit ut complete version infor related to git, with the nearest commit and tag. I you ever need to set a special version number, use this: -: UTILITIES/set_version 7.02trans +: utils/set_version 7.02trans and commit the result. Note that the above command does not change the version string in the file from which Org's homepage is generated. @@ -213,7 +213,7 @@ So the way I have been doing things with Emacs is this: For this, I do in the org-mode git repository - : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02 + : utils/make_emacs_changelog release_7.02.05..release_7.03.02 This will spit out ChangeLog entries (for the given commit range) that need to go into the ChangeLog files in Emacs. Org-mode @@ -236,7 +236,7 @@ So the way I have been doing things with Emacs is this: second and third command line arguments to =make_emacs_changelog=, for example - : UTILITIES/make_emacs_changelog release_7.02.05..release_7.03.02 2010-12-11 lisp + : utils/make_emacs_changelog release_7.02.05..release_7.03.02 2010-12-11 lisp These entries need to be added to the ChangeLog files in Emacs. You should, in the ChangeLog file, select the inserted region of @@ -253,7 +253,7 @@ So the way I have been doing things with Emacs is this: The file /org-configs/org-hooks.org/ contains a list of all hooks in Org. This list has to be updated after hooks have been added or - removed. The perl script /UTILITIES/list-hooks.pl/ creates the + removed. The perl script /utils/list-hooks.pl/ creates the entire section "Hooks and Function variables", including its level-one headline. I guess babel code could be used to update this automatically, but I have not implemented this - I have been doing diff --git a/default.mk b/default.mk index 483d1de39..4844d8998 100644 --- a/default.mk +++ b/default.mk @@ -71,7 +71,7 @@ BATCH = $(EMACS) -batch -Q MAKE_LOCAL_MK = $(BATCH) \ --eval '(add-to-list '"'"'load-path "./lisp")' \ --eval '(load "org-compat.el")' \ - --eval '(load "../UTILITIES/org-fixup.el")' \ + --eval '(load "../utils/org-fixup.el")' \ --eval '(org-make-local-mk)' # Emacs must be started in lisp directory @@ -81,13 +81,13 @@ BATCHL = $(BATCH) \ # How to generate org-install.el MAKE_ORG_INSTALL = $(BATCHL) \ --eval '(load "org-compat.el")' \ - --eval '(load "../UTILITIES/org-fixup.el")' \ + --eval '(load "../utils/org-fixup.el")' \ --eval '(org-make-org-install)' # How to generate org-version.el MAKE_ORG_VERSION = $(BATCHL) \ --eval '(load "org-compat.el")' \ - --eval '(load "../UTILITIES/org-fixup.el")' \ + --eval '(load "../utils/org-fixup.el")' \ --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)" "$(datadir)")' # How to byte-compile the whole source directory diff --git a/doc/Makefile b/doc/Makefile index 75c2ea7ad..caf8eca3b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -20,10 +20,10 @@ manual guide:: $(MKDIR) $@ manual:: org.texi org-version.inc $(TEXI2HTML) -o $@ $< - ../UTILITIES/mansplit.pl $@/* + ../utils/mansplit.pl $@/* guide:: orgguide.texi org-version.inc $(TEXI2HTML) -o $@ $< - ../UTILITIES/guidesplit.pl $@/* + ../utils/guidesplit.pl $@/* org-version.inc: org.texi @echo "org-version: $(ORGVERSION) ($(GITVERSION))" @@ -61,14 +61,14 @@ clean-install: %.html: %.texi org-version.inc $(TEXI2HTML) --no-split -o $@ $< - ../UTILITIES/manfull.pl $@ + ../utils/manfull.pl $@ %.txt: %.tex - perl ../UTILITIES/orgcard2txt.pl $< > $@ + perl ../utils/orgcard2txt.pl $< > $@ %_letter.tex: %.tex $(BATCH) \ --eval '(add-to-list '"'"'load-path "../lisp")' \ --eval '(load "org-compat.el")' \ - --eval '(load "../UTILITIES/org-fixup.el")' \ + --eval '(load "../utils/org-fixup.el")' \ --eval '(org-make-letterformat "$(