Skip to content

Commit 7b2172a

Browse files
author
reyalp
committed
include build information in readme.txt and camnotes.txt, based on suggestion by "SX720" in https://chdk.setepontos.com/index.php?topic=13858.msg140908#msg140908
1 parent b8437a5 commit 7b2172a

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,15 @@ firzipsubcopy: infoline
173173

174174

175175
firzipsubcomplete: infoline clean firsub
176-
cat $(doc)/1_intro.txt $(cam)/notes.txt $(doc)/2_installation.txt $(doc)/3_faq.txt $(doc)/4_urls.txt $(doc)/5_gpl.txt $(doc)/6_ubasic_copyright.txt > $(doc)/readme.txt
177-
cp $(cam)/notes.txt $(doc)/camnotes.txt
176+
( printf "\r\n*** Build Information ***\r\n" ; \
177+
printf "CHDK for $(TARGET_CAM) fw:$(PLATFORMSUB)" ; \
178+
COMPATFW="$(shell grep '^'$(TARGET_CAM)',[^,]\+,[^,]*,'$(PLATFORMSUB) camera_list.csv | grep -v '^'$(TARGET_CAM),$(PLATFORMSUB) | sed -e 's/^'$(TARGET_CAM)',\([^,]\+\),[^,]*,'$(PLATFORMSUB)'.*/\1/')" ; \
179+
if [ ! -z "$$COMPATFW" ] ; then \
180+
printf " compatible fw:$$COMPATFW" ; \
181+
fi ; \
182+
printf " PID:$(TARGET_PID)\r\nbuild:$(BUILD_NUMBER)-$(BUILD_SVNREV)$(STATE) date:`$(ZIPDATE)`\r\n\r\n*** Camera specific notes ***\r\n" ) > $(doc)/camnotes.txt
183+
cat $(cam)/notes.txt >> $(doc)/camnotes.txt
184+
cat $(doc)/1_intro.txt $(doc)/camnotes.txt $(doc)/2_installation.txt $(doc)/3_faq.txt $(doc)/4_urls.txt $(doc)/5_gpl.txt $(doc)/6_ubasic_copyright.txt > $(doc)/readme.txt
178185
@echo \-\> $(ZIP_SMALL)
179186
rm -f $(bin)/$(ZIP_SMALL)
180187
LANG=C echo "CHDK-$(VER) for $(TARGET_CAM) fw:$(TARGET_FW) build:$(BUILD_NUMBER)-$(BUILD_SVNREV)$(STATE) date:`$(ZIPDATE)`" | \

0 commit comments

Comments
 (0)