summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-23 12:47:10 +0200
committerBastien Guerry <bzg@altern.org>2012-08-23 12:47:10 +0200
commit0c8e87b8d21d227b770ebfbe608e9b0cc4947442 (patch)
treea5aa865421c8edfcb4dd950de6afbc8647990744
parent91e4ccb6c15532a972986caaa49a80905427f82c (diff)
downloadorg-mode-0c8e87b8d21d227b770ebfbe608e9b0cc4947442.tar.gz
Rename UTILITIES/ to utils/
-rw-r--r--.gitignore2
-rw-r--r--README_maintainer10
-rw-r--r--default.mk6
-rw-r--r--doc/Makefile10
-rw-r--r--doc/org.texi2
-rw-r--r--lisp/org-compat.el2
-rw-r--r--targets.mk4
-rwxr-xr-xutils/fake_change_log.pl (renamed from UTILITIES/fake_change_log.pl)0
-rwxr-xr-xutils/git-changelog (renamed from UTILITIES/git-changelog)0
-rwxr-xr-xutils/gplmanual.pl (renamed from UTILITIES/gplmanual.pl)0
-rwxr-xr-xutils/guidesplit.pl (renamed from UTILITIES/guidesplit.pl)0
-rwxr-xr-xutils/list-hooks.pl (renamed from UTILITIES/list-hooks.pl)0
-rwxr-xr-xutils/make_emacs_changelog (renamed from UTILITIES/make_emacs_changelog)2
-rwxr-xr-xutils/manfull.pl (renamed from UTILITIES/manfull.pl)0
-rwxr-xr-xutils/mansplit.pl (renamed from UTILITIES/mansplit.pl)0
-rw-r--r--utils/org-fixup.el (renamed from UTILITIES/org-fixup.el)0
-rwxr-xr-xutils/orgcard2txt.pl (renamed from UTILITIES/orgcard2txt.pl)0
-rwxr-xr-xutils/pw (renamed from UTILITIES/pw)0
-rw-r--r--utils/server.mk (renamed from UTILITIES/server.mk)0
-rwxr-xr-xutils/set-version.pl (renamed from UTILITIES/set-version.pl)0
-rw-r--r--utils/x11idle.c (renamed from UTILITIES/x11idle.c)0
21 files changed, 19 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index 1470b87..4000f68 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 a4a93c7..655c6d8 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 483d1de..4844d89 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 75c2ea7..caf8eca 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 "$(<F)" "$(@F)")'
diff --git a/doc/org.texi b/doc/org.texi
index edd6064..897115c 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6276,7 +6276,7 @@ as 10 or 15, Emacs can alert you when you get back to your computer after
being idle for that many minutes@footnote{On computers using Mac OS X,
idleness is based on actual user idleness, not just Emacs' idle time. For
X11, you can install a utility program @file{x11idle.c}, available in the
-UTILITIES directory of the Org git distribution, to get the same general
+@code{utils} directory of the Org git distribution, to get the same general
treatment of idleness. On other systems, idle time refers to Emacs idle time
only.}, and ask what you want to do with the idle time. There will be a
question waiting for you when you get back, indicating how much idle time has
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 0a98ed1..eb416be 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -446,7 +446,7 @@ With two arguments, return floor and remainder of their quotient."
"Try very hard to provide sensible version strings."
(let* ((org-dir (org-find-library-dir "org"))
(org-version.el (concat org-dir "org-version.el"))
- (org-fixup.el (concat org-dir "../UTILITIES/org-fixup.el")))
+ (org-fixup.el (concat org-dir "../utils/org-fixup.el")))
(if (require 'org-version org-version.el 'noerror)
'(progn
(autoload 'org-release "org-version.el")
diff --git a/targets.mk b/targets.mk
index 7059c62..4b1ef51 100644
--- a/targets.mk
+++ b/targets.mk
@@ -5,7 +5,7 @@ DISTFILES_extra= Makefile request-assign-future.txt contrib etc
LISPDIRS = lisp
OTHERDIRS = doc etc
-CLEANDIRS = contrib testing UTILITIES
+CLEANDIRS = contrib testing utils
SUBDIRS = $(OTHERDIRS) $(LISPDIRS)
INSTSUB = $(SUBDIRS:%=install-%)
ORG_MAKE_DOC ?= info html pdf
@@ -146,7 +146,7 @@ cleanaddcontrib:
$(RM) $(ORG_TO_LISP)
endif
-cleanutils: cleanUTILITIES
+cleanutils: cleanutils
cleanelc:
$(MAKE) -C lisp $@
diff --git a/UTILITIES/fake_change_log.pl b/utils/fake_change_log.pl
index 6ed3bc2..6ed3bc2 100755
--- a/UTILITIES/fake_change_log.pl
+++ b/utils/fake_change_log.pl
diff --git a/UTILITIES/git-changelog b/utils/git-changelog
index 85c5f79..85c5f79 100755
--- a/UTILITIES/git-changelog
+++ b/utils/git-changelog
diff --git a/UTILITIES/gplmanual.pl b/utils/gplmanual.pl
index d7171a5..d7171a5 100755
--- a/UTILITIES/gplmanual.pl
+++ b/utils/gplmanual.pl
diff --git a/UTILITIES/guidesplit.pl b/utils/guidesplit.pl
index 436519b..436519b 100755
--- a/UTILITIES/guidesplit.pl
+++ b/utils/guidesplit.pl
diff --git a/UTILITIES/list-hooks.pl b/utils/list-hooks.pl
index ffacd7c..ffacd7c 100755
--- a/UTILITIES/list-hooks.pl
+++ b/utils/list-hooks.pl
diff --git a/UTILITIES/make_emacs_changelog b/utils/make_emacs_changelog
index 9ecc461..6571ea8 100755
--- a/UTILITIES/make_emacs_changelog
+++ b/utils/make_emacs_changelog
@@ -66,7 +66,7 @@ foreach my $commit (@commits) {
# remove stuff which is not for this output
if ($kind =~ /\S/) {
- remove_parts("contrib/","testing/","xemacs/","UTILITIES/","etc/");
+ remove_parts("contrib/","testing/","xemacs/","utils/","etc/");
remove_parts(".*Makefile","README",".+\.mk");
}
if ($kind eq "lisp") { remove_parts("doc/") }
diff --git a/UTILITIES/manfull.pl b/utils/manfull.pl
index 680b878..680b878 100755
--- a/UTILITIES/manfull.pl
+++ b/utils/manfull.pl
diff --git a/UTILITIES/mansplit.pl b/utils/mansplit.pl
index 01ac851..01ac851 100755
--- a/UTILITIES/mansplit.pl
+++ b/utils/mansplit.pl
diff --git a/UTILITIES/org-fixup.el b/utils/org-fixup.el
index c8aff50..c8aff50 100644
--- a/UTILITIES/org-fixup.el
+++ b/utils/org-fixup.el
diff --git a/UTILITIES/orgcard2txt.pl b/utils/orgcard2txt.pl
index c5d942c..c5d942c 100755
--- a/UTILITIES/orgcard2txt.pl
+++ b/utils/orgcard2txt.pl
diff --git a/UTILITIES/pw b/utils/pw
index 1e2f44f..1e2f44f 100755
--- a/UTILITIES/pw
+++ b/utils/pw
diff --git a/UTILITIES/server.mk b/utils/server.mk
index be8aee4..be8aee4 100644
--- a/UTILITIES/server.mk
+++ b/utils/server.mk
diff --git a/UTILITIES/set-version.pl b/utils/set-version.pl
index ed185ea..ed185ea 100755
--- a/UTILITIES/set-version.pl
+++ b/utils/set-version.pl
diff --git a/UTILITIES/x11idle.c b/utils/x11idle.c
index 22cefe1..22cefe1 100644
--- a/UTILITIES/x11idle.c
+++ b/utils/x11idle.c