1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-24 10:38:41 +00:00

Small fixes to the README files and to mk/server.mk

This commit is contained in:
Bastien Guerry 2012-09-22 10:32:46 +02:00
parent ae57da7d80
commit 51955a248d
6 changed files with 17 additions and 22 deletions

8
README
View File

@ -15,6 +15,9 @@ Makefile
instructions, see the manual or the more detailed procedure instructions, see the manual or the more detailed procedure
on Worg: http://orgmode.org/worg/dev/org-build-system.html on Worg: http://orgmode.org/worg/dev/org-build-system.html
mk/
Files needed for building Org.
lisp/ lisp/
Directory with all the Emacs Lisp files that make up Org. Directory with all the Emacs Lisp files that make up Org.
@ -29,14 +32,11 @@ contrib/
etc/ etc/
Files needed for the ODT exporter. Files needed for the ODT exporter.
mk/
Files needed for building Org.
testing/ testing/
Testing suite for Org. Testing suite for Org.
request-assign-future.txt request-assign-future.txt
The form that contributors have to sign and get processed with The form that contributors have to sign and get processed with
the FSF before contributed changes can be integrated into the Org the FSF before contributed changes can be integrated into the Org
core. All files in this distribution except the contrib/ directory core. All files in this distribution except the contrib/ directory
have copyright assigned to the FSF. have copyright assigned to the FSF.

View File

@ -16,12 +16,12 @@ There are other ELPA online, offering more packages.
Some contain the org-plus-contrib-*.tar ELPA package, which bundles Some contain the org-plus-contrib-*.tar ELPA package, which bundles
the core Org files plus many additional contributed libraries. the core Org files plus many additional contributed libraries.
All ELPA version of Org contain: All ELPA packages of Org contain:
README_ELPA README_ELPA
This file. This file.
*el *.el
Elisp files. Elisp files.
org org

View File

@ -86,4 +86,3 @@ move the file into the Org-mode core. This means they will be
moved up to the root directory and will also eventually be added moved up to the root directory and will also eventually be added
to GNU Emacs bzr repository. The final decision about this rests to GNU Emacs bzr repository. The final decision about this rests
with the maintainer. with the maintainer.

View File

@ -15,7 +15,7 @@ README_ELPA
README_contribute README_contribute
Information about the git repository and how to contribute Information about the git repository and how to contribute
to Org-mode development. to Org-mode development.
README_maintainer README_maintainer
Information for the maintainer. Information for the maintainer.

View File

@ -33,7 +33,7 @@ release.
When doing a /major release/, make sure all changes from the maint When doing a /major release/, make sure all changes from the maint
branch are merged into the the master branch, then merge the master branch are merged into the the master branch, then merge the master
branch back into maint to synchronize the two. branch back into maint to synchronize the two.
** Minor release ** Minor release
@ -41,7 +41,7 @@ The release number for minor releases look like this: =7.13.01=
Minor releases are small amends to main releases. Usually they fix Minor releases are small amends to main releases. Usually they fix
critical bugs discovered in a main release. Minor bugs are usually critical bugs discovered in a main release. Minor bugs are usually
not fixed -- they will be adressed in the next main release. not fixed -- they will be adressed in the next main release.
Only the fix to the bug is bundled into a release, without the main Only the fix to the bug is bundled into a release, without the main
development work going on in the master branch. Since the bug fix development work going on in the master branch. Since the bug fix
@ -50,7 +50,7 @@ maint then merged in master.
** Tagging the release ** Tagging the release
When doing a major and a minor release, after all necessary merging When doing a major and a minor release, after all necessary merging
is done, tag the _maint_ branch for the release with: is done, tag the _maint_ branch for the release with:
git tag -a "Adding release tag" release_7.9.1 git tag -a "Adding release tag" release_7.9.1
@ -65,11 +65,11 @@ Log on the orgmode.org server as the emacs user and cd to
~/git/org-mode ~/git/org-mode
From there do From there do
make release make release
make upload make upload
to create the .tar.gz and .zip files, the documentation, and to to create the .tar.gz and .zip files, the documentation, and to
upload everything at the right place. upload everything at the right place.
* Working with patchwork * Working with patchwork
@ -246,7 +246,7 @@ So the way I have been doing things with Emacs is this:
* Updating the list of hooks/commands/options on Worg * Updating the list of hooks/commands/options on Worg
Load the =mk/eldo.el= file then =M-x eldo-make-doc RET=. Load the =mk/eldo.el= file then =M-x eldo-make-doc RET=.
This will produce an org file with the documentation. This will produce an org file with the documentation.

View File

@ -31,17 +31,13 @@ SERVERMK ?= true # or just any value at all, really
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ORGREADMECOMM = README ORGFULL = README lisp/ \
ORGREADMEELPA = README_ELPA
ORGCOMM = lisp/
ORGFULL = $(ORGCOMM) $(ORGREADMECOMM) \
Makefile request-assign-future.txt \ Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \ mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \ mk/org-fixup.el \
etc/ contrib/ doc/ etc/ contrib/ doc/
ORGFULL := $(ORGFULL:%/=%/*) ORGFULL := $(ORGFULL:%/=%/*)
ORGELPA = $(ORGCOMM) $(ORGREADMEELPA) \ ORGELPA = README_ELPA lisp/ \
doc/dir doc/org doc/orgcard.pdf \ doc/dir doc/org doc/orgcard.pdf \
etc/styles/ org-pkg.el etc/styles/ org-pkg.el
ORGELPA := $(ORGELPA:%/=%/*) ORGELPA := $(ORGELPA:%/=%/*)
@ -71,7 +67,7 @@ elpa-dirty:
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-pkg.el > org-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-pkg.el -@$(RM) $(ORGDIR) org-pkg.el
elpa-up: info card elpa-dirty elpa-up: info card elpa-dirty
@ -87,7 +83,7 @@ elpaplus-dirty:
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-plus-contrib-pkg.el > org-plus-contrib-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-plus-contrib-pkg.el -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el
@$(MAKE) cleanlisp @$(MAKE) cleanlisp