From: rocky Date: Fri, 27 Feb 2015 18:11:28 +0000 (-0500) Subject: Revise for FSF release X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/2a03b2d3514ab6c4211d65957c44432dc79cfa5c Revise for FSF release --- diff --git a/.gitignore b/.gitignore index 073378209..eadfb9250 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /*.elc /*~ +/ChangeLog /aclocal.m4 /autom4te.cache /config.log diff --git a/Carton b/Carton deleted file mode 100644 index 2581298f6..000000000 --- a/Carton +++ /dev/null @@ -1,7 +0,0 @@ -(source "melpa" "http://melpa.milkbox.net/packages/") - -(package "loc-change" "0.1.0" - "Unit tests for GNU emacs that work interactively and in batch") - -(development - (depends-on "test-simple")) diff --git a/Makefile.am b/Makefile.am index f391799b1..0b381fc71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,3 +28,21 @@ check-short: check: $(MAKE) -C test $@ + +CR_EXCEPTIONS=copyright_exceptions +#: Check for GNU Copyrights. +check_copyrights: + @echo "Compute exceptions >$(CR_EXCEPTIONS)~" + @export LANG=C; \ + find . -name '.git' -prune -o -name '*.el' -print0 | \ + xargs -0 grep -L 'Free Software Foundation, Inc' | \ + grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \ + find . -name '.git' -prune -o -name '*.el' -print | \ + while read f; do \ + fquoted="$$(echo $$f|tr '|' '_')"; \ + sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N' \ + -e '/Free Software Foundation/d' \ + -e "s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p" \ + "$$f"; \ + done | sort >$(CR_EXCEPTIONS)~ + diff -u "$(CR_EXCEPTIONS)" "$(CR_EXCEPTIONS)~" diff --git a/copyright_exceptions b/copyright_exceptions new file mode 100644 index 000000000..e69de29bb diff --git a/el-get-install.el b/el-get-install.el deleted file mode 100644 index 4ed032588..000000000 --- a/el-get-install.el +++ /dev/null @@ -1,103 +0,0 @@ -(eval-when-compile - (defvar el-get-sources) -) - -(declare-function el-get-post-install 'el-get) - -(add-to-list 'load-path "~/.emacs.d/el-get/el-get") - -;;; el-get-install.el --- installer for the lazy -;; -;; Copyright (C) 2010 Dimitri Fontaine -;; -;; Author: Dimitri Fontaine -;; URL: http://www.emacswiki.org/emacs/el-get.el -;; Created: 2010-06-17 -;; Keywords: emacs package elisp install elpa git git-svn bzr cvs apt-get fink http http-tar -;; Licence: WTFPL, grab your copy here: http://sam.zoy.org/wtfpl/ -;; -;; This file is NOT part of GNU Emacs. -;; -;; bootstrap your el-get installation, the goal is then to use el-get to -;; update el-get. -;; -;; So the idea is that you copy/paste this code into your *scratch* buffer, -;; hit C-j, and you have a working el-get. - -(let ((el-get-root - (file-name-as-directory - (or (bound-and-true-p el-get-dir) - (concat (file-name-as-directory user-emacs-directory) "el-get"))))) - - (when (file-directory-p el-get-root) - (add-to-list 'load-path el-get-root)) - - ;; try to require el-get, failure means we have to install it - (unless (require 'el-get nil t) - (unless (file-directory-p el-get-root) - (make-directory el-get-root t)) - - (let* ((package "el-get") - (buf (switch-to-buffer "*el-get bootstrap*")) - (pdir (file-name-as-directory (concat el-get-root package))) - (git (or (executable-find "git") - (error "Unable to find `git'"))) - (url (or (bound-and-true-p el-get-git-install-url) - "http://github.com/dimitri/el-get.git")) - (default-directory el-get-root) - (process-connection-type nil) ; pipe, no pty (--no-progress) - - ;; First clone el-get - (status - (call-process - git nil `(,buf t) t "--no-pager" "clone" "-v" url package))) - - (unless (zerop status) - (error "Couldn't clone el-get from the Git repository: %s" url)) - - ;; switch branch if we have to - (let* ((branch (cond - ;; Check if a specific branch is requested - ((bound-and-true-p el-get-install-branch)) - ;; Check if master branch is requested - ((boundp 'el-get-master-branch) "master") - ;; Read the default branch from the el-get recipe - ((plist-get (with-temp-buffer - (insert-file-contents-literally - (expand-file-name "recipes/el-get.rcp" pdir)) - (read (current-buffer))) - :branch)) - ;; As a last resort, use the master branch - ("master"))) - (remote-branch (format "origin/%s" branch)) - (default-directory pdir) - (bstatus - (if (string-equal branch "master") - 0 - (call-process git nil (list buf t) t "checkout" "-t" remote-branch)))) - (unless (zerop bstatus) - (error "Couldn't `git checkout -t %s`" branch))) - - (add-to-list 'load-path pdir) - (load package) - (let ((el-get-default-process-sync t) ; force sync operations for installer - (el-get-verbose t)) ; let's see it all - (el-get-post-install "el-get")) - (with-current-buffer buf - (goto-char (point-max)) - (insert "\nCongrats, el-get is installed and ready to serve!"))))) - - -(declare-function el-get 'el-get) - -;; now either el-get is `require'd already, or have been `load'ed by the -;; el-get installer. -(setq - el-get-sources - '(el-get ; el-get is self-hosting - load-relative ; load emacs lisp relative to emacs source - test-simple ; simple test framework - )) - -;; install new packages and init already installed packages -(el-get 'sync '(loc-changes load-relative test-simple)) diff --git a/install-from-git.sh b/install-from-git.sh deleted file mode 100755 index 5bed782a9..000000000 --- a/install-from-git.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Install emacs-dbgr from git -run_cmd() { - echo "--- Running command: $@" - $@ - rc=$? - echo "--- $@ exit status is $?" - return $rc -} - -if (( $(id -u) != 0)) ; then - need_sudo='sudo' -else - need_sudo='' -fi -for program in git make $need_sudo ; do - if ! which $program >/dev/null 2>&1 ; then - echo "Cant find program $program in $PATH" - exit 1 - fi -done - -packages=emacs-{test-simple,load-relative,loc-changes,dbgr} -for pkg in $packages ; do - echo '******************************************' - echo Trying to install ${pkg}... - echo '******************************************' - run_cmd git clone http://github.com/rocky/${pkg}.git - (cd $pkg && \ - run_cmd $SHELL ./autogen.sh && \ - run_cmd ./configure && \ - run_cmd make && \ - run_cmd make check && \ - run_cmd $need_sudo make install - ) -done diff --git a/test/install-pkgs.el b/test/install-pkgs.el new file mode 100644 index 000000000..d43575c4e --- /dev/null +++ b/test/install-pkgs.el @@ -0,0 +1,24 @@ +;; Copyright (C) 2015 Free Software Foundation, Inc + +;; Author: Rocky Bernstein + +;; This program 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. + +;; This program 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 this program. If not, see . + +(require 'package) +(package-refresh-contents) +(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/"))) +(condition-case nil + (package-install 'test-simple) + ((debug error) nil)) +(load-library "test-simple") diff --git a/test/test-basic.el b/test/test-basic.el index 0169b7067..190d1dd32 100644 --- a/test/test-basic.el +++ b/test/test-basic.el @@ -1,3 +1,20 @@ +;; Copyright (C) 2015 Free Software Foundation, Inc + +;; Author: Rocky Bernstein + +;; This program 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. + +;; This program 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 this program. If not, see . + (require 'cl) (require 'test-simple) (load-file "../loc-changes.el")