notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Bill Kendrick 2022-06-04 00:22:54 -07:00
commit 2af844e40c
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -1,15 +1,16 @@
# Tux Paint - A simple drawing program for children. # Tux Paint - A simple drawing program for children.
# Copyright (c) 2002-2021 # Copyright (c) 2002-2022
# Various contributors (see AUTHORS.txt) # Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - December 1, 2021 # June 14, 2002 - June 4, 2022
# The version number, for release: # The version number, for release:
VER_VERSION:=0.9.28 VER_VERSION:=0.9.28
VER_FLAVOR:="-sdl1"
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d") VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
else else
@ -394,21 +395,21 @@ releaseclean:
@echo @echo
@echo "Cleaning release directory" @echo "Cleaning release directory"
@echo @echo
@rm -rf "build/tuxpaint-$(VER_VERSION)" "build/tuxpaint-$(VER_VERSION).tar.gz" @rm -rf "build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR)" "build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR).tar.gz"
@-if [ -d build ] ; then rmdir build ; fi @-if [ -d build ] ; then rmdir build ; fi
.PHONY: releasedir .PHONY: releasedir
releasedir: build/tuxpaint-$(VER_VERSION) releasedir: build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR)
build/tuxpaint-$(VER_VERSION): build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR):
@echo @echo
@echo "Creating release directory" @echo "Creating release directory"
@echo @echo
@mkdir -p build/tuxpaint-$(VER_VERSION) @mkdir -p build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR)
@find . -follow \ @find . -follow \
\( -wholename '*/.git' -o -name .gitignore -o -name .thumbs -o -name .cvsignore -o -name 'dummy.o' -o -name 'build' -o -name '.#*' \) \ \( -wholename '*/.git' -o -name .gitignore -o -name .thumbs -o -name .cvsignore -o -name 'dummy.o' -o -name 'build' -o -name '.#*' \) \
-prune -o -type f -exec cp --parents -vdp \{\} build/tuxpaint-$(VER_VERSION)/ \; -prune -o -type f -exec cp --parents -vdp \{\} build/tuxpaint-$(VER_VERSION)$(VER_FLAVOR)/ \;
.PHONY: release .PHONY: release
release: releasedir release: releasedir
@ -416,7 +417,7 @@ release: releasedir
@echo "Creating release tarball" @echo "Creating release tarball"
@echo @echo
@cd build ; \ @cd build ; \
tar -czvf tuxpaint-$(VER_VERSION).tar.gz tuxpaint-$(VER_VERSION) tar -czvf tuxpaint-$(VER_VERSION)$(VER_FLAVOR).tar.gz tuxpaint-$(VER_VERSION)$(VER_FLAVOR)
# "make olpc" builds the program for an OLPC XO: # "make olpc" builds the program for an OLPC XO:
MAGIC_GOOD:=blur blocks_chalk_drip bricks calligraphy fade_darken\ MAGIC_GOOD:=blur blocks_chalk_drip bricks calligraphy fade_darken\

4
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2022.May.18 (0.9.28) 2022.June.4 (0.9.28)
* Improvements to "Paint" and "Lines" tools: * Improvements to "Paint" and "Lines" tools:
------------------------------------------ ------------------------------------------
* Brush spacing may now be altered within Tux Paint. * Brush spacing may now be altered within Tux Paint.
@ -240,6 +240,8 @@ http://www.tuxpaint.org/
* Ports & Building: * Ports & Building:
----------------- -----------------
* Release builds tarballs that denote SDL1.2 vs SDL2.0 branch.
* Windows * Windows
* Windows installer will no nlonger show a dialogue to inform * Windows installer will no nlonger show a dialogue to inform
user of uninstallation when "/VERYSILENT" switch is specified user of uninstallation when "/VERYSILENT" switch is specified