evm-contracts-tools 0.0.51 → 0.0.54

package/Makefile

@@ -37,6 +37,12 @@ MAN_DIR?=$(DESTDIR)$(PREFIX)/share/man
 NODE_DIR=$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)
 BUILD_NPM_DIR=build
 
+_MAKE_LINK=\
+  ln \
+    -sv
+_MAKE_EXE=\
+  chmod \
+    755
 _INSTALL_FILE=\
   install \
     -vDm644
@@ -52,27 +58,29 @@ DOC_FILES=\
       *.rst) \
   $(wildcard \
       *.md)
+_PROGRAMS=\
+  "evm-contract-call" \
+  "evm-contract-deployment-abi" \
+  "evm-contract-deployment-address" \
+  "evm-contract-deployment-bytecode" \
+  "evm-contract-deployment-compiler-output" \
+  "evm-contract-deployment-networks" \
+  "evm-contract-deployment-versions" \
+  "evm-contract-deployments-dir"
 NPM_FILES=\
   "README.md" \
   "COPYING" \
   "AUTHORS.rst" \
   "Makefile" \
   "dist" \
-  "evm-contract-call" \
+  $(_PROGRAMS) \
   "evm-contract-call.webpack.config.cjs" \
-  "evm-contract-deployment-abi" \
   "evm-contract-deployment-abi.webpack.config.cjs" \
-  "evm-contract-deployment-address" \
   "evm-contract-deployment-address.webpack.config.cjs" \
-  "evm-contract-deployment-bytecode" \
   "evm-contract-deployment-bytecode.webpack.config.cjs" \
-  "evm-contract-deployment-compiler-output" \
   "evm-contract-deployment-compiler-output.webpack.config.cjs" \
-  "evm-contract-deployment-networks" \
   "evm-contract-deployment-networks.webpack.config.cjs" \
-  "evm-contract-deployment-versions" \
   "evm-contract-deployment-versions.webpack.config.cjs" \
-  "evm-contract-deployments-dir" \
   "evm-contract-deployments-dir.webpack.config.cjs" \
   "lib" \
   "libevm-contract-call" \
@@ -115,23 +123,73 @@ install: install-scripts install-doc install-examples install-man
 
 install-scripts:
 
-	$(_INSTALL_DIR) \
-	  "$(LIB_DIR)/nodejs/lib"
-	for _file in $(NPM_FILES); do
-	  $(_INSTALL_FILE) \
-	    "$${_file}" \
-	    "$(LIB_DIR)/nodejs/$${_file}"; \
-	  ln \
-	    -s \
-            "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs/$${_file}" \
-	    "$(LIB_DIR)/$${_file}" || \
+	if [[ "$(_NPM)" == "false" ]]; then \
+	  $(_INSTALL_DIR) \
+	    "$(LIB_DIR)/nodejs"; \
+	  cp \
+	    -r \
+	    $$(printf \
+	         "$${PWD}/%s " \
+	         $$(cat \
+	              "$${PWD}/package.json" | \
+	              jq \
+	                --raw-output \
+	                '.files[]')) \
+	    "$(LIB_DIR)/nodejs"; \
+	  $(_MAKE_EXE) \
+	    "$(LIB_DIR)/nodejs/$(_PROJECT_NPM)"; \
+	  for _program in \
+	    $(_PROGRAMS); do \
+	    if [[ ! -s "$(BIN_DIR)/$${_program}" && \
+	          ! -e "$(BIN_DIR)/$${_program}" ]]; then \
+	      $(_MAKE_LINK) \
+	        "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs/$${_program}" \
+	        "$(BIN_DIR)/$${_program}"; \
+	    fi; \
+	  done; \
+	  rm \
+	    "$(LIB_DIR)/node_modules" || \
 	    true; \
-	    done
-	  # ln \
-		  #   -s \
-		  #   "$(PREFIX)/lib/$(_PROJECT_NPM)/node/lib$(_PROJECT_NPM)" \
-		  #   "$(LIB_DIR)/$(_PROJECT_NPM)-js" || \
-		  # true
+	  if [[ ! -s "$(LIB_DIR)/node_modules" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/node_modules" \
+	      "$(LIB_DIR)/nodejs/node_modules"; \
+	  fi; \
+	  rm \
+	    -rf \
+	    "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)" \
+	    "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)"; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)"; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" || \
+	      true; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT)" || \
+	      true; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT_NPM)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT_NPM)" || \
+	      true; \
+	  fi; \
+	elif [[ "$(_NPM)" == "true" ]]; then \
+	  make \
+	    install-npm; \
+	  $(_MAKE_LINK) \
+	    "$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" \
+	    "$(LIB_DIR)/nodejs" || \
+	  true; \
+	fi;
 
 build-man:
 
@@ -244,4 +302,16 @@ install-man:
 	  "build/man/$(_PROJECT_NPM).1" \
 	  "$(MAN_DIR)/man1/$(_PROJECT_NPM).1"
 
+uninstall-scripts:
+
+	for _program in \
+	  $(_PROGRAMS); do \
+	  rm \
+	    -vrf \
+	    "$(BIN_DIR)/$${_program}"; \
+	done; \
+	rm  \
+	  "$(LIB_DIR") \
+	  "$(NODE_DIR)"
+
 .PHONY: check build-man build-npm build-scripts install install-doc install-man install-npm install-scripts shellcheck

package/eslint.config.mjs

@@ -123,26 +123,7 @@ export default defineConfig([
        "prefer-const":
          "error" },
    files: [
-    "**/*.js",
-    `**/evm-contract-call`,
-    `**/evm-contract-deployment-abi`,
-    `**/evm-contract-deployment-address`,
-    `**/evm-contract-deployment-bytecode`,
-    `**/evm-contract-deployment-compiler-output`,
-    `**/evm-contract-deployment-networks`,
-    `**/evm-contract-deployment-networks`,
-    `**/evm-contract-deployment-versions`,
-    `**/evm-contract-deployments-dir`,
-    `**/lib/*`,
-    `**/libevm-contract-call`,
-    `**/libevm-contract-deployment-abi`,
-    `**/libevm-contract-deployment-address`,
-    `**/libevm-contract-deployment-bytecode`,
-    `**/libevm-contract-deployment-compiler-output`,
-    `**/libevm-contract-deployment-networks`,
-    `**/libevm-contract-deployment-versions`,
-    `**/libevm-contract-deployments-dir`,
-    `**/lib${_project}`
+    "**/*.{cjs,js}",
    ],
    languageOptions:
      { sourceType: