Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fc777b7

Browse files
FMXExpressFMXExpress
committedMay 29, 2020
Upgraded AStyle to 3.1.
1 parent b5458b7 commit fc777b7

13 files changed

+3237
-1931
lines changed
 

‎AStyle/AStyle.exe

160 KB
Binary file not shown.

‎AStyle/doc/LICENSE.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
### MIT License
2+
3+
Copyright (c) 2018 by Jim Pattee <jimp03@email.com>.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎AStyle/doc/astyle.html

+1,331-487
Large diffs are not rendered by default.

‎AStyle/doc/index.html

+86-124
Large diffs are not rendered by default.

‎AStyle/doc/install.html

+450-281
Large diffs are not rendered by default.

‎AStyle/doc/license.html

-213
This file was deleted.

‎AStyle/doc/links.html

+181-94
Large diffs are not rendered by default.

‎AStyle/doc/news.html

+621-319
Large diffs are not rendered by default.

‎AStyle/doc/notes.html

+318-189
Large diffs are not rendered by default.

‎AStyle/doc/scripts.html

+46-69
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,84 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
22

3-
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
44

55
<head>
66
<title>Artistic Style - Scripts</title>
77
<meta http-equiv="Content-Language" content="en-us" />
88
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
9+
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
910
<link href="styles.css" rel="stylesheet" type="text/css" />
1011
</head>
1112

1213
<body>
1314

14-
<h1>
15-
Artistic Style Scripts</h1>
15+
<h1>Artistic Style Scripts</h1>
1616

1717
<p>
1818
&nbsp;</p>
1919
<p>
2020
The following are scripts to support the Artistic Style program. They are in various computer languages for multiple
2121
platforms.</p>
22-
<p>
23-
On Windows Vista the following scripts may be blocked to help protect the computer. You will get a Security Warning
24-
message when trying to open or edit the extracted file. Right click on the file and select Properties. At the
25-
bottom of the General tab is a Security option. Select "Unblock" to unblock the file. This can be done with either
26-
the extracted or the zip file.</p>
2722

28-
<h3>
29-
Scripts</h3>
23+
<h3>Scripts</h3>
3024

