godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed upload to upload_all which is more clear. You can now use make upload to upload a specific file

Browse Source
This commit is contained in:
Marcos Kirsch 2015-04-18 23:13:04 -05:00
parent 572732fd44
commit 3125f997f7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -2,10 +2,10 @@
# User configuration # User configuration
###################################################################### ######################################################################
# Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader) # Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
NODEMCU-UPLOADER=nodemcu-uploader.py NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
# Serial port # Serial port
PORT=/dev/ttyUSB0 PORT=/dev/cu.usbserial-A602HRAZ
SPEED=460800 SPEED=9600
###################################################################### ######################################################################
# End of user config # End of user config
@ -15,9 +15,15 @@ LUA_FILES := init.lua httpserver.lua httpserver-request.lua httpserver-static.lu
# Print usage # Print usage
usage: usage:
@echo "make upload FILE:=<file> to upload a specific file (i.e make upload FILE:=init.lua)"
@echo "make upload_http to upload files to be served" @echo "make upload_http to upload files to be served"
@echo "make upload_server to upload the server code and init.lua" @echo "make upload_server to upload the server code and init.lua"
@echo "make upload to upload all" @echo "make upload_all to upload all"
@echo $(TEST)
# Upload one files only
upload:
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(FILE)
# Upload HTTP files only # Upload HTTP files only
upload_http: $(HTTP_FILES) upload_http: $(HTTP_FILES)
@ -28,6 +34,6 @@ upload_server: $(LUA_FILES)
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f)) @$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
# Upload all # Upload all
upload: $(LUA_FILES) $(HTTP_FILES) upload_all: $(LUA_FILES) $(HTTP_FILES)
@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f)) @$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))