Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rather than clean generated icons, plan to distribute them

Browse Source
This commit is contained in:
Luke Dashjr 2016-02-06 07:28:33 +00:00
parent ca5fc30a48
commit 70b8f6debe
5 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -332,6 +332,9 @@ docs:
@echo "error: doxygen not found" @echo "error: doxygen not found"
endif endif
src_files: $(DISTFILES)
@true
clean-docs: clean-docs:
rm -rf doc/doxygen rm -rf doc/doxygen

3
configure.ac
View File

@ -849,9 +849,6 @@ case $host in
esac esac
AM_CONDITIONAL([CAN_RENDER_ICONS], [test "$can_render_icons" = "yes"]) AM_CONDITIONAL([CAN_RENDER_ICONS], [test "$can_render_icons" = "yes"])
if test "$can_render_icons" != "yes"; then
AC_MSG_WARN([Couldn't find ${can_render_icons}; you won't get the Knots-branded Bitcoin icon])
fi
if test "$use_extended_functional_tests" != "no"; then if test "$use_extended_functional_tests" != "no"; then
AC_SUBST(EXTENDED_FUNCTIONAL_TESTS, --extended) AC_SUBST(EXTENDED_FUNCTIONAL_TESTS, --extended)

1
contrib/guix/libexec/make_release_tarball.sh
View File

@ -24,6 +24,7 @@ cd "${DISTNAME}"
./autogen.sh ./autogen.sh
./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
make src_files
make distclean make distclean
cd .. cd ..

37
src/Makefile.am
View File

@ -1100,6 +1100,43 @@ endif
} > "$@.new" && mv -f "$@.new" "$@" } > "$@.new" && mv -f "$@.new" "$@"
@echo "Generated $@" @echo "Generated $@"
# Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
RES_RENDERED_ICONS = \
qt/res/rendered_icons/bitcoin.ico \
qt/res/rendered_icons/bitcoin1024.png
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
qt/res/rendered_icons/bitcoin.icns \
qt/res/rendered_icons/nsis-wizard.bmp
EXTRA_DIST += $(RES_RENDERED_ICON_SRC) $(RES_ALL_RENDERED_ICONS)
if CAN_RENDER_ICONS
qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
@$(MKDIR_P) $(@D)
$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
$(PNG2ICNS) $@ $^
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)
$(IMAGEMAGICK_CONVERT) $^ $@
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
endif
if EMBEDDED_LEVELDB if EMBEDDED_LEVELDB
include Makefile.crc32c.include include Makefile.crc32c.include
include Makefile.leveldb.include include Makefile.leveldb.include

42
src/Makefile.qt.include
View File

@ -172,17 +172,6 @@ BITCOIN_QT_H = \
QT_RES_FONTS = \ QT_RES_FONTS = \
qt/res/fonts/RobotoMono-Bold.ttf qt/res/fonts/RobotoMono-Bold.ttf
RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
RES_RENDERED_ICONS = \
qt/res/rendered_icons/bitcoin.ico \
qt/res/rendered_icons/bitcoin1024.png
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
qt/res/rendered_icons/bitcoin.icns \
qt/res/rendered_icons/nsis-wizard.bmp
QT_RES_ICONS = $(RES_RENDERED_ICONS) \ QT_RES_ICONS = $(RES_RENDERED_ICONS) \
qt/res/icons/add.png \ qt/res/icons/add.png \
qt/res/icons/address-book.png \ qt/res/icons/address-book.png \
@ -395,7 +384,7 @@ $(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(Q
@test -f $(RCC) @test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@ $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
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) CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD)
CLEANFILES += $(CLEAN_QT) CLEANFILES += $(CLEAN_QT)
@ -433,32 +422,3 @@ moc_%.cpp: %.h
@test -f $(LRELEASE) @test -f $(LRELEASE)
@$(MKDIR_P) $(@D) @$(MKDIR_P) $(@D)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@ $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@
EXTRA_DIST += $(RES_RENDERED_ICON_SRC)
if CAN_RENDER_ICONS
qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
@$(MKDIR_P) $(@D)
$(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
$(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
$(PNG2ICNS) $@ $^
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)
$(IMAGEMAGICK_CONVERT) $^ $@
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
else
qt/res/rendered_icons/%: qt/res/icons/%
@$(MKDIR_P) $(@D)
cp $< $@
endif