[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master dba910c 01/13: Get ready for FSF ELPA release
From: |
Rocky Bernstein |
Subject: |
[elpa] master dba910c 01/13: Get ready for FSF ELPA release |
Date: |
Tue, 17 Feb 2015 13:55:14 +0000 |
branch: master
commit dba910cd32cc29a4216e855a41666bbc2f7697af
Author: rocky <address@hidden>
Commit: rocky <address@hidden>
Get ready for FSF ELPA release
---
AUTHORS | 2 +-
Carton | 6 --
Makefile.am | 18 +++++
el-get-install.el | 105 --------------------------
load-relative.el | 4 +-
test/load-file1.el | 17 ++++-
test/load-file2.el | 16 ++++
test/load-file3.el | 16 ++++
test/require-file1.el | 16 ++++
test/require-file2.el | 16 ++++
test/require-file3.el | 16 ++++
test/subdir/test-require-list-from-subdir.el | 16 ++++
test/test-load.el | 31 ++++++--
test/test-require-list.el | 16 ++++
14 files changed, 172 insertions(+), 123 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 38a13b7..fee42c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Rocky Bernstein (address@hidden)
+Rocky Bernstein (address@hidden)
diff --git a/Carton b/Carton
deleted file mode 100644
index 092be81..0000000
--- a/Carton
+++ /dev/null
@@ -1,6 +0,0 @@
-(source "melpa" "http://melpa.milkbox.net/packages/")
-
-(package "load-relative" "0.2.0" "relative file load like Ruby's
require_relative")
-
-(development
- (depends-on "test-simple"))
diff --git a/Makefile.am b/Makefile.am
index 981101b..04aca09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,3 +35,21 @@ ChangeLog:
ACLOCAL_AMFLAGS=-I .
endif
+
+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 0000000..e69de29
diff --git a/el-get-install.el b/el-get-install.el
deleted file mode 100644
index e175e28..0000000
--- a/el-get-install.el
+++ /dev/null
@@ -1,105 +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 <address@hidden>
-;; 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
- loc-changes ; loc marks in buffers
- list-utils ; list utilities like list-utils-flatten
- 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 '(test-simple))
diff --git a/load-relative.el b/load-relative.el
index 409c3c5..b2346a3 100644
--- a/load-relative.el
+++ b/load-relative.el
@@ -1,12 +1,12 @@
;;; load-relative.el --- relative file load (within a multi-file Emacs package)
;; Author: Rocky Bernstein
-;; Version: 1.0
+;; Version: 1.1
;; Keywords: internal
;; URL: http://github.com/rocky/emacs-load-relative
;; Compatibility: GNU Emacs 23.x
-;; Copyright (C) 2009-2010, 2012-2014 Rocky Bernstein <address@hidden>
+;; Copyright (C) 2015 Free Software Foundation, Inc
;; This program is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
diff --git a/test/load-file1.el b/test/load-file1.el
index 724b528..00930a5 100644
--- a/test/load-file1.el
+++ b/test/load-file1.el
@@ -1,3 +1,18 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(setq loaded-file "load-file1")
(setq loaded-file1 't)
-
diff --git a/test/load-file2.el b/test/load-file2.el
index ca6f3d2..835a4be 100644
--- a/test/load-file2.el
+++ b/test/load-file2.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(load-relative "load-file3")
diff --git a/test/load-file3.el b/test/load-file3.el
index fb15947..f788421 100644
--- a/test/load-file3.el
+++ b/test/load-file3.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(setq loaded-file "load-file3")
diff --git a/test/require-file1.el b/test/require-file1.el
index 53c149e..8524f53 100644
--- a/test/require-file1.el
+++ b/test/require-file1.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(provide 'require-file1)
diff --git a/test/require-file2.el b/test/require-file2.el
index e751183..c84b014 100644
--- a/test/require-file2.el
+++ b/test/require-file2.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(provide-me "my-")
diff --git a/test/require-file3.el b/test/require-file3.el
index d9236cd..2271059 100644
--- a/test/require-file3.el
+++ b/test/require-file3.el
@@ -1 +1,17 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(provide 'require-file3)
diff --git a/test/subdir/test-require-list-from-subdir.el
b/test/subdir/test-require-list-from-subdir.el
index 6d93605..880b4f3 100644
--- a/test/subdir/test-require-list-from-subdir.el
+++ b/test/subdir/test-require-list-from-subdir.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(require 'cl)
(require 'test-unit)
(load-file "../../load-relative.el")
diff --git a/test/test-load.el b/test/test-load.el
index 3dbce3b..af47412 100644
--- a/test/test-load.el
+++ b/test/test-load.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(require 'cl)
(require 'test-simple)
(load-file "../load-relative.el")
@@ -17,9 +33,9 @@
"(__FILE__) on this running program"
)
-(dolist (file-name
+(dolist (file-name
'("load-file1.el" "./load-file1.el" "../test/load-file1.el"))
- (assert-equal
+ (assert-equal
(expand-file-name file-name)
(relative-expand-file-name file-name))
"relative-expand-filename"
@@ -32,14 +48,14 @@
(setq loaded-file nil)
(setq loaded-file1 nil)
-(assert-equal '(t t)
+(assert-equal '(t t)
(load-relative '("load-file1" "load-file2")
))
(assert-equal 't loaded-file1)
(assert-equal "load-file3" loaded-file)
-(dolist (file-name
+(dolist (file-name
'("load-file1.el" "./load-file1.el" "../test/load-file1.el"))
(setq loaded-file nil)
(assert-equal t (load-relative file-name)
@@ -48,13 +64,13 @@
(format "load-relative value with list file %s" loaded-file)
))
-(if (featurep 'require-file1 t)
+(if (featurep 'require-file1 t)
(unload-feature 'require-file1))
-(require-relative "require-file1")
+(require-relative "require-file1")
(assert-t (featurep 'require-file1) "require-relative")
-(if (featurep 'require-file1 t)
+(if (featurep 'require-file1 t)
(unload-feature 'require-file1))
(require-relative-list '("require-file1" "require-file3"))
@@ -79,4 +95,3 @@
(assert-t (featurep 'my-test-load) "provide-me - prefix")
(end-tests)
-
diff --git a/test/test-require-list.el b/test/test-require-list.el
index 4a6b731..fae8421 100644
--- a/test/test-require-list.el
+++ b/test/test-require-list.el
@@ -1,3 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
(require 'cl)
(require 'test-simple)
(load-file "../load-relative.el")
- [elpa] master updated (28f59c2 -> be78cfd), Rocky Bernstein, 2015/02/17
- [elpa] master dba910c 01/13: Get ready for FSF ELPA release,
Rocky Bernstein <=
- [elpa] master c94ca40 05/13: Travis 5th try, Rocky Bernstein, 2015/02/17
- [elpa] master 12afc2c 06/13: Travis 6th try, Rocky Bernstein, 2015/02/17
- [elpa] master c68783f 03/13: Travis 3rd try, Rocky Bernstein, 2015/02/17
- [elpa] master 064074d 08/13: Wrong syntax, Rocky Bernstein, 2015/02/17
- [elpa] master e088dc6 02/13: Travis 2nd try, Rocky Bernstein, 2015/02/17
- [elpa] master 0ae1ff3 04/13: Travis 4th try, Rocky Bernstein, 2015/02/17
- [elpa] master c876c3c 10/13: Travis 8th try, Rocky Bernstein, 2015/02/17
- [elpa] master fea2a8b 12/13: Back off reqiure-realtive test until we get dependencies worked out, Rocky Bernstein, 2015/02/17
- [elpa] master be78cfd 13/13: Merge commit 'fea2a8b1c10f9f29ba6924b17892de670b650756', Rocky Bernstein, 2015/02/17
- [elpa] master bf0b019 07/13: back off require-list test in Travis, Rocky Bernstein, 2015/02/17