3125
<p>
32-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/astyle-clean.py.zip"><strong>astyle-clean.py</strong></a>&nbsp;
33-
is a <strong>Python script</strong> to clean a directory tree by moving Artistic Style backup files to a separate
34-
directory. This allows Artistic Style to create backup files without cluttering your source directories. There
35-
are four variables at the start of the script that need to be set for each application. The script will move or
36-
copy backup files to a backup directory maintaining the original directory structure. New backup files will be
37-
copied over the old so you will always have the most current backup.</p>
26+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/astyle-clean.py.zip" target="_blank" title="open new window">
27+
<strong>astyle-clean.py</strong></a>&nbsp; is a <strong>Python script</strong> to clean a directory tree by
28+
moving Artistic Style backup files to a separate directory. This allows Artistic Style to create backup files
29+
without cluttering your source directories. There are four variables at the start of the script that need to be
30+
set for each application. The script will move or copy backup files to a backup directory maintaining the original
31+
directory structure. New backup files will be copied over the old so you will always have the most current
32+
backup.</p>
3833
<p>
39-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/astyle-clean.sh.zip"><strong>astyle-clean.sh</strong></a>&nbsp;
40-
is a <strong>Linux shell script</strong> to clean a directory tree by moving Artistic Style backup files to a
41-
separate directory. This allows Artistic Style to create backup files without cluttering your source directories.
42-
There are four variables at the start of the script that need to be set for each application. The script will
43-
move or copy backup files to a backup directory maintaining the original directory structure. New backup files
44-
will be copied over the old so you will always have the most current backup.</p>
34+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/astyle-clean.sh.zip" target="_blank" title="open new window">
35+
<strong>astyle-clean.sh</strong></a>&nbsp; is a <strong>Linux shell script</strong> to clean a directory tree
36+
by moving Artistic Style backup files to a separate directory. This allows Artistic Style to create backup files
37+
without cluttering your source directories. There are four variables at the start of the script that need to be
38+
set for each application. The script will move or copy backup files to a backup directory maintaining the original
39+
directory structure. New backup files will be copied over the old so you will always have the most current
40+
backup.</p>
4541
<p>
46-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/astyle-clean.bat.zip"><strong>astyle-clean.bat</strong></a>&nbsp;
47-
is a <strong>Windows batch file</strong> to clean a directory tree by moving Artistic Style backup files to a
48-
separate directory. This allows Artistic Style to create backup files without cluttering your source directories.
49-
There are four variables at the start of the script that need to be set for each application. The script will
50-
move or copy backup files to a backup directory maintaining the original directory structure. New backup files
51-
will be copied over the old so you will always have the most current backup.</p>
42+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/astyle-clean.bat.zip" target="_blank" title="open new window">
43+
<strong>astyle-clean.bat</strong></a>&nbsp; is a <strong>Windows batch file</strong> to clean a directory
44+
tree by moving Artistic Style backup files to a separate directory. This allows Artistic Style to create backup
45+
files without cluttering your source directories. There are four variables at the start of the script that need
46+
to be set for each application. The script will move or copy backup files to a backup directory maintaining the
47+
original directory structure. New backup files will be copied over the old so you will always have the most current
48+
backup.</p>
5249
<p>
53-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/astyle.pl.zip"><strong>astyle.pl</strong></a>&nbsp;
54-
is a <strong>Mac Perl script</strong> to indent source files in TextWrangler and BBEdit using Artistic Style.
55-
Selected text from the editor can be passed to Artistic Style and replaced with the reformatted text. Save the
56-
script in the "Unix Filters" directory (you need to restart TextWrangler to see new scripts). Then simply highlight
57-
the text you would like to indent, choose the script from the Shebang (<code>#!</code>) menu, and the text will
58-
be immaculately formatted. You can add Artistic Style options to the "my $astyle" line in the script.</p>
50+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/astyle.pl.zip" target="_blank" title="open new window">
51+
<strong>astyle.pl</strong></a>&nbsp; is a <strong>Mac Perl script</strong> to indent source files in TextWrangler
52+
and BBEdit using Artistic Style. Selected text from the editor can be passed to Artistic Style and replaced with
53+
the reformatted text. Save the script in the "Unix Filters" directory (you need to restart TextWrangler to see
54+
new scripts). Then simply highlight the text you would like to indent, choose the script from the Shebang (<code>#!</code>)
55+
menu, and the text will be immaculately formatted. You can add Artistic Style options to the "my $astyle" line
56+
in the script.</p>
5957
<p>
60-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/indent-commit.pl.zip"><strong>indent-commit.pl</strong></a>&nbsp;
61-
is a <strong>Perl script</strong> to integrate Artistic Style with a CVS repository check-in. Before code is checked in,
62-
Artistic Style is automatically called so that the repository files have a consistent style. This script was posted
63-
on the web site several years ago and probably needs to be updated.</p>
58+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/indent-commit.pl.zip" target="_blank" title="open new window">
59+
<strong>indent-commit.pl</strong></a>&nbsp; is a <strong>Perl script</strong> to integrate Artistic Style
60+
with a CVS repository check-in. Before code is checked in, Artistic Style is automatically called so that the
61+
repository files have a consistent style. This script was posted on the web site several years ago and probably
62+
needs to be updated.</p>
6463
<p>
65-
<a href="http://astyle.svn.sourceforge.net/viewvc/astyle/trunk/AStyleDev/downloads/astyle-hooks.el.zip"><strong>astyle-hooks.el</strong></a>&nbsp;
66-
is an <strong>Emacs Lisp script</strong> containing hooks to convert Emacs default styles to Artistic Style default
67-
styles. There are hooks for C++, Java, and C# files. The C# hook requires the csharp-mode.el file from <a href="https://code.google.com/p/csharpmode/">
64+
<a href="https://sourceforge.net/projects/astyle/files/OldFiles/scripts/astyle-hooks.el.zip" target="_blank" title="open new window">
65+
<strong>astyle-hooks.el</strong></a>&nbsp; is an <strong>Emacs Lisp script</strong> containing hooks to convert
66+
Emacs default styles to Artistic Style default styles. There are hooks for C++, Java, and C# files. The C# hook
67+
requires the csharp-mode.el file from <a href="https://code.google.com/p/csharpmode/" target="_blank" title="open new window">
6868
csharpmode</a> on Google Project Hosting. For best results Artistic Style should use the options &#8209;&#8209;min&#8209;conditional&#8209;indent=0
69-
(&#8209;m0) and &#8209;&#8209;max&#8209;instatement&#8209;indent=50 (&#8209;M50). Emacs does not seem to have
70-
an option equivalent to these. The formatting for Emacs and Artistic Style will not be identical but should be
69+
(&#8209;m0) and &#8209;&#8209;max&#8209;continuation&#8209;indent=50 (&#8209;M50). Emacs does not seem to have
70+
an option equivalent to these. The formatting for Emacs and Artistic Style will not be identical, but should be
7171
reasonably close.</p>
7272
<p>
7373
&nbsp;</p>
7474

75-
<center style="margin-left: -0.4in;">
75+
<p style="margin-left: -0.4in; text-align: center;">
7676
<a href="http://sourceforge.net/projects/astyle">
77-
<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" width="150" height="40" alt="[SourceForge.net]" /></a>
78-
</center>
77+
<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" alt="" /></a></p>
7978

8079
<p>
8180
&nbsp;</p>
8281

83-
<!-- Piwik -->
84-
85-
<script type="text/javascript">
86-
var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/astyle/" : "http://sourceforge.net/apps/piwik/astyle/");
87-
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
88-
</script>
89-
90-
<script type="text/javascript">
91-
try {
92-
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
93-
piwikTracker.trackPageView();
94-
piwikTracker.enableLinkTracking();
95-
} catch( err ) {}
96-
</script>
97-
98-
<noscript>
99-
<p>
100-
<img src="http://sourceforge.net/apps/piwik/astyle/piwik.php?idsite=1" style="border: 0" alt="" /></p>
101-
</noscript>
102-
103-
<!-- End Piwik Tag -->
104-
10582
</body>
10683

10784
</html>

‎AStyle/doc/styles.css

+47-31
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,56 @@
44
* h3 is a hanging text title
55
* h4 is a non-hanging text title
66
* p.noindent is non-hanging text (text without a title)
7-
* div.code is a light-blue backgroung color for preformatted code
8-
* pre is preformatted source code
97
* p.contents entries are for the table of contents
108
* a.contents are table of contents links (not underlined)
119
* a.links are links (underlined)
12-
* .footer is the image table at the bottom of the page
1310
* img does not have a border
11+
* pre is a predefined format for formatting code
1412
*/
1513

16-
17-
body { margin-top:0.5in; margin-right:0.8in; margin-bottom:0.5in; margin-left:1.3in; }
18-
19-
h1 { color:#0000A0; text-align:center; font-style:italic; margin-top:18pt; margin-left:-0.5in; }
20-
h2.large { color:#0000A0; text-align:center; font-size:x-large; margin-top:0.4in; margin-left:-0.5in; }
21-
h2 { color:#0000A0; text-align:center; font-size:larger; margin-top:0.4in; margin-left:-0.5in; }
22-
h3 { color:#0000A0; margin-top:0.4in; margin-left:-0.4in; }
23-
h4 { color:#0000A0; }
24-
25-
p.noindent { margin-left:-0.4in; }
26-
27-
div.code { background:#E0E8FF; }
28-
pre { margin-left:0.3in; }
29-
/* pre.em { background:#FDFCFF; margin-right:0.3in;} */
30-
31-
p.contents1 { font-size:105%; margin-top:0in; margin-left:0in; margin-bottom:0in; margin-right:0in; }
32-
p.contents2 { margin-top:0in; margin-left:.4in; margin-bottom:0in; margin-right:.4in; }
33-
/* p.contents3 { margin-top:0in; margin-left:.8in; margin-bottom:0in; margin-right:.8in; } */
34-
a.contents:link, a.contents:visited { color:#0000A0; text-decoration:none; }
35-
a.contents:hover { color:#F00000; text-decoration:none; }
36-
37-
a:link, a:visited { color:#0000A0; text-decoration:underline; }
38-
a:hover { color:#F00000; text-decoration:underline; }
39-
40-
center.footer { margin-left:-0.4in; margin-top:0.25in; }
41-
h2.footer { font-size:x-large; margin-top:0; margin-left:0; }
42-
43-
img { border:none; }
14+
/* margin: [top] [right] [bottom] [left] */
15+
16+
body { background-color: white; margin: 0.5in 0.8in 0.5in 1.3in; }
17+
18+
h1 { color: #0000A0; text-align: center; font-style: italic; margin-top: 0.4in; margin-left: -0.5in; }
19+
/* h2.large { color: #0000A0; text-align: center; font-size: x-large; margin-top: 0.4in; margin-left: -0.5in; } */
20+
h2 { color: #0000A0; text-align: center; font-size: larger; margin-top: 0.4in; margin-left: -0.5in; }
21+
h3 { color: #0000A0; margin-top: 0.4in; margin-left: -0.4in; }
22+
h4 { color: #0000A0; margin-top: 0.3in; }
23+
24+
/* paragraph classes */
25+
.noindent { margin-left: -0.4in; }
26+
.contents1 { font-size: 105%; margin: 0; }
27+
.contents2 { margin: 0 0.4in 0 0.4in; }
28+
29+
a.contents:link, a.contents:visited { color: #0000A0; text-decoration: none; }
30+
a.contents:hover { color: #F00000; text-decoration: none; }
31+
a:link, a:visited { color: #0000A0; text-decoration: underline; }
32+
a:hover { color: #F00000; text-decoration: underline; }
33+
34+
img { border: none; }
35+
36+
pre { margin-left: 0.3in; color: navy; font-weight: bold; }
37+
38+
/*- the following styles are for the 'top' button
39+
the corresponding javascript is in the html document from
40+
https://www.w3schools.com/howto/tryit.asp?filename=tryhow_js_scroll_to_top
41+
*/
42+
#topBtn {
43+
display: none; /* Hidden by default */
44+
position: fixed; /* Fixed/sticky position */
45+
bottom: 55px; /* Place the button from the bottom */
46+
right: 10px; /* Place the button from the right */
47+
z-index: 99; /* Make sure it does not overlap */
48+
border: none; /* Remove borders */
49+
outline: none; /* Remove outline */
50+
background-color: #ccc; /* Set a background color */
51+
color: #0000C0; /* Text color */
52+
cursor: pointer; /* Add a mouse pointer on hover */
53+
padding: 10px; /* Some padding */
54+
border-radius: 10px; /* Rounded corners */
55+
}
56+
57+
#topBtn:hover {
58+
background-color: #aaa; /* Add a darker background on hover */
59+
}

‎AStyle/doc/subversion.html

+102-67
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,160 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
22

3-
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
44

55
<head>
66
<title>Artistic Style - Subversion</title>
77
<meta http-equiv="Content-Language" content="en-us" />
88
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
9+
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
910
<link href="styles.css" rel="stylesheet" type="text/css" />
1011
</head>
1112

1213
<body>
1314

14-
<h1>
15-
Artistic Style Subversion Repository</h1>
15+
<h1>Artistic Style Subversion Repository</h1>
1616

1717
<p>
1818
&nbsp;</p>
1919

20-
<h3>
21-
Artistic Style</h3>
20+
<h3>Artistic Style</h3>
2221

2322
<p>
2423
The latest development source is in the Artistic Style repository at SourceForge. It can be checked out using
2524
Subversion. The source code is under development and some changes take several weeks to complete. The intermediate
2625
source files have not been through the extensive system tests that are done before each release. Use reasonable
2726
precautions when using source code from the repository.</p>
2827
<p>
29-
The repository address is "https://astyle.svn.sourceforge.net/svnroot/astyle". The current version is in the "trunk/AStyle"
30-
branch of the repository. The file and directory names in the repository are case sensitive.</p>
28+
The current version is in the "trunk/AStyle" branch of the repository. The file and directory names are case
29+
sensitive.</p>
3130
<p>
3231
A sample checkout is:<br />
33-
<strong>svn&nbsp; checkout&nbsp; "https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle"&nbsp; "$HOME/astyle"</strong></p>
32+
<strong>svn&nbsp; checkout&nbsp; "https://svn.code.sf.net/p/astyle/code/trunk/AStyle"&nbsp;
33+
"$HOME/astyle"</strong></p>
3434
<p>
35-
Note that the URLs used to access the repository will change when the project is upgraded to the Allura platform
36-
by SourceForge. SourceForge should provide information on the new URLs.</p>
37-
<p>
38-
You can also <a href="http://astyle.svn.sourceforge.net/viewvc/astyle/">browse the subversion repository</a>. The current development release is in the "trunk" directory. This gives you a view into the current status of the project's code without actually checking-out the files.</p>
35+
You can also <a href="https://sourceforge.net/p/astyle/code/HEAD/tree/" target="_blank" title="open new window">browse
36+
the subversion repository</a>. The current development release is in the "trunk" directory. This gives you
37+
a view into the current status of the project's code without actually checking-out the files.</p>
3938
<p>
4039
&nbsp;</p>
4140

42-
<h3>
43-
Other Projects</h3>
41+
<h3>Other Projects</h3>
4442

4543
<p>
4644
Two additional Artistic Style projects are available in the repository. They are not maintained for the general
47-
public but are available if you want them. You may have to create your own project files and scripts to use them.
48-
These projects require the Artistic Style project above. They are an extension that requires the Artistic Style
49-
source. All projects, and any additional source required, should be installed in the same top level folder.</p>
45+
public, but are available if you want them. You may have to create your own project files and scripts to use
46+
them.</p>
47+
<p>
48+
All projects, and any additional source required, should be installed in the same top level folder. A sample file
49+
directory containing ALL the projects should look as follows. The project dependencies are described
50+
below.</p>
51+
<pre> Projects
52+
AStyle
53+
AStyleDev
54+
AStyleTest
55+
AStyleWx
56+
AStyleWxTest
57+
googlemock
58+
googletest</pre>
5059

51-
<h4>
52-
AStyleDev</h4>
60+
<h4>AStyleDev</h4>
5361

5462
<p>
5563
AStyleDev contains the development files that are made available in the "Developer Information" section. Refer
5664
to that section for more information.</p>
5765
<p>
58-
A sample checkout is:<br />
59-
svn&nbsp; checkout&nbsp; "https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyleDev"&nbsp; "$HOME/astyledev"</p>
66+
These projects require the Artistic Style project to compile.</p>
6067
<p>
61-
Note that the URLs used to access the repository will change when the project is upgraded to the Allura platform
62-
by SourceForge. SourceForge should provide information on the new URLs.</p>
68+
A sample checkout is:<br />
69+
<strong>svn&nbsp; checkout&nbsp; "https://svn.code.sf.net/p/astyle/code/trunk/AStyleDev"&nbsp; "$HOME/astyledev"
70+
</strong></p>
6371

64-
<h4>
65-
AStyleTest</h4>
72+
<h4>AStyleTest</h4>
6673

6774
<p>
68-
AStyleTest contains the unit test programs and test scripts for Artistic Style.
69-
</p>
75+
AStyleTest contains the unit test programs and test scripts for Artistic Style. There are over 2500 tests in the
76+
main test program.</p>
77+
<p>
78+
This project requires the Artistic Style project to compile.
79+
In addition, the test program requires Google Mock and Google Test described below.</p>
80+
<p>
81+
The main test project, AStyleTest, can be run in Visual Studio using the graphical Visual Studio Test
82+
Explorer. The procedure is described below.</p>
7083
<p>
7184
A sample checkout is:<br />
72-
svn&nbsp; checkout&nbsp; "https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyleTest"&nbsp; "$HOME/astyletest"</p>
85+
<strong>svn&nbsp; checkout&nbsp; "https://svn.code.sf.net/p/astyle/code/trunk/AStyleTest"&nbsp; "$HOME/astyletest"
86+
</strong></p>
87+
88+
<h4>AStyleWx</h4>
89+
90+
<p>
91+
AStyleWx contains a GUI test program for Artistic Style that uses the wxWidgets C++ library.</p>
92+
<p>
93+
This project requires the Artistic Style project to compile.
94+
Files for download are made available in the
95+
<a href="https://sourceforge.net/projects/astylewx.astyle.p/" target="_blank" title="open new window">Artistic Style
96+
Wx</a> subproject. The download contains all files needed to compile the project. The subproject can be accessed
97+
from the Artistic Style SourceForge pages.</p>
7398
<p>
74-
Note that the URLs used to access the repository will change when the project is upgraded to the Allura platform
75-
by SourceForge. SourceForge should provide information on the new URLs.</p>
99+
A sample checkout is:<br />
100+
<strong>svn&nbsp; checkout&nbsp; "https://svn.code.sf.net/p/astyle/code/trunk/AStyleWx&quot;&nbsp; "$HOME/astylewx&quot;
101+
</strong></p>
102+
103+
<h4>AStyleWxTest</h4>
104+
76105
<p>
77-
In addition to the Artistic Style source the test program requires
78-
<a href="http://code.google.com/p/googlemock/"
79-
target="astyle" title="open new window">Google Mock</a>. This is the Google multi-platform framework for writing C++
80-
unit tests. The main Artistic Style test project, AStyleTest, actually uses &quot;integration&quot; tests instead of
81-
&quot;unit&quot; tests. This type of testing can be effective for programs that were written without unit tests to begin
82-
with.</p>
106+
AStyleTest contains the unit test programs and test scripts for AStyleWx.&nbsp; </p>
83107
<p>
84-
An optional leak finder program can be added if you
85-
are using Visual Studio. The <a href="https://vld.codeplex.com/" target="astyle"
86-
title="open new window">Visual Leak Detector</a> should be installed in the default install directory
87-
(C:\Program Files (x86)\Visual Leak Detector). You do NOT need to change the &quot;PATH&quot; environment variable.
88-
It can be downloaded from the website or installed from standard versions of Visual Studio 2012 from the
89-
&quot;Tools &gt; Extensions and Updates&quot; menu.</p>
108+
This project requires the AStyleWx project to compile. In addition, the test program requires Google Mock and
109+
Google Test described below.</p>
90110
<p>
91-
&nbsp;
92-
</p>
111+
A sample checkout is:<br />
112+
<strong>svn&nbsp; checkout&nbsp; "https://svn.code.sf.net/p/astyle/code/trunk/AStyleWxTest"&nbsp; "$HOME/astylewxtest"
113+
</strong></p>
93114

94-
<center style="margin-left: -0.4in;">
95-
<a href="http://sourceforge.net/projects/astyle">
96-
<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" width="150" height="40" alt="[SourceForge.net]" /></a>
97-
</center>
115+
<h4>Google Mock and Google Test</h4>
98116

99117
<p>
100-
&nbsp;</p>
118+
Google Test and Google Mock is the Google multi-platform framework for writing C++ unit tests.
119+
It is available on <a href="https://github.com/google/googletest" target="_blank" title="open new window">GitHub</a>
120+
and can be downloaded as a zip file by pressing the green &quot;clone or download&quot; button and selecting
121+
&quot;Download ZIP&quot;. The default is to download the master development branch. The latest stable release
122+
can be obtained by using the drop-down box labeled &quot;Branch: master&quot;, selecting the &quot;tags&quot;
123+
tab, and then selecting the latest release. The selected release can then be downloaded using the &quot;clone
124+
or download&quot; button. Download the latest release for googletest and googlemock from the repository.</p>
125+
<p>
126+
The Artistic Style project files are set up to use googletest and googlemock installed in the top level folder
127+
as indicated above. The library compile for googlemock includes googletest. The library compile for googletest
128+
includes only googletest. The AStyle test programs have their own project files for compiling the test platform.
129+
There are also compile project files in the downloaded google modules if you want to use them. They create a static
130+
library file that is linked to the test program. The google downloads contain instructions for using the
131+
package. </p>
101132

102-
<!-- Piwik -->
133+
<h4>Visual Studio Test Explorer</h4>
103134

104-
<script type="text/javascript">
105-
var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/astyle/" : "http://sourceforge.net/apps/piwik/astyle/");
106-
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
107-
</script>
135+
<p>
136+
Some of the test projects can be run in Visual Studio Community using Visual Studio Test Explorer.
137+
If there is a <strong>.gta.runsettings</strong> file in the solution directory for a test project,
138+
the test will run in the Test Explorer.</p>
139+
<p>
140+
The &quot;Google Test Adapter&quot; extension must be installed from the Tools &gt; &quot;Extensions
141+
and Updates&quot; menu. After restarting Visual Studio the test window is activated from the Test
142+
&gt; Window &gt; &quot;Test Explorer&quot; menu option. After compiling, the tests will appear in
143+
the test window. Then they may be run from the &quot;Test Explorer&quot; window or from the Test menu
144+
options.</p>
145+
<p>
146+
Test Explorer may be used for other test projects. The tests can also be run as a command line program by using
147+
the standard debug or run button on the menu or toolbar.</p>
108148

109-
<script type="text/javascript">
110-
try {
111-
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
112-
piwikTracker.trackPageView();
113-
piwikTracker.enableLinkTracking();
114-
} catch( err ) {}
115-
</script>
149+
<p>
150+
&nbsp;</p>
116151

117-
<noscript>
118-
<p>
119-
<img src="http://sourceforge.net/apps/piwik/astyle/piwik.php?idsite=1" style="border: 0" alt="" /></p>
120-
</noscript>
152+
<p style="margin-left: -0.4in; text-align: center;">
153+
<a href="http://sourceforge.net/projects/astyle">
154+
<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" alt="" /></a></p>
121155

122-
<!-- End Piwik Tag -->
156+
<p>
157+
&nbsp;</p>
123158

124159
</body>
125160

‎AStyle/doc/vsinstall.html

+34-57
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,90 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
22

3-
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
44

55
<head>
66
<title>.NET Framework SDK</title>
77
<meta http-equiv="Content-Language" content="en-us" />
88
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
9+
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
910
<link href="styles.css" rel="stylesheet" type="text/css" />
1011
</head>
1112

1213
<body>
1314

14-
<h1>
15-
Visual Studio 2010 C++ Express</h1>
15+
<h1>Visual Studio 2010 C++ Express</h1>
1616

17-
<h2>
18-
Install Instructions for .NET Framework SDK</h2>
17+
<h2>Install Instructions for .NET Framework SDK</h2>
1918

2019
<p>
2120
&nbsp;</p>
2221

2322
<p>
2423
Following are instructions for installing the .NET Framework SDK in Visual Studio 2010 Express and adding x64
2524
platforms to an existing project in a manner similar to the more expensive Visual Studio editions.</p>
26-
<p>
27-
IMPORTANT: If Visual Studio 2010 Service Pack 1 is applied after the .NET Framework SDK install, an additional
28-
update is
29-
required to restore the Visual C++ compilers and libraries that may have been removed. Information is available
30-
<a href="http://msdn.microsoft.com/en-us/visualc/gg697159" target="_blank" title="open new window">here</a>.</p>
3125

32-
<h4>
33-
Installing .NET Framework SDK</h4>
26+
<h4>Installing .NET Framework SDK</h4>
3427

3528
<p>
36-
64-bit tools are not available on the Visual Studio 2010 C++ Express Edition by default. To enable 64-bit targets,
29+
64-bit tools are not available in the Visual Studio 2010 C++ Express Edition by default. To enable 64-bit targets,
3730
install the .NET Framework SDK in addition to the Visual Studio 2010 Express Edition. Otherwise, the x64 solution
3831
platform is not available and a warning will occur if you open a project containing a 64-bit target.</p>
3932
<p>
40-
Install the <a href="http://msdn.microsoft.com/en-us/windows/bb980924.aspx">Windows SDK</a> appropriate for your
41-
operating system<a href="http://www.microsoft.com/downloads/details.aspx?FamilyID=6b6c21d2-2006-4afa-9702-529fa782d63b&displaylang=en"></a>.
42-
Use the "Install Now" link to get the SDK. You can
33+
Install the <a href="http://www.microsoft.com/en-us/download/details.aspx?id=8279" target="_blank" title="open new window">
34+
Windows SDK</a> appropriate for your operating system. Use the "Install Now" link to get the SDK. You can
4335
optionally install the Windows Performance Toolkit, Debugging Tools, and Application Verifier. The Help is also
4436
optional.</p>
4537
<p>
4638
After installing this package the x64 configurations can be created.</p>
39+
<p>
40+
IMPORTANT: If Visual Studio 2010 Service Pack 1 is applied after the .NET Framework SDK install, an additional
41+
update is required to restore the Visual C++ compilers and libraries that may have been removed. Information is
42+
available <a href="http://msdn.microsoft.com/en-us/vstudio//gg697159" target="_blank"
43+
title="open new window">here</a>.</p>
44+
4745

48-
<h4>
49-
Adding x64 to Project Files</h4>
46+
<h4>Adding x64 to Project Files</h4>
5047

5148
<p>
5249
Open a Win32 project. Open the Configuration Manager from the Build menu. In the Active Solution Platform select
53-
New. For the New Platform select x64. Usually you will want to &#8220;Copy settings from Win32&#8221; and check
54-
&#8220;Create new project platforms&#8221;.
55-
</p>
56-
<p>
57-
</p>
50+
New. For the New Platform select x64. You will need to &#8220;Copy settings from Win32&#8221; and check
51+
&#8220;Create new project platforms&#8221;.</p>
5852
<p>
5953
Open the Properties from the Project menu. There is a new configuration property that needs to be set for the
6054
linker to find the system libraries. Be sure the x64 platform is selected and change "Configuration Properties
6155
&gt; General
62-
&gt; Platform Toolset<strong>"</strong>, to <strong>Windows7.1SDK</strong>. Otherwise you will get linker errors
56+
&gt; Platform Toolset<strong>"</strong>, to <strong>Windows7.1SDK</strong>. Otherwise, you will get linker errors
6357
such as "LINK : fatal error LNK1104: cannot open file 'kernel32.lib'". This setting can also optionally be used
6458
for the Win32 platform.</p>
6559
<p>
66-
The x64 configuration can now be compiled, but the compiles will place the files in the same directories as the
67-
Win32 compiles. To correct this the x64 compiles should be placed in an x64 directory using the <strong>$(PlatformName)</strong>
60+
The x64 configuration can now be compiled, but the compiler will place the files in the same directories as the
61+
Win32 compiles. To correct this, the x64 compiles should be placed in an x64 directory using the <strong>$(Platform)</strong>
6862
macro.</p>
6963
<p>
70-
Add the $(PlatformName) macro to &#8220;Configuration Properties &gt; General &gt; Output directory&#8221; so the
71-
entry becomes $(SolutionDir)<strong>$(PlatformName)\</strong>$(Configuration)\.</p>
64+
Add the $(Platform) macro to &#8220;Configuration Properties &gt; General &gt; Output directory&#8221; so the
65+
entry becomes $(SolutionDir)<strong>$(Platform)\</strong>$(Configuration)\.</p>
7266
<p>
73-
Add the $(PlatformName) macro to &#8220;Configuration Properties&nbsp; &gt; General&gt; Intermediate Directory&#8221;
74-
so the entry becomes <strong>$(PlatformName)\</strong>$(Configuration)\.</p>
67+
Leave &#8220;Configuration Properties&nbsp; &gt; General&gt; Intermediate Directory&#8221; at the default which
68+
should be <strong>$(Platform)\</strong>$(Configuration)\.</p>
7569
<p>
76-
Check the x64 Debug configuration &#8220;Configuration Properties &gt; Linker &gt; Debugging &gt; Generate Program Database File&#8221;
77-
for $(ProjectDir)<strong>$(PlatformName)\</strong>$(ConfigurationName)\$(TargetName).pdb<strong>.</strong></p>
70+
Check the x64 Debug configuration &#8220;Configuration Properties &gt; Linker &gt; Debugging &gt; Generate Program
71+
Database File&#8221; for $(TargetDir)$(TargetName).pdb.</p>
7872
<p>
79-
Compile the project. If there are compile errors you may need to add the <strong>$(PlatformName)</strong> macro
73+
Compile the project. If there are compile errors you may need to add the <strong>$(Platform)</strong> macro
8074
to other settings as well. For example, if there are user library files the macro may need to be added to
81-
&#8220;Configuration Properties &gt; Linker &gt; General &gt; Additional Library Directories&#8221;.<strong></strong></p>
82-
<p>
83-
</p>
75+
&#8220;Configuration Properties &gt; Linker &gt; General &gt; Additional Library Directories&#8221;.</p>
8476
<p>
8577
You should now be able to compile both Win32 and x64 platforms in a manner similar to the more expensive Visual
8678
Studio editions.</p>
8779
<p>
8880
&nbsp;</p>
8981

90-
<!-- Piwik -->
91-
92-
<script type="text/javascript">
93-
var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/astyle/" : "http://sourceforge.net/apps/piwik/astyle/");
94-
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
95-
</script>
96-
97-
<script type="text/javascript">
98-
try {
99-
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
100-
piwikTracker.trackPageView();
101-
piwikTracker.enableLinkTracking();
102-
} catch( err ) {}
103-
</script>
82+
<p style="margin-left: -0.4in; text-align: center;">
83+
<a href="http://sourceforge.net/projects/astyle">
84+
<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2319&type=16" alt="" /></a></p>
10485

105-
<noscript>
106-
<p>
107-
<img src="http://sourceforge.net/apps/piwik/astyle/piwik.php?idsite=1" style="border: 0" alt="" /></p>
108-
</noscript>
109-
110-
<!-- End Piwik Tag -->
86+
<p>
87+
&nbsp;</p>
11188

11289
</body>
11390

0 commit comments

Comments
 (0)
Please sign in to comment.