[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into f
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into feature/integrated-elpa |
Date: |
Fri, 16 Sep 2016 20:34:17 +0000 (UTC) |
branch: feature/integrated-elpa
commit db2bcc6723a18a0655acf746816c965b8dbadce3
Merge: b2f34a4 cf1d196
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Merge branch into feature/integrated-elpa
---
configure.ac | 5 +++++
packages/Makefile.in | 8 ++++++--
packages/admin/package-makefile.el | 6 +++++-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2e75097..65dbf7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3755,6 +3755,10 @@ fi
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_CFLAGS)
+
+ELPA=""
+AC_SUBST(ELPA)
+
# Check for mail-locking functions in a "mail" library. Probably this should
# have the same check as for liblockfile below.
AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no)
@@ -5392,6 +5396,7 @@ SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e
's| | $(srcdir)/|g' -e
AC_SUBST(SUBDIR_MAKEFILES_IN)
+
dnl You might wonder (I did) why epaths.h is generated by running make,
dnl rather than just letting configure generate it from epaths.in.
dnl One reason is that the various paths are not fully expanded (see above);
diff --git a/packages/Makefile.in b/packages/Makefile.in
index 528bb8d..09f1149 100644
--- a/packages/Makefile.in
+++ b/packages/Makefile.in
@@ -2,7 +2,11 @@
EMACS= ../src/emacs
-ELPA=../../elpa
+
+
+## This should be coming from autoconf!
+ELPA=/home/phillord/src/git/elpa-git/master
+
DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
@@ -17,7 +21,7 @@ check-maybe: check-packages
WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
makefile-inc.mk: ./admin/package-makefile.el
- $(EMACS) --batch --load admin/package-makefile.el \
+ ELPA=$(ELPA) $(EMACS) --batch --load admin/package-makefile.el \
--funcall package-makefile
include makefile-inc.mk
diff --git a/packages/admin/package-makefile.el
b/packages/admin/package-makefile.el
index b30ae6e..2e6c861 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -1,7 +1,10 @@
(require 'seq)
(defvar package-makefile--elpa
- (expand-file-name "../../../../elpa-git/master/packages"))
+ (when (getenv "ELPA")
+ (concat (getenv "ELPA")
+ "/packages")))
+
(defvar package-makefile--log-targets nil)
(defvar package-makefile--pkg-targets nil)
@@ -134,6 +137,7 @@
(package-makefile--elpa-dirs
package-makefile--elpa))))
+
"ert-summarize: " (mapconcat 'identity package-makefile--log-targets " ")
"\n\t$(EMACS) --batch -l ert -f ert-summarize-tests-batch-and-exit $^\n\n"
- [Emacs-diffs] feature/integrated-elpa 937c695 18/23: Add bug report about multifile packages, (continued)
- [Emacs-diffs] feature/integrated-elpa 937c695 18/23: Add bug report about multifile packages, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 4f6df43 15/23: README added, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5a2fa7a 11/23: Lots of changes, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa d208ef5 13/23: Makefile generator for tests, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 2456488 09/23: Start to factor out, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5d0232b 19/23: Multifile packages now work, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa b2f34a4 20/23: ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa dad684e 10/23: Refactor new files, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 8b53bb8 14/23: Summarization happening and some ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into feature/integrated-elpa,
Phillip Lord <=
- [Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of ELPA env var, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa ac145ce 16/23: autoconf support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa c1c7c63 01/23: Initial Support for ELPA packages in core, Phillip Lord, 2016/09/16