Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows CUI (Console User Interface) with ported functionality from … #276

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
17f6768
Windows CUI (Console User Interface) with ported functionality from …
trevorsandy Apr 14, 2017
72cd9a7
Build both Windows CUI and GUI projects in AppVeyor
trevorsandy Apr 16, 2017
7f273de
Add _CONSOLE definition to AppVeyor.yml
trevorsandy Apr 16, 2017
0410cfb
Enable openexr _eLut and _toFloat projects to SSE2 and AVX configurat…
trevorsandy Apr 17, 2017
81f6bf0
Fix extra entries in openexr_eLut, _toFloat project files
trevorsandy Apr 17, 2017
580a02f
Windows CUI cleanup and document
trevorsandy Apr 18, 2017
4ca70cd
Refactor appvoyer.yml
trevorsandy Apr 19, 2017
103a7e7
Check appveyor environment variables
trevorsandy Apr 19, 2017
bb7f34b
Merge branch 'master' of https://github.com/POV-Ray/povray into windo…
trevorsandy May 18, 2017
f283e96
Remove strdup warning
trevorsandy May 18, 2017
ce4ea36
Fix povray.conf and ini lookup. Refactor autobuild scripts.
trevorsandy May 20, 2017
a702944
Merge remote-tracking branch 'POV-Ray/master' into windows-cui
trevorsandy Jun 21, 2017
315bb46
Bump version number and update change log.
c-lipka Jun 22, 2017
e3c1738
Fix a blunder in `version.h`.
c-lipka Jun 22, 2017
9808f53
Update list of required packages for Unix builds. ( #294)
wfpokorny Jun 24, 2017
09f1014
Bump version number in the most essential places.
c-lipka Jun 26, 2017
b0557b8
Update bulk of source code file header comments.
c-lipka Jun 26, 2017
7195810
Update remaining source code file header comments.
c-lipka Jun 26, 2017
7957ad5
Elimiate unnecessary version numbers from HTML Help infrastructure.
c-lipka Jun 29, 2017
43c8fa8
Merge remote-tracking branch 'POV-Ray/master' into windows-cui
trevorsandy Jun 29, 2017
71b165f
Eliminate various explicit mentions of version numbers.
c-lipka Jul 1, 2017
bdbb0b5
Bump version threshold for new features to 3.8.
c-lipka Jul 2, 2017
b108748
Demote version back to alpha status for now.
c-lipka Jul 5, 2017
9f644fe
Add some debugging aids.
c-lipka Jul 7, 2017
463442e
Update version number in AppVeyor automated build config.
c-lipka Jul 8, 2017
443ae79
Major overhaul of version number macro system in `version.h`.
c-lipka Jul 8, 2017
2c3afc4
[ci skip] Update source documentation of version numbering.
c-lipka Jul 9, 2017
bfeb999
[ci skip] Include SDL2 v2.0.5 source files - Windows and Unix
trevorsandy Aug 13, 2017
34f9bc2
Port and upgrade SDL display window
trevorsandy Aug 13, 2017
54d6b16
Fix VS solution file, minor tweaks
trevorsandy Aug 13, 2017
7a99e7c
[ci skip] Update and fix `README.md`.
c-lipka Aug 18, 2017
7bddd06
Enable and require C++11.
c-lipka Jun 24, 2017
1dbca0b
Remove dependency on `boost::tr1` to fix issue #317.
c-lipka Sep 6, 2017
03e27c6
Update docs.
c-lipka Sep 10, 2017
8bc4881
Update some more version numbers thoughout the repo.
c-lipka Sep 10, 2017
bbb4a35
Add Unix command-line option to print short version number.
c-lipka Sep 10, 2017
5cdb3f7
Update POV-Ray's mechanism to inherit settings from older versions on…
c-lipka Sep 10, 2017
d850f92
Add Windows scripts to extract version information from `base/version…
c-lipka Sep 12, 2017
7d225a0
Fix bug in Windows version info macros.
c-lipka Sep 17, 2017
0358da0
Change ambient default to 0.0 (#305)
LeForgeron Sep 20, 2017
e39f5af
Extension of ovus (#306)
LeForgeron Sep 20, 2017
844dae6
Minor beautification of previous commits.
c-lipka Sep 20, 2017
17e3f64
Modify doxygen invocation scripts to not rely on `unix/VERSION` for v…
c-lipka Sep 20, 2017
12fbab3
Change camera `right` default length to output image aspect ratio.
c-lipka Sep 21, 2017
7d56489
[ci skip] Merge 'POV-Ray/release/v3.8.0' into windows-cui
trevorsandy Sep 23, 2017
526cfd8
Patch POV-Ray/release/v3.8.0 merge
trevorsandy Sep 23, 2017
8b46cc3
Fix POV-Ray/release/v3.8.0 merge
trevorsandy Sep 23, 2017
1ceb827
Format quoted command line arguments
trevorsandy Sep 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************

POV-Ray 3.7 documentation style sheet
POV-Ray documentation style sheet
based on POV-Ray 3.5 style sheet by Chris Cason
modified Jul 2003 by Christoph Hormann
modified Dec 2010 by Jim Holsenback
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[OPTIONS]
Binary TOC=Yes
Compatibility=1.1 or later
Compiled file=povray37.chm
Contents file=povray37.hhc
Compiled file=povray.chm
Contents file=povray.hhc
Default Font=Verdana, 8
Default Window=POV-Ray Help
Default topic=index.html
Display compile progress=No
Error log file=errorlog.txt
Full text search stop list file=povray37.stp
Full text search stop list file=povray.stp
Full-text search=Yes
Index file=povray37.hhk
Index file=povray.hhk
Language=0x409 English (United States)
Title=POV-Ray Help

[WINDOWS]
POV-Ray Help="POV-Ray Help","povray37.hhc","povray37.hhk","index.html","index.html",,"Start",,,0x63520,,0x70387e,[6,1,807,610],0xb0000,,,,,,0
POV-Ray Help="POV-Ray Help","povray.hhc","povray.hhk","index.html","index.html",,"Start",,,0x63520,,0x70387e,[6,1,807,610],0xb0000,,,,,,0


[FILES]
index.html
povray37.js
povray.js

[INFOTYPES]

File renamed without changes.
File renamed without changes.
9 changes: 6 additions & 3 deletions tools/windows/htmlhelp/makedocs.bat
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@
REM *** Prepare Clean Slate **************************************************

rmdir /s /q "output"
REM The rmdir command schedules a directory for demolition, but it may take
REM a moment before the directory is actually gone for good.
if exist "output" timeout /NOBREAK 1
mkdir "output"

REM *** Create TOC and Index *************************************************
@@ -24,7 +27,7 @@ REM *** Copy Auxiliary Files *************************************************
echo Copying auxiliary files...

xcopy "include" "output"
REM copy "input\povray37.css" "output"
REM copy "input\povray.css" "output"
xcopy /i /s "input\images" "output\images"

echo.
@@ -33,15 +36,15 @@ REM *** Create Compressed Help File ******************************************

echo Creating compressed help file...

hhc.exe "output\povray37.hhp"
hhc.exe "output\povray.hhp"

echo.

REM *** Copy To Final Location ***********************************************

echo Copying result...

copy "output\povray37.chm" "..\..\..\distribution\platform-specific\windows\help\povray37.chm"
copy "output\povray.chm" "..\..\..\distribution\platform-specific\windows\help\povray.chm"

echo.

12 changes: 6 additions & 6 deletions tools/windows/htmlhelp/makedocs.pl
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

#######################################################################
#
# makedocs.pl - HTML Help doc conversion tool for POV-Ray 3.7.
# makedocs.pl - HTML Help doc conversion tool for POV-Ray.
#
# This tool generates the output files needed for the POVWIN HTML Help
# documentation. It has only been tested under Win32.
@@ -24,8 +24,8 @@
#
#######################################################################
#
# Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
# Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
# Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
# Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
#
# POV-Ray is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -54,7 +54,7 @@
sub hh_index
{
%primaryindex = %index ;
open (OUT, ">output/povray37.hhk") || die "Cannot open povray37.hhk: $!" ;
open (OUT, ">output/povray.hhk") || die "Cannot open povray.hhk: $!" ;
print OUT qq*<html>
<head>
<meta name="GENERATOR" content="POV-Ray Documentation Generation System">
@@ -165,7 +165,7 @@ sub hh_index
# make the HTML Help Table of Contents (TOC)
sub hh_toc
{
open (OUT, ">output/povray37.hhc") || die "Cannot open povray37.hhc: $!" ;
open (OUT, ">output/povray.hhc") || die "Cannot open povray.hhc: $!" ;
print OUT qq*<html>
<head>
<meta name="GENERATOR" content="POV-Ray Documentation Generation System">
@@ -293,7 +293,7 @@ sub check_images

$result .= "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=9\"/>\n";
$result .= "<object classid=\"clsid:adb880a6-d8ff-11cf-9377-00aa003b7a11\" id=\"htmlhelp\" type=\"application/x-oleobject\"></object>\n";
$result .= "<script language=\"javascript\" src=\"povray37.js\"></script>\n";
$result .= "<script language=\"javascript\" src=\"povray.js\"></script>\n";
$result .= $line;

while ($line = <IN>)
4 changes: 2 additions & 2 deletions tools/windows/htmlhelp/readme.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ To build the HTML Help file for POV-Ray for Windows, you need the following piec
- **Microsoft HTML Help Workshop**: Version 4.7.4.8702.0 has successfully been tested; other
versions may work just as fine.

Perl is presumed to be associated with the `.pl` file extension; HTML Workshop is presumed to be
Perl is presumed to be associated with the `.pl` file extension; HTML Help Workshop is presumed to be
found in the command search path.

To build the POV-Ray for Windows help files, proceed as follows:
@@ -16,7 +16,7 @@ To build the POV-Ray for Windows help files, proceed as follows:
- Run `makedocs.bat`.

The generated HTML Help file will be placed in `distribution/platform-specific/windows/Help/`
as `povray37.chm`, ready for inclusion in the installer package.
as `povray.chm`, ready for inclusion in the installer package.

(**Note:** Don't forget to also update the Unix HTML help files residing in
`doc/html`.)
2 changes: 1 addition & 1 deletion windows/pvengine.cpp
Original file line number Diff line number Diff line change
@@ -5622,7 +5622,7 @@ int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
splitpath (str, modulePath, NULL) ;
validatePath (modulePath) ;

sprintf (engineHelpPath, "%shelp\\povray37.chm", BinariesPath) ;
sprintf (engineHelpPath, "%shelp\\povray.chm", BinariesPath) ;
HtmlHelp (NULL, NULL, HH_INITIALIZE, (DWORD_PTR) &help_cookie) ;
memset (&hh_aklink, 0, sizeof (hh_aklink)) ;
hh_aklink.cbStruct = sizeof (hh_aklink) ;
2 changes: 1 addition & 1 deletion windows/setup.nsi
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@
!define MYCOPYRIGHT "Copyright(c) 2050-2051 Acme Space Blasters. Inc."
!define MYEXEPREFIX "lasray"
!define MYSCENEEXT "pov"
!define MYHELPFILE "povray37.chm"
!define MYHELPFILE "povray.chm"
###################################################################################################

RequestExecutionLevel highest