[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/core-elpa-by-copy e26f1ab 06/13: Fix concurrent bu
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/core-elpa-by-copy e26f1ab 06/13: Fix concurrent build, add some more |
Date: |
Sat, 26 Jan 2019 05:29:36 -0500 (EST) |
branch: feature/core-elpa-by-copy
commit e26f1ab73e0dfed3e5b294161872332fcfe11605
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Fix concurrent build, add some more
---
.gitignore | 2 ++
elpa/Makefile.in | 26 +++++++++++++++++---------
elpa/bin/extract-package.sh | 18 ++++++++++--------
elpa/bin/package-makefile.mk | 6 +++---
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index b2ad1f9..66d178d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,6 +151,8 @@ test/manual/indent/*.new
# ELPA
/elpa/elpa-git/
/elpa/packages/
+/lisp/elpa/
+/test/lisp/elpa/
# ctags, etags.
TAGS
diff --git a/elpa/Makefile.in b/elpa/Makefile.in
index 20339d1..06ffd39 100644
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -3,7 +3,7 @@ dirstate = .git/logs/HEAD
VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
-all: pabbrev hydra
+all: all-packages
../lisp/elpa:
mkdir ../lisp/elpa
@@ -25,17 +25,25 @@ directories: packages ../lisp/elpa ../test/lisp/elpa
.PHONY: elpa-update directories
-packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev: elpa-update
directories
- ./bin/extract-package.sh -s d28cf8632d2691dc93afbb28500126242d37961c -p
pabbrev -e
+PACKAGES=
+define package_template
+ packages/$(1)-$(2): elpa-update directories
+ ./bin/extract-package.sh -p $(1) -s $(2) $(3)
-pabbrev: packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev
- $(MAKE) -C
packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev/pabbrev -f
package-makefile.mk deploy PACKAGE=pabbrev
+ $(1): packages/$(1)-$(2)
+ $$(MAKE) -C packages/$(1)-$(2)/$(1) -f package-makefile.mk deploy
PACKAGE=$(1)
-packages/cba688842ac089ad516155d1b2d6d73826929449-hydra: elpa-update
directories
- ./bin/extract-package.sh -s cba688842ac089ad516155d1b2d6d73826929449 -p
hydra
+ PACKAGES:=$$(PACKAGES) $(1)
+endef
-hydra: packages/cba688842ac089ad516155d1b2d6d73826929449-hydra
- $(MAKE) -C
packages/cba688842ac089ad516155d1b2d6d73826929449-hydra/hydra -f
package-makefile.mk deploy PACKAGE=hydra
+$(info $(call
package_template,pabbrev,d28cf8632d2691dc93afbb28500126242d37961c,-e))
+$(eval $(call
package_template,pabbrev,d28cf8632d2691dc93afbb28500126242d37961c,-e))
+$(eval $(call
package_template,darkroom,73701d95133ba6581a95cec9489224b87f483cc0))
+$(eval $(call package_template,queue,cf2001d3e83e05af5820174e9fa1f9638a4f8c08))
+
+
+all-packages: $(PACKAGES)
+ # PACKAGES $(PACKAGES)
clean:
rm -rf packages
diff --git a/elpa/bin/extract-package.sh b/elpa/bin/extract-package.sh
index 7325d95..507b1db 100755
--- a/elpa/bin/extract-package.sh
+++ b/elpa/bin/extract-package.sh
@@ -1,24 +1,24 @@
#!/bin/bash
function grab_external {
- rm -rf packages/*$PACKAGE
- mkdir --parents packages/$SHA-$PACKAGE/$PACKAGE
+ rm -rf packages/$PACKAGE*
+ mkdir --parents $PACKAGE_LOC
cd elpa-git
git archive $SHA \
- | tar xv -C ../packages/$SHA-$PACKAGE/$PACKAGE
+ | tar xv -C ../$PACKAGE_LOC
cd ..
- cp --no-clobber bin/package-makefile.mk packages/$SHA-$PACKAGE/$PACKAGE/
+ cp --no-clobber bin/package-makefile.mk $PACKAGE_LOC
}
function grab_subtree {
rm -rf packages/*$PACKAGE
- mkdir --parents packages/$SHA-$PACKAGE/$PACKAGE
+ mkdir --parents $PACKAGE_LOC
cd elpa-git
- git archive $SHA \
- | tar xv -C ../packages/$SHA-$PACKAGE/$PACKAGE
+ git archive $SHA packages/$PACKAGE \
+ | tar xv --strip-components=2 -C ../$PACKAGE_LOC
cd ..
- cp --no-clobber bin/package-makefile.mk packages/$SHA-$PACKAGE/$PACKAGE
+ cp --no-clobber bin/package-makefile.mk $PACKAGE_LOC
}
SHA=
@@ -39,6 +39,8 @@ while getopts "s:p:e" opt; do
esac
done
+PACKAGE_LOC=packages/$PACKAGE-$SHA/$PACKAGE
+
if (($EXTERNAL))
then
grab_external
diff --git a/elpa/bin/package-makefile.mk b/elpa/bin/package-makefile.mk
index d368fc0..fd25bd3 100644
--- a/elpa/bin/package-makefile.mk
+++ b/elpa/bin/package-makefile.mk
@@ -14,19 +14,19 @@ TEST_DIR=../../../../test/lisp/elpa/$(PACKAGE)/
LISP_TARGETS=$(addprefix $(LISP_DIR),$(LISP))
TEST_TARGETS=$(addprefix $(TEST_DIR),$(TEST))
-deploy: prepare $(LISP_TARGETS) $(TEST_TARGETS)
+deploy: $(LISP_TARGETS) $(TEST_TARGETS)
# LISP $(LISP_TARGETS)
# TEST $(TEST_TARGETS)
define lisp_template
- $(LISP_DIR)$(1): $(1)
+ $(LISP_DIR)$(1): $(1) prepare
cp $$< $$@
endef
$(foreach prereq, $(LISP), $(eval $(call lisp_template,$(prereq))))
define test_template
- $(TEST_DIR)$(1): $(1)
+ $(TEST_DIR)$(1): $(1) prepare
cp $$< $$@
endef
- [Emacs-diffs] branch feature/core-elpa-by-copy created (now 05e20b8), Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 084a0c4 01/13: Initial notes (to be removed!), Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e2cf6b1 05/13: Top level make file plumbing, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 4f0ca28 03/13: Build process started, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy bf7519e 12/13: And dependencies all working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 05e20b8 13/13: Fix dependency between packages and ELPA checkout, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e26f1ab 06/13: Fix concurrent build, add some more,
Phillip Lord <=
- [Emacs-diffs] feature/core-elpa-by-copy fd618c5 08/13: Working --enable-elpa with conditional build, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy b3dad07 07/13: Semi working attempt to get configure to work, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 69f8ceb 10/13: Working Configurable checkout for elpa, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e557b18 11/13: Depedency mostly working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 2cfe571 02/13: Extraction of code working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy a5f5801 04/13: Probably working but untested version, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 9594e37 09/13: Configurable location for git checkout, Phillip Lord, 2019/01/26