[nongnu] elpa/sqlite3 a47384ef04 13/62: moved sqlite3-api-constants.el to tools/

[ELPA Syncer]

branch: elpa/sqlite3
commit a47384ef047f7989c5d731b52b4555a72d49aadc
Author: Y. N. Lo <gordonynlo@yahoo.com>
Commit: Y. N. Lo <gordonynlo@yahoo.com>

    moved sqlite3-api-constants.el to tools/
---
 Makefile                                           | 23 ++++++++++++++--------
 README-in.md                                       |  2 +-
 README.md                                          |  2 +-
 tools/run.sh                                       |  6 +++---
 .../sqlite3-api-constants.el                       |  0
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index da34195e1f..97d215231c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,14 @@ CC = gcc
 CFLAGS = -g3 -Wall -std=c99
 EMACS252=$(HOME)/test-emacs/bin/emacs
 EMACS251=$(HOME)/test-emacs-251/bin/emacs
-MODULE=sqlite3-api-module
+
+# Melpa package
+PKG=sqlite3-api
+
+# dynamic module package
+MODULE=$(PKG)-module
 MODULE_VERSION=0.0.1
+MODULE_PKG_VERSION=20170901
 MODULE_BASENAME=$(MODULE)-$(MODULE_VERSION)
 MODULE_PKG_EL=$(MODULE_BASENAME)/$(MODULE)-pkg.el
 MODULE_TAR=$(MODULE_BASENAME).tar
@@ -11,17 +17,18 @@ MODULE_TAR=$(MODULE_BASENAME).tar
 all: $(MODULE).so
 
 clean:
-       rm -f *.so *.o *.tar $(MODULE)-pkg.el MODULE
+       rm -rf *.so *.o *.tar MODULE $(MODULE_BASENAME)
 
+# create sqlite3-api-constants.el
 consts:
-       (cd tools; ./run.sh)
+       (cd tools; ./run.sh $(MODULE_VERSION) $(MODULE_PKG_VERSION))
 
 # File "MODULE" is read by (sqlite3-api-install-dynamic-module)
 # during installation
-module: $(MODULE).so
+module: clean $(MODULE).so
        mkdir $(MODULE_BASENAME)
-       echo "(define-package \"$(MODULE)\" \"$(MODULE_VERSION)\" \"SQLite3 API 
dynamic module\")" > $(MODULE_PKG_EL)
-       cp $(MODULE).so sqlite3-api-constants.el $(MODULE_BASENAME)
+       echo "(define-package \"$(MODULE)\" \"$(MODULE_VERSION)\" \"SQLite3 API 
dynamic module\" '((sqlite3-api \"0.0.1\")))" > $(MODULE_PKG_EL)
+       cp $(MODULE).so tools/$(PKG)-constants.el $(MODULE_BASENAME)
        tar cvf $(MODULE_TAR) $(MODULE_BASENAME)
        echo $(MODULE_TAR) > MODULE
 
@@ -33,8 +40,8 @@ module: $(MODULE).so
 
 # Emacs 25.2
 test: $(MODULE)
-       $(EMACS252) -batch -Q -l regression.el
+       $(EMACS252) -batch -Q -l test/regression.el
 
 # Emacs 25.1
 test251: $(MODULE)
-       $(EMACS251) -batch -Q -l regression.el
+       $(EMACS251) -batch -Q -l test/regression.el
diff --git a/README-in.md b/README-in.md
index 7720f8f2c7..95d86a7a0d 100644
--- a/README-in.md
+++ b/README-in.md
@@ -39,7 +39,7 @@ It's been tested on macOS (Sierra) and CentOS 7.
 $ git co https://github.com/pekingduck/emacs-sqlite3-api
 $ cd emacs-sqlite3-api
 $ make
-$ cp sqlite3-api.el sqlite3-api-constants.el sqlite3-api-module.so 
/your/elisp/load-path/
+$ cp sqlite3-api.el tools/sqlite3-api-constants.el sqlite3-api-module.so 
/your/elisp/load-path/
 ~~~
 A copy of `emacs-module.h` is included in this repo so Emacs source tree
 is not needed to build the module.
diff --git a/README.md b/README.md
index 35b3b17c9e..89b17c1663 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ It's been tested on macOS (Sierra) and CentOS 7.
 $ git co https://github.com/pekingduck/emacs-sqlite3-api
 $ cd emacs-sqlite3-api
 $ make
-$ cp sqlite3-api.el sqlite3-api-constants.el sqlite3-api-module.so 
/your/elisp/load-path/
+$ cp sqlite3-api.el tools/sqlite3-api-constants.el sqlite3-api-module.so 
/your/elisp/load-path/
 ~~~
 A copy of `emacs-module.h` is included in this repo so Emacs source tree
 is not needed to build the module.
diff --git a/tools/run.sh b/tools/run.sh
index b591893cff..d87694c284 100755
--- a/tools/run.sh
+++ b/tools/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEST=../sqlite3-api-constants.el
+DEST=sqlite3-api-constants.el
 cat <<EOF > $DEST
 ;;; sqlite3-api-constants.el --- Constants for SQLite3 API
 ;;; Commentary:
@@ -8,8 +8,8 @@ cat <<EOF > $DEST
 ;; The file is auto-generated. Do not edit.
 
 ;; Author: Peking Duck <github.com/pekingduck>
-;; Version: 0.0.1
-;; Package-Version: 20170901
+;; Version: $1
+;; Package-Version: $2
 ;; Package-Requires: ((emacs "25.1"))
 ;; Keywords: data, extensions
 ;; URL: https://github.com/pekingduck/emacs-sqlite3-api
diff --git a/sqlite3-api-constants.el b/tools/sqlite3-api-constants.el
similarity index 100%
rename from sqlite3-api-constants.el
rename to tools/sqlite3-api-constants.el