[Emacs-diffs] feature/core-elpa-by-copy 4f0ca28 03/13: Build process started

[Phillip Lord]

branch: feature/core-elpa-by-copy
commit 4f0ca28c3023eb5a5a9333580caea79f8e1d509e
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    Build process started
---
 elpa/Makefile.in             | 39 +++++++++++++++++++++++++++------------
 elpa/bin/extract-package.sh  | 37 +++++++++++++++++++++++++++++++++++++
 elpa/bin/package-makefile.mk |  2 ++
 elpa/package-makefile        |  2 --
 4 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/elpa/Makefile.in b/elpa/Makefile.in
index ab73bbc..1469737 100644
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -1,25 +1,40 @@
+## Get this stuff from above
+dirstate = .git/logs/HEAD
+VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
 
-all: packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev
 
+all: pabbrev hydra
 
+../lisp/elpa:
+       mkdir ../lisp/elpa
+
+../test/lisp/elpa:
+       mkdir ../test/lisp/elpa
+
+packages:
+       mkdir packages
+
+# The location of this needs to be configurable in some way
 elpa-git:
        git clone --mirror https://git.savannah.gnu.org/git/emacs/elpa.git 
elpa-git
 
-elpa-update: elpa-git
+elpa-update: $(VCSWITNESS) elpa-git
        cd elpa-git;git fetch --all
-.PHONY: elpa-update
 
-packages:
-       mkdir packages
+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/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev: elpa-update packages
-       # Remove all version
-       rm -rf packages/*pabbrev
-       mkdir packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev
-       cd elpa-git;\
-       git archive d28cf8632d2691dc93afbb28500126242d37961c \
-       | tar xv -C ../packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev
+pabbrev: packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev
+       $(MAKE) -C packages/d28cf8632d2691dc93afbb28500126242d37961c-pabbrev/ 
-f package-makefile.mk deploy
 
+packages/cba688842ac089ad516155d1b2d6d73826929449-hydra: elpa-update 
directories
+       ./bin/extract-package.sh -s cba688842ac089ad516155d1b2d6d73826929449 -p 
hydra
 
+hydra: packages/cba688842ac089ad516155d1b2d6d73826929449-hydra
+       $(MAKE) -C packages/cba688842ac089ad516155d1b2d6d73826929449-hydra -f 
package-makefile.mk deploy
 clean:
        rm -rf packages
diff --git a/elpa/bin/extract-package.sh b/elpa/bin/extract-package.sh
new file mode 100755
index 0000000..a8440df
--- /dev/null
+++ b/elpa/bin/extract-package.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+function grab_external {
+    rm -rf packages/*$PACKAGE
+    mkdir packages/$SHA-$PACKAGE
+    cd elpa-git
+    git archive $SHA \
+        | tar xv -C ../packages/$SHA-$PACKAGE
+    cd ..
+    cp bin/package-makefile.mk packages/$SHA-$PACKAGE
+}
+
+SHA=
+PACKAGE=
+EXTERNAL=0
+
+while getopts "s:p:e" opt; do
+    case $opt in
+        s)
+            SHA=$OPTARG
+            ;;
+        p)
+            PACKAGE=$OPTARG
+            ;;
+        e)
+            EXTERNAL=1
+            ;;
+    esac
+done
+
+if (($EXTERNAL))
+then
+    grab_external
+    exit 0
+fi
+
+exit 1
diff --git a/elpa/bin/package-makefile.mk b/elpa/bin/package-makefile.mk
new file mode 100644
index 0000000..70bff68
--- /dev/null
+++ b/elpa/bin/package-makefile.mk
@@ -0,0 +1,2 @@
+deploy:
+       echo hello `pwd`
diff --git a/elpa/package-makefile b/elpa/package-makefile
deleted file mode 100644
index be1a0c7..0000000
--- a/elpa/package-makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-       echo hello world