diff --git a/melpa b/melpa index 173f89f8..8c194148 100755 --- a/melpa +++ b/melpa @@ -19,7 +19,7 @@ function melpa_build_pkglist { } function melpa_generate_html { - echo "*** Building html" + echo "*** Building html..." cd html || return 1 erb index.erb > index.md pandoc --template=template.html --css=style.css -s --mathml -t html --smart index.md > index.html @@ -31,26 +31,8 @@ function trim { echo $1 } -function melpa_validate { - NUMPACKAGES=$(trim `ls recipes/* | wc -l`) - NUMBUILT=$(trim `ls packages/*.{el,tar} | wc -l`) - - echo "${NUMBUILT}/${NUMPACKAGES} packages built" - - if [[ $NUMBUILT -ne $NUMPACKAGES ]]; then - echo - echo "Missing Packages" - echo "______________________" - emacs --script missing.el - exit 1 - else - exit 0 - fi - -} - function print_usage { - echo "usage: $0 [-h | -?] [clear | build | html | validate]" + echo "usage: $0 [-h | -?] [clear | build | html ]" } args=`getopt h $*` @@ -77,7 +59,7 @@ done if [[ "$#" == "0" ]]; then - set -- build index validate + set -- build index fi for i; do @@ -85,7 +67,6 @@ for i; do clear ) melpa_clear_packages ;; build ) melpa_build_pkglist ;; html | index ) melpa_generate_html ;; - validate ) melpa_validate ;; esac shift done diff --git a/package-build.el b/package-build.el index b7cadc20..eec868fb 100644 --- a/package-build.el +++ b/package-build.el @@ -541,7 +541,8 @@ of the same-named package which is to be kept." (delete-directory pkg-dir t nil) (pb/add-to-archive-contents pkg-info 'tar)))) - (pb/dump-archive-contents)))) + (pb/dump-archive-contents) + file-name))) (defun package-build-archive-ignore-errors (pkg) "Build archive for package PKG, ignoring any errors." @@ -551,8 +552,14 @@ of the same-named package which is to be kept." (defun package-build-all () "Build all packages in the `package-build-alist'." (interactive) - (mapc 'package-build-archive-ignore-errors - (mapcar 'symbol-name (mapcar 'car package-build-alist))) + (let ((failed (loop for pkg in (mapcar 'car package-build-alist) + when (not (package-build-archive-ignore-errors + (symbol-name pkg))) + collect pkg))) + (if (zerop (length failed)) + (princ "\nSuccessfully Compiled All Packages\n") + (princ "\nFailed to Build the Following Packages\n") + (princ (mapconcat 'symbol-name failed "\n")))) (package-build-cleanup)) (defun package-build-cleanup ()