[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH] ELPA: Support for building Package Variants and Package Uplo
From: |
Jambunathan K |
Subject: |
[O] [PATCH] ELPA: Support for building Package Variants and Package Upload. |
Date: |
Sat, 28 May 2011 19:25:35 +0530 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (windows-nt) |
Attaching an improvement to my earlier patch
- http://patchwork.newartisans.com/patch/377/
The earlier patch can now be ignored.
Jambunathan K.
>From 2ba0a7341c7968f38086cec3d7d3e8f0a95960ad Mon Sep 17 00:00:00 2001
From: Jambunathan K <address@hidden>
Date: Wed, 18 May 2011 23:55:13 +0530
Subject: [PATCH] ELPA: Support for building Package Variants and Package Upload.
* Makefile (PKG_TAG): Package version. Use YYMMDD as the
default version.
(PKG_SEP, PKG_FLAVOUR): New config variables for building
various flavours of org, for eg., org-odt20110518.tar,
(PKG_FILES): Removed
(PKG_LISP_FILES, PKG_INFO_FILES): These files end up in the root dir.
(PKG_DOC_FILES): Optional. These files end up in the doc dir.
(PKG_DATA_DIRS): Optional. Extra directories to be
distributed with tarball. For example, org-odt package uses
this to distribute rnc schema files, default styles file and
unit test files.
(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 Emacs
machine that doesn't ship with package manager (for example
Emacs-23.x)
(PKG_UPLOAD_DIR): Package tarball is copied here. This is
presumably the 'pub' dir of the webserver hosting the package.
(pkg-info, pkg-doc, pkg-data, pkg-readme, pkg-upload): New
targets subsumed within pkg target.
(pkg): Modified. Use the above targets.
* doc/ReleaseNotes.org: New file used to build package README
file.
---
Makefile | 124 ++++++++++++++++++++++++++++++++++++++++++++------
doc/ReleaseNotes.org | 38 +++++++++++++++
2 files changed, 147 insertions(+), 15 deletions(-)
create mode 100644 doc/ReleaseNotes.org
diff --git a/Makefile b/Makefile
index 9693fd3..984c515 100644
--- a/Makefile
+++ b/Makefile
@@ -170,18 +170,58 @@ TEXIFILES = doc/org.texi
INFOFILES = doc/org
# Package Manager (ELPA)
+
+# Common Usage
+
+#
|---------------------------------------+----------------------+--------------|
+# | Invocation | Output |
Side-Effects |
+#
|---------------------------------------+----------------------+--------------|
+# | make pkg | org-20110518.tar |
|
+# | make PKG_TAG=7.3 pkg | org-7.3.tar |
|
+# | make PKG_FLAVOUR=odt pkg | org-odt-20110518.tar |
|
+#
|---------------------------------------+----------------------+--------------|
+
+# Advanced Usage
+
+# make PKG_EL_DIR="~/elisp" PKG_UPLOAD_DIR="~/packages/" PKG_TAG=7.3 pkg
+
+# Invocation shown above builds org-7.3.tar and uploads the same to
+# "~/packages" using package-x.el in "~/elisp/".
+
+ifndef PKG_TAG
PKG_TAG = $(shell date +%Y%m%d)
+endif
+
+ifdef PKG_FLAVOUR
+PKG_SEP = -
+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_LISP_FILES = $(LISPFILES0)
+PKG_INFO_FILES = doc/org doc/dir
+PKG_DOC_FILES = doc/org.pdf \
+ doc/org.html \
+ doc/orgguide.pdf \
+ doc/orgcard.txt \
+ doc/orgcard.pdf \
+ doc/orgcard_letter.pdf
+
+PKG_DATA_DIRS =
+PKG_README_ORG_FILE = doc/ReleaseNotes.org
+PKG_README_HTML_FILE = $(PKG_README_ORG_FILE:.org=.html)
+
+# PKG_EL_DIR =
+PKG_UPLOAD_DIR = packages
+
+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
@@ -402,14 +442,68 @@ distfile:
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_LISP_FILES) $(PKG_FNAME)
+ ${MAKE} pkg-info
+ ${MAKE} pkg-doc
+ ${MAKE} pkg-data
+ ${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-data: $(PKG_DATA_DIRS)
+ @if [ "X$(PKG_DATA_DIRS)" = "X" ]; \
+ then echo "*** WARNING: PKG_DATA_DIRS not defined ***"; \
+ else \
+ git clean -dfx $<; \
+ mkdir -p $(PKG_FNAME)/$<; \
+ cp -r $</* $(PKG_FNAME)/$<; \
+ fi
+
+pkg-info: $(PKG_INFO_FILES)
+ cp -r $(PKG_INFO_FILES) $(PKG_FNAME)
+
+pkg-doc: $(PKG_DOC_FILES)
+ @if [ "X$(PKG_DOC_FILES)" = "X" ]; \
+ then echo "*** WARNING: PKG_DOC_FILES not defined ***"; \
+ else \
+ $(MKDIR) $(PKG_FNAME)/doc; \
+ cp -r $(PKG_DOC_FILES) $(PKG_FNAME)/doc; \
+ fi
+
+pkg-readme:
+ $(MKDIR) $(PKG_FNAME)
+ cp $(PKG_README_ORG_FILE) $(PKG_FNAME)/README.org
+ $(BATCH) \
+ --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);
\
+ rm -f $(PKG_UPLOAD_DIR)/archive-contents;
\
+ $(BATCH) $(BATCH_EXTRA)
\
+ --eval '(toggle-debug-on-error)'
\
+ --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")';
\
+ $(BATCH)
\
+ --eval "(require 'org-html)"
\
+ --visit=$(PKG_README_ORG_FILE)
\
+ --eval "(org-export-as-html 3 t)";
\
+ mv $(PKG_README_HTML_FILE) $(PKG_UPLOAD_DIR)/README.html;
\
+ fi
cleanall:
${MAKE} clean
diff --git a/doc/ReleaseNotes.org b/doc/ReleaseNotes.org
new file mode 100644
index 0000000..af6b458
--- /dev/null
+++ b/doc/ReleaseNotes.org
@@ -0,0 +1,38 @@
+#+TITLE: Readme
+#+AUTHOR: Bastien Guerry
+#+EMAIL: address@hidden
+#+DATE: %Y-%m-%d %T %Z
+#+DESCRIPTION:
+#+KEYWORDS:
+#+LANGUAGE: en
+#+OPTIONS: H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
+#+OPTIONS: TeX:t LaTeX:dvipng skip:nil d:nil todo:t pri:nil tags:not-in-toc
+
+#+EXPORT_SELECT_TAGS: export
+#+EXPORT_EXCLUDE_TAGS: noexport
+#+LINK_UP:
+#+LINK_HOME:
+#+XSLT:
+
+
+* About Orgmode
+
+Org-mode is a mode for keeping notes, maintaining ToDo lists, and
+doing project planning with a fast and effective plain-text system.
+
+This package contains a daily build of Org-mode.
+
+Org-mode develops organizational tasks around NOTES files that contain
+information about projects as plain text. Org-mode is implemented on
+top of outline-mode, which makes it possible to keep the content of
+large files well structured. Visibility cycling and structure editing
+help to work with the tree. Tables are easily created with a built-in
+table editor. Org-mode supports ToDo items, deadlines, time stamps,
+and scheduling. It dynamically compiles entries into an agenda that
+utilizes and smoothly integrates much of the Emacs calendar and diary.
+Plain text URL-like links connect to websites, emails, Usenet
+messages, BBDB entries, and any files related to the projects. For
+printing and sharing of notes, an Org-mode file can be exported as a
+structured ASCII file, as HTML, or (todo and agenda items only) as an
+iCalendar file. It can also serve as a publishing tool for a set of
+linked webpages.
--
1.7.2.3
--
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [O] [PATCH] ELPA: Support for building Package Variants and Package Upload.,
Jambunathan K <=