Skip to content

Commit b408434

Browse files
committed
Miscellaneous housekeeping for v3.8.0 beta.
- Update list of contributors (preliminary). - Fix typo in `scenes/portfolio/readme.txt`. - Fix GitHub Workflow for automated builds. - Update GitHub release build Workflow to earmark binary as official.
1 parent 50dfa9b commit b408434

File tree

7 files changed

+52
-42
lines changed

7 files changed

+52
-42
lines changed

.github/workflows/release_build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: 'Sanity-Check'
1515
runs-on: ubuntu-latest
1616
outputs:
17-
do-build-installer: ${{ steps.check_validity.do-build-installer }}
17+
do-build-installer: ${{ steps.check_validity.outputs.do-build-installer }}
1818
steps:
1919

2020
- name: 'Check out Repository'
@@ -220,9 +220,10 @@ jobs:
220220
uses: microsoft/[email protected]
221221

222222
- name: 'Build'
223-
uses: POV-Ray/povray/.github/actions/windows_build@gh-actions-v1
223+
uses: POV-Ray/povray/.github/actions/windows_build@gh-actions-v2
224224
with:
225225
pov-ray-build-id: gh${{github.run_number}}${{matrix.compatibility}}
226+
pov-ray-special-sauce: ${{ secrets.POV_RAY_OFFICIAL_SAUCE_V3_8 }}
226227
solution: ${{matrix.solution-dir}}
227228
configuration: ${{matrix.configuration}}
228229
platform: ${{matrix.platform}}
@@ -321,21 +322,21 @@ jobs:
321322
uses: actions/checkout@v2
322323

323324
- name: 'Retrieve Installer Artifacts for Release'
324-
if: ${{ needs.build_windows_installer.status == 'success' }}
325+
if: ${{ needs.build_windows_installer.result == 'success' }}
325326
uses: actions/download-artifact@v2
326327
with:
327328
name: artifact_installer
328329
path: installer
329330

330331
- name: 'Retrieve Source Documentation Artifacts for Release'
331-
if: ${{ needs.build_sourcedoc.status == 'success' }}
332+
if: ${{ needs.build_sourcedoc.result == 'success' }}
332333
uses: actions/download-artifact@v2
333334
with:
334335
name: artifact_sourcedoc
335336
path: sourcedoc
336337

337338
- name: 'Retrieve Unix Source Package Artifacts for Release'
338-
if: ${{ needs.build_unix_package.status == 'success' }}
339+
if: ${{ needs.build_unix_package.result == 'success' }}
339340
uses: actions/download-artifact@v2
340341
with:
341342
name: artifact_unix_package

distribution/scenes/portfolio/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
The goal of the portfolio is to show most of
3-
the standard patterns, objects and and items
4-
in the standard include files.
3+
the standard patterns, objects and items in
4+
the standard include files.
55

66
The portfolio is generated by rendering all
77
the .INI files (except __empty.ini) in this

source/backend/povray.cpp

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// @parblock
99
///
1010
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
11-
/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
11+
/// Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd.
1212
///
1313
/// POV-Ray is free software: you can redistribute it and/or modify
1414
/// it under the terms of the GNU Affero General Public License as
@@ -139,29 +139,40 @@ using namespace pov;
139139
using namespace pov_base;
140140

141141
/// Primary Developers.
142+
/// `nullptr`-terminated list of primary developers of this "generation" of
143+
/// POV-Ray (as identified by the first two components of the version number).
144+
/// @note
145+
/// Please keep this list sorted by last name.
142146
const char *PrimaryDevelopers[] =
143147
{
144148
"Chris Cason",
145-
"Thorsten Froehlich",
146149
"Christoph Lipka",
147150
nullptr
148151
};
149152

150153
/// Assisting Developers.
154+
/// `nullptr`-terminated list of additional contributors to this "generation" of
155+
/// POV-Ray (as identified by the first two components of the version number).
156+
/// @note
157+
/// Please keep this list sorted by last name; contributors known only
158+
/// by some user name should go at the end, using simple ASCII sort order.
151159
const char *AssistingDevelopers[] =
152160
{
153-
"Nicolas Calimet",
154161
"Jerome Grimbert",
155162
"James Holsenback",
156-
"Christoph Hormann",
157-
"Nathan Kopp",
158-
"Juha Nieminen",
159163
"William F. Pokorny",
160164
nullptr
161165
};
162166

