neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #9140: Bugfix: Correctly replace generated headers and fail cleanly

Browse Source 
b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan 2016-11-15 10:34:46 +01:00 committed by Alexander Block
parent 12883cfe4d
commit a9c354472e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.bench.include
View File

@ -67,7 +67,9 @@ bitcoin_bench_clean : FORCE
%.raw.h: %.raw %.raw.h: %.raw
@$(MKDIR_P) $(@D) @$(MKDIR_P) $(@D)
@echo "static unsigned const char $(*F)[] = {" >> $@ @{ \
@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' >> $@ echo "static unsigned const char $(*F)[] = {" && \
@echo "};" >> $@ $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' && \
echo "};"; \
} > "$@.new" && mv -f "$@.new" "$@"
@echo "Generated $@" @echo "Generated $@"

18
src/Makefile.test.include
View File

@ -159,16 +159,10 @@ endif
%.json.h: %.json %.json.h: %.json
@$(MKDIR_P) $(@D) @$(MKDIR_P) $(@D)
@echo "namespace json_tests{" > $@ @{ \
@echo "static unsigned const char $(*F)[] = {" >> $@ echo "namespace json_tests{" && \
@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' >> $@ echo "static unsigned const char $(*F)[] = {" && \
@echo "};};" >> $@ $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' && \
@echo "Generated $@" echo "};};"; \
} > "$@.new" && mv -f "$@.new" "$@"
%.raw.h: %.raw
@$(MKDIR_P) $(@D)
@echo "namespace alert_tests{" > $@
@echo "static unsigned const char $(*F)[] = {" >> $@
@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' >> $@
@echo "};};" >> $@
@echo "Generated $@" @echo "Generated $@"