[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 348294a57f 002/166: Add swipl-devel submodule
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sweeprolog 348294a57f 002/166: Add swipl-devel submodule |
Date: |
Fri, 30 Sep 2022 04:59:21 -0400 (EDT) |
branch: elpa/sweeprolog
commit 348294a57faa4f272a25c3718d2ad59345891c19
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
Add swipl-devel submodule
---
.gitignore | 4 ++++
.gitmodules | 3 +++
Makefile | 27 ++++++++++++++++++++++++---
swipl | 1 +
4 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 42073c2d27..641c18cc36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
/.iprolog_history
/sweep-module.dylib
+/swipl-win.app/
+/bin/
+/lib/
+/share/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..dafcc46a54
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "swipl"]
+ path = swipl
+ url = https://github.com/SWI-Prolog/swipl-devel.git
diff --git a/Makefile b/Makefile
index 59a4c355ec..d11f967b60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+CURRENT_DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
+
BASENAME = sweep
SOEXT = dylib
@@ -5,6 +7,7 @@ TARGET = $(BASENAME)-module.$(SOEXT)
SOURCE = $(BASENAME).c
LDFLAGS += -shared
+LDFLAGS += -Llib
LDFLAGS += -lswipl
CFLAGS += -fPIC
@@ -12,13 +15,31 @@ CFLAGS += -fdiagnostics-absolute-paths
CFLAGS += -Wall
CFLAGS += -Wextra
CFLAGS += -O2
+CFLAGS += -Ilib/swipl/include
+
+CMAKE_OPTIONS += -DCMAKE_INSTALL_PREFIX=$(CURRENT_DIR)
+CMAKE_OPTIONS += -DUSE_GMP=OFF
+CMAKE_OPTIONS += -DSWIPL_PACKAGES_ODBC=OFF
+CMAKE_OPTIONS += -DSWIPL_PACKAGES_JAVA=OFF
+CMAKE_OPTIONS += -DSWIPL_PACKAGES_X=OFF
+CMAKE_OPTIONS += -DSWIPL_INSTALL_IN_LIB=ON
-.PHONY: clean all
+.PHONY: clean all swipl
all: $(TARGET)
-$(TARGET): $(SOURCE)
- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+$(TARGET): $(SOURCE) swipl
+ $(CC) $(CFLAGS) -o $@ $(SOURCE) $(LDFLAGS)
clean:
+ rm -rf bin lib share swipl/build
rm -f $(TARGET)
+
+swipl:
+ cd swipl; \
+ rm -rf build; \
+ mkdir build; \
+ cd build; \
+ cmake $(CMAKE_OPTIONS) -G Ninja ..; \
+ ninja; \
+ ninja install
diff --git a/swipl b/swipl
new file mode 160000
index 0000000000..5c7d1f8352
--- /dev/null
+++ b/swipl
@@ -0,0 +1 @@
+Subproject commit 5c7d1f8352b27d45cb8066eac5af95cf925a05b7
- [nongnu] elpa/sweeprolog ea43b81c95 058/166: DOC: update manual section about filespec expansion, (continued)
- [nongnu] elpa/sweeprolog ea43b81c95 058/166: DOC: update manual section about filespec expansion, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 3351766605 103/166: sweep.el: bump Package-Version to 0.2.0, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5b9e2d7d7c 126/166: ADDED: sweep_op_info/2: new_predicate, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5eb4ede8f8 113/166: ADDED: (sweep-prefix-operators): New function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 2abad939fe 108/166: DOC: Following file specifications: new section, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6dd6433920 165/166: ENHANCED: fontify quasi-quotation content according to its type, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 48e8fb7c65 155/166: ENHANCED: (sweep--colour-term-to-face): return multiple regions, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1c87ca72e3 163/166: DOC: document new variable highlighting in the manual, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a8d186092f 157/166: ENHANCED: More indicative error on failure to locate sweep-module, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 97856b5c85 159/166: DOC: add installation instructions from NonGNU ELPA, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 348294a57f 002/166: Add swipl-devel submodule,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog b2838d5477 004/166: Cleanup, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 4f96499382 011/166: DOC: expand README.org, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5c4aef50f2 041/166: Run `ninja install` as root in CI, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a6e37f306b 069/166: ENHANCED: fontify mutlifile predicate calls in a dedicated face, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 4299c39d62 070/166: ENHANCED: indentation edge cases handling, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1a19f7b3be 074/166: DOC: document font-lock and xref integration for sweep-mode, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1c6d2e96a8 078/166: ENHANCED: allow user to specify location of swipl binary, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 5a8f70149f 099/166: FIXED: (sweep-load-buffer): error after prompting for a buffer, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 7327016d15 095/166: FIXED: sweep_predicates_collection/2: include preds defined in user, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a70a730f48 087/166: PORT: don't use the 2nd arg to looking-at, added only in Emacs 29, ELPA Syncer, 2022/09/30