From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: Adding async package to GNU ELPA (was: [elpa] master 88578a4: Increase the default number of hits) Date: Tue, 29 Dec 2015 22:07:06 +0000 Message-ID: References: <20151224213932.12107.84317@vcs.savannah.gnu.org> <87wps1ghyu.fsf@gnus.org> <0xd1ttrmgp.fsf@fencepost.gnu.org> <871ta9ar7a.fsf@gmx.de> <87ege73o2q.fsf@gmx.de> <871ta7g77t.fsf@gnus.org> <874mf2qiv3.fsf@gmx.de> <5681C474.4030408@yandex.ru> <87wprxpq4n.fsf@gmx.de> <87h9j114ay.fsf_-_@gmx.de> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1451426848 8046 80.91.229.3 (29 Dec 2015 22:07:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 29 Dec 2015 22:07:28 +0000 (UTC) Cc: Glenn Morris , Lars Ingebrigtsen , Dmitry Gutov , emacs-devel To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 29 23:07:18 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aE2QI-0008PQ-Gh for ged-emacs-devel@m.gmane.org; Tue, 29 Dec 2015 23:07:18 +0100 Original-Received: from localhost ([::1]:50363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE2QH-0004P5-Bi for ged-emacs-devel@m.gmane.org; Tue, 29 Dec 2015 17:07:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE2QC-0004Oq-KK for emacs-devel@gnu.org; Tue, 29 Dec 2015 17:07:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aE2QA-0004Bm-K6 for emacs-devel@gnu.org; Tue, 29 Dec 2015 17:07:12 -0500 Original-Received: from mail-yk0-x235.google.com ([2607:f8b0:4002:c07::235]:33956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE2Q7-0004B5-Ly; Tue, 29 Dec 2015 17:07:07 -0500 Original-Received: by mail-yk0-x235.google.com with SMTP id a85so63755736ykb.1; Tue, 29 Dec 2015 14:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=Eu+oBmX72fWevzHLE1+0elLv1XTsXiliGQWA+u7vpm0=; b=0UEMZjWed9XTEwJ9YwiPnu9M2pa1sy/0Mnr65ENZNGzACc1Y2eZAt5lcwRz4YLAo23 QBU/lTp4y2B1KJwz5LqKOc+AsyUwMdeSNYr4oFefcP8z//ZSsoTbvjHTo0XQN9NPdARl AI2wZT8esnLGwAGv2TyB/xO4ai4WUEAiYI73BGD8hphhnipuepYX36tooz3uCDvvBuhW pasDoACZkceay7Vk9ne7z2+WF5TL2FLwv1EZPKQoP67RbcvxF3LNePQ4J/DFhVkABOSr A7f56Sm2c83tVtVbGWEklG1D0N8Yb+MRcyP0zeXpP1370dhXq6aH67ndnVTkEPRWRkHZ elDA== X-Received: by 10.129.146.150 with SMTP id j144mr23051527ywg.19.1451426827000; Tue, 29 Dec 2015 14:07:07 -0800 (PST) Original-Received: by 10.129.87.130 with HTTP; Tue, 29 Dec 2015 14:07:06 -0800 (PST) In-Reply-To: <87h9j114ay.fsf_-_@gmx.de> X-Google-Sender-Auth: 2cwyNJu64U9BC7NsQC8EhmdPWqg X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4002:c07::235 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:197144 Archived-At: > I must confess I have no idea how to add the package to ELPA. I suppose > it shall be an external package. > > Could somebody who knows do it? Or tell me where I could get the needed > information how-to? See the README file in elpa.git. I've pasted the file below for your convenience. The "External branches" section explains how to use subtrees or a separate branch. ----- Copyright (C) 2010-2011, 2014, 2015 Free Software Foundation, Inc. See the end of the file for license conditions. This branch contains the sources, deployment scripts, and auxiliary files for the Emacs Lisp package archive (elpa.gnu.org). This file explains the branch layout, how to add and edit packages, and how to deploy the archive (either on elpa.gnu.org, or a local copy for testing purposes). * DIRECTORY LAYOUT ** admin/ -- scripts for administering the package archive. ** html/ -- HTML for the elpa.gnu.org website. ** packages/ -- source code for the packages. * PACKAGES ** Contents of the packages/ directory: This directory holds the package sources, with one subdirectory for each package. Each directory in here corresponds to a package, which can be either a single-file package or a multifile package. A nightly cron job refreshes the GNU ELPA archive from this repository. This cron job only creates a new package when the "version" (as specified in the "Version:" header) of a package is modified. This means that you can safely work on the next version here without worrying about the unstable code making it to GNU ELPA, and simply update the "version" when you want to release the new code. ** To add a package: (submission, submit) Adding a basic package is very simple. There are thorough instructional, but the gist is that you: 1. Notify emacs-devel@gnu.org. 2. Place all files inside `packages//'. 3. `git add', `git commit' and `git push'. If you don't have push access to the repository, someone will do steps 2 and 3 for you. *** Notify emacs-devel@gnu.org There is no approval process for GNU Elpa packages. Still, you must send an email to emacs-devel for several reasons: - Notifying other developers; - Making sure the package doesn't break FSF rules; - Checking if the package is not reinventing the wheel; - Ensuring that first-time developers are doing it right. Before doing anything, please ensure your package follows the conventions described in the `** Format' section. Then, send an email to the list with the subject: [ELPA] New package: Start your message with an explanation about the package. A copy-paste of the package's Summary and Commentary is perfectly fine here, but you can write more or less than that if you'd like. At the bottom of the message contents include the changes you're going to make (the patch). For a single-file package this can be the package file itself instead of the patch. If you prefer (and if you have push access), you can push your changes to a branch called `scratch/', and mention the branch in your message. After 48h, or once any issues have been addressed, someone will push your changes for you. You should probably also subscribe to emacs-devel@gnu.org, since that's where we discuss about GNU Elpa, and to bug-gnu-emacs@gnu.org, since that's where people will report bugs about your package. *** Add a simple (1-file) package as packages//.el. The file needs to follow the usual coding conventions (most importantly start with ";;; --- ") and have a "Version:" and "Maintainer:" pseudo-header (see the "Format" subsection below). For some examples, see (info "(elisp) Simple Packages") *** Add a multi-file package as a directory, packages/. It needs to have a file named packages//.el which follows the same rules as above. It additionally follows the same guidelines described in (info "(elisp) Multi-file Packages") with the exception that it is not a tar package (it's a plain directory) and it must not contain a "-pkg.el" file (this will be created for you). *** Commit your changes the usual way ("git add", "git commit", etc). Changes in the Git repository do not immediately propagate to the user-facing archive (what users see when they do `M-x list-packages'). That is done by deploying the archive, which happens automatically once a day, and the changes are only reflected when the "Version:" header changes. ** Format Each package should follow the ELPA packaging conventions, but there are some differences due to the way the deployment script creates the packages and the web-pages from this source code: - Multi-file packages put the package metadata in the main .el file in the format used for single-file packages: the -pkg.el file is auto-generated from it. - Every package should have both a "Version:" *and* a "Maintainer:". - the "URL:" header can be used to specify the home page of the package, if it's maintained externally. - A "News:" section (or "NEWS" file) can/should be used to list the user-visible changes of each version. - The "Package-Type:" header can be used to force the type of package created (can be either `simple' for single-file packages or `multi' for tarballs). By default the type is decided based on whether there are several Elisp files in the source. - If you want some files to not be included in the tarball, you can put a `.elpaignore' file in the root of your package directory, where you can list patterns of files to ignore (this file is passed to tar's -X). ** External branches The above instructions are enough to add regular packages, those that are maintained primarily here in the repository. The instructions below are for those maintainers who prefer to use a dedicated repository or branch for the package. There are two ways to do that: subtrees and externals. Either way, such packages should always be listed in the `externals-list' file. In both cases, a copy of the code is kept in the `elpa' repository (not necessarily in the master branch) and should be sync'd with the upstream every once in a while. This copy may include local changes, although these should be kept to a minimum. If know you don't want a local package, but don't know which of these two options you prefer, then use a subtree. *** Subtrees In the `subtree' case, the copy of the code is kept here in the master branch, inside its corresponding `packages/' directory just as if it were a local package. In fact, a subtree package is essentially indistinguishable from a local package. The only difference is that, instead of developing it here, you do it in some remote repository and pull in the changes. Instead of manually creating the directory, you should be able to use: git subtree add --prefix=packages/ Later, when you make some changes to the remote and want to publish them here, simply do: git subtree pull --prefix=packages/ On older git versions "git subtree" might not be available. You can try "git merge -s subtree", or just update git. - is the remote's URL. If you've previously used "git remote add", then this can be the remote's name. - is the branch you want to pull (probably "master"). If you want the local code to be slightly different from the remote, simply commit further changes to it here. Of course, this may trigger merge conflicts when you do a "subtree pull" in the future, so it's best to avoid these local changes. If someone makes changes to your package here on elpa.git and you want to push them to your remote, it's easiest to just copy these changes over to the remote repo. Trying to push a subtree with git is likely to induce headache. **** When you're adding and pulling, DO NOT --SQUASH!! Don't worry about flooding elpa.git's commit log with your package's commit messages. Your package is part of elpa.git. Squashing doesn't help and only gets in the way. *** Externals In the `external' case, the copy of the code is not kept here but in the `externals/' branch in the `elpa' repository. You can check out all the external packages into the `packages' directory with the command: make externals You can check out a specific external PACKAGE into the `packages' directory with these commands: cd packages git clone --reference .. --single-branch --branch externals/PACKAGE $(git config remote.origin.url) PACKAGE If you already have a packages/PACKAGE directory with a previous checkout, you can update it like this: cd packages/PACKAGE git pull ** Public incubation If you want to develop a package publicly prior to its first release (to benefit from others' feedback, primarily), but not in an external repo, you have 2 choices: - you can simply put "Version: 0" to indicate that this should not be released yet. - or you can push to an "ephemeral" branch -- subject to rebase and eventual removal upon finishing merge -- for the duration of the incubation. * DEPLOYMENT ** To install all the packages "in place": make externals make This compiles and generates autoloads for all the packages in the packages/ directory. You can then add that directory, e.g. with: (eval-after-load 'package '(add-to-list 'package-directory-list ".../elpa/packages")) ** To deploy the package repository as a remotely-accessible archive: git clone .../elpa (cd elpa; git clone .../emacs) #If you want to generate :core packages. mkdir build cd build (cd ../elpa; git log --format=%H | tail -n 1) >.changelog-witness ln -s ../elpa/admin ln -s ../elpa/GNUmakefile admin/update-archive.sh This deploys the packages to the staging/ directory (sibling of "build"). Unlike "make", this makes a full copy of the packages, tars up multi-file packages, and doesn't byte-compile any files. ** To access a deployed archive To access the archive via HTTP, have a symlink (say) /var/www/packages pointing to DEST/packages, and set up Emacs with (setq package-archives '(("new-elpa" . "http://foo.com/packages"))) You can also access the archive via normal file access. Such "local archives" are useful for debugging: (setq package-archives '(("local-elpa" . ".../elpa/packages"))) ** Notes specific to elpa.gnu.org The way things are set up on this machine, we refresh the archive by a cron job. You can do it by hand by logging in (access set up by FSF admins), and su elpa cd ~elpa/build admin/update-archive.sh Which makes a full archive deployment, as discussed above. The symlink /var/www/packages points to the staging package directory under /home/elpa/. The Org mode dailies are also fetched and added by the script admin/org-synch.sh, run as a cron job. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . Local variables: mode: outline paragraph-separate: "[ ]*$" end: