{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752657430, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"b86cb04d587783dd0992a498781556ab", "commit": {"type":"commit", "time": 1512099455, "time_ofs": 480, "oid_tree": { "oid": "7c54ad9d494a384faf53a37a83f88f198e69eaf5", "alias": []}, "oid":{ "oid": "dcf5a83ee4619309e1469d8a413f9e32a735b2a8", "alias": []}, "msg": "esp32: move check for xxd and genromfs from CMake to esp32.mk", "sig_commit": { "git_time": { "time": 1512099455, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1510451551, "offset": -480 }, "name": "Ben Delarre", "email": "ben@delarre.net", "md5": "e4926c0cb9fccda01e7abedc774cef36" }}, "body": "esp32: move check for xxd and genromfs from CMake to esp32.mk" , "diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex 4d98e87..433c315 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -157,14 +157,6 @@ if(GIT_EXECUTABLE)\n message(\u0022Git commit hash: ${LWS_BUILD_HASH}\u0022)\n endif()\n \n-macro(confirm_command CMD NOCMD)\n-\tfind_program (HAVE_CMD_${CMD} ${CMD} )\n-\tif (NOT HAVE_CMD_${CMD})\n-\t\tmessage(FATAL_ERROR \u0022Missing command ${CMD} required for build: ${NOCMD}\u0022 )\n-\tendif()\n-endmacro()\n-\n-\n if (LWS_WITH_LWSWS)\n message(STATUS \u0022LWS_WITH_LWSWS --\u003e Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV\u0022)\n set(LWS_WITH_PLUGINS 1)\n@@ -224,10 +216,6 @@ if (LWS_WITH_ESP8266)\n endif()\n \n if (LWS_WITH_ESP32)\n-\n-\tconfirm_command(xxd \u0022usually found in vim package\u0022)\n-\tconfirm_command(genromfs \u0022install genromfs package\u0022)\n-\n set(LWS_WITH_SHARED OFF)\n set(LWS_WITH_MBEDTLS ON)\n # set(LWS_WITHOUT_CLIENT ON)\ndiff --git a/scripts/esp32.mk b/scripts/esp32.mk\nindex f8c8f68..566ca3d 100644\n--- a/scripts/esp32.mk\n+++ b/scripts/esp32.mk\n@@ -8,6 +8,11 @@\n \n SHELL\u003d/bin/bash\n \n+# check genromfs is available\n+GENROMFS :\u003d $(shell command -v genromfs 2\u003e /dev/null)\n+# check xxd is available\n+XXD :\u003d $(shell command -v xxd 2\u003e /dev/null)\n+\n ESPPORT ?\u003d $(CONFIG_ESPTOOLPY_PORT)\n \n LWS_BUILD_PATH\u003d$(PROJECT_PATH)/build\n@@ -22,6 +27,14 @@ export FAC\n DIRNAME:\u003d$(shell basename $$(pwd) | tr -d '\u005cn')\n \n $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)\n+\tif [ -z \u0022$(GENROMFS)\u0022 ]; then \u005c\n+\t\techo \u0022ERROR: genromfs is unavailable, please install or compile genromfs\u0022 ; \u005c\n+\t\texit 1 ; \u005c\n+\tfi; \u005c\n+\tif [ -z \u0022$(XXD)\u0022 ]; then \u005c\n+\t\techo \u0022ERROR: xxd is unavailable, please install or compile xxd (usually provided by vim package)\u0022 ; \u005c\n+\t\texit 1 ; \u005c\n+\tfi; \u005c\n \tGNUSTAT\u003dstat ;\u005c\n \tif [ `which gstat 2\u003e/dev/null` ] ; then GNUSTAT\u003dgstat ; fi ;\u005c\n \tDIRNAME\u003d$$(basename $$(pwd) | tr -d '\u005cn') ;\u005c\n","s":{"c":1752657430,"u": 1779}} ],"g": 2591,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}