163167
/// Past Contributing Developers.
164-
/// By convention, current developers are also already included here.
168+
/// `nullptr`-terminated list of contributors to previous "generations" of
169+
/// POV-Ray (as identified by the first two components of the version number).
170+
/// @note
171+
/// Please keep this list sorted by last name; contributors known only
172+
/// by some user name should go at the end, using simple ASCII sort order.
173+
/// @note
174+
/// By convention, current developers are also included here, provided they had
175+
/// already contributed to earlier "generations" of POV-Ray.
165176
const char *ContributingDevelopers[] =
166177
{
167178
"Steve Anger",
@@ -205,7 +216,7 @@ const char *ContributingDevelopers[] =
205216
"Timothy Wegner",
206217
"Drew Wells",
207218
"Chris Young",
208-
nullptr // `nullptr` flags the end of the list
219+
nullptr
209220
};
210221

211222
/// POVMS context to receive messages from the frontend

source/frontend/renderfrontend.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// @parblock
99
///
1010
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
11-
/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
11+
/// Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd.
1212
///
1313
/// POV-Ray is free software: you can redistribute it and/or modify
1414
/// it under the terms of the GNU Affero General Public License as
@@ -747,6 +747,7 @@ void InitInfo(POVMS_Object& cppmsg, TextStreamBuffer *tsb)
747747
POVMSObject msgobj(cppmsg());
748748
POVMSObjectPtr msg = &msgobj;
749749
const int NUMBER_OF_AUTHORS_ACROSS = 4;
750+
const char* FORMAT_OF_AUTHORS_ITEM = " %-18s";
750751
POVMSAttributeList attrlist;
751752
POVMSAttribute item;
752753
char charbuf[1024];
@@ -762,7 +763,7 @@ void InitInfo(POVMS_Object& cppmsg, TextStreamBuffer *tsb)
762763

763764
l = 1024;
764765
charbuf[0] = 0;
765-
if (POVMSUtil_GetString(msg, kPOVAttrib_CoreVersion, charbuf, &l) == kNoErr)
766+
if (POVMSUtil_GetString(msg, kPOVAttrib_CoreGeneration, charbuf, &l) == kNoErr)
766767
generation = charbuf;
767768

768769
l = 1024;
@@ -788,7 +789,7 @@ void InitInfo(POVMS_Object& cppmsg, TextStreamBuffer *tsb)
788789
l = 1023;
789790
charbuf[0] = 0;
790791
if(POVMSAttr_Get(&item, kPOVMSType_CString, charbuf, &l) == kNoErr)
791-
tsb->printf(" %-18s", charbuf);
792+
tsb->printf(FORMAT_OF_AUTHORS_ITEM, charbuf);
792793

793794
(void)POVMSAttr_Delete(&item);
794795
}
@@ -817,7 +818,7 @@ void InitInfo(POVMS_Object& cppmsg, TextStreamBuffer *tsb)
817818
l = 1023;
818819
charbuf[0] = 0;
819820
if(POVMSAttr_Get(&item, kPOVMSType_CString, charbuf, &l) == kNoErr)
820-
tsb->printf(" %-18s", charbuf);
821+
tsb->printf(FORMAT_OF_AUTHORS_ITEM, charbuf);
821822

822823
(void)POVMSAttr_Delete(&item);
823824
}
@@ -846,7 +847,7 @@ void InitInfo(POVMS_Object& cppmsg, TextStreamBuffer *tsb)
846847
l = 1023;
847848
charbuf[0] = 0;
848849
if(POVMSAttr_Get(&item, kPOVMSType_CString, charbuf, &l) == kNoErr)
849-
tsb->printf(" %-18s", charbuf);
850+
tsb->printf(FORMAT_OF_AUTHORS_ITEM, charbuf);
850851

851852
(void)POVMSAttr_Delete(&item);
852853
}

unix/AUTHORS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
Persistence of Vision(tm) Ray Tracer Version 3.8.0.
22

33
POV-Ray is based on DKBTrace 2.12 by David K. Buck & Aaron A. Collins
4-
Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
4+
Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd.
55

6-
Primary POV-Ray 3.7 Architects/Developers: (Alphabetically)
7-
Chris Cason Thorsten Froehlich Christoph Lipka
6+
Primary POV-Ray v3.8 Architects/Developers: (Alphabetically)
7+
Chris Cason Christoph Lipka
88

99
With Assistance From: (Alphabetically)
10-
Nicolas Calimet Jerome Grimbert James Holsenback Christoph Hormann
11-
Nathan Kopp Juha Nieminen William F. Pokorny
10+
Jerome Grimbert James Holsenback William F. Pokorny
1211

1312
Past Contributors: (Alphabetically)
1413
Steve Anger Eric Barish Dieter Bayer David K. Buck

