ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
org-mode/mk/server.mk

119 lines
4.3 KiB
Makefile
Raw Normal View History

Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
#----------------------------------------------------------------------
# This file is used for maintenance of org on the server.
#----------------------------------------------------------------------
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
.PHONY: helpserver \
release rel-dirty rel-up cleanrel \
elpa elpa-dirty elpa-up \
doc-up \
upload-release upload-elpa upload-doc upload \
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
tagwarn version
Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
help helpall helpserver::
$(info )
$(info Maintenance)
$(info ===========)
mk/server.mk: More compact help.
2012-08-26 14:22:57 -04:00
$(info release - clean up, create the distribution archives)
$(info elpa - clean up, create the ELPA archive)
$(info upload-release - clean up, populate the server with arhives)
$(info upload-elpa - clean up, populate the server with ELPA)
$(info upload-doc - clean up, populate the server with docs)
$(info upload - clean up, populate the server with everything)
mk/server.mk: Set SERVROOT and SERVERMK and add more help
2012-08-26 14:20:34 -04:00
Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
helpserver::
@echo ""
#----------------------------------------------------------------------
server.mk: do not prevent proper customization * mk/server.mk: Do not prevent proper customization, so do not overwrite existing variables.
2012-08-26 08:03:20 -04:00
SERVROOT ?= /var/www/orgmode.org
SERVERMK ?= true # or just any value at all, really
mk/server.mk: Set SERVROOT and SERVERMK and add more help
2012-08-26 14:20:34 -04:00
#----------------------------------------------------------------------
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
ORGCOMM = README lisp/
ORGFULL = $(ORGCOMM) Makefile request-assign-future.txt \
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
etc/ contrib/ doc/
server.mk: implement ELPA * UTILITIES/server.mk: Add ELPA archive generation.
2012-08-19 06:21:33 -04:00
ORGFULL := $(ORGFULL:%/=%/*)
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
ORGELPA = $(ORGCOMM) doc/dir doc/org doc/orgcard.pdf \
etc/styles/ org-pkg.el
server.mk: implement ELPA * UTILITIES/server.mk: Add ELPA archive generation.
2012-08-19 06:21:33 -04:00
ORGELPA := $(ORGELPA:%/=%/*)
mk/server.mk: orgplus must be the package name for package manager to recognize it * mk/server.mk: Rename org-pkg.el to orgplus-pkg.el, rename the package to orgplus also. The package manager will otherwise not recognize the package. This means we will need to educate users not to install both packages at the same time or try to introduce this dependency in a different way.
2012-09-15 13:52:18 -04:00
ORGELPAPLUS := $(ORGELPA:org-pkg%=orgplus-pkg%)
Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
release: cleanall info pdf card rel-dirty tagwarn
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
rel-dirty rel-up: ORGDIR=org-$(GITVERSION:release_%=%)
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
rel-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-dist version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGRZIP)
server.mk: fix typo * UTILITIES/server.mk: Change ORGRDIR->ORGDIR everywhere.
2012-08-22 02:04:56 -04:00
ln -s . $(ORGDIR)
tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
zip -r9 $(ORGDIR).zip $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR)
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
rel-up: info pdf card rel-dirty
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
$(CP) $(ORGDIR).tar.gz $(ORGDIR).zip $(SERVROOT)/
server.mk: implement ELPA * UTILITIES/server.mk: Add ELPA archive generation.
2012-08-19 06:21:33 -04:00
PKG_TAG = $(shell date +%Y%m%d)
PKG_DOC = "Outline-based notes management and organizer"
PKG_REQ = "nil"
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
elpa: cleanall info card elpa-dirty
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
elpa-dirty elpa-up: ORGDIR=org-$(PKG_TAG)
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
elpa-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
mk/server.mk: fix previous commit
2012-09-15 14:06:53 -04:00
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-pkg.el
utils/server.mk: use --transform, not alias --xform * utils/server.mk: For compatibility with GNU tar 1.20, use --transform, not alias --xform.
2012-08-24 14:39:30 -04:00
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
mk/server.mk: fix previous commit
2012-09-15 14:06:53 -04:00
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-pkg.el
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
elpa-up: info card elpa-dirty
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
Re-introduce server.mk * UTILITIES/server.mk: Re-introduce, keep in UTILITIES like the other server stuff. Implement "helpserver" and link into "help" and "helpall" targets. Add "reltest" target to clean up the work tree and produce release archives, uses internal target "rel-dirty" for the actual archive creation. Warn if $(ORGVERSION) is different from $(GITVERSION), as a release should only be made from a revision that has an annotated tag.
2012-05-17 04:34:39 -04:00
mk/server.mk: implement ELPA archive including all contrib files - "orgplus" * mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty and upload-eplaplus as copy of respective epla targets, but with all files from contrib added. * .gitignore: Add orgplus EPLA archive to the patterns.
2012-09-15 12:49:18 -04:00
elpaplus: cleanall info card elpaplus-dirty
elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-*
elpaplus-dirty elpaplus-up: ORGDIR=orgplus-$(PKG_TAG)
elpaplus-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR)
mk/server.mk: fix previous commit
2012-09-15 14:06:53 -04:00
echo "(define-package \"orgplus\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> orgplus-pkg.el
mk/server.mk: implement ELPA archive including all contrib files - "orgplus" * mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty and upload-eplaplus as copy of respective epla targets, but with all files from contrib added. * .gitignore: Add orgplus EPLA archive to the patterns.
2012-09-15 12:49:18 -04:00
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
mk/server.mk: fix previous commit
2012-09-15 14:06:53 -04:00
$(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) orgplus-pkg.el
mk/server.mk: implement ELPA archive including all contrib files - "orgplus" * mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty and upload-eplaplus as copy of respective epla targets, but with all files from contrib added. * .gitignore: Add orgplus EPLA archive to the patterns.
2012-09-15 12:49:18 -04:00
@$(MAKE) cleanlisp
elpaplus-up: info card elpaplus-dirty
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
server.mk: implement ELPA * UTILITIES/server.mk: Add ELPA archive generation.
2012-08-19 06:21:33 -04:00
tagwarn:
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
$(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
$(info ======================================================) \
$(info = =) \
$(info = A release should only be made from a revision that =) \
$(info = has an annotated tag! =) \
$(info = =) \
$(info ======================================================))
server.mk: implement `cleanrel´ here * targets.mk: Remove `cleanrel´. * UTILITIES/server.mk: Implement `cleanrel´, use only the names that will be produced by server.mk.
2012-08-22 02:04:56 -04:00
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
version:
@echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION)$(ORGDIST)
@echo "ORGVERSION ?= $(ORGVERSION)" > mk/version.mk
@echo "GITVERSION ?= $(GITVERSION)" >> mk/version.mk
server.mk: add version.mk to distribution archives * targets.mk: If $(ORGVERSION) and $(GITVERSION) are not defined and cannot be determined from Git, try to read `version.mk´. Fall back to "N/A" if still no definition has been made. * utils/server.mk: Create `version.mk´ for each distribution. Append "-dist" and "-elpa" to $(GITVERSION) to easily recognize builds from distribution archives. Remove `version.mk´ in `cleanrel´ and use the same globbing patterns as .gitignore. * .gitignore: Add "version.mk", also ignore ELPA archive (no ".gz" suffix) and only "org-version.el" (no globbing).
2012-08-26 04:18:23 -04:00
cleanall clean: cleanrel
server.mk: implement `cleanrel´ here * targets.mk: Remove `cleanrel´. * UTILITIES/server.mk: Implement `cleanrel´, use only the names that will be produced by server.mk.
2012-08-22 02:04:56 -04:00
cleanrel:
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 08:03:20 -04:00
-$(RM) org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
server.mk: shrink ELPA archive, correct documentation dependencies * mk/server.mk: Drop some documentation files from ELPA archive. Correct dependencies for documentation, ORG_MAKE_DOC can not be used as a per-target definition because it has been expanded before. Directly give the dependencies instead.
2012-08-27 13:12:36 -04:00
doc-up: info pdf card html
$(MAKE) -C doc manual guide
server.mk: implement upload targets * utils/server.mk: Implement `upload´ (create and install everything), `upload-elpa´ (create and install ELPA archive), `upload-release´ (create and install release archives) and `upload-doc´ (create and install manuals). The server layout is hardcoded and the directory structure must be in place, the server root is determined via variable $(SERVROOT).
2012-08-25 02:35:02 -04:00
$(CP) doc/org.html $(SERVROOT)
$(CP) doc/manual/* $(SERVROOT)/manual
$(CP) doc/guide/* $(SERVROOT)/guide
mk/server.mk: implement ELPA archive including all contrib files - "orgplus" * mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty and upload-eplaplus as copy of respective epla targets, but with all files from contrib added. * .gitignore: Add orgplus EPLA archive to the patterns.
2012-09-15 12:49:18 -04:00
upload: cleanall elpa-up rel-up doc-up elpaplus-up
upload-elpa: cleanall elpa-up
upload-elpaplus: cleanall elpaplus-up
upload-release: cleanall rel-up
upload-doc: cleanall doc-up