commit 98c3291ebe107245cd5d3b1cf8f044c72a5a3527
Author: randymcmillan <[email protected]>
Date: Wed May 8 21:09:16 2024 -0400
gnostr.mk:GNUmakefile:intermediate
diff --git a/GNUmakefile b/GNUmakefile
old mode 100644
new mode 100755
index 3e63df2c9..250e955b2
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,14 +1,9 @@
-
ifeq ($(project),)
PROJECT_NAME := $(notdir $(PWD))
else
PROJECT_NAME := $(project)
endif
export PROJECT_NAME
-VERSION :=$(shell cat version)
-export VERSION
-TIME :=$(shell date +%s)
-export TIME
OS :=$(shell uname -s)
export OS
@@ -29,57 +24,25 @@ TRIPLET :=aarch64-linux-gnu
export TRIPLET
endif
-HOMEBREW :=$(shell which brew || false)
-
-RUSTUP_INIT_SKIP_PATH_CHECK=yes
-TOOLCHAIN=stable
-Z= ##
-ifneq ($(toolchain),)
-
-ifeq ($(toolchain),nightly)
-TOOLCHAIN=nightly
-Z=-Z unstable-options
-endif
-
-ifeq ($(toolchain),stable)
-TOOLCHAIN=stable
-Z= ##
-endif
-
-endif
-
-export RUSTUP_INIT_SKIP_PATH_CHECK
-export TOOLCHAIN
-export Z
-
-SUBMODULES=:$(shell cat .gitmodules | grep path | cut -d ' ' -f 3)
-export SUBMODULES
-
-ifeq ($(verbose),true)
-VERBOSE :=-v
-else
-VERBOSE :=$(verbose)
-endif
-export VERBOSE
+CLANG=$(shell which clang)
ifeq ($(reuse),true)
REUSE :=-r
else
-REUSE :=$(reuse)
+REUSE :=
endif
export REUSE
-
ifeq ($(bind),true)
BIND :=-b
else
-BIND :=$(bind)
+BIND :=
endif
export BIND
ifeq ($(token),)
-GITHUB_TOKEN =$(shell touch ~/GITHUB_TOKEN.txt && cat ~/GITHUB_TOKEN.txt || echo "0")
+GITHUB_TOKEN :=$(shell cat ~/GITHUB_TOKEN.txt || echo "0")
else
-GITHUB_TOKEN :=$(shell echo $(token))
+GITHUB_TOKEN :=$(shell echo $(token))
endif
export GITHUB_TOKEN
@@ -166,253 +129,19 @@ export GIT_REPO_NAME
GIT_REPO_PATH := $(HOME)/$(GIT_REPO_NAME)
export GIT_REPO_PATH
-
-
.PHONY:- help
-:
- @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?##/ {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
- @echo
-more:## more help
- @sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' | sed -e 's/^/ /'
- #$(MAKE) -f Makefile help
-
--include Makefile
-
-##initialize
-## git submodule update --init --recursive
-initialize:## ensure submodules exist
- git submodule update --init --recursive
-
-.ONESHELL:
-docker-start:venv
-##docker-start
-## start docker on Linux or Darwin
- @echo CI=$(CI)
- @touch requirements.txt && $(PYTHON3) -m pip install -q -r requirements.txt
- @touch requirements.txt && $(PYTHON3) -m pip install -U virtualenv
- @test -d .venv || $(PYTHON3) -m virtualenv .venv
- @( \
- . .venv/bin/activate; pip install -q -r requirements.txt; \
- python3 -m pip install -q pipenv \
- pip install -q --upgrade pip; \
- );
- @( \
- while ! docker system info > /dev/null 2>&1; do\
- echo 'Waiting for docker to start...';\
- if [[ '$(OS)' == 'Linux' ]]; then\
- type -P systemctl && systemctl restart docker.service || type -P service && service restart docker;\
- fi;\
- if [[ '$(OS)' == 'Darwin' ]]; then\
- echo $(CI);\
- if [[ '$(CI)' != 'True' ]]; then\
- type -P docker && open --background -a /./Applications/Docker.app/Contents/MacOS/Docker || brew install --cask docker;\
- fi;\
- fi;\
- sleep 1;\
- done\
- )
-
-detect:## install sequence got Darwin and Linux
-##detect
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && type -P brew >/tmp/gnostr.log && \
- export LIBRARY_PATH='$(LIBRARY_PATH):$(brew --prefix)/lib' || echo"
-## detect uname -s uname -m uname -p and install sequence
-
-## Darwin
-ifneq ($(shell id -u),0)
- @echo
- @echo $(shell id -u -n) 'not root'
- @echo
-endif
- #bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew update || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install automake || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install autoconf || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install automake || echo "
-## bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install boost || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install cmake --cask || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install coreutils || echo "
- #bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install --cask docker || echo "
- #bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install gcc || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install expat || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install gettext || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install git-archive-all || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install git-gui || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install glib-openssl || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install golang || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install help2man || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install libtool || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install mercurial || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install node@14 || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install pandoc || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install pkg-config || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install protobuf || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install pipx || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install python3 || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install rustup || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install secp256k1 || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install tcl-tk || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install virtualenv || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew link --overwrite virtualenv || echo "
- bash -c "[ '$(shell uname -s)' == 'Darwin' ] && brew install zlib || echo "
- #bash -c "[ '$(shell uname -s)' == 'Darwin' ] && /Applications/Docker.app/Contents/Resources/bin/docker system info || echo "
-
+ @awk 'BEGIN {FS = ":.*?###"} /^[a-zA-Z_-]+:.*?###/ {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+help-verbose:### more verbose help
+ @awk 'BEGIN {FS = ":.*?##"} /^[a-zA-Z_-]+:.*?##/ {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-
-
-
-
-
-## Linux
-ifneq ($(shell id -u),0)
- @echo
- @echo $(shell id -u -n) 'not root'
- @echo
-endif
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- type -P brew >/tmp/gnostr.log && \
- export LIBRARY_PATH='$(LIBRARY_PATH):$(brew --prefix)/lib' || echo"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get update 2>/dev/null || \
- apk add update || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install autoconf 2>/dev/null || \
- apk add autoconf || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install bison 2>/dev/null || \
- apk add bison || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install bsdmainutils 2>/dev/null || \
- apk add util-linux || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install build-essential 2>/dev/null || \
- apk add alpine-sdk || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install cargo 2>/dev/null || \
- apk add cargo || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install clang 2>/dev/null || \
- apk add clang || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install cmake-curses-gui 2>/dev/null || \
- apk add extra-cmake-modules || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install cmake 2>/dev/null || \
- apk add cmake || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install expat 2>/dev/null || \
- apk add expat || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install gettext 2>/dev/null || \
- apk add gettext || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install golang-go 2>/dev/null || \
- apk add go || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install help2man 2>/dev/null || \
- apk add help2man || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install libcurl4-openssl-dev 2>/dev/null || \
- apk add curl-dev || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install libssl-dev 2>/dev/null || \
- apk add openssl-dev || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install libtool 2>/dev/null || \
- apk add libtool || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install mercurial 2>/dev/null || \
- apk add mercurial || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install npm 2>/dev/null || \
- apk add npm || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install pandoc 2>/dev/null || \
- echo"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install pipx 2>/dev/null || \
- echo"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install pkg-config 2>/dev/null || \
- apk add pkgconfig || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install protobuf-compiler 2>/dev/null || \
- apk add protobuf || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install python3 2>/dev/null || \
- apk add python3 || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install python3-pip 2>/dev/null || \
- apk add py3-pip || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install python-is-python3 2>/dev/null || \
- echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install tcl-dev 2>/dev/null || \
- echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install util-linux 2>/dev/null || \
- apk add util-linux || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install tcl-dev 2>/dev/null || \
- apk add tcl-dev || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install virtualenv 2>/dev/null || \
- apk add py3-virtualenv || true"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && \
- $(SUDO) apt-get install zlib1g-dev 2>/dev/null || \
- echo "
-
-## install gvm sequence
- @rm -rf $(HOME)/.gvm || echo "not removing ~/.gvm"
- @bash -c "bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) || echo 'not installing gvm...'"
- bash -c "[ '$(shell uname -m)' == 'x86_64' ] && echo 'is x86_64' || echo 'not x86_64';"
- bash -c "[ '$(shell uname -m)' == 'arm64' ] && [ '$(shell uname -s)' == 'Darwin' ] && type -P brew && brew install pandoc || echo 'not arm64 AND Darwin';"
- bash -c "[ '$(shell uname -m)' == 'i386' ] && echo 'is i386' || echo 'not i386';"
-
-## install rustup sequence
- $(shell echo which rustup) || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --no-modify-path --default-toolchain stable --profile default #& . "$(HOME)/.cargo/env"
-
-## install nvm sequence
- @bash -c "curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash && export NVM_DIR='$(HOME)/.nvm'; [ -s '$(NVM_DIR)/nvm.sh' ] && \. '$(NVM_DIR)/nvm.sh'; [ -s '$(NVM_DIR)/bash_completion' ] && \. '$(NVM_DIR)/bash_completion' &"
-
- bash -c "which autoconf || echo "
- bash -c "which automake || echo "
- bash -c "which brew || echo "
- bash -c "which cargo || echo "
- bash -c "which cmake || echo "
- bash -c "which go || echo "
- bash -c "which node || echo "
- bash -c "which rustup || echo "
-
-.PHONY: report
-report:## print make variables
-## print make variables
+report:### report
@echo ''
- @echo 'TIME=${TIME}'
@echo 'PROJECT_NAME=${PROJECT_NAME}'
- @echo 'VERSION=${VERSION}'
- @echo ''
- @echo 'OS=${OS}'
- @echo 'OS_VERSION=${OS_VERSION}'
- @echo 'ARCH=${ARCH}'
@echo ''
- @echo 'SUBMODULES=${SUBMODULES}'
- @echo ''
- @echo 'PYTHON=${PYTHON}'
- @echo 'PYTHON2=${PYTHON2}'
- @echo 'PYTHON3=${PYTHON3}'
- @echo ''
- @echo 'PIP=${PIP}'
- @echo 'PIP2=${PIP2}'
- @echo 'PIP3=${PIP3}'
- @echo ''
- @echo 'PYTHON_VENV=${PYTHON_VENV}'
- @echo 'PYTHON3_VENV=${PYTHON3_VENV}'
+ @echo 'CLANG=${CLANG}'
@echo ''
@echo 'GIT_USER_NAME=${GIT_USER_NAME}'
- @echo 'GH_USER_REPO=${GH_USER_REPO}'
- @echo 'GH_USER_SPECIAL_REPO=${GH_USER_SPECIAL_REPO}'
- @echo 'KB_USER_REPO=${KB_USER_REPO}'
@echo 'GIT_USER_EMAIL=${GIT_USER_EMAIL}'
@echo 'GIT_SERVER=${GIT_SERVER}'
@echo 'GIT_PROFILE=${GIT_PROFILE}'
@@ -422,47 +151,29 @@ report:## print make variables
@echo 'GIT_REPO_ORIGIN=${GIT_REPO_ORIGIN}'
@echo 'GIT_REPO_NAME=${GIT_REPO_NAME}'
@echo 'GIT_REPO_PATH=${GIT_REPO_PATH}'
- @echo ''
- @echo 'VERBOSE=${VERBOSE}'
- @echo 'REUSE=${REUSE}'
- @echo 'BIND=${BIND}'
-
-checkbrew:## install brew command
-## install brew command
-ifeq ($(HOMEBREW),)
- @/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-else
- @type -P brew && brew install wxWidgets [email protected] gettext
- $(MAKE) detect
-## brew install wxWidgets [email protected] gettext
-## make detect
-endif
-
-tag:## git tag & git push
-tags:tag
-##tag
-## git tag $(OS)-$(OS_VERSION)-$(ARCH)-$(shell date +%s)
- @git tag $(OS)-$(OS_VERSION)-$(ARCH)-$(shell date +%s)
- @git push -f --tags || echo "unable to push tags..."
-
-.PHONY: nvm
-.ONESHELL:
-nvm: ## nvm
- @echo "$(NODE_VERSION)" > .nvmrc
- @curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash || git pull -C $(HOME)/.nvm && export NVM_DIR="$(HOME)/.nvm" && [ -s "$(NVM_DIR)/nvm.sh" ] && \. "$(NVM_DIR)/nvm.sh" && [ -s "$(NVM_DIR)/bash_completion" ] && \. "$(NVM_DIR)/bash_completion" && nvm install $(NODE_VERSION) && nvm use $(NODE_VERSION)
- @source ~/.bashrc && nvm alias $(NODE_ALIAS) $(NODE_VERSION) &
-nvm-clean: ## nvm-clean
- @rm -rf ~/.nvm
-
--include gnostr.mk
--include gnostr-act.mk
--include gnostr-bot.mk
--include docker.mk
--include venv.mk
--include clean.mk
--include cargo.mk
--include tests.mk
-
-# vim: set noexpandtab:
-# vim: set setfiletype make
+extra:## additional
+##extra
+ @echo "example: add additional make commands"
+submodules:### recursively initialize git submodules
+##submodules
+ git submodule update --init --recursive || echo "install git..."
+
+cmake:submodules## cmake .
+##cmake
+ cmake -S . -B build && cd build && make all
+.PHONY:ext/openssl
+ext/openssl:
+##ext/openssl
+ cd $(PWD)/[email protected] && \
+ ./Configure \
+ --prefix=/usr/local/ssl \
+ --openssldir=/usr/local/ssl \
+ '-Wl,-rpath,$(LIBRPATH)' && $(MAKE) all
+.PHONY:openssl
+openssl:ext/openssl cmake## openssl
+##openssl
+
+## include Makefile if exists
+-include Makefile
+-include act.mk
diff --git a/gnostr.mk b/gnostr.mk
index 01e778969..cbd5abc60 100644
--- a/gnostr.mk
+++ b/gnostr.mk
@@ -1,7 +1,7 @@
CFLAGS = -Wall -O2 -Isecp256k1/include
CFLAGS += -I/include
LDFLAGS = -Wl
-GNOSTR_OBJS = gnostr.o sha256.o aes.o base64.o libsecp256k1.a
+GNOSTR_OBJS = gnostr.o sha256.o aes.o base64.o
#GNOSTR_GIT_OBJS = gnostr-git.o sha256.o aes.o base64.o libgit.a
#GNOSTR_RELAY_OBJS = gnostr-relay.o sha256.o aes.o base64.o
#GNOSTR_XOR_OBJS = gnostr-xor.o sha256.o aes.o base64.o libsecp256k1.a
@@ -100,7 +100,7 @@ doc-gnostr-git:gnostr-git
##We stream edit certain tools man pages
## make goals are processed from left to right
## doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install##
-doc:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install## doc - generate man pages
+docs:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install## doc - generate man pages
##help2man < $^ > $@
##[[ -x "$(shell which gnostr-act)" ]] || $(MAKE) doc-gnostr-act
@(\
@@ -298,6 +298,14 @@ gnostr-build-install:gnostr-build## gnostr-build-install
gnostr-bins:bins
bins:#bins/.git
cargo install --path bins --force
+.PHONY:lookup gnostr-lookup
+#lookup/.git:
+# @devtools/refresh-submodules.sh lookup
+gnostr-lookup:lookup
+lookup:#bins/.git
+ cargo install --path lookup --force
+
+.PHONY:xq gnostr-xq
.PHONY:xq gnostr-xq
xq/.git:
@@ -444,6 +452,19 @@ cli:cli/.git
make cargo-build-release cargo-i
.PHONY:gnostr-cli cli
+.PHONY:gnostrd/target/release/gnostrd
+gnostrd/target/release/gnostrd:
+ cd gnostrd && \
+ cargo b -r --bin gnostrd && \
+ cargo install --bin gnostrd --path . --force
+.PHONY:gnostrd/target/release/gnostr-chat
+gnostrd/target/release/gnostr-chat:
+ cd gnostrd && \
+ cargo b -r --bin gnostr-chat && \
+ cargo install --bin gnostr-chat --path . --force
+gnostr-chat:chat gnostrd
+chat:gnostrd/target/release/gnostr-chat
+
.PHONY:grep/.git gnostr-grep grep
grep/.git:
@devtools/refresh-submodules.sh grep
@@ -495,7 +516,6 @@ src/libcjson/bin/libcjson.a:src/libcjson
libcjson:src/libcjson/bin/libcjson.a
cp $^ .
-## gnostr-am
gnostr-am:$(HEADERS) $(GNOSTR_OBJS) $(ARS)## make gnostr binary
$(MAKE) secp256k1
$(CC) $(CFLAGS) $(GNOSTR_OBJS) $(ARS) -o $@ && $(MAKE) gnostr-install
npub1vvl…ua4l
2024-07-03 00:50:20
Author Public Key
npub1vvlg2snct3z9s4zguf3w3x0yt8hclrhlfd3t6j82qcz8xp2kqjsqegua4lPublished at
2024-07-03 00:50:20Event JSON
{
"id": "0009d9b27dc083bd83bbada89db4725db0ec9e79352352574d2154c3fe01a7c2",
"pubkey": "633e8542785c44585448e262e899e459ef8f8eff4b62bd48ea060473055604a0",
"created_at": 1719960620,
"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",
"00000000000000000000000098c3291ebe107245cd5d3b1cf8f044c72a5a3527"
],
[
"commit",
"98c3291ebe107245cd5d3b1cf8f044c72a5a3527"
],
[
"parent",
"d933684d78975b06901590755c55ff1ee6c04246"
],
[
"p",
"e6b7055068e5be011a2e9982e59471f32afd55bbf2fc9072a26c59c86d3e56a2"
],
[
"nonce",
"5824",
"12"
]
],
"content": "commit 98c3291ebe107245cd5d3b1cf8f044c72a5a3527\nAuthor: randymcmillan \[email protected]\u003e\nDate: Wed May 8 21:09:16 2024 -0400\n\n gnostr.mk:GNUmakefile:intermediate\n\ndiff --git a/GNUmakefile b/GNUmakefile\nold mode 100644\nnew mode 100755\nindex 3e63df2c9..250e955b2\n--- a/GNUmakefile\n+++ b/GNUmakefile\n@@ -1,14 +1,9 @@\n-\n ifeq ($(project),)\n PROJECT_NAME := $(notdir $(PWD))\n else\n PROJECT_NAME := $(project)\n endif\n export PROJECT_NAME\n-VERSION :=$(shell cat version)\n-export VERSION\n-TIME :=$(shell date +%s)\n-export TIME\n \n OS :=$(shell uname -s)\n export OS\n@@ -29,57 +24,25 @@ TRIPLET :=aarch64-linux-gnu\n export TRIPLET\n endif\n \n-HOMEBREW :=$(shell which brew || false)\n-\n-RUSTUP_INIT_SKIP_PATH_CHECK=yes\n-TOOLCHAIN=stable\n-Z=\t##\n-ifneq ($(toolchain),)\n-\n-ifeq ($(toolchain),nightly)\n-TOOLCHAIN=nightly\n-Z=-Z unstable-options\n-endif\n-\n-ifeq ($(toolchain),stable)\n-TOOLCHAIN=stable\n-Z=\t##\n-endif\n-\n-endif\n-\n-export RUSTUP_INIT_SKIP_PATH_CHECK\n-export TOOLCHAIN\n-export Z\n-\n-SUBMODULES=:$(shell cat .gitmodules | grep path | cut -d ' ' -f 3)\n-export SUBMODULES\n-\n-ifeq ($(verbose),true)\n-VERBOSE :=-v\n-else\n-VERBOSE :=$(verbose)\n-endif\n-export VERBOSE\n+CLANG=$(shell which clang)\n \n ifeq ($(reuse),true)\n REUSE :=-r\n else\n-REUSE :=$(reuse)\n+REUSE :=\t\n endif\n export REUSE\n-\n ifeq ($(bind),true)\n BIND :=-b\n else\n-BIND :=$(bind)\n+BIND := \n endif\n export BIND\n \n ifeq ($(token),)\n-GITHUB_TOKEN =$(shell touch ~/GITHUB_TOKEN.txt \u0026\u0026 cat ~/GITHUB_TOKEN.txt || echo \"0\")\n+GITHUB_TOKEN :=$(shell cat ~/GITHUB_TOKEN.txt || echo \"0\")\n else\n-GITHUB_TOKEN :=$(shell echo $(token))\n+GITHUB_TOKEN :=$(shell echo $(token))\n endif\n export GITHUB_TOKEN\n \n@@ -166,253 +129,19 @@ export GIT_REPO_NAME\n GIT_REPO_PATH := $(HOME)/$(GIT_REPO_NAME)\n export GIT_REPO_PATH\n \n-\n-\n .PHONY:- help\n -:\n-\t@awk 'BEGIN {FS = \":.*?## \"} /^[a-zA-Z_-]+:.*?##/ {printf \"\\033[36m%-15s\\033[0m %s\\n\", $$1, $$2}' $(MAKEFILE_LIST)\n-\t@echo\n-more:## \tmore help\n-\t@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' | sed -e 's/^/\t/'\n-\t#$(MAKE) -f Makefile help\n-\n--include Makefile\n-\n-##initialize\n-##\tgit submodule update --init --recursive\n-initialize:## \tensure submodules exist\n-\tgit submodule update --init --recursive\n-\n-.ONESHELL:\n-docker-start:venv\n-##docker-start\n-##\tstart docker on Linux or Darwin\n-\t@echo CI=$(CI)\n-\t@touch requirements.txt \u0026\u0026 $(PYTHON3) -m pip install -q -r requirements.txt\n-\t@touch requirements.txt \u0026\u0026 $(PYTHON3) -m pip install -U virtualenv\n-\t@test -d .venv || $(PYTHON3) -m virtualenv .venv\n-\t@( \\\n-\t . .venv/bin/activate; pip install -q -r requirements.txt; \\\n-\t python3 -m pip install -q pipenv \\\n-\t pip install -q --upgrade pip; \\\n-\t);\n-\t@( \\\n-\t while ! docker system info \u003e /dev/null 2\u003e\u00261; do\\\n-\t echo 'Waiting for docker to start...';\\\n-\t if [[ '$(OS)' == 'Linux' ]]; then\\\n-\t type -P systemctl \u0026\u0026 systemctl restart docker.service || type -P service \u0026\u0026 service restart docker;\\\n-\t fi;\\\n-\t if [[ '$(OS)' == 'Darwin' ]]; then\\\n-\t echo $(CI);\\\n-\t if [[ '$(CI)' != 'True' ]]; then\\\n-\t type -P docker \u0026\u0026 open --background -a /./Applications/Docker.app/Contents/MacOS/Docker || brew install --cask docker;\\\n-\t fi;\\\n-\t fi;\\\n-\tsleep 1;\\\n-\tdone\\\n-\t)\n-\n-detect:## \tinstall sequence got Darwin and Linux\n-##detect\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 type -P brew \u003e/tmp/gnostr.log \u0026\u0026 \\\n-\t\texport LIBRARY_PATH='$(LIBRARY_PATH):$(brew --prefix)/lib' || echo\"\n-##\tdetect uname -s uname -m uname -p and install sequence\n-\n-## \tDarwin\n-ifneq ($(shell id -u),0)\n-\t@echo\n-\t@echo $(shell id -u -n) 'not root'\n-\t@echo\n-endif\n-\t#bash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew update || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install automake || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install autoconf || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install automake || echo \"\n-##\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install boost || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install cmake --cask || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install coreutils || echo \"\n-\t#bash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install --cask docker || echo \"\n-\t#bash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install gcc || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install expat || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install gettext || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install git-archive-all || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install git-gui || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install glib-openssl || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install golang || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install help2man || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install libtool || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install mercurial || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install node@14 || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install pandoc || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install pkg-config || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install protobuf || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install pipx || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install python3 || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install rustup || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install secp256k1 || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install tcl-tk || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install virtualenv || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew link --overwrite virtualenv || echo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 brew install zlib || echo \"\n-\t#bash -c \"[ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 /Applications/Docker.app/Contents/Resources/bin/docker system info || echo \"\n-\n+\t@awk 'BEGIN {FS = \":.*?###\"} /^[a-zA-Z_-]+:.*?###/ {printf \"\\033[36m%-15s\\033[0m %s\\n\", $$1, $$2}' $(MAKEFILE_LIST)\n+help-verbose:###\tmore verbose help\n+\t@awk 'BEGIN {FS = \":.*?##\"} /^[a-zA-Z_-]+:.*?##/ {printf \"\\033[36m%-15s\\033[0m %s\\n\", $$1, $$2}' $(MAKEFILE_LIST)\n \n-\n-\n-\n-\n-\n-## \tLinux\n-ifneq ($(shell id -u),0)\n-\t@echo\n-\t@echo $(shell id -u -n) 'not root'\n-\t@echo\n-endif\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\ttype -P brew \u003e/tmp/gnostr.log \u0026\u0026 \\\n-\t\texport LIBRARY_PATH='$(LIBRARY_PATH):$(brew --prefix)/lib' || echo\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get update 2\u003e/dev/null || \\\n-\t\tapk add update || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install autoconf 2\u003e/dev/null || \\\n-\t\tapk add autoconf || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install bison 2\u003e/dev/null || \\\n-\t\tapk add bison || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install bsdmainutils 2\u003e/dev/null || \\\n-\t\tapk add util-linux || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install build-essential 2\u003e/dev/null || \\\n-\t\tapk add alpine-sdk || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install cargo 2\u003e/dev/null || \\\n-\t\tapk add cargo || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install clang 2\u003e/dev/null || \\\n-\t\tapk add clang || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install cmake-curses-gui 2\u003e/dev/null || \\\n-\t\tapk add extra-cmake-modules || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install cmake 2\u003e/dev/null || \\\n-\t\tapk add cmake || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install expat 2\u003e/dev/null || \\\n-\t\tapk add expat || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install gettext 2\u003e/dev/null || \\\n-\t\tapk add gettext || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install golang-go 2\u003e/dev/null || \\\n-\t\tapk add go || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install help2man 2\u003e/dev/null || \\\n-\t\tapk add help2man || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install libcurl4-openssl-dev 2\u003e/dev/null || \\\n-\t\tapk add curl-dev || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install libssl-dev 2\u003e/dev/null || \\\n-\t\tapk add openssl-dev || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install libtool 2\u003e/dev/null || \\\n-\t\tapk add libtool || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install mercurial 2\u003e/dev/null || \\\n-\t\tapk add mercurial || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install npm 2\u003e/dev/null || \\\n-\t\tapk add npm || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install pandoc 2\u003e/dev/null || \\\n-\t\techo\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install pipx 2\u003e/dev/null || \\\n-\t\techo\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install pkg-config 2\u003e/dev/null || \\\n-\t\tapk add pkgconfig || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install protobuf-compiler 2\u003e/dev/null || \\\n-\t\tapk add protobuf || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install python3 2\u003e/dev/null || \\\n-\t\tapk add python3 || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install python3-pip 2\u003e/dev/null || \\\n-\t\tapk add py3-pip || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install python-is-python3 2\u003e/dev/null || \\\n-\t\techo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install tcl-dev 2\u003e/dev/null || \\\n-\t\techo \"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install util-linux 2\u003e/dev/null || \\\n-\t\tapk add util-linux || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install tcl-dev 2\u003e/dev/null || \\\n-\t\tapk add tcl-dev || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install virtualenv 2\u003e/dev/null || \\\n-\t\tapk add py3-virtualenv || true\"\n-\tbash -c \"[ '$(shell uname -s)' == 'Linux' ] \u0026\u0026 \\\n-\t\t$(SUDO) apt-get install zlib1g-dev 2\u003e/dev/null || \\\n-\t\techo \"\n-\n-##\tinstall gvm sequence\n-\t@rm -rf $(HOME)/.gvm || echo \"not removing ~/.gvm\"\n-\t@bash -c \"bash \u003c \u003c(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) || echo 'not installing gvm...'\"\n-\tbash -c \"[ '$(shell uname -m)' == 'x86_64' ] \u0026\u0026 echo 'is x86_64' || echo 'not x86_64';\"\n-\tbash -c \"[ '$(shell uname -m)' == 'arm64' ] \u0026\u0026 [ '$(shell uname -s)' == 'Darwin' ] \u0026\u0026 type -P brew \u0026\u0026 brew install pandoc || echo 'not arm64 AND Darwin';\"\n-\tbash -c \"[ '$(shell uname -m)' == 'i386' ] \u0026\u0026 echo 'is i386' || echo 'not i386';\"\n-\n-##\tinstall rustup sequence\n-\t$(shell echo which rustup) || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --no-modify-path --default-toolchain stable --profile default #\u0026 . \"$(HOME)/.cargo/env\"\n-\n-##\tinstall nvm sequence\n-\t@bash -c \"curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash \u0026\u0026 export NVM_DIR='$(HOME)/.nvm'; [ -s '$(NVM_DIR)/nvm.sh' ] \u0026\u0026 \\. '$(NVM_DIR)/nvm.sh'; [ -s '$(NVM_DIR)/bash_completion' ] \u0026\u0026 \\. '$(NVM_DIR)/bash_completion' \u0026\"\n-\n-\tbash -c \"which autoconf || echo \"\n-\tbash -c \"which automake || echo \"\n-\tbash -c \"which brew || echo \"\n-\tbash -c \"which cargo || echo \"\n-\tbash -c \"which cmake || echo \"\n-\tbash -c \"which go || echo \"\n-\tbash -c \"which node || echo \"\n-\tbash -c \"which rustup || echo \"\n-\n-.PHONY: report\n-report:## \tprint make variables\n-##\tprint make variables\n+report:###\treport\n \t@echo ''\n-\t@echo 'TIME=${TIME}'\n \t@echo 'PROJECT_NAME=${PROJECT_NAME}'\n-\t@echo 'VERSION=${VERSION}'\n-\t@echo ''\n-\t@echo 'OS=${OS}'\n-\t@echo 'OS_VERSION=${OS_VERSION}'\n-\t@echo 'ARCH=${ARCH}'\n \t@echo ''\n-\t@echo 'SUBMODULES=${SUBMODULES}'\n-\t@echo ''\n-\t@echo 'PYTHON=${PYTHON}'\n-\t@echo 'PYTHON2=${PYTHON2}'\n-\t@echo 'PYTHON3=${PYTHON3}'\n-\t@echo ''\n-\t@echo 'PIP=${PIP}'\n-\t@echo 'PIP2=${PIP2}'\n-\t@echo 'PIP3=${PIP3}'\n-\t@echo ''\n-\t@echo 'PYTHON_VENV=${PYTHON_VENV}'\n-\t@echo 'PYTHON3_VENV=${PYTHON3_VENV}'\n+\t@echo 'CLANG=${CLANG}'\n \t@echo ''\n \t@echo 'GIT_USER_NAME=${GIT_USER_NAME}'\n-\t@echo 'GH_USER_REPO=${GH_USER_REPO}'\n-\t@echo 'GH_USER_SPECIAL_REPO=${GH_USER_SPECIAL_REPO}'\n-\t@echo 'KB_USER_REPO=${KB_USER_REPO}'\n \t@echo 'GIT_USER_EMAIL=${GIT_USER_EMAIL}'\n \t@echo 'GIT_SERVER=${GIT_SERVER}'\n \t@echo 'GIT_PROFILE=${GIT_PROFILE}'\n@@ -422,47 +151,29 @@ report:## \tprint make variables\n \t@echo 'GIT_REPO_ORIGIN=${GIT_REPO_ORIGIN}'\n \t@echo 'GIT_REPO_NAME=${GIT_REPO_NAME}'\n \t@echo 'GIT_REPO_PATH=${GIT_REPO_PATH}'\n-\t@echo ''\n-\t@echo 'VERBOSE=${VERBOSE}'\n-\t@echo 'REUSE=${REUSE}'\n-\t@echo 'BIND=${BIND}'\n-\n-checkbrew:## \tinstall brew command\n-##\tinstall brew command\n-ifeq ($(HOMEBREW),)\n-\t@/bin/bash -c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"\n-else\n-\t@type -P brew \u0026\u0026 brew install wxWidgets [email protected] gettext\n-\t$(MAKE) detect\n-##\tbrew install wxWidgets [email protected] gettext\n-##\tmake detect\n-endif\n-\n-tag:## \tgit tag \u0026 git push\n-tags:tag\n-##tag\n-##\tgit tag $(OS)-$(OS_VERSION)-$(ARCH)-$(shell date +%s)\n-\t@git tag $(OS)-$(OS_VERSION)-$(ARCH)-$(shell date +%s)\n-\t@git push -f --tags || echo \"unable to push tags...\"\n-\n-.PHONY: nvm\n-.ONESHELL:\n-nvm: ## \tnvm\n-\t@echo \"$(NODE_VERSION)\" \u003e .nvmrc\n-\t@curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash || git pull -C $(HOME)/.nvm \u0026\u0026 export NVM_DIR=\"$(HOME)/.nvm\" \u0026\u0026 [ -s \"$(NVM_DIR)/nvm.sh\" ] \u0026\u0026 \\. \"$(NVM_DIR)/nvm.sh\" \u0026\u0026 [ -s \"$(NVM_DIR)/bash_completion\" ] \u0026\u0026 \\. \"$(NVM_DIR)/bash_completion\" \u0026\u0026 nvm install $(NODE_VERSION) \u0026\u0026 nvm use $(NODE_VERSION)\n-\t@source ~/.bashrc \u0026\u0026 nvm alias $(NODE_ALIAS) $(NODE_VERSION) \u0026\n \n-nvm-clean: ## \tnvm-clean\n-\t@rm -rf ~/.nvm\n-\n--include gnostr.mk\n--include gnostr-act.mk\n--include gnostr-bot.mk\n--include docker.mk\n--include venv.mk\n--include clean.mk\n--include cargo.mk\n--include tests.mk\n-\n-# vim: set noexpandtab:\n-# vim: set setfiletype make\n+extra:## \tadditional\n+##extra\n+\t@echo \"example: add additional make commands\"\n+submodules:###\trecursively initialize git submodules\n+##submodules\n+\tgit submodule update --init --recursive || echo \"install git...\"\n+\n+cmake:submodules## \tcmake .\n+##cmake\n+\tcmake -S . -B build \u0026\u0026 cd build \u0026\u0026 make all\n+.PHONY:ext/openssl\n+ext/openssl:\n+##ext/openssl\n+\tcd $(PWD)/[email protected] \u0026\u0026 \\\n+\t\t./Configure \\\n+\t\t--prefix=/usr/local/ssl \\\n+\t\t--openssldir=/usr/local/ssl \\\n+\t\t'-Wl,-rpath,$(LIBRPATH)' \u0026\u0026 $(MAKE) all\n+.PHONY:openssl\n+openssl:ext/openssl cmake## \topenssl\n+##openssl\n+\n+## include Makefile if exists\n+-include Makefile\n+-include act.mk\ndiff --git a/gnostr.mk b/gnostr.mk\nindex 01e778969..cbd5abc60 100644\n--- a/gnostr.mk\n+++ b/gnostr.mk\n@@ -1,7 +1,7 @@\n CFLAGS = -Wall -O2 -Isecp256k1/include\n CFLAGS += -I/include\n LDFLAGS = -Wl\n-GNOSTR_OBJS = gnostr.o sha256.o aes.o base64.o libsecp256k1.a\n+GNOSTR_OBJS = gnostr.o sha256.o aes.o base64.o\n #GNOSTR_GIT_OBJS = gnostr-git.o sha256.o aes.o base64.o libgit.a\n #GNOSTR_RELAY_OBJS = gnostr-relay.o sha256.o aes.o base64.o\n #GNOSTR_XOR_OBJS = gnostr-xor.o sha256.o aes.o base64.o libsecp256k1.a\n@@ -100,7 +100,7 @@ doc-gnostr-git:gnostr-git\n ##We stream edit certain tools man pages\n ##\tmake goals are processed from left to right\n ##\tdoc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install##\n-doc:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install## \tdoc - generate man pages\n+docs:doc-gnostr-act doc-gnostr-cat doc-gnostr-git gnostr-install## \tdoc - generate man pages\n ##help2man \u003c $^ \u003e $@\n \t##[[ -x \"$(shell which gnostr-act)\" ]] || $(MAKE) doc-gnostr-act\n \t@(\\\n@@ -298,6 +298,14 @@ gnostr-build-install:gnostr-build## \tgnostr-build-install\n gnostr-bins:bins\n bins:#bins/.git\n \tcargo install --path bins --force\n+.PHONY:lookup gnostr-lookup\n+#lookup/.git:\n+#\t@devtools/refresh-submodules.sh lookup\n+gnostr-lookup:lookup\n+lookup:#bins/.git\n+\tcargo install --path lookup --force\n+\n+.PHONY:xq gnostr-xq\n \n .PHONY:xq gnostr-xq\n xq/.git:\n@@ -444,6 +452,19 @@ cli:cli/.git\n \t\tmake cargo-build-release cargo-i\n .PHONY:gnostr-cli cli\n \n+.PHONY:gnostrd/target/release/gnostrd\n+gnostrd/target/release/gnostrd:\n+\tcd gnostrd \u0026\u0026 \\\n+\t\tcargo b -r --bin gnostrd \u0026\u0026 \\\n+\t\tcargo install --bin gnostrd --path . --force\n+.PHONY:gnostrd/target/release/gnostr-chat\n+gnostrd/target/release/gnostr-chat:\n+\tcd gnostrd \u0026\u0026 \\\n+\t\tcargo b -r --bin gnostr-chat \u0026\u0026 \\\n+\t\tcargo install --bin gnostr-chat --path . --force\n+gnostr-chat:chat gnostrd\n+chat:gnostrd/target/release/gnostr-chat\n+\n .PHONY:grep/.git gnostr-grep grep\n grep/.git:\n \t@devtools/refresh-submodules.sh grep\n@@ -495,7 +516,6 @@ src/libcjson/bin/libcjson.a:src/libcjson\n libcjson:src/libcjson/bin/libcjson.a\n \tcp $^ .\n \n-## gnostr-am\n gnostr-am:$(HEADERS) $(GNOSTR_OBJS) $(ARS)## \tmake gnostr binary\n \t$(MAKE) secp256k1\n \t$(CC) $(CFLAGS) $(GNOSTR_OBJS) $(ARS) -o $@ \u0026\u0026 $(MAKE) gnostr-install",
"sig": "4a81d036e2757f61d7f7ca368e0acadff9c2eb1c9c4a109e261fc3d1a89b438fc7e4ac61a08f21f64cf57eb75a1ce87eadacc1a7fe9267b386c3c4df0b24dc90"
}