![Please Enable Javascript]()
{"schema":"libjg2-1",
"vpath":"/git/",
"avatar":"/git/avatar/",
"alang":"",
"gen_ut":1766019804,
"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":"005e42f19b5af26a8dddff91a3c54ba5",
"commit": {"type":"commit",
"time": 1512099455,
"time_ofs": 480,
"oid_tree": { "oid": "f378d4b48bc6385e34c3511ca6c8a70ec503d3c7", "alias": []},
"oid":{ "oid": "946bfa2f189038fe249cdb911dcfa6b693174adb", "alias": []},
"msg": "Uses PROJECT_NAME instead of DIRNAME for binary filename",
"sig_commit": { "git_time": { "time": 1512099455, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },
"sig_author": { "git_time": { "time": 1510521484, "offset": -480 }, "name": "Ben Delarre", "email": "ben@delarre.net", "md5": "e4926c0cb9fccda01e7abedc774cef36" }},
"body": "Uses PROJECT_NAME instead of DIRNAME for binary filename\n"
,
"diff": "diff --git a/scripts/esp32.mk b/scripts/esp32.mk\nindex 566ca3d..92db7e1 100644\n--- a/scripts/esp32.mk\n+++ b/scripts/esp32.mk\n@@ -24,7 +24,6 @@ ifeq ($(FAC),)\n \tFAC\u003d0\n endif\n 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@@ -37,22 +36,21 @@ $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)\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 \tgenromfs -f $(LWS_BUILD_PATH)/romfs.img -d $(PROJECT_PATH)/romfs-files ; \u005c\n RLEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/romfs.img) ;\u005c\n- LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\u005c\n+ LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\u005c\n printf \u0022 Original length: 0x%06x (%8d)\u005cn\u0022 $$LEN $$LEN ; \u005c\n- printf %02x $$(( $$RLEN % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n- printf %02x $$(( ( $$RLEN / 256 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n- printf %02x $$(( ( $$RLEN / 65536 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n- printf %02x $$(( ( $$RLEN / 16777216 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n- cat $(LWS_BUILD_PATH)/romfs.img \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ; \u005c\n- LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\u005c\n+ printf %02x $$(( $$RLEN % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+ printf %02x $$(( ( $$RLEN / 256 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+ printf %02x $$(( ( $$RLEN / 65536 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+ printf %02x $$(( ( $$RLEN / 16777216 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+ cat $(LWS_BUILD_PATH)/romfs.img \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ; \u005c\n+ LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\u005c\n \tUNIXTIME\u003d$$(date +%s | tr -d '\u005cn') ; \u005c\n \techo -n -e \u0022{\u005cr\u005cn \u005c\u0022schema\u005c\u0022: \u005c\u0022lws1\u005c\u0022,\u005cr\u005cn \u005c\u0022model\u005c\u0022: \u005c\u0022$(CONFIG_LWS_MODEL_NAME)\u005c\u0022,\u005cr\u005cn \u005c\u0022builder\u005c\u0022: \u005c\u0022\u0022 \u003e $(jbi) ;\u005c\n \thostname | tr -d '\u005cn' \u003e\u003e $(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022app\u005c\u0022: \u005c\u0022\u0022 \u003e\u003e $(jbi) ;\u005c\n-\techo -n $$DIRNAME \u003e\u003e $(jbi) ;\u005c\n+\techo -n $(PROJECT_NAME) \u003e\u003e $(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022user\u005c\u0022: \u005c\u0022\u0022 \u003e\u003e $(jbi) ;\u005c\n \twhoami | tr -d '\u005cn' \u003e\u003e$(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022git\u005c\u0022: \u005c\u0022\u0022 \u003e\u003e $(jbi) ;\u005c\n@@ -61,18 +59,18 @@ $(LWS_BUILD_PATH)/pack.img: $(APP_BIN)\n \tdate | tr -d '\u005cn' \u003e\u003e $(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022unixtime\u005c\u0022: \u005c\u0022\u0022 \u003e\u003e $(jbi) ;\u005c\n \techo -n $$UNIXTIME \u003e\u003e $(jbi) ;\u005c\n-\techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022file\u005c\u0022: \u005c\u0022\u0022$$DIRNAME-$$UNIXTIME.bin \u003e\u003e $(jbi) ;\u005c\n+\techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022file\u005c\u0022: \u005c\u0022\u0022$(PROJECT_NAME)-$$UNIXTIME.bin \u003e\u003e $(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022,\u005cr\u005cn \u005c\u0022factory\u005c\u0022: \u005c\u0022$(FAC)\u0022 \u003e\u003e $(jbi) ;\u005c\n \techo -n -e \u0022\u005c\u0022\u005cr\u005cn}\u0022 \u003e\u003e $(jbi) ;\u005c\n \tJLEN\u003d$$($$GNUSTAT -c %s $(jbi)) ;\u005c\n-\tprintf %02x $$(( $$JLEN % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n-\tprintf %02x $$(( ( $$JLEN / 256 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n-\tprintf %02x $$(( ( $$JLEN / 65536 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n-\tprintf %02x $$(( ( $$JLEN / 16777216 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n-\tcat $(jbi) \u003e\u003e $(LWS_BUILD_PATH)/$$DIRNAME.bin ;\u005c\n-\tcp $(LWS_BUILD_PATH)/$$DIRNAME.bin $(LWS_BUILD_PATH)/pack.img ;\u005c\n- LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$$DIRNAME.bin) ;\u005c\n-\tcp $(LWS_BUILD_PATH)/$$DIRNAME.bin $(LWS_BUILD_PATH)/$$DIRNAME-$$UNIXTIME.bin ;\u005c\n+\tprintf %02x $$(( $$JLEN % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+\tprintf %02x $$(( ( $$JLEN / 256 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+\tprintf %02x $$(( ( $$JLEN / 65536 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+\tprintf %02x $$(( ( $$JLEN / 16777216 ) % 256 )) | xxd -r -p \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+\tcat $(jbi) \u003e\u003e $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin ;\u005c\n+\tcp $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin $(LWS_BUILD_PATH)/pack.img ;\u005c\n+ LEN\u003d$$($$GNUSTAT -c %s $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin) ;\u005c\n+\tcp $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin $(LWS_BUILD_PATH)/$(PROJECT_NAME)-$$UNIXTIME.bin ;\u005c\n \tprintf \u0022 After ROMFS + Build info: 0x%06x (%8d)\u005cn\u0022 $$LEN $$LEN\n \n .PHONY: manifest\n@@ -96,12 +94,11 @@ all: $(LWS_BUILD_PATH)/pack.img\n flash: $(LWS_BUILD_PATH)/pack.img\n \n flash_ota: $(LWS_BUILD_PATH)/pack.img\n-\tDIRNAME\u003d$$(basename $$(pwd) | tr -d '\u005cn') ;\u005c\n \t$(IDF_PATH)/components/esptool_py/esptool/esptool.py \u005c\n \t\t--chip esp32 \u005c\n \t\t--port $(ESPPORT) \u005c\n \t\t--baud $(CONFIG_ESPTOOLPY_BAUD) \u005c\n-\t\twrite_flash 0x110000 $(LWS_BUILD_PATH)/$$DIRNAME.bin\n+\t\twrite_flash 0x110000 $(LWS_BUILD_PATH)/$(PROJECT_NAME).bin\n \n erase_ota:\n \t$(IDF_PATH)/components/esptool_py/esptool/esptool.py \u005c\n","s":{"c":1766019804,"u": 2073}}
],"g": 3505,"chitpc": 0,"ehitpc": 0,"indexed":0
,
"ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}