emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/sqlite3 1b7b1fc03f 10/62: fixed module installation bug


From: ELPA Syncer
Subject: [nongnu] elpa/sqlite3 1b7b1fc03f 10/62: fixed module installation bug
Date: Tue, 14 Mar 2023 11:01:44 -0400 (EDT)

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

    fixed module installation bug
---
 .gitignore                   |   5 +++--
 MODULE                       |   1 -
 Makefile                     |  13 +++++++++----
 sqlite3-api-module-0.0.1.tar | Bin 34816 -> 0 bytes
 sqlite3-api-module-pkg.el    |   1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b800ee7c50..86b005a01c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 *.so
 **/.DS_Store
 sqlite3-napi-module-with-create-function.c
-README-in.md
 xxx.el
 tools/def.c
-tools/def
\ No newline at end of file
+tools/def
+MODULE
+**/sqlite3-api-module-*
\ No newline at end of file
diff --git a/MODULE b/MODULE
deleted file mode 100644
index 8ad12853a9..0000000000
--- a/MODULE
+++ /dev/null
@@ -1 +0,0 @@
-sqlite3-api-module-0.0.1.tar
diff --git a/Makefile b/Makefile
index d82800ab5e..c77e01e206 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ EMACS252=$(HOME)/test-emacs/bin/emacs
 EMACS251=$(HOME)/test-emacs-251/bin/emacs
 MODULE=sqlite3-api-module
 MODULE_VERSION=0.0.1
+MODULE_BASENAME=$(MODULE)-$(MODULE_VERSION)
+MODULE_PKG_EL=$(MODULE_BASENAME)/$(MODULE)-pkg.el
+MODULE_TAR=$(MODULE_BASENAME).tar
 
 all: $(MODULE).so
 
@@ -15,10 +18,12 @@ consts:
 
 # File "MODULE" is read by (sqlite3-api-install-dynamic-module)
 # during installation
-package: $(MODULE).so
-       echo $(MODULE)-$(MODULE_VERSION).tar > MODULE
-       echo "(define-package \"$(MODULE)\" \"$(MODULE_VERSION)\" \"SQLite3 API 
dynamic module\")" > $(MODULE)-pkg.el
-       tar cvf $(MODULE)-$(MODULE_VERSION).tar $(MODULE)-pkg.el $(MODULE).so
+module: $(MODULE).so
+       mkdir $(MODULE_BASENAME)
+       echo "(define-package \"$(MODULE)\" \"$(MODULE_VERSION)\" \"SQLite3 API 
dynamic module\")" > $(MODULE_PKG_EL)
+       cp $(MODULE).so $(MODULE_BASENAME)
+       tar cvf $(MODULE_TAR) $(MODULE_BASENAME)
+       echo $(MODULE_TAR) > MODULE
 
 %.so: %.o
        $(CC) -shared -o $@ $< -lsqlite3
diff --git a/sqlite3-api-module-0.0.1.tar b/sqlite3-api-module-0.0.1.tar
deleted file mode 100644
index ebb362b250..0000000000
Binary files a/sqlite3-api-module-0.0.1.tar and /dev/null differ
diff --git a/sqlite3-api-module-pkg.el b/sqlite3-api-module-pkg.el
deleted file mode 100644
index a4a8cb4e5c..0000000000
--- a/sqlite3-api-module-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "sqlite3-api-module" "0.0.1" "SQLite3 API dynamic module")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]