[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] elparized-core f8be6d6 5/6: Complete working version
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] elparized-core f8be6d6 5/6: Complete working version |
Date: |
Fri, 9 Mar 2018 17:17:02 -0500 (EST) |
branch: elparized-core
commit f8be6d6d84ec98a0a481eb5a202f7615dc8d706e
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Complete working version
---
Makefile.in | 8 ++++----
configure.ac | 3 ++-
elpa/Makefile.in | 22 +++++++++++++++-------
elpa/bin/deploy-elpa | 20 +++++++++++++-------
4 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index a993452..b66135f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -398,10 +398,10 @@ lib-src src: $(NTDIR) lib
src: lib-src
# We need to build 'emacs' in 'src' to compile the *.elc files in 'lisp'.
-lisp: src
+lisp: src elpa
# These targets should be "${SUBDIR} without 'src'".
-lib lib-src lisp nt: Makefile
+elpa lib lib-src lisp nt: Makefile
$(MAKE) -C $@ all
# Ideally, VCSWITNESS should be a file that is modified whenever the
@@ -815,7 +815,7 @@ endef
### target for GCC does not delete 'libgcc.a', because recompiling it
### is rarely necessary and takes a lot of time.
mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \
- doc/lispref doc/lispintro
+ doc/lispref doc/lispintro elpa
$(foreach dir,$(mostlyclean_dirs),$(eval $(call
submake_template,$(dir),mostlyclean)))
@@ -1055,7 +1055,7 @@ uninstall-ps: $(UNINSTALL_PS)
# would require changing every rule in doc/ that builds an info file,
# and it's not worth it. This case is only relevant if you download a
# release, then change the .texi files.
-info:
+info: elpa
ifneq ($(HAVE_MAKEINFO),no)
$(MAKE) info-real info-dir
endif
diff --git a/configure.ac b/configure.ac
index d2269d6..c714441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5051,6 +5051,7 @@ AC_SUBST(bitmapdir)
AC_SUBST(gamedir)
AC_SUBST(gameuser)
AC_SUBST(gamegroup)
+AC_SUBST(elpadir)
## FIXME? Nothing uses @address@hidden
## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
## end of LIBX_BASE, but nothing ever set it.
@@ -5539,7 +5540,7 @@ dnl config.status treats $srcdir specially, so I think
this is ok...
AC_CONFIG_FILES([$srcdir/doc/man/emacs.1])
m4_define([subdir_makefiles],
- [lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile
doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile
lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile])
+ [lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile
doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile
lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile
elpa/Makefile])
SUBDIR_MAKEFILES="subdir_makefiles"
AC_CONFIG_FILES(subdir_makefiles)
diff --git a/elpa/Makefile.in b/elpa/Makefile.in
index 756d9a3..c4c2526 100644
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -1,7 +1,9 @@
+all: ensure-dir repo working/pabbrev
+
ensure-dir:
- -mkdir working
- -mkdir ../lisp/elpa
- -mkdir ../test/lisp/elpa
+ - mkdir working
+ - mkdir ../lisp/elpa
+ - mkdir ../test/lisp/elpa
repo:
git clone --mirror https://git.savannah.gnu.org/git/emacs/elpa.git repo
@@ -9,7 +11,13 @@ repo:
repo-update: repo
cd repo;git fetch --all
-pabbrev:
- - mkdir pabbrev
- cd repo;git archive d28cf8632d2691dc93afbb28500126242d37961c | tar xv
--directory ../pabbrev
- cp pabbrev/pabbrev.el ../lisp/elpa/
+working/pabbrev:
+ ./bin/deploy-elpa d28cf8632d2691dc93afbb28500126242d37961c pabbrev
+
+clean:
+ rm -rf working
+ rm -rf ../lisp/elpa
+ rm -rf ../test/lisp/elpa
+
+distclean: clean
+ rm -rf repo
diff --git a/elpa/bin/deploy-elpa b/elpa/bin/deploy-elpa
old mode 100644
new mode 100755
index 5a0c530..6a82649
--- a/elpa/bin/deploy-elpa
+++ b/elpa/bin/deploy-elpa
@@ -3,20 +3,26 @@
shopt -s extglob
generate_source(){
- git_treeish = $1
- package_name = $2
+ git_treeish=$1
+ package_name=$2
+ echo git_treeish $git_treeish
+ echo package_name $package_name
mkdir working/$package_name
cd repo
- git archive $i | tar xv --directory ../working/$package_name
+ git archive $git_treeish | tar xv --directory ../working/$package_name
+ cd ..
}
deploy_source(){
- package_name = $1
+ package_name=$1
cd working/$package_name
- cp *!(test)*.el ../../lisp/elpa
- cp *.texi ../../doc/elpa
- cp *test*.el ../../test/lisp/elpa
+ rsync -i --ignore-missing-args *!(test)*.el ../../../lisp/elpa
+ rsync -i --ignore-missing-args *.texi ../../../doc/elpa
+ rsync -i --ignore-missing-args *test*.el ../../../test/lisp/elpa
}
+
+generate_source $1 $2
+deploy_source $2
- [Emacs-diffs] branch elparized-core created (now 239379f), Phillip Lord, 2018/03/09
- [Emacs-diffs] elparized-core 6e4ce1b 2/6: Add elpa directory, Phillip Lord, 2018/03/09
- [Emacs-diffs] elparized-core 570bdd3 4/6: Delete directories, Phillip Lord, 2018/03/09
- [Emacs-diffs] elparized-core b5639eb 3/6: More still, Phillip Lord, 2018/03/09
- [Emacs-diffs] elparized-core f8be6d6 5/6: Complete working version,
Phillip Lord <=
- [Emacs-diffs] elparized-core 05c8f82 1/6: Initial checkin, Phillip Lord, 2018/03/09
- [Emacs-diffs] elparized-core 239379f 6/6: Add master branch support, Phillip Lord, 2018/03/09