Skip to content

Commit 4d071b0

Browse files
luke-jrluke-jr
committed
Rather than clean generated icons, plan to distribute them
1 parent d22aa1d commit 4d071b0

File tree

5 files changed

+42
-44
lines changed

5 files changed

+42
-44
lines changed

‎Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ docs:
327327
@echo "error: doxygen not found"
328328
endif
329329

330+
src_files: $(DISTFILES)
331+
@true
332+
330333
clean-docs:
331334
rm -rf doc/doxygen
332335

‎configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,6 @@ case $host in
779779
esac
780780

781781
AM_CONDITIONAL([CAN_RENDER_ICONS], [test "$can_render_icons" = "yes"])
782-
if test "$can_render_icons" != "yes"; then
783-
AC_MSG_WARN([Couldn't find ${can_render_icons}; you won't get the Knots-branded Bitcoin icon])
784-
fi
785782

786783
if test "$use_extended_functional_tests" != "no"; then
787784
AC_SUBST(EXTENDED_FUNCTIONAL_TESTS, --extended)

‎contrib/guix/libexec/make_release_tarball.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ cd "${DISTNAME}"
2424

2525
./autogen.sh
2626
./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
27+
make src_files
2728
make distclean
2829

2930
cd ..

‎src/Makefile.am

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,43 @@ endif
11061106
echo "};"; \
11071107
} > "$@.new" && mv -f "$@.new" "$@"
11081108

1109+
# Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
1110+
1111+
RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
1112+
1113+
RES_RENDERED_ICONS = \
1114+
qt/res/rendered_icons/bitcoin.ico \
1115+
qt/res/rendered_icons/bitcoin1024.png
1116+
1117+
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
1118+
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
1119+
qt/res/rendered_icons/bitcoin.icns \
1120+
qt/res/rendered_icons/nsis-wizard.bmp
1121+
1122+
EXTRA_DIST += $(RES_RENDERED_ICON_SRC) $(RES_ALL_RENDERED_ICONS)
1123+
1124+
if CAN_RENDER_ICONS
1125+
1126+
qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
1127+
@$(MKDIR_P) $(@D)
1128+
$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
1129+
1130+
# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
1131+
qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
1132+
$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
1133+
1134+
qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
1135+
$(PNG2ICNS) $@ $^
1136+
1137+
qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
1138+
$(IMAGEMAGICK_CONVERT) $^ $@
1139+
1140+
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
1141+
$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
1142+
1143+
endif
1144+
1145+
11091146
if EMBEDDED_LEVELDB
11101147
include Makefile.crc32c.include
11111148
include Makefile.leveldb.include

‎src/Makefile.qt.include

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,6 @@ BITCOIN_QT_H = \
172172
QT_RES_FONTS = \
173173
qt/res/fonts/RobotoMono-Bold.ttf
174174

175-
RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
176-
177-
RES_RENDERED_ICONS = \
178-
qt/res/rendered_icons/bitcoin.ico \
179-
qt/res/rendered_icons/bitcoin1024.png
180-
181-
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
182-
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
183-
qt/res/rendered_icons/bitcoin.icns \
184-
qt/res/rendered_icons/nsis-wizard.bmp
185-
186175
QT_RES_ICONS = $(RES_RENDERED_ICONS) \
187176
qt/res/icons/add.png \
188177
qt/res/icons/address-book.png \
@@ -398,7 +387,7 @@ $(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(Q
398387
@test -f $(RCC) || (echo "rcc $(RCC) not found, but is required for generating qrc cpp files"; exit 1)
399388
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
400389

401-
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD) $(RES_ALL_RENDERED_ICONS)
390+
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD)
402391

403392
CLEANFILES += $(CLEAN_QT)
404393

@@ -422,32 +411,3 @@ moc_%.cpp: %.h
422411
@test -f $(LRELEASE) || (echo "lrelease $(LRELEASE) not found, but is required for generating translations"; exit 1)
423412
@$(MKDIR_P) $(@D)
424413
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@
425-
426-
EXTRA_DIST += $(RES_RENDERED_ICON_SRC)
427-
428-
if CAN_RENDER_ICONS
429-
430-
qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
431-
@$(MKDIR_P) $(@D)
432-
$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
433-
434-
# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
435-
qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
436-
$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
437-
438-
qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
439-
$(PNG2ICNS) $@ $^
440-
441-
qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
442-
$(IMAGEMAGICK_CONVERT) $^ $@
443-
444-
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
445-
$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
446-
447-
else
448-
449-
qt/res/rendered_icons/%: qt/res/icons/%
450-
@$(MKDIR_P) $(@D)
451-
cp $< $@
452-
453-
endif

0 commit comments

Comments
 (0)