unix/povray.1

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.TH POV-Ray 1 "April 2018" "POV\-Team" "Version 3.8.0" \" -*- nroff -*-
1+
.TH POV-Ray 1 "July 2021" "POV\-Team" "Version 3.8.0" \" -*- nroff -*-
22
.\" man page written by Andreas Dilger
3-
.\" updated by Mark Gordon for POV-Ray 3.5
4-
.\" updated by Nicolas Calimet and Christoph Hormann for POV-Ray 3.6
5-
.\" updated by James Holsenback for POV-Ray 3.7
6-
.\" updated by William F. Pokorny and Christoph Lipka for POV-Ray 3.8
3+
.\" updated by Mark Gordon for POV-Ray v3.5
4+
.\" updated by Nicolas Calimet and Christoph Hormann for POV-Ray v3.6
5+
.\" updated by James Holsenback for POV-Ray v3.7
6+
.\" updated by William F. Pokorny and Christoph Lipka for POV-Ray v3.8
77

88
.SH NAME
99
povray \- POV\-Ray: The Persistence of Vision Ray Tracer
@@ -29,7 +29,7 @@ or for a better explanation of the meaning of the
2929
command\-line and INI file options, please consult the online documentation
3030
at http://wiki.povray.org/content/Documentation:Contents or the documentation
3131
capture that should accompany all versions of \fBPOV\-Ray\fP. The documentation
32-
is installed in PREFIX/share/doc/povray-3.7, where PREFIX is /usr/local
32+
is installed in PREFIX/share/doc/povray-3.8, where PREFIX is /usr/local
3333
by default, or a path specified when configuring the source package for
3434
compilation and installation.
3535
.LP
@@ -272,12 +272,12 @@ Write the stream to the console and/or the specified file. The streams are
272272
.LP
273273
\fBPOV\-Ray\fP for UNIX allows a \fIpovray.ini\fP file in the current
274274
directory to override the individual setting in
275-
\fI$HOME/.povray/3.7/povray.ini\fP.
275+
\fI$HOME/.povray/3.8/povray.ini\fP.
276276
\fBPOV\-Ray\fP looks for initial configuration information, like the
277277
Library_Path settings, which gives the location for the standard include
278278
files, first in the environment variable \fI$POVINI\fP, then in
279-
\fI./povray.ini\fP, then in \fI$HOME/.povray/3.7/povray.ini\fP, then in
280-
\fIPREFIX/etc/povray/3.7/povray.ini\fP. The PREFIX directory can be changed
279+
\fI./povray.ini\fP, then in \fI$HOME/.povray/3.8/povray.ini\fP, then in
280+
\fIPREFIX/etc/povray/3.8/povray.ini\fP. The PREFIX directory can be changed
281281
at compile\-time using the \-\-prefix option of the configure script.
282282
For backward compatibility with \fBPOV\-Ray\fP version 3.5 and earlier,
283283
the \fI$HOME/.povrayrc\fP and \fI$PREFIX/etc/povray.ini\fP files are also
@@ -287,9 +287,9 @@ Since version 3.5 \fBPOV\-Ray\fP features an I/O Restriction mechanism.
287287
I/O Restrictions attempt to at least partially protect a machine running
288288
\fBPOV-Ray\fP from having files read or written outside of a given set
289289
of directories. The settings are defined in two \fIconfiguration files\fP,
290-
a system-level \fIPREFIX/etc/povray/3.7/povray.conf\fP file and an user-level
291-
\fI$HOME/.povray/3.7/povray.conf\fP file with more restrictive settings.
292-
In \fBPOV-Ray\fP 3.7 the format of these configuration files has changed,
290+
a system-level \fIPREFIX/etc/povray/3.8/povray.conf\fP file and an user-level
291+
\fI$HOME/.povray/3.8/povray.conf\fP file with more restrictive settings.
292+
As of \fBPOV-Ray\fP v3.6 the format of these configuration files has changed,
293293
and no backward compatibility is retained with the configuration files
294294
in \fBPOV-Ray\fP 3.5. See the documentation for further details and
295295
examples of I/O Restriction settings.
@@ -333,15 +333,13 @@ http://news.povray.org/groups. You should try to find
333333
help and assistance in there before lodging a bug report.
334334

335335
.SH AUTHORS
336-
Primary POV-Ray 3.7 Architects/Developers: (Alphabetically)
336+
Primary POV-Ray v3.8 Architects/Developers: (Alphabetically)
337337
.LP
338-
Chris Cason Thorsten Froehlich Christoph Lipka
338+
Chris Cason Christoph Lipka
339339
.LP
340340
With Assistance From: (Alphabetically)
341341
.LP
342-
Nicolas Calimet Jerome Grimbert James Holsenback
343-
Christoph Hormann Nathan Kopp Juha Nieminen
344-
William F. Pokorny
342+
Jerome Grimbert James Holsenback William F. Pokorny
345343
.LP
346344
Past Contributors: (Alphabetically)
347345
.LP

windows/bitmaps/about.bmp

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)