From 8db21e6cb39f68576e4ad8a53c169d771a4c3c62 Mon Sep 17 00:00:00 2001 From: Bastien Date: Wed, 29 Sep 2021 10:08:20 +0200 Subject: [PATCH] Remove and update Makefiles as contrib/ has been moved out --- mk/default.mk | 4 -- mk/server.mk | 135 -------------------------------------------------- mk/targets.mk | 18 ++----- 3 files changed, 3 insertions(+), 154 deletions(-) delete mode 100644 mk/server.mk diff --git a/mk/default.mk b/mk/default.mk index 8ab31e089..4ffb07607 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -26,10 +26,6 @@ infodir = $(prefix)/info # the branch when undefined. GIT_BRANCH = -# Define if you want to include some (or all) files from contrib/lisp -# just the filename please (no path prefix, no .el suffix), maybe with globbing -#ORG_ADD_CONTRIB = ox-* # e.g. the contributed exporter - # Where to create temporary files for the testsuite # respect TMPDIR if it is already defined in the environment TMPDIR ?= /tmp diff --git a/mk/server.mk b/mk/server.mk deleted file mode 100644 index 48b3f261c..000000000 --- a/mk/server.mk +++ /dev/null @@ -1,135 +0,0 @@ -#---------------------------------------------------------------------- -# This file is used for maintenance of org on the server. -#---------------------------------------------------------------------- -.PHONY: helpserver \ - release rel-dirty rel-up cleanrel \ - elpa elpa-dirty elpa-up \ - doc-up \ - upload-release upload-elpa upload-doc upload \ - tagwarn version - -help helpall helpserver:: - $(info ) - $(info Maintenance) - $(info ===========) - $(info release - clean up, create the distribution archives) - $(info elpa - clean up, create the org-*.tar ELPA archive) - $(info elpaplus - clean up, create the org-plus-contrib-*.tar ELPA archive) - $(info upload-release - clean up, populate the server with archives) - $(info upload-elpa - clean up, populate the server with org-*.tar) - $(info upload-elpaplus - clean up, populate the server with org-plus-contrib-*.tar) - $(info upload-doc - clean up, populate the server with docs) - $(info upload - clean up, populate the server with everything) - -helpserver:: - @echo "" - -#---------------------------------------------------------------------- - -SERVROOT ?= upload -SERVERMK ?= true # or just any value at all, really - -#---------------------------------------------------------------------- - -ORGFULL = README COPYING lisp/ \ - Makefile request-assign-future.txt \ - mk/default.mk mk/targets.mk mk/version.mk \ - mk/org-fixup.el \ - etc/ contrib/ doc/ testing/ -ORGFULL := $(ORGFULL:%/=%/*) -ORGELPA = README_ELPA COPYING etc/ORG-NEWS lisp/ \ - doc/dir doc/org.info doc/orgguide.info doc/orgcard.pdf \ - etc/styles/ org-pkg.el -ORGELPA := $(ORGELPA:%/=%/*) -ORGELPAPLUS := $(ORGELPA:org-pkg%=org-plus-contrib-pkg%) - -release: cleanall info pdf card rel-dirty tagwarn -rel-dirty rel-up: ORGDIR=org-$(GITVERSION:release_%=%) -rel-dirty: - @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-dist version autoloads - -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGRZIP) - ln -s . $(ORGDIR) - tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist)) - zip -r9 $(ORGDIR).zip $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist)) - -@$(RM) $(ORGDIR) -rel-up: info pdf card rel-dirty - $(CP) $(ORGDIR).tar.gz $(ORGDIR).zip $(SERVROOT)/ - -PKG_TAG = $(shell date +%Y%m%d) -PKG_DOC = "Outline-based notes management and organizer" -PKG_REQ = "" # marmalade chokes on explicit "nil" - -elpa: cleanall info card elpa-dirty -elpa-dirty elpa-up: ORGDIR=org-$(PKG_TAG) -elpa-dirty: - @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads - -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) - ln -s . $(ORGDIR) - echo "(define-package \"org\"" > org-pkg.el - echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-pkg.el - echo ";; Local Variables:" >> org-pkg.el - echo ";; no-byte-compile: t" >> org-pkg.el - echo ";; End:" >> org-pkg.el - tar --exclude=Makefile \ - --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ - $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) - -@$(RM) $(ORGDIR) org-pkg.el -elpa-up: info card elpa-dirty archive-contents - $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ - -archive-contents: - echo "(1 (org . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar])" > $@ - echo " (org-plus-contrib . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar]))" >> $@ - -elpaplus: cleanall info card elpaplus-dirty -elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org*.el ob-*.el ox-*.el ol-*.el -elpaplus-dirty elpaplus-up: ORGDIR=org-plus-contrib-$(PKG_TAG) -elpaplus-dirty: - @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads - -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) - ln -s . $(ORGDIR) - echo "(define-package \"org-plus-contrib\"" > org-plus-contrib-pkg.el - echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-plus-contrib-pkg.el - echo ";; Local Variables:" >> org-plus-contrib-pkg.el - echo ";; no-byte-compile: t" >> org-plus-contrib-pkg.el - echo ";; End:" >> org-plus-contrib-pkg.el - tar --exclude=Makefile \ - --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ - $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) - -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el - @$(MAKE) cleanlisp -elpaplus-up: info card elpaplus-dirty archive-contents - $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ - -tagwarn: - $(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 ======================================================)) - -version: - @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION)$(ORGDIST) - @echo "ORGVERSION ?= $(ORGVERSION)" > mk/version.mk - @echo "GITVERSION ?= $(GITVERSION)" >> mk/version.mk - -cleanall clean: cleanrel -cleanrel: - -$(RM) archive-contents org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk - -doc-up: info pdf card html - $(MAKE) -C doc manual guide - $(CP) doc/org.html $(SERVROOT) - $(CP) doc/org.pdf $(SERVROOT) - $(CP) doc/orgguide.html $(SERVROOT) - $(CP) doc/orgguide.pdf $(SERVROOT) - $(CP) doc/manual/* $(SERVROOT)/manual - $(CP) doc/guide/* $(SERVROOT)/guide - -upload: cleanall rel-up doc-up elpa-up elpaplus-up -upload-elpa: cleanall elpa-up -upload-elpaplus: cleanall elpaplus-up -upload-release: cleanall rel-up -upload-doc: cleanall doc-up diff --git a/mk/targets.mk b/mk/targets.mk index ee6f3f344..6de77b1e6 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -1,7 +1,7 @@ .EXPORT_ALL_VARIABLES: .NOTPARALLEL: .PHONY # Additional distribution files -DISTFILES_extra= Makefile request-assign-future.txt contrib etc +DISTFILES_extra= Makefile request-assign-future.txt etc LISPDIRS = lisp OTHERDIRS = doc etc @@ -37,7 +37,7 @@ endif check test install $(INSTSUB) \ info html pdf card refcard doc docs \ autoloads cleanall clean $(CLEANDIRS:%=clean%) \ - clean-install cleanelc cleandirs cleanaddcontrib \ + clean-install cleanelc cleandirs \ cleanlisp cleandoc cleandocs cleantest \ compile compile-dirty uncompiled \ config config-test config-exe config-all config-eol config-version \ @@ -55,13 +55,6 @@ config config-all:: $(info ========= Emacs executable and Installation paths) $(foreach var,$(CONF_BASE),$(info $(var) = $($(var))$(EOL))) $(foreach var,$(CONF_DEST),$(info $(var) = $(DESTDIR)$($(var))$(EOL))) - $(info ========= Additional files from contrib/lisp) - $(info $(notdir \ - $(wildcard \ - $(addsuffix .el, \ - $(addprefix contrib/lisp/, \ - $(basename \ - $(notdir $(ORG_ADD_CONTRIB)))))))) config-test config-all:: $(info ) $(info ========= Test configuration) @@ -115,7 +108,6 @@ ifeq ($(TEST_NO_AUTOCLEAN),) # define this variable to leave $(testdir) around f $(MAKE) cleantest endif -up0:: cleanaddcontrib up0 up1 up2:: git checkout $(GIT_BRANCH) git remote update @@ -145,7 +137,7 @@ cleandirs: clean: cleanlisp cleandoc -cleanall: cleandirs cleantest cleanaddcontrib +cleanall: cleandirs cleantest -$(FIND) . \( -name \*~ -o -name \*# -o -name .#\* \) -exec $(RM) {} + -$(FIND) $(CLEANDIRS) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} + @@ -155,10 +147,6 @@ $(CLEANDIRS:%=clean%): cleanelc: $(MAKE) -C lisp $@ -cleanaddcontrib: - -$(RM) $(wildcard $(addprefix lisp/,$(notdir $(wildcard contrib/lisp/*.el)))) - -cleanlisp: cleanaddcontrib cleanlisp cleandoc: $(MAKE) -C $(@:clean%=%) clean