From 06d227cc4d4e3ac86320690ebbe184bb804d9bf1 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Fri, 12 Nov 2010 16:32:51 +0530 Subject: [PATCH] (ELPA): Support for building Package Variants and Package Upload. (PKG_TAG): Use PKG_TAG to control package flavour. If unspecified, assume a snapshot build. (PKG_SEP, PKG_FLAVOUR): New config variables for building various flavours of ELPA tarball. For eg., org-7.3.tar, org@snapshot-20101112.tar, org-snapshot-20101112 etc. (PKG_FILES): Removed (PKG_BASE_FILES): Files here end up in the root dir. (PKG_DOC_FILES): Files here end up in the doc dir. (PKG_README_ORG_FILE): README file (PKG_EL_DIR): Load path for package.el and package-x.el. Useful if the build machine runs an 'old' Emacs or if the build process requires a patched up versions of these files. (PKG_UPLOAD_DIR): 'pub' dir of the webserver serving the ELPA tarball. (pkg-upload, pkg-readme): New targets subsumed within pkg target. --- diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 0b15abe..5c13d8b --- a/Makefile +++ b/Makefile @@ -165,18 +165,44 @@ TEXIFILES = doc/org.texi INFOFILES = doc/org # Package Manager (ELPA) + +# PKG_TAG = + +ifndef PKG_TAG +# PKG_SEP = @ +# PKG_SEP = - +# PKG_SEP = . +# PKG_FLAVOUR = snapshot PKG_TAG = $(shell date +%Y%m%d) +endif + +PKG_BNAME = org +PKG_QNAME = $(PKG_BNAME)$(PKG_SEP)$(PKG_FLAVOUR) +PKG_FNAME = $(PKG_QNAME)-$(PKG_TAG) + PKG_DOC = "Outline-based notes management and organizer" PKG_REQ = "nil" -PKG_FILES = $(LISPFILES0) \ - doc/dir doc/org \ - doc/pdflayout.sty \ - doc/org.pdf \ - doc/orgguide.pdf \ - doc/orgcard.tex \ - doc/orgcard.pdf \ - doc/orgcard_letter.pdf +PKG_BASE_FILES = $(LISPFILES0) \ + doc/dir doc/org + +PKG_DOC_FILES = \ + doc/org.pdf \ + doc/org.html \ + doc/orgguide.pdf \ + doc/orgcard.txt \ + doc/orgcard.pdf \ + doc/orgcard_letter.pdf + +PKG_README_ORG_FILE = ORGWEBPAGE/Changes.org +PKG_README_TXT_FILE = $(PKG_README_ORG_FILE:%.org=%.txt) + +# PKG_EL_DIR = +# PKG_UPLOAD_DIR = + +ifdef PKG_EL_DIR +BATCH_EXTRA = -eval "(setq load-path (cons (expand-file-name \"$(PKG_EL_DIR)\") load-path))" +endif .SUFFIXES: .el .elc .texi SHELL = /bin/sh @@ -372,16 +398,46 @@ distfile: zip -r org-$(TAG).zip org-$(TAG) gtar zcvf org-$(TAG).tar.gz org-$(TAG) -pkg: +pkg: @if [ "X$(PKG_TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi + echo "Building $(PKG_FNAME).tar ..." touch doc/org.texi doc/orgcard.tex # force update ${MAKE} info ${MAKE} doc - rm -rf org-$(PKG_TAG) org-$(PKG_TAG).tar - $(MKDIR) org-$(PKG_TAG) - cp -r $(PKG_FILES) org-$(PKG_TAG) - echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > org-$(PKG_TAG)/org-pkg.el - tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files + rm -rf $(PKG_FNAME) $(PKG_FNAME).tar + $(MKDIR) $(PKG_FNAME) + cp -r $(PKG_BASE_FILES) $(PKG_FNAME) + $(MKDIR) $(PKG_FNAME)/doc + cp -r $(PKG_DOC_FILES) $(PKG_FNAME)/doc + ${MAKE} pkg-readme + echo "(define-package \"$(PKG_QNAME)\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > $(PKG_FNAME)/$(PKG_QNAME)-pkg.el + tar cf $(PKG_FNAME).tar $(PKG_FNAME) --remove-files + ${MAKE} pkg-upload + +pkg-readme: + $(MKDIR) $(PKG_FNAME) + cp $(PKG_README_ORG_FILE) $(PKG_FNAME)/README.org + $(BATCH) \ + --eval "(require 'org-exp)" \ + --eval "(require 'org-ascii)" \ + --visit=$(PKG_FNAME)/README.org \ + --eval "(org-export-as-ascii 3 t)" + cp $(PKG_FNAME)/README.txt $(PKG_FNAME)/README + rm -f $(PKG_FNAME)/README.txt $(PKG_FNAME)/README.org + +pkg-upload: + @if [ "X$(PKG_UPLOAD_DIR)" = "X" ]; \ + then echo "*** WARNING: Skipping Upload of $(PKG_FNAME).tar ***"; \ + else \ + echo "Uploading $(PKG_FNAME).tar to $(PKG_UPLOAD_DIR) ..."; \ + $(MKDIR) $(PKG_UPLOAD_DIR); \ + $(BATCH) $(BATCH_EXTRA) \ + --eval '(ignore)' \ + --eval "(require 'package-x)" \ + --eval '(setq package-archive-upload-base "$(PKG_UPLOAD_DIR)")' \ + --eval '(setq package-update-news-on-upload nil)' \ + --eval '(package-upload-file "$(PKG_FNAME).tar")'; \ + fi makerelease: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi -- 1.7.2.3