Skip to content

Commit 3de604c

Browse files
committed
Bump version number and update change log.
1 parent 4b3282d commit 3de604c

File tree

5 files changed

+108
-5
lines changed

5 files changed

+108
-5
lines changed

changes.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ should be located in the same directory as this file is.
2929
------------------------------------------------------------------------------
3030

3131

32-
Changes between 3.7.0.1 and 3.7.0.TBD
32+
Changes between 3.7.0.1 and 3.7.0.2
3333
===================================
3434

3535
(Note: This version has not been released in binary form, as it does not
@@ -45,6 +45,8 @@ Fixed or Mitigated Bugs
4545
with the 3.7.0.1 source code (boost 1.59) turned out to have a bug that
4646
would have caused POV-Ray for Windows to wake the computer from sleep mode
4747
even when not currently rendering.
48+
- Updated code to be compatible with GNU C++ compiler g++ 6.x (tested with
49+
6.3.1).
4850

4951

5052
Changes between 3.7.0 and 3.7.0.1

revision.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,23 @@ Notes:
3232
------------------------------------------------------------------------------
3333

3434
------------------------------------------------------------------------------
35-
POV-Ray v3.7.0.TBD
35+
POV-Ray v3.7.0.2
3636
------------------------------------------------------------------------------
3737

38+
Commit 4b3282d on 2017-05-16 by Christoph Lipka
39+
40+
Silence various clang warnings, some of which might cause actual
41+
issues. (#290)
42+
43+
Minor code modifications to eliminate compile errors in base/image/hdr.cpp
44+
reported for GNU g++ 6.3.1.
45+
46+
Also cleaned up some clang (4.2) compiler warnings along the way.
47+
48+
Commit 9863a01 on 2017-05-13 by Christoph Lipka
49+
50+
Update change log, `.gitignore` file and Travis CI configuration.
51+
3852
Commit bd856d6 on 2016-12-03 by Christoph Lipka
3953

4054
Update boost version to 1.62.

source/backend/povray.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ bool povray_terminated();
7676
// POV-Ray version and copyright message macros
7777

7878
#if POV_RAY_IS_OFFICIAL == 1
79-
#define POV_RAY_VERSION "3.7.0.1"
79+
#define POV_RAY_VERSION "3.7.0.2"
8080
#else
81-
#define POV_RAY_VERSION "3.7.0.1.unofficial"
81+
#define POV_RAY_VERSION "3.7.0.2.unofficial"
8282
#endif
8383

8484
#define POV_RAY_COPYRIGHT "Copyright 1991-2013 Persistence of Vision Raytracer Pty. Ltd."

tools/git/revision.sh

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#!/bin/sh
2+
3+
# Run this script from time to time to update revision.txt.
4+
5+
outfile="revision.txt~"
6+
tempfile="${outfile}~"
7+
8+
# first, generate a list of version tags
9+
releases=`git log --decorate --date=short --pretty=format:"%d" HEAD | sed -n 's/^.*tag: \(v3[.][^,)]*\).*$/\1/p'`
10+
# strip any experimental versions
11+
releases=`echo "${releases}" | sed 's/^v[0-9.]*-x.*$//g'`
12+
13+
# generate list of relevant commits
14+
echo -n "Fetching revision data from Git repo"
15+
current="HEAD"
16+
rm "${outfile}"
17+
for prev in $releases
18+
do
19+
echo -n "."
20+
git log --decorate --date=short --topo-order --pretty=tformat:"%d%n%nCommit %h on %cd by %an %n%n%n%w(0,4,4)%B%n" "$current" "^$prev" >> "${outfile}"
21+
current="$prev"
22+
done
23+
git log --decorate --date=short --topo-order --pretty=tformat:"%d%n%nCommit %h on %cd by %an %n%n%n%w(0,4,4)%B%n" "$current" >> "${outfile}"
24+
echo "Done."
25+
26+
# split up ref name lists into single lines
27+
echo -n "Isolating ref names"
28+
while grep -e '^ ([^,)]*,' "${outfile}" >/dev/null
29+
do
30+
echo -n "."
31+
sed 's/^ (\([^,)]*\),\s/ (\1)\n (/g' "${outfile}" > "${tempfile}"
32+
mv -f "${tempfile}" "${outfile}"
33+
done
34+
echo "Done."
35+
36+
# eliminate any tags indicating experimental versions
37+
sed 's/^ (tag:\sv[0-9.]*-x[^)]*)$//g' "${outfile}" > "${tempfile}"
38+
mv -f "${tempfile}" "${outfile}"
39+
40+
# prettify the tag ref names
41+
divider='------------------------------------------------------------------------------'
42+
sed 's/^ (tag:\s\(v3\.[^)+]*\)[^)]*)/'$divider'\nPOV-Ray \1\n'$divider'/g' "${outfile}" > "${tempfile}"
43+
mv -f "${tempfile}" "${outfile}"
44+
sed 's/^ (tag:\s\([^)+]*\)[^)]*)/'$divider'\n??? \1\n'$divider'/g' "${outfile}" > "${tempfile}"
45+
mv -f "${tempfile}" "${outfile}"
46+
47+
# eliminate any other ref names
48+
sed 's/^ ([^)]*)$//g' "${outfile}" > "${tempfile}"
49+
mv -f "${tempfile}" "${outfile}"
50+
51+
# collapse consecutive empty lines
52+
sed -r ':a; /^\s*$/ {N;ba}; s/( *\n){2,}/\n/' "${outfile}" > "${tempfile}"
53+
mv -f "${tempfile}" "${outfile}"
54+
55+
# remove trailing whitespace
56+
sed 's/\s*$//g' "${outfile}" > "${tempfile}"
57+
mv -f "${tempfile}" "${outfile}"
58+
59+
# identify known authors
60+
sed 's/by chris20$/by Chris Cason (chris20)/g' "${outfile}" > "${tempfile}"
61+
mv -f "${tempfile}" "${outfile}"
62+
sed 's/by c-lipka$/by Christoph Lipka (c-lipka)/g' "${outfile}" > "${tempfile}"
63+
mv -f "${tempfile}" "${outfile}"
64+
sed 's/by wfpokorny$/by William F. Pokorny (wfpokorny)/g' "${outfile}" > "${tempfile}"
65+
mv -f "${tempfile}" "${outfile}"
66+
sed 's/by BentSm$/by Ben Small (BentSm)/g' "${outfile}" > "${tempfile}"
67+
mv -f "${tempfile}" "${outfile}"
68+
69+
# word wrap after 79 characters
70+
fmt -w79 -s "${outfile}" > "${tempfile}"
71+
mv -f "${tempfile}" "${outfile}"
72+
73+
# add header
74+
(
75+
echo $divider
76+
echo "POV-Ray Revision History"
77+
echo $divider
78+
echo "NOTE: This auto-generated revision history needs manual postprocessing."
79+
echo "DO NOT COMMIT THIS FILE TO THE REPOSITORY!"
80+
echo $divider
81+
echo ""
82+
echo $divider
83+
echo "POV-Ray v???"
84+
echo $divider
85+
cat "${outfile}"
86+
) > "${tempfile}"
87+
mv -f "${tempfile}" "${outfile}"

unix/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.0.1
1+
3.7.0.2

0 commit comments

Comments
 (0)