branch: elpa/gnuplot
commit 7c72d1ea748e762f9b4322acfba9e7416d749cff
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Reorganize files
---
.elpaignore | 6 ++----
.gitignore | 4 ++--
Makefile | 12 +++++-------
README.org | 21 ++-------------------
admin/Makefile | 18 ++++++++++++++++++
doc2texi.el => admin/doc2texi.el | 0
.../gnuplot-debug-context.el | 0
.../gnuplot-test-context.el | 0
gnuplot-tests.el => test/gnuplot-test.el | 2 +-
9 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/.elpaignore b/.elpaignore
index bb49ef5f40..78f61f50b5 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -3,7 +3,5 @@
.gitignore
LICENSE
Makefile
-doc2texi.el
-gnuplot-debug-context.el
-gnuplot-test-context.el
-gnuplot-tests.el
+admin
+test
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c49e935edd..320f18b3e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
*.elc
*.tar.*
*~
-\#*\#
/*-autoloads.el
/*-pkg.el
-/gnuplot-*/
+/admin/*/
+\#*\#
diff --git a/Makefile b/Makefile
index 3f3c2c216a..44546dda83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,18 @@
-EMACS ?= emacs
-
LOAD = -l gnuplot \
-l gnuplot-context \
-l gnuplot-debug-context \
-l gnuplot-gui \
- -l gnuplot-tests
+ -l gnuplot-test
-.PHONY: all default clean
+.PHONY: all default clean regen test
default: compile
test:
- $(EMACS) --batch -L . -f package-initialize $(LOAD) -f
ert-run-tests-batch-and-exit
+ emacs --batch -L test -L . -f package-initialize $(LOAD) -f
ert-run-tests-batch-and-exit
compile:
- $(EMACS) --batch -L . -f package-initialize -f batch-byte-compile
gnuplot-*.el
+ emacs --batch -L test -L . -f package-initialize -f batch-byte-compile
gnuplot-*.el test/gnuplot-*.el
clean:
- rm -f *.elc
+ rm -f *.elc */*.elc
diff --git a/README.org b/README.org
index 778720e4b1..e5b924b31f 100644
--- a/README.org
+++ b/README.org
@@ -137,22 +137,5 @@ until this issue is fixed upstream.
The files ~gnuplot.texi~ and ~gnuplot-eldoc.el~ are generated from the Gnuplot
source, which can be obtained from
https://packages.debian.org/unstable/gnuplot.
-
-#+begin_src bash
-# Download and extract the Gnuplot source
-[ -e gnuplot-source.tar.xz ] || curl -o gnuplot-source.tar.xz
http://deb.debian.org/debian/pool/main/g/gnuplot/gnuplot_6.0.2+dfsg1.orig.tar.xz
-rm -rf gnuplot-source/
-mkdir gnuplot-source
-tar --strip-components=1 -C gnuplot-source -xf gnuplot-source.tar.xz
-
-# Run doc2texi.el inside the gnuplot-source/docs directory
-cp doc2texi.el gnuplot-source/docs
-cd gnuplot-source/docs
-emacs -batch -l doc2texi.el -f d2t-doc-to-texi
-
-# Make sure that the info file compiles cleanly
-makeinfo --no-split gnuplot.texi
-
-# Copy the updated gnuplot-eldoc.el and gnuplot.texi to the package directory
-cp gnuplot.texi gnuplot-eldoc.el ../..
-#+end_src
+Run ~make~ inside the ~admin~ directory to download the source and regenerate
the
+files.
diff --git a/admin/Makefile b/admin/Makefile
new file mode 100644
index 0000000000..57884fc0eb
--- /dev/null
+++ b/admin/Makefile
@@ -0,0 +1,18 @@
+src = gnuplot-source
+
+regen:
+ # Download and extract the Gnuplot source
+ [ -e $(src).tar.xz ] || curl -o $(src).tar.xz
http://deb.debian.org/debian/pool/main/g/gnuplot/gnuplot_6.0.2+dfsg1.orig.tar.xz
+ rm -rf $(src)/
+ mkdir $(src)
+ tar --strip-components=1 -C $(src) -xf $(src).tar.xz
+
+ # Run doc2texi.el inside the $(src)/docs directory
+ cp doc2texi.el $(src)/docs
+ (cd $(src)/docs; emacs --batch -l doc2texi.el -f d2t-doc-to-texi)
+
+ # Make sure that the info file compiles cleanly
+ (cd $(src)/docs; makeinfo --no-split gnuplot.texi)
+
+ # Copy the updated gnuplot-eldoc.el and gnuplot.texi to the package
directory
+ cp $(src)/docs/gnuplot.texi $(src)/docs/gnuplot-eldoc.el ..
diff --git a/doc2texi.el b/admin/doc2texi.el
similarity index 100%
rename from doc2texi.el
rename to admin/doc2texi.el
diff --git a/gnuplot-debug-context.el b/test/gnuplot-debug-context.el
similarity index 100%
rename from gnuplot-debug-context.el
rename to test/gnuplot-debug-context.el
diff --git a/gnuplot-test-context.el b/test/gnuplot-test-context.el
similarity index 100%
rename from gnuplot-test-context.el
rename to test/gnuplot-test-context.el
diff --git a/gnuplot-tests.el b/test/gnuplot-test.el
similarity index 99%
rename from gnuplot-tests.el
rename to test/gnuplot-test.el
index 476535a4f9..135995047b 100644
--- a/gnuplot-tests.el
+++ b/test/gnuplot-test.el
@@ -249,4 +249,4 @@ mutliple # lines #")
'comment' \
\"containing strings\"")
-;;; gnuplot-tests.el ends here
+;;; gnuplot-test.el ends here
