commit 6eb8e42ad9706ea3a476ab9be6f5fe8437788945
Author: @RandyMcMillan <[email protected]>
Date: Tue Jan 9 00:06:05 2024 -0500
gnostr.mk
diff --git a/gnostr.mk b/gnostr.mk
index 8e60b0730..6ca10ebb0 100644
--- a/gnostr.mk
+++ b/gnostr.mk
@@ -37,10 +37,32 @@ GTAR :=$(shell which tar)
endif
export GTAR
+DOCS=\
+gnostr-act\
+gnostr-blockheight\
+gnostr-cli\
+gnostr-client\
+gnostr-get-relays-c\
+gnostr-get-relays\
+gnostr-git-log\
+gnostr-git-reflog\
+gnostr-gnode\
+gnostr-keyconv\
+gnostr-post\
+gnostr-query\
+gnostr-relays\
+gnostr-req\
+gnostr-send\
+gnostr-set-relays\
+gnostr-sha256\
+gnostr-tui\
+gnostr-weeble\
+gnostr-wobble\
+gnostr\
##all:
#all: submodules gnostr gnostr-git gnostr-get-relays gnostr-docs## make gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs
-all: submodules gnostr gnostr-git gnostr-get-relays gnostr-docs## make gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs
+all: submodules gnostr gnostr-git gnostr-get-relays ##gnostr-docs## make gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs
## build gnostr tool and related dependencies
##gnostr-docs:
@@ -57,8 +79,40 @@ gnostr-docs:docker-start doc/gnostr.1## docs: convert README to doc/gnostr.1
git add --ignore-errors sources/*.md 2>/dev/null || echo && git add --ignore-errors *.md 2>/dev/null || echo
#@git ls-files -co --exclude-standard | grep '\.md/$\' | xargs git
-doc/gnostr.1: README##
- scdoc < $^ > $@
+doc-gnostr-act:
+ help2man gnostr-act | sed 's/act /gnostr\-act /g' | sed 's/ACT /GNOSTR\-ACT /g' > doc/gnostr-act.1 #&& man doc/gnostr-act.1
+doc-gnostr-cat:
+ help2man gnostr-cat > doc/gnostr-cat.1 #&& man doc/gnostr-cat.1
+doc-gnostr-git:
+ help2man gnostr-git | sed 's/ git / gnostr\-git /g' | sed 's/ GIT / GNOSTR\-GIT /g' > doc/gnostr-git.1 #&& man doc/gnostr-git.1
+.PHONY:doc
+doc:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install##
+##help2man < $^ > $@
+ @(\
+ for b in $(DOCS);\
+ do touch doc/$$b.1;\
+ done;\
+ exit;\
+ )
+ (\
+ for b in $(DOCS);\
+ do echo doc/$$b.1 > /tmp/make-doc.log;\
+ done;\
+ exit;\
+ )
+ (\
+ for b in $(DOCS);\
+ do help2man $$b > doc/$$b.1;\
+ echo $$b;\
+ done;\
+ exit;\
+ )
+ #for b in $(DOCS); do echo $b; done; exit
+ #for b in $(DOCS); do touch doc/$(DOCS); done;exit
+ #for n in $(DOCS); do touch doc/$n.1; done
+ #bash -c "for n in $(ls gnostr-* ); do touch doc/$n.1; done"
+ #for n in $(DOCS); do [ -x $n ] && help2man $n > doc/$n.1 || true; done
+ #bash -c "for n in $(ls gnostr-* ); do [ -x $n ] && help2man $n > doc/$n.1 || true; done"
.PHONY: version
version: gnostr.c## print version
@@ -177,10 +231,10 @@ gnostr-git:deps/gnostr-git/gnostr-git## gnostr-git
gnostr-get-relays:
- $(CC) ./template/gnostr-get-relays.c -o gnostr-get-relays
+ $(CC) ./src/gnostr-get-relays.c -o gnostr-get-relays
gnostr-set-relays:
- $(CC) ./template/gnostr-set-relays.c -o gnostr-set-relays
+ $(CC) ./src/gnostr-set-relays.c -o gnostr-set-relays
gnostr-cargo-binstall:
@@ -220,28 +274,33 @@ gnostr-command:deps/gnostr-command/target/release/gnostr-command## gnostr-comma
.PHONY:bins
bins:
@cd bins && make cargo-b-release && make cargo-i
+bins-test-post-event:
+ cat test/first-gnostr-commit.json | gnostr-post-event wss://relay.damus.io
+bins-test-fetch-by-id:
+ gnostr-fetch-by-id wss://relay.damus.io fbf73a17a4e0fe390aba1808a8d55f1b50717d5dd765b2904bf39eba18c51f7c | jq || true
+ #gnostr-fetch-by-id wss://relay.damus.io fbf73a17a4e0fe390aba1808a8d55f1b50717d5dd765b2904bf39eba18c51f7c | jq .content || true
+
+.PHONY:tui
+tui:
+ @cd tui && make build-release install
deps/gnostr-legit/.git:gnostr-git
@devtools/refresh-submodules.sh deps/gnostr-legit
-#.PHONY:deps/gnostr-legit/gnostr-legit
-deps/gnostr-legit/gnostr-legit:deps/gnostr-legit/.git
+#.PHONY:deps/gnostr-legit/release/gnostr-legit
+deps/gnostr-legit/target/release/gnostr-legit:deps/gnostr-legit/.git
cd deps/gnostr-legit && \
- make cargo-build-release install
-deps/gnostr-legit/target/release/gnostr-legit:deps/gnostr-legit/gnostr-legit## gnostr-legit
+ make cargo-b-release install
gnostr-legit:deps/gnostr-legit/target/release/gnostr-legit## gnostr-legit
cp $< $@ && exit;
install -v template/gnostr-* /usr/local/bin >/tmp/gnostr-legit.log
-
-
deps/gnostr-sha256/.git:
@devtools/refresh-submodules.sh deps/gnostr-sha256
#.PHONY:deps/gnostr-sha256/gnostr-sha256
deps/gnostr-sha256/gnostr-sha256:deps/gnostr-sha256/.git
cd deps/gnostr-sha256 && \
- make cargo-install
+ make cargo-b-release install
deps/gnostr-sha256/target/release/gnostr-sha256:deps/gnostr-sha256/gnostr-sha256## gnostr-sha256
-.PHONY:
gnostr-sha256:deps/gnostr-sha256/target/release/gnostr-sha256
@@ -490,6 +549,8 @@ gnostr-all:
$(MAKE) -j libsecp256k1.a
type -P gnostr || $(MAKE) -j gnostr
$(MAKE) -j gnostr-install
+ type -P gnostr-post-event || $(MAKE) -j bins
+ type -P gnostr-tui || $(MAKE) -j tui
type -P gnostr-cat || $(MAKE) -j gnostr-cat
type -P gnostr-cli || $(MAKE) -j gnostr-cli
type -P gnostr-grep || $(MAKE) -j gnostr-grep
npub1qsd…rr3m
2024-07-03 00:54:14
Author Public Key
npub1qsdleyqflt606ph0ghz0zn2u96k9xfxqv29mp0nznhvs3fn7kyhs5jrr3mPublished at
2024-07-03 00:54:14Event JSON
{
"id": "00064a355b5503dd872c3e301d6da48f4e9496a399514eeb361881308ffb1124",
"pubkey": "041bfc9009faf4fd06ef45c4f14d5c2eac5324c0628bb0be629dd908a67eb12f",
"created_at": 1719960854,
"kind": 1,
"tags": [
[
"t",
"gnostr"
],
[
"repo",
"gnostr"
],
[
"branch",
"2022/850435/375200/eaeea1dc4/6b12a7e64-gnostr-syndicate"
],
[
"origin",
"[email protected]:gnostr-org/gnostr.git"
],
[
"weeble",
"2022"
],
[
"weeble",
"2022"
],
[
"block",
"850442"
],
[
"wobble",
"366802"
],
[
"t",
"0000000000000000000000006eb8e42ad9706ea3a476ab9be6f5fe8437788945"
],
[
"commit",
"6eb8e42ad9706ea3a476ab9be6f5fe8437788945"
],
[
"parent",
"a611f9fa08acce6aa27e940ef9dcc2ff9eee8af4"
],
[
"p",
"3f6fe543c6796adacd37fd41bae9ba5cb4aac369200f29030cfa6cf12000f823"
],
[
"nonce",
"732",
"12"
]
],
"content": "commit 6eb8e42ad9706ea3a476ab9be6f5fe8437788945\nAuthor: @RandyMcMillan \[email protected]\u003e\nDate: Tue Jan 9 00:06:05 2024 -0500\n\n gnostr.mk\n\ndiff --git a/gnostr.mk b/gnostr.mk\nindex 8e60b0730..6ca10ebb0 100644\n--- a/gnostr.mk\n+++ b/gnostr.mk\n@@ -37,10 +37,32 @@ GTAR :=$(shell which tar)\n endif\n export GTAR\n \n+DOCS=\\\n+gnostr-act\\\n+gnostr-blockheight\\\n+gnostr-cli\\\n+gnostr-client\\\n+gnostr-get-relays-c\\\n+gnostr-get-relays\\\n+gnostr-git-log\\\n+gnostr-git-reflog\\\n+gnostr-gnode\\\n+gnostr-keyconv\\\n+gnostr-post\\\n+gnostr-query\\\n+gnostr-relays\\\n+gnostr-req\\\n+gnostr-send\\\n+gnostr-set-relays\\\n+gnostr-sha256\\\n+gnostr-tui\\\n+gnostr-weeble\\\n+gnostr-wobble\\\n+gnostr\\\n \n ##all:\n #all: submodules gnostr gnostr-git gnostr-get-relays gnostr-docs## \tmake gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs\n-all: submodules gnostr gnostr-git gnostr-get-relays gnostr-docs## \tmake gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs\n+all: submodules gnostr gnostr-git gnostr-get-relays ##gnostr-docs## \tmake gnostr gnostr-cat gnostr-git gnostr-relay gnostr-xor docs\n ##\tbuild gnostr tool and related dependencies\n \n ##gnostr-docs:\n@@ -57,8 +79,40 @@ gnostr-docs:docker-start doc/gnostr.1## \tdocs: convert README to doc/gnostr.1\n \tgit add --ignore-errors sources/*.md 2\u003e/dev/null || echo \u0026\u0026 git add --ignore-errors *.md 2\u003e/dev/null || echo\n #@git ls-files -co --exclude-standard | grep '\\.md/$\\' | xargs git\n \n-doc/gnostr.1: README##\n-\tscdoc \u003c $^ \u003e $@\n+doc-gnostr-act:\n+\thelp2man gnostr-act | sed 's/act /gnostr\\-act /g' | sed 's/ACT /GNOSTR\\-ACT /g' \u003e doc/gnostr-act.1 #\u0026\u0026 man doc/gnostr-act.1\n+doc-gnostr-cat:\n+\thelp2man gnostr-cat \u003e doc/gnostr-cat.1 #\u0026\u0026 man doc/gnostr-cat.1\n+doc-gnostr-git:\n+\thelp2man gnostr-git | sed 's/ git / gnostr\\-git /g' | sed 's/ GIT / GNOSTR\\-GIT /g' \u003e doc/gnostr-git.1 #\u0026\u0026 man doc/gnostr-git.1\n+.PHONY:doc\n+doc:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install##\n+##help2man \u003c $^ \u003e $@\n+\t@(\\\n+\tfor b in $(DOCS);\\\n+ do touch doc/$$b.1;\\\n+ done;\\\n+ exit;\\\n+\t)\n+\t(\\\n+\tfor b in $(DOCS);\\\n+ do echo doc/$$b.1 \u003e /tmp/make-doc.log;\\\n+ done;\\\n+ exit;\\\n+\t)\n+\t(\\\n+\tfor b in $(DOCS);\\\n+ do help2man $$b \u003e doc/$$b.1;\\\n+ echo $$b;\\\n+ done;\\\n+ exit;\\\n+\t)\n+\t#for b in $(DOCS); do echo $b; done; exit\n+\t#for b in $(DOCS); do touch doc/$(DOCS); done;exit\n+\t#for n in $(DOCS); do touch doc/$n.1; done\n+\t#bash -c \"for n in $(ls gnostr-* ); do touch doc/$n.1; done\"\n+\t#for n in $(DOCS); do [ -x $n ] \u0026\u0026 help2man $n \u003e doc/$n.1 || true; done\n+\t#bash -c \"for n in $(ls gnostr-* ); do [ -x $n ] \u0026\u0026 help2man $n \u003e doc/$n.1 || true; done\"\n \n .PHONY: version\n version: gnostr.c## \tprint version\n@@ -177,10 +231,10 @@ gnostr-git:deps/gnostr-git/gnostr-git## \tgnostr-git\n \n \n gnostr-get-relays:\n-\t$(CC) ./template/gnostr-get-relays.c -o gnostr-get-relays\n+\t$(CC) ./src/gnostr-get-relays.c -o gnostr-get-relays\n \n gnostr-set-relays:\n-\t$(CC) ./template/gnostr-set-relays.c -o gnostr-set-relays\n+\t$(CC) ./src/gnostr-set-relays.c -o gnostr-set-relays\n \n \n gnostr-cargo-binstall:\n@@ -220,28 +274,33 @@ gnostr-command:deps/gnostr-command/target/release/gnostr-command## \tgnostr-comma\n .PHONY:bins\n bins:\n \t@cd bins \u0026\u0026 make cargo-b-release \u0026\u0026 make cargo-i\n+bins-test-post-event:\n+\tcat test/first-gnostr-commit.json | gnostr-post-event wss://relay.damus.io\n+bins-test-fetch-by-id:\n+\t\tgnostr-fetch-by-id wss://relay.damus.io fbf73a17a4e0fe390aba1808a8d55f1b50717d5dd765b2904bf39eba18c51f7c | jq || true\n+\t\t#gnostr-fetch-by-id wss://relay.damus.io fbf73a17a4e0fe390aba1808a8d55f1b50717d5dd765b2904bf39eba18c51f7c | jq .content || true\n+\n+.PHONY:tui\n+tui:\n+\t@cd tui \u0026\u0026 make build-release install\n \n deps/gnostr-legit/.git:gnostr-git\n \t@devtools/refresh-submodules.sh deps/gnostr-legit\n-#.PHONY:deps/gnostr-legit/gnostr-legit\n-deps/gnostr-legit/gnostr-legit:deps/gnostr-legit/.git\n+#.PHONY:deps/gnostr-legit/release/gnostr-legit\n+deps/gnostr-legit/target/release/gnostr-legit:deps/gnostr-legit/.git\n \tcd deps/gnostr-legit \u0026\u0026 \\\n-\t\tmake cargo-build-release install\n-deps/gnostr-legit/target/release/gnostr-legit:deps/gnostr-legit/gnostr-legit## \tgnostr-legit\n+\t\tmake cargo-b-release install\n gnostr-legit:deps/gnostr-legit/target/release/gnostr-legit## \tgnostr-legit\n \tcp $\u003c $@ \u0026\u0026 exit;\n \tinstall -v template/gnostr-* /usr/local/bin \u003e/tmp/gnostr-legit.log\n \n-\n-\n deps/gnostr-sha256/.git:\n \t@devtools/refresh-submodules.sh deps/gnostr-sha256\n #.PHONY:deps/gnostr-sha256/gnostr-sha256\n deps/gnostr-sha256/gnostr-sha256:deps/gnostr-sha256/.git\n \tcd deps/gnostr-sha256 \u0026\u0026 \\\n-\t\tmake cargo-install\n+\t\tmake cargo-b-release install\n deps/gnostr-sha256/target/release/gnostr-sha256:deps/gnostr-sha256/gnostr-sha256## \tgnostr-sha256\n-.PHONY:\n gnostr-sha256:deps/gnostr-sha256/target/release/gnostr-sha256\n \n \n@@ -490,6 +549,8 @@ gnostr-all:\n \t$(MAKE) -j libsecp256k1.a\n \ttype -P gnostr || $(MAKE) -j gnostr\n \t$(MAKE) -j gnostr-install\n+\ttype -P gnostr-post-event || $(MAKE) -j bins\n+\ttype -P gnostr-tui || $(MAKE) -j tui\n \ttype -P gnostr-cat || $(MAKE) -j gnostr-cat\n \ttype -P gnostr-cli || $(MAKE) -j gnostr-cli\n \ttype -P gnostr-grep || $(MAKE) -j gnostr-grep",
"sig": "0425fc57368dccda61c525ae49f35c0308f4e306c45198e51b894c529cc68a33f7a74e1e4a5be51d0e3259403b59b5411c1489be56f9172ff5821a0d69d56f9a